github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

io_urint/zcrx: narrow var scope in io_zcrx_recv_skb()

Browse Source 
A preparation patch that limits scopes of a couple variables in
io_zcrx_recv_skb() and rename them, it makes it easier to reason about
the code.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://patch.msgid.link/182c140502e7be534caf10360714a4d78f2ce5f4.1786108672.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2026-08-07 14:19:25 +01:00 committed by Jens Axboe
parent ebb2b81a2d
commit 7f32f17ffb
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
io_uring/zcrx.c
View File

@ -1692,8 +1692,7 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb,
struct io_kiocb *req = args->req;
struct sk_buff *frag_iter;
unsigned start, start_off = offset;
int i, copy, end, off;
int ret = 0;
int i, ret = 0;
len = min_t(size_t, len, desc->count);
/*
@ -1731,20 +1730,19 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb,
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
const skb_frag_t *frag;
unsigned frag_end;
if (WARN_ON(start > offset + len))
return -EFAULT;
frag = &skb_shinfo(skb)->frags[i];
end = start + skb_frag_size(frag);
frag_end = start + skb_frag_size(frag);
if (offset < end) {
copy = end - offset;
if (copy > len)
copy = len;
if (offset < frag_end) {
unsigned copy = min(frag_end - offset, len);
unsigned frag_off = offset - start;
off = offset - start;
ret = io_zcrx_recv_frag(req, ifq, frag, off, copy);
ret = io_zcrx_recv_frag(req, ifq, frag, frag_off, copy);
if (ret < 0)
goto out;
@ -1753,24 +1751,23 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb,
if (len == 0 || ret != copy)
goto out;
}
start = end;
start = frag_end;
}
skb_walk_frags(skb, frag_iter) {
unsigned frag_end;
if (WARN_ON(start > offset + len))
return -EFAULT;
end = start + frag_iter->len;
if (offset < end) {
frag_end = start + frag_iter->len;
if (offset < frag_end) {
unsigned copy = min(frag_end - offset, len);
unsigned frag_off = offset - start;
size_t count;
copy = end - offset;
if (copy > len)
copy = len;
off = offset - start;
count = desc->count;
ret = io_zcrx_recv_skb(desc, frag_iter, off, copy);
ret = io_zcrx_recv_skb(desc, frag_iter, frag_off, copy);
desc->count = count;
if (ret < 0)
goto out;
@ -1780,7 +1777,7 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb,
if (len == 0 || ret != copy)
goto out;
}
start = end;
start = frag_end;
}
out: