diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-15 13:04:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-15 13:04:23 +0300 |
| commit | 608f2e77e49f99663221a857f518c568a320a4cc (patch) | |
| tree | 56bc39b6644673ef3990b4354521e2983d381aef /io_uring | |
| parent | 4a12f38e23d10a5dbad6cce0abaadd10e5a1aa68 (diff) | |
| parent | 17e9266e1aff69de51dbd554c8dad36c4cfef0bd (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.17.3linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/waitid.c | 3 | ||||
| -rw-r--r-- | io_uring/zcrx.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/io_uring/waitid.c b/io_uring/waitid.c index e07a94694397..3101ad8ec0cf 100644 --- a/io_uring/waitid.c +++ b/io_uring/waitid.c @@ -232,13 +232,14 @@ static int io_waitid_wait(struct wait_queue_entry *wait, unsigned mode, if (!pid_child_should_wake(wo, p)) return 0; + list_del_init(&wait->entry); + /* cancel is in progress */ if (atomic_fetch_inc(&iw->refs) & IO_WAITID_REF_MASK) return 1; req->io_task_work.func = io_waitid_cb; io_req_task_work_add(req); - list_del_init(&wait->entry); return 1; } diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index e5ff49f3425e..643a69f9ffe2 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -1154,12 +1154,16 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, end = start + frag_iter->len; if (offset < end) { + 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); + desc->count = count; if (ret < 0) goto out; |