Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
io_uring/zcrx: remove sync refill uapi
There is a better way to handle the problem IORING_REGISTER_ZCRX_REFILL
solves. The uapi can also be slightly adjusted to accommodate future
extensions. Remove the feature for now, it'll be reworked for the next
release.
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
819630bd
6f1cbf6d
-90
-12
include/uapi/linux/io_uring.h
-12
include/uapi/linux/io_uring.h
···
689
689
/* query various aspects of io_uring, see linux/io_uring/query.h */
690
690
IORING_REGISTER_QUERY = 35,
691
691
692
-
/* return zcrx buffers back into circulation */
693
-
IORING_REGISTER_ZCRX_REFILL = 36,
694
-
695
692
/* this goes last */
696
693
IORING_REGISTER_LAST,
697
694
···
1068
1071
__u32 zcrx_id;
1069
1072
__u32 __resv2;
1070
1073
__u64 __resv[3];
1071
-
};
1072
-
1073
-
struct io_uring_zcrx_sync_refill {
1074
-
__u32 zcrx_id;
1075
-
/* the number of entries to return */
1076
-
__u32 nr_entries;
1077
-
/* pointer to an array of struct io_uring_zcrx_rqe */
1078
-
__u64 rqes;
1079
-
__u64 __resv[2];
1080
1074
};
1081
1075
1082
1076
#ifdef __cplusplus
-3
io_uring/register.c
-3
io_uring/register.c
-68
io_uring/zcrx.c
-68
io_uring/zcrx.c
···
928
928
.uninstall = io_pp_uninstall,
929
929
};
930
930
931
-
#define IO_ZCRX_MAX_SYS_REFILL_BUFS (1 << 16)
932
-
#define IO_ZCRX_SYS_REFILL_BATCH 32
933
-
934
-
static void io_return_buffers(struct io_zcrx_ifq *ifq,
935
-
struct io_uring_zcrx_rqe *rqes, unsigned nr)
936
-
{
937
-
int i;
938
-
939
-
for (i = 0; i < nr; i++) {
940
-
struct net_iov *niov;
941
-
netmem_ref netmem;
942
-
943
-
if (!io_parse_rqe(&rqes[i], ifq, &niov))
944
-
continue;
945
-
946
-
scoped_guard(spinlock_bh, &ifq->rq_lock) {
947
-
if (!io_zcrx_put_niov_uref(niov))
948
-
continue;
949
-
}
950
-
951
-
netmem = net_iov_to_netmem(niov);
952
-
if (!page_pool_unref_and_test(netmem))
953
-
continue;
954
-
io_zcrx_return_niov(niov);
955
-
}
956
-
}
957
-
958
-
int io_zcrx_return_bufs(struct io_ring_ctx *ctx,
959
-
void __user *arg, unsigned nr_arg)
960
-
{
961
-
struct io_uring_zcrx_rqe rqes[IO_ZCRX_SYS_REFILL_BATCH];
962
-
struct io_uring_zcrx_rqe __user *user_rqes;
963
-
struct io_uring_zcrx_sync_refill zr;
964
-
struct io_zcrx_ifq *ifq;
965
-
unsigned nr, i;
966
-
967
-
if (nr_arg)
968
-
return -EINVAL;
969
-
if (copy_from_user(&zr, arg, sizeof(zr)))
970
-
return -EFAULT;
971
-
if (!zr.nr_entries || zr.nr_entries > IO_ZCRX_MAX_SYS_REFILL_BUFS)
972
-
return -EINVAL;
973
-
if (!mem_is_zero(&zr.__resv, sizeof(zr.__resv)))
974
-
return -EINVAL;
975
-
976
-
ifq = xa_load(&ctx->zcrx_ctxs, zr.zcrx_id);
977
-
if (!ifq)
978
-
return -EINVAL;
979
-
nr = zr.nr_entries;
980
-
user_rqes = u64_to_user_ptr(zr.rqes);
981
-
982
-
for (i = 0; i < nr;) {
983
-
unsigned batch = min(nr - i, IO_ZCRX_SYS_REFILL_BATCH);
984
-
size_t size = batch * sizeof(rqes[0]);
985
-
986
-
if (copy_from_user(rqes, user_rqes + i, size))
987
-
return i ? i : -EFAULT;
988
-
io_return_buffers(ifq, rqes, batch);
989
-
990
-
i += batch;
991
-
992
-
if (fatal_signal_pending(current))
993
-
return i;
994
-
cond_resched();
995
-
}
996
-
return nr;
997
-
}
998
-
999
931
static bool io_zcrx_queue_cqe(struct io_kiocb *req, struct net_iov *niov,
1000
932
struct io_zcrx_ifq *ifq, int off, int len)
1001
933
{
-7
io_uring/zcrx.h
-7
io_uring/zcrx.h
···
63
63
};
64
64
65
65
#if defined(CONFIG_IO_URING_ZCRX)
66
-
int io_zcrx_return_bufs(struct io_ring_ctx *ctx,
67
-
void __user *arg, unsigned nr_arg);
68
66
int io_register_zcrx_ifq(struct io_ring_ctx *ctx,
69
67
struct io_uring_zcrx_ifq_reg __user *arg);
70
68
void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx);
···
94
96
unsigned int id)
95
97
{
96
98
return NULL;
97
-
}
98
-
static inline int io_zcrx_return_bufs(struct io_ring_ctx *ctx,
99
-
void __user *arg, unsigned nr_arg)
100
-
{
101
-
return -EOPNOTSUPP;
102
99
}
103
100
#endif
104
101