io_uring/query: return support for custom rx page size

Add an ability to query if the zcrx rx page size setting is available.

Note, even when the API is supported by io_uring, the registration can
still get rejected for various reasons, e.g. when the NIC or the driver
doesn't support it, when the particular specified size is unsupported,
when the memory area doesn't satisfy all requirements, etc.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index da5156954731189bc314b19f282d71ad482cba5a..c462bdf3c42c0fc24b27ee7599342f176febc488 100644 (file)
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -1090,6 +1090,14 @@ enum zcrx_reg_flags {
        ZCRX_REG_IMPORT = 1,
 };
 
+enum zcrx_features {
+       /*
+        * The user can ask for the desired rx page size by passing the
+        * value in struct io_uring_zcrx_ifq_reg::rx_buf_len.
+        */
+       ZCRX_FEATURE_RX_PAGE_SIZE       = 1 << 0,
+};
+
 /*
  * Argument for IORING_REGISTER_ZCRX_IFQ
  */

diff --git a/include/uapi/linux/io_uring/query.h b/include/uapi/linux/io_uring/query.h
index 2456e6c5ebb5e02848acf6cce41dfc343859c572..0b6248175e26d9a2be60bfedc64f51178356c63d 100644 (file)
--- a/include/uapi/linux/io_uring/query.h
+++ b/include/uapi/linux/io_uring/query.h
@@ -50,7 +50,8 @@ struct io_uring_query_zcrx {
        __u64 area_flags;
        /* The number of supported ZCRX_CTRL_* opcodes */
        __u32 nr_ctrl_opcodes;
-       __u32 __resv1;
+       /* Bitmask of ZCRX_FEATURE_* indicating which features are available */
+       __u32 features;
        /* The refill ring header size */
        __u32 rq_hdr_size;
        /* The alignment for the header */

diff --git a/io_uring/query.c b/io_uring/query.c
index abdd6f3e1223dab7d38e9880d7491d29e7dd0ad9..63cc30c9803d197269238c6c3fd1c74d95e3bf5e 100644 (file)
--- a/io_uring/query.c
+++ b/io_uring/query.c
@@ -39,7 +39,7 @@ static ssize_t io_query_zcrx(union io_query_data *data)
        e->nr_ctrl_opcodes = __ZCRX_CTRL_LAST;
        e->rq_hdr_size = sizeof(struct io_uring);
        e->rq_hdr_alignment = L1_CACHE_BYTES;
-       e->__resv1 = 0;
+       e->features = ZCRX_FEATURE_RX_PAGE_SIZE;
        e->__resv2 = 0;
        return sizeof(*e);
 }