tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

io_uring/zcrx: always pass page to io_zcrx_copy_chunk

io_zcrx_copy_chunk() currently takes either a page or virtual address.
Unify the parameters, make it take pages and resolve the linear part
into a page the same way general networking code does that.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: David Wei <dw@davidwei.uk>
Link: https://lore.kernel.org/r/b8f9f4bac027f5f44a9ccf85350912d1db41ceb8.1751466461.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Pavel Begunkov and committed by
Jens Axboe e9a9ddb1 825aea66

+10 -11
+10 -11
io_uring/zcrx.c
··· 945 945 } 946 946 947 947 static ssize_t io_zcrx_copy_chunk(struct io_kiocb *req, struct io_zcrx_ifq *ifq, 948 - void *src_base, struct page *src_page, 949 - unsigned int src_offset, size_t len) 948 + struct page *src_page, unsigned int src_offset, 949 + size_t len) 950 950 { 951 951 struct io_zcrx_area *area = ifq->area; 952 952 size_t copied = 0; ··· 960 960 const int dst_off = 0; 961 961 struct net_iov *niov; 962 962 struct page *dst_page; 963 - void *dst_addr; 963 + void *dst_addr, *src_addr; 964 964 965 965 niov = io_zcrx_alloc_fallback(area); 966 966 if (!niov) { ··· 970 970 971 971 dst_page = io_zcrx_iov_page(niov); 972 972 dst_addr = kmap_local_page(dst_page); 973 - if (src_page) 974 - src_base = kmap_local_page(src_page); 973 + src_addr = kmap_local_page(src_page); 975 974 976 - memcpy(dst_addr, src_base + src_offset, copy_size); 975 + memcpy(dst_addr, src_addr + src_offset, copy_size); 977 976 978 - if (src_page) 979 - kunmap_local(src_base); 977 + kunmap_local(src_addr); 980 978 kunmap_local(dst_addr); 981 979 982 980 if (!io_zcrx_queue_cqe(req, niov, ifq, dst_off, copy_size)) { ··· 1003 1005 1004 1006 skb_frag_foreach_page(frag, off, len, 1005 1007 page, p_off, p_len, t) { 1006 - ret = io_zcrx_copy_chunk(req, ifq, NULL, page, p_off, p_len); 1008 + ret = io_zcrx_copy_chunk(req, ifq, page, p_off, p_len); 1007 1009 if (ret < 0) 1008 1010 return copied ? copied : ret; 1009 1011 copied += ret; ··· 1065 1067 size_t to_copy; 1066 1068 1067 1069 to_copy = min_t(size_t, skb_headlen(skb) - offset, len); 1068 - copied = io_zcrx_copy_chunk(req, ifq, skb->data, NULL, 1069 - offset, to_copy); 1070 + copied = io_zcrx_copy_chunk(req, ifq, virt_to_page(skb->data), 1071 + offset_in_page(skb->data) + offset, 1072 + to_copy); 1070 1073 if (copied < 0) { 1071 1074 ret = copied; 1072 1075 goto out;