Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
io_uring/zcrx: declare some constants for query
Add constants for zcrx features and supported registration flags that
can be reused by the query code. I was going to add another registration
flag, and this patch helps to avoid duplication and keeps changes
specific to zcrx files.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
authored by
Pavel Begunkov
and committed by
Jens Axboe
dc156e0f
403fec55
+8
-3
+2
-2
io_uring/query.c
+2
-2
io_uring/query.c
···
34
34
{
35
35
struct io_uring_query_zcrx *e = &data->zcrx;
36
36
37
-
e->register_flags = ZCRX_REG_IMPORT;
37
+
e->register_flags = ZCRX_SUPPORTED_REG_FLAGS;
38
38
e->area_flags = IORING_ZCRX_AREA_DMABUF;
39
39
e->nr_ctrl_opcodes = __ZCRX_CTRL_LAST;
40
40
e->rq_hdr_size = sizeof(struct io_uring);
41
41
e->rq_hdr_alignment = L1_CACHE_BYTES;
42
-
e->features = ZCRX_FEATURE_RX_PAGE_SIZE;
42
+
e->features = ZCRX_FEATURES;
43
43
e->__resv2 = 0;
44
44
return sizeof(*e);
45
45
}
+3
-1
io_uring/zcrx.c
+3
-1
io_uring/zcrx.c
···
778
778
return -EFAULT;
779
779
if (!mem_is_zero(®.__resv, sizeof(reg.__resv)) || reg.zcrx_id)
780
780
return -EINVAL;
781
+
if (reg.flags & ~ZCRX_SUPPORTED_REG_FLAGS)
782
+
return -EINVAL;
781
783
if (reg.flags & ZCRX_REG_IMPORT)
782
784
return import_zcrx(ctx, arg, ®);
783
785
if (copy_from_user(&rd, u64_to_user_ptr(reg.region_ptr), sizeof(rd)))
784
786
return -EFAULT;
785
-
if (reg.if_rxq == -1 || !reg.rq_entries || reg.flags)
787
+
if (reg.if_rxq == -1 || !reg.rq_entries)
786
788
return -EINVAL;
787
789
if (reg.rq_entries > IO_RQ_MAX_ENTRIES) {
788
790
if (!(ctx->flags & IORING_SETUP_CLAMP))