From nobody Wed Dec 17 19:39:06 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C089013C83A for ; Tue, 25 Jun 2024 02:47:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719283667; cv=none; b=tnUiSegME5WeUBSxfd3KO3+/PQMdUShVRLDmoij2Qxx4izKDqVrwqjyAHjhPkdj8bVzxcrocciXQ2P20j2FS0Q8lhikurFIg/IiV2TBGm7eAjlOoOt6rcvwCSGZD7TApnHGoECPrZmK3L65e9YvCq4oVLB3vH0waskabTlrBSOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719283667; c=relaxed/simple; bh=8vsZ1JdkvwI45+lYDYxFqvc4Hm4hsYsHfZmOxoGeWVM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EbhnMMeqfhLovrEkSxRFavGrppvYDgDOAh4epLeZKMeGylF+IPByrjGFtCQ7GZHbhb7orHYQGYuMDKH440mIVvl/ViyHXBhEowe6V0ViIglsD7UfAkaLWcwFzUuGyRT9e13dfVeYIVtS0OlT5gMCSR6ClJYdaevkK9axFHGVTGQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sP3J6t19; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sP3J6t19" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7065df788f6so5099432b3a.3 for ; Mon, 24 Jun 2024 19:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719283660; x=1719888460; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rjqCUniG57E7HFDfQ//A8yq7TBBPpI2ixFSYNRNPhno=; b=sP3J6t19chwPGvK6m3aWC+RwLimnY5qopN/Z92W7ZWKLCTxMoyvcORAh1m0twA25U2 MmJ5TReRgrGtQRax5UTpwraqtt1jVz0vX7j76tLgX9JI+WOGbKJobFg6pcJJJFmRKdl7 p5m/2BwxJP92j0w3wvlXYeZp8mucl++7bVh4Au6SknFpZ0geVm7GHblCe4deuZsn8kK6 IxuELji7r2VzwTDYuA+uB8UWc2ur2kR/LX4ELHmnD4saDjvP6XbNq714S2SnqHK/eYB0 4MV0R3bgPePkAUB72AnDZyx+lxkKrecAn8KAMrIa7nfFlfjmhinmpYYC59PncgyWNIYF Lksg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719283660; x=1719888460; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rjqCUniG57E7HFDfQ//A8yq7TBBPpI2ixFSYNRNPhno=; b=LTTjMdy1tphgPxulblzS/cG2bk4PYh42pjlAlFcB3emg5hda5K5zP8Exlbf66UjDu/ dnmmeq5Vo1co74rzkypEb/tBUXmE9uLMVIDQsoBYmTANkkvyKyxBXigd+xwcgxqq9vpc b/ysyNfLFf3GSnZZZv4l8otMLeVs6Nh1sXtItn7gFLmms4jutqBzYNkHrGoAuf5AmWyU 2+PYsIaN8rIXAXXt3pBNTWSdYh6kTRVZJsjgLdZ2weNchtPEdUj2ptebJiDSJgefl6z1 sNtq07l9knV2TdsKmqo150NQd3ajEB64aPSRfE0zEqlhn+p9LIHJvFGurmN7NcplGTL+ 6mxQ== X-Forwarded-Encrypted: i=1; AJvYcCWOPMaLQumyw0m7XO/Y4/0y3TG00ZRgEfOYHnzgaeid9XDZsndYb2wjZDPk0Z46FTZjlEWARiC20/O4VE9mY85y1EZbA6r5hhlojUqC X-Gm-Message-State: AOJu0Yw2KmX3C7m7ZsxapEp9aPhQ0eAI9pQ+9q1AT9XJfushEfOFNCx2 vV+ZmcmavPdEi4sIrkH0JH1xYy2DRpXvwjBccbephd0FhxcAhYIvOg4lP/xNJ7O1M1yfR/0rL5T ww4rqXrQLs3IpBQGHOGjB1Q== X-Google-Smtp-Source: AGHT+IHYGX8Rs1J39YvUdQ2idIpF1mFHoAIlEXO1pb1lvmx84UdA8KGTmpQgXL/J5f+zfZX23y838/eqO5VUyFT7WQ== X-Received: from almasrymina.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:4bc5]) (user=almasrymina job=sendgmr) by 2002:a05:6a00:6c84:b0:705:d750:83f7 with SMTP id d2e1a72fcca58-70674791182mr236347b3a.4.1719283659769; Mon, 24 Jun 2024 19:47:39 -0700 (PDT) Date: Tue, 25 Jun 2024 02:47:11 +0000 In-Reply-To: <20240625024721.2140656-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625024721.2140656-1-almasrymina@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240625024721.2140656-9-almasrymina@google.com> Subject: [PATCH net-next v13 08/13] net: support non paged skb frags From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-alpha@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, sparclinux@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arch@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Donald Hunter , Jonathan Corbet , Richard Henderson , Ivan Kokshaysky , Matt Turner , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Andreas Larsson , Jesper Dangaard Brouer , Ilias Apalodimas , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Steffen Klassert , Herbert Xu , David Ahern , Willem de Bruijn , Shuah Khan , Sumit Semwal , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Bagas Sanjaya , Christoph Hellwig , Nikolay Aleksandrov , Pavel Begunkov , David Wei , Jason Gunthorpe , Yunsheng Lin , Shailend Chand , Harshitha Ramamurthy , Shakeel Butt , Jeroen de Borst , Praveen Kaligineedi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- v10: - Fixed newly generated kdoc warnings found by patchwork. While we're at it, fix the Return section of the functions I touched. v6: - Rebased on top of the merged netmem changes. Changes in v1: - Fix illegal_highdma() (Yunsheng). - Rework napi_pp_put_page() slightly to reduce code churn (Willem). --- include/linux/skbuff.h | 42 +++++++++++++++++++++++++++++++++++++- include/linux/skbuff_ref.h | 9 ++++---- net/core/dev.c | 3 ++- net/core/gro.c | 3 ++- net/core/skbuff.c | 11 ++++++++++ net/ipv4/esp4.c | 3 ++- net/ipv4/tcp.c | 3 +++ net/ipv6/esp6.c | 3 ++- 8 files changed, 67 insertions(+), 10 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f4cda3fbdb75a..3cd06eb3a44da 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3512,21 +3512,58 @@ static inline void skb_frag_off_copy(skb_frag_t *fr= agto, fragto->offset =3D fragfrom->offset; } =20 +/* Return: true if the skb_frag contains a net_iov. */ +static inline bool skb_frag_is_net_iov(const skb_frag_t *frag) +{ + return netmem_is_net_iov(frag->netmem); +} + +/** + * skb_frag_net_iov - retrieve the net_iov referred to by fragment + * @frag: the fragment + * + * Return: the &struct net_iov associated with @frag. Returns NULL if this + * frag has no associated net_iov. + */ +static inline struct net_iov *skb_frag_net_iov(const skb_frag_t *frag) +{ + if (!skb_frag_is_net_iov(frag)) + return NULL; + + return netmem_to_net_iov(frag->netmem); +} + /** * skb_frag_page - retrieve the page referred to by a paged fragment * @frag: the paged fragment * - * Returns the &struct page associated with @frag. + * Return: the &struct page associated with @frag. Returns NULL if this fr= ag + * has no associated page. */ static inline struct page *skb_frag_page(const skb_frag_t *frag) { + if (skb_frag_is_net_iov(frag)) + return NULL; + return netmem_to_page(frag->netmem); } =20 +/** + * skb_frag_netmem - retrieve the netmem referred to by a fragment + * @frag: the fragment + * + * Return: the &netmem_ref associated with @frag. + */ +static inline netmem_ref skb_frag_netmem(const skb_frag_t *frag) +{ + return frag->netmem; +} + int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb, unsigned int headroom); int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb, struct bpf_prog *prog); + /** * skb_frag_address - gets the address of the data contained in a paged fr= agment * @frag: the paged fragment buffer @@ -3536,6 +3573,9 @@ int skb_cow_data_for_xdp(struct page_pool *pool, stru= ct sk_buff **pskb, */ static inline void *skb_frag_address(const skb_frag_t *frag) { + if (!skb_frag_page(frag)) + return NULL; + return page_address(skb_frag_page(frag)) + skb_frag_off(frag); } =20 diff --git a/include/linux/skbuff_ref.h b/include/linux/skbuff_ref.h index 16c241a234728..0f3c58007488a 100644 --- a/include/linux/skbuff_ref.h +++ b/include/linux/skbuff_ref.h @@ -34,14 +34,13 @@ static inline void skb_frag_ref(struct sk_buff *skb, in= t f) =20 bool napi_pp_put_page(netmem_ref netmem); =20 -static inline void -skb_page_unref(struct page *page, bool recycle) +static inline void skb_page_unref(netmem_ref netmem, bool recycle) { #ifdef CONFIG_PAGE_POOL - if (recycle && napi_pp_put_page(page_to_netmem(page))) + if (recycle && napi_pp_put_page(netmem)) return; #endif - put_page(page); + put_page(netmem_to_page(netmem)); } =20 /** @@ -54,7 +53,7 @@ skb_page_unref(struct page *page, bool recycle) */ static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle) { - skb_page_unref(skb_frag_page(frag), recycle); + skb_page_unref(skb_frag_netmem(frag), recycle); } =20 /** diff --git a/net/core/dev.c b/net/core/dev.c index 0f22665037562..eac4cdd17765d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3432,8 +3432,9 @@ static int illegal_highdma(struct net_device *dev, st= ruct sk_buff *skb) if (!(dev->features & NETIF_F_HIGHDMA)) { for (i =3D 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; + struct page *page =3D skb_frag_page(frag); =20 - if (PageHighMem(skb_frag_page(frag))) + if (page && PageHighMem(page)) return 1; } } diff --git a/net/core/gro.c b/net/core/gro.c index b3b43de1a6502..26f09c3e830b7 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -408,7 +408,8 @@ static inline void skb_gro_reset_offset(struct sk_buff = *skb, u32 nhoff) pinfo =3D skb_shinfo(skb); frag0 =3D &pinfo->frags[0]; =20 - if (pinfo->nr_frags && !PageHighMem(skb_frag_page(frag0)) && + if (pinfo->nr_frags && skb_frag_page(frag0) && + !PageHighMem(skb_frag_page(frag0)) && (!NET_IP_ALIGN || !((skb_frag_off(frag0) + nhoff) & 3))) { NAPI_GRO_CB(skb)->frag0 =3D skb_frag_address(frag0); NAPI_GRO_CB(skb)->frag0_len =3D min_t(unsigned int, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ae161cd444eab..d36b9c1e9877f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1354,6 +1354,14 @@ void skb_dump(const char *level, const struct sk_buf= f *skb, bool full_pkt) struct page *p; u8 *vaddr; =20 + if (skb_frag_is_net_iov(frag)) { + printk("%sskb frag %d: not readable\n", level, i); + len -=3D skb_frag_size(frag); + if (!len) + break; + continue; + } + skb_frag_foreach_page(frag, skb_frag_off(frag), skb_frag_size(frag), p, p_off, p_len, copied) { @@ -3144,6 +3152,9 @@ static bool __skb_splice_bits(struct sk_buff *skb, st= ruct pipe_inode_info *pipe, for (seg =3D 0; seg < skb_shinfo(skb)->nr_frags; seg++) { const skb_frag_t *f =3D &skb_shinfo(skb)->frags[seg]; =20 + if (WARN_ON_ONCE(!skb_frag_page(f))) + return false; + if (__splice_segment(skb_frag_page(f), skb_frag_off(f), skb_frag_size(f), offset, len, spd, false, sk, pipe)) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 3968d3f98e083..4ce0bc41e7806 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 *t= mp, struct sk_buff *skb) */ if (req->src !=3D req->dst) for (sg =3D sg_next(req->src); sg; sg =3D sg_next(sg)) - skb_page_unref(sg_page(sg), skb->pp_recycle); + skb_page_unref(page_to_netmem(sg_page(sg)), + skb->pp_recycle); } =20 #ifdef CONFIG_INET_ESPINTCP diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e03a342c9162b..8050148d302b1 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 =3D skb_frag_page(frags); + if (WARN_ON_ONCE(!page)) + break; + prefetchw(page); pages[pages_to_map++] =3D page; length +=3D PAGE_SIZE; diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 34a9a5b9ed00b..0318aea0d4ce6 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -132,7 +132,8 @@ static void esp_ssg_unref(struct xfrm_state *x, void *t= mp, struct sk_buff *skb) */ if (req->src !=3D req->dst) for (sg =3D sg_next(req->src); sg; sg =3D sg_next(sg)) - skb_page_unref(sg_page(sg), skb->pp_recycle); + skb_page_unref(page_to_netmem(sg_page(sg)), + skb->pp_recycle); } =20 #ifdef CONFIG_INET6_ESPINTCP --=20 2.45.2.741.gdbec12cfda-goog