[PATCH v2 1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped

[PATCH v2 1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped

[Stefan Metzmacher]

include/uapi/linux/io_uring.h is synced 1:1 into
liburing:src/include/liburing/io_uring.h.

liburing has a configure check to detect the need for
linux/time_types.h. It can opt-out by defining
UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H

Fixes: 78a861b94959 ("io_uring: add sync cancelation API through io_uring_register()")
Link: https://github.com/axboe/liburing/issues/708
Link: https://github.com/axboe/liburing/pull/709
Link: https://lore.kernel.org/io-uring/20221115212614.1308132-1-ammar.faizi@intel.com/T/#m9f5dd571cd4f6a5dee84452dbbca3b92ba7a4091
CC: Jens Axboe <axboe@kernel.dk>
Cc: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
---
 include/uapi/linux/io_uring.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 551e75908f33..082020257f19 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -10,7 +10,15 @@
 
 #include <linux/fs.h>
 #include <linux/types.h>
+/*
+ * this file is shared with liburing and that has to autodetect
+ * if linux/time_types.h is available or not, it can
+ * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
+ * if linux/time_types.h is not available
+ */
+#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
 #include <linux/time_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.34.1

Re: [PATCH v2 1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped

[Ammar Faizi]

On 11/17/22 3:25 AM, Stefan Metzmacher wrote:
> diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
> index 551e75908f33..082020257f19 100644
> --- a/include/uapi/linux/io_uring.h
> +++ b/include/uapi/linux/io_uring.h
> @@ -10,7 +10,15 @@
>   
>   #include <linux/fs.h>
>   #include <linux/types.h>
> +/*
> + * this file is shared with liburing and that has to autodetect
> + * if linux/time_types.h is available or not, it can
> + * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
> + * if linux/time_types.h is not available
> + */
> +#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
>   #include <linux/time_types.h>
> +#endif
>   
>   #ifdef __cplusplus
>   extern "C" {

I admit the v1 was a stupid mistake. Sorry for that. Now this change
should not have any effect on the kernel code.

Only apps that use io_uring.h and put:

   #define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H

before the #include will get the effect, which Stefan will do in
liburing once this one gets accepted.

Reviewed-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>

-- 
Ammar Faizi

Re: [PATCH v2 1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped

[Stefan Metzmacher]

Hi Jens,

any chance to get this merged?

metze

Am 16.11.22 um 21:25 schrieb Stefan Metzmacher:
> include/uapi/linux/io_uring.h is synced 1:1 into
> liburing:src/include/liburing/io_uring.h.
> 
> liburing has a configure check to detect the need for
> linux/time_types.h. It can opt-out by defining
> UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
> 
> Fixes: 78a861b94959 ("io_uring: add sync cancelation API through io_uring_register()")
> Link: https://github.com/axboe/liburing/issues/708
> Link: https://github.com/axboe/liburing/pull/709
> Link: https://lore.kernel.org/io-uring/20221115212614.1308132-1-ammar.faizi@intel.com/T/#m9f5dd571cd4f6a5dee84452dbbca3b92ba7a4091
> CC: Jens Axboe <axboe@kernel.dk>
> Cc: Ammar Faizi <ammarfaizi2@gnuweeb.org>
> Signed-off-by: Stefan Metzmacher <metze@samba.org>
> ---
>   include/uapi/linux/io_uring.h | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
> index 551e75908f33..082020257f19 100644
> --- a/include/uapi/linux/io_uring.h
> +++ b/include/uapi/linux/io_uring.h
> @@ -10,7 +10,15 @@
>   
>   #include <linux/fs.h>
>   #include <linux/types.h>
> +/*
> + * this file is shared with liburing and that has to autodetect
> + * if linux/time_types.h is available or not, it can
> + * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
> + * if linux/time_types.h is not available
> + */
> +#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
>   #include <linux/time_types.h>
> +#endif
>   
>   #ifdef __cplusplus
>   extern "C" {

Re: [PATCH v2 1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped

[Jens Axboe]

On Wed, 16 Nov 2022 21:25:24 +0100, Stefan Metzmacher wrote:
> include/uapi/linux/io_uring.h is synced 1:1 into
> liburing:src/include/liburing/io_uring.h.
> 
> liburing has a configure check to detect the need for
> linux/time_types.h. It can opt-out by defining
> UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
> 
> [...]

Applied, thanks!

[1/1] uapi:io_uring.h: allow linux/time_types.h to be skipped
      commit: 9eb803402a2a83400c6c6afd900e3b7c87c06816

Best regards,
-- 
Jens Axboe