diff options
| author | Mina Almasry <almasrymina@google.com> | 2024-09-10 17:14:51 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-11 20:44:31 -0700 |
| commit | 9f6b619edf2e85746f261b42ae8f818a59d126f7 (patch) | |
| tree | 0eba6fef2f40b4e4261e96815a9946b58869bf8e /net/ipv4 | |
| parent | 0f921404689398943257793f7240db239a23b609 (diff) | |
| download | lwn-9f6b619edf2e85746f261b42ae8f818a59d126f7.tar.gz lwn-9f6b619edf2e85746f261b42ae8f818a59d126f7.zip | |
net: support non paged skb frags
Make skb_frag_page() fail in the case where the frag is not backed
by a page, and fix its relevant callers to handle this case.
Signed-off-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20240910171458.219195-8-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/esp4.c | 3 | ||||
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 47378ca41904..f3281312eb5e 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -115,7 +115,8 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb) */ if (req->src != req->dst) for (sg = sg_next(req->src); sg; sg = sg_next(sg)) - skb_page_unref(sg_page(sg), skb->pp_recycle); + skb_page_unref(page_to_netmem(sg_page(sg)), + skb->pp_recycle); } #ifdef CONFIG_INET_ESPINTCP diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e359a9161445..06dcf89e2cca 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2177,6 +2177,9 @@ static int tcp_zerocopy_receive(struct sock *sk, break; } page = skb_frag_page(frags); + if (WARN_ON_ONCE(!page)) + break; + prefetchw(page); pages[pages_to_map++] = page; length += PAGE_SIZE; |