From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.229.4 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794855954; b=pY+X/nmjknrLVN28REWGwOeOD4xm3eBZM27XrdtZLJ+v8HMryPJj6qAbbEKinTyouAJi pFvXH5Jq8pJeceD8naOpU5O2KKeJzqXDVykKo72dy71okvxgoJJ70s8tJRdT25ANH6M8e dFVh3pkUaxVwSKrwvSe8YZXy05eAYZp0Tp7bCixtCJ4iAgFHfEnHHtL2CE9YaKw0eM01q fzh/B0jQ5D8I9K+xhxi9y3ygOujiHif8Rgsw1rvdrdWkuOQF3x+f5n4k+w6HiI5UfB7Du I30Al5ah6NGi0yO1feWFtsKMjHtaDq4tDBEDpzxU3xask69ptEr31hpkUX6j39XxM4w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794855954; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; bh=uxQMYwwz7yNG5xs6CvbpRYX33to4uhawWZVBwJyeiY8=; b=MFRXzLErObtxgkToCyQxS2wbUUwJzQoZCDWcu+PlGQ7BSTCV9Od3lV1miKr1Yinv87Se VSSo7maM00ndCBwlC0zElrwlDC939gOVdTWi4pbwPBjx7reukveXueZcha6cnN6NA1/mL 97zn+ZDeSAumS4edRadVZV6CwPwNluJN5if0qwAMpg+XKVSeUbr86WBQf2xj4v2qiylxi Jep8WNFP5eB9U4uFdE3e/a/0OSOGeK+NcW5b6t4agRxRZt0WbzbVMO0PepdDhflIVtv50 MM8a5E56Kc3gZHJv8UbP2KeKBxnYqtiXGB366dqHW0cKEG7n3lIStKLVPExgxE9ngCA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=wkCiVxsZ; arc=none smtp.remote-ip=74.125.229.4 Received: from mail-dy2-f4.google.com (mail-dy2-f4.google.com [74.125.229.4]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38588606A33E for ; Mon, 16 Nov 2026 19:05:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 38588606A33E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=wkCiVxsZ Received: by mail-dy2-f4.google.com with SMTP id 5a478bee46e88-36f758312e0so1066124eec.0 for ; Mon, 16 Nov 2026 11:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794855952; x=1795460752; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=uxQMYwwz7yNG5xs6CvbpRYX33to4uhawWZVBwJyeiY8=; b=wkCiVxsZ6dJT02YF60E5go+iS1uyByIAi7dM39R8hfN2KdWodcwN4LA5PYh5w1Y2RO 0oEX/oaMFSNIXOhVSgjowRzIXkNrbgvC7zuo913NFM/QN9FiJg9pOzfCTYAj6NdufAzy dwOchWL3Qoq2OVVXg3CD0fSWKaCEO+AQW2ZH8OQdrXc5b1TS6i2JaehpQJwD9uJbGIdh Ri53AOvxyV0G6wP6ruvFbyhQz8XWO0IPZJfinIU427eGNMq8CZv5XOLaHhIFc6JrGGnS wXx9T0oD6FlyJNHMyG1w/aRdL/61IGlr5AQOOQ+Azz0TK+RmM5LgSOr2y1kMNme0x4Y9 POEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794855952; x=1795460752; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uxQMYwwz7yNG5xs6CvbpRYX33to4uhawWZVBwJyeiY8=; b=uzemv7uBduO3DxoVOSxD/dNW4trLFXLEChh2ftkJt30glnf+PUm7QPUoT1KXgFaOp8 L0IkCfcQUgNezQYINdFG4BcMptP3IOGDM4MReVV2Ra/5XAgxhBB7WsR8f1hC3+PNfov4 uS29nJXI3eUEhudxNgokmL1M0u2O5FS9988KOtufDywsbGPtf7ypxpZVo1MYkeC07UsX 1Co0mOYbaHf3SSGHBYwaVl8BIFn2ATEoujDqjmptsY4CCl2mwh/w3pPQEpDCEst2JKiw R1Iqiso5oTm3t/+nrymVQtui/8d/GUdzem9CyMRH8Fy2S0CpX/fgvLx1Dj3TeLjItkJ8 80Eg== X-Forwarded-Encrypted: i=1; AL+hErFx2D4PFGDbkQjlwY2Mw0Xsa1uAgxCTY2Mdxx1YL4uGvA11VOo4jAGd+jro3yYi+JEUsEGuZKDPpt1J9hE=@vger.kernel.org X-Gm-Message-State: APuU4Z+MoA+DumDf8idGsYIbDJAdZZrCjW2dLITXIEqT476KmrNhLm1f HLIZYnw+5SruBi44yQRwjbWyasW60cFypyix/2/zFTDmPpc49K/v2OgI X-Gm-Gg: AYBFou3HzOIKi6cuvzX9FNWJC1rcuR3cQQrabEc+hwWkTcybelYgTPEP66ztISYaNCB OrsnhtQvkUFYI6dzUmdbXI/z3raV98A1fXlOcXiPEDP4+X9N2GAR1WKMo+pSiJ1UBXlcBPoxbJx OuSaeY8ALEjw9Rg4BOLQBFrghxgJvd0hGOx0EAJqYY//n1aQvSyuFHS2IS+V3LwpgyNWQBXuzOI cryLPFwI0mzJZ/pSl23A5ih2snqJ/6ntHq6nq0oDFLmAao06ZF8kr72VnUbP45rmp6zWHVfKeIB mHAUhqNH5BXn+GQ6ipMzvUw2N0YqXtroZztTiiy1HlWEC0YnEQe8F22atcvgLVSQX+HTDf7ouFq suZIeM28G0PotPsEbE8D7MqZ5lh8zYpRgArGN1LARqgKUQ41EbLLSk5jRMvYbPePPsUyjRDK9iv XpycqChf2gYVg8LqxiMFDnNCQkvx/PZytpgtR6zxopbJMkyIkNW1zQi+QhCg6VaKbw+GyRtoDBZ UdOH4JCYWdKzl4RF2DsDAWRWXkSKvzZVk/zhWOK3drD/6fvMSdr2Xc4Z6LAkvRSqlCSN997RsWx rCve1W0AoQxW3aWjcg4qR08= X-Received: by 2002:a05:7023:a4c:b0:196:bf5f:8bb with SMTP id a92af1059eb24-1b5030f8a56mr10239944c88.45.1794855952028; Mon, 16 Nov 2026 11:05:52 -0800 (PST) Received: from localhost ([2a03:2880:9ff:6c::]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b50316e195sm38806416c88.8.2026.11.16.11.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 11:05:51 -0800 (PST) Date: Mon, 16 Nov 2026 11:05:08 -0800 From: Stanislav Fomichev To: Mina Almasry Cc: netdev@vger.kernel.org, Eric Dumazet , Neal Cardwell , Kuniyuki Iwashima , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org, Josef Bacik , Kaiyuan Zhang , Willem de Bruijn , Bobby Eshleman , Stanislav Fomichev , Pavel Begunkov , Daniel Borkmann Subject: Re: [PATCH net-next v5 2/3] net: prevent mixing frags from different memory providers or bindings Message-ID: References: <20261115004003.3695475-1-almasrymina@google.com> <20261115004003.3695475-3-almasrymina@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20261115004003.3695475-3-almasrymina@google.com> On 11/15, Mina Almasry wrote: > Prevent coalescing, shifting, or appending skb fragments from > incompatible memory providers or different devmem bindings. > > Add skb_net_iov_provider(), skb_mem_provider_compat(), and > skb_frags_can_coalesce() to check readability and fragment provider > compatibility (net_iov_owner(niov) for devmem, niov->desc.pp for other > net_iov providers such as io_uring zcrx, and NULL for page-backed skbs) > across skb_try_coalesce(), skb_shift(), skb_gro_receive(), > skb_gro_receive_list(), tcp_skb_can_collapse(), and > tcp_skb_can_collapse_rx(). > > Also add net_devmem_skb_binding() and use it in tcp_sendmsg_locked(), > zerocopy_fill_skb_from_devmem(), and validate_xmit_unreadable_skb() so > TX skbs cannot mix different devmem bindings or transmit non-devmem > unreadable frags on DMA TX devices. Reject converting linear head_frag > payloads into page frags on unreadable skbs in skb_try_coalesce() and > skb_gro_receive(), and propagate skb->unreadable and compare > skb_frag_netmem() in tcp_clone_payload(). > > Update netmem_ref_test_net_iov and netmem_ref_test_try_coalesce so their > target skbs carry a compatible unreadable net_iov frag before shifting > or coalescing. > > This issue was found by manual code inspection and LLM review; it was > not triggered in production. Verified with the net_core KUnit test > suite; not tested on real hardware. > > Fixes: 65249feb6b3d ("net: add support for skbs with unreadable frags") > Fixes: bd61848900bf ("net: devmem: Implement TX path") > Signed-off-by: Mina Almasry > --- > include/linux/skbuff.h | 55 ++++++++++++++++++++++++++++++++++++++++++ > include/net/tcp.h | 5 ++-- > net/core/datagram.c | 4 +-- > net/core/dev.c | 14 ++++------- > net/core/devmem.h | 22 +++++++++++++++++ > net/core/gro.c | 16 ++++-------- > net/core/net_test.c | 42 +++++++++++++++++++++++++++----- > net/core/skbuff.c | 24 +++++++----------- > net/ipv4/tcp.c | 3 ++- > net/ipv4/tcp_output.c | 4 ++- > 10 files changed, 142 insertions(+), 47 deletions(-) > > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index 1d6832878930..867e3ab17c17 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -3770,6 +3770,61 @@ static inline void *skb_frag_address(const skb_frag_t *frag) > return page_address(skb_frag_page(frag)) + skb_frag_off(frag); > } > > +/* Return an opaque pointer identifying the memory provider instance of @skb's > + * net_iov fragments: > + * - For devmem (NET_IOV_DMABUF), net_iov_owner(niov) (&binding->area, 1:1 with > + * the binding across RX queues and TX). > + * - For other net_iov providers (e.g., io_uring zcrx), niov->desc.pp (shared > + * across all areas of an io_zcrx_ifq). > + */ > +static inline void *skb_net_iov_provider(const struct sk_buff *skb) > +{ > + struct net_iov *niov; > + > + if (skb_frags_readable(skb) || !skb_shinfo(skb)->nr_frags) > + return NULL; > + > + niov = skb_frag_net_iov(&skb_shinfo(skb)->frags[0]); > + if (!niov) > + return NULL; > + > + if (net_is_devmem_iov(niov)) > + return net_iov_owner(niov); > + > + return niov->desc.pp; > +} > + > +/* Return true if the memory providers of @skb1 and @skb2 are compatible > + * for coalescing. For any struct page-backed provider (the buddy allocator > + * or a future provider handing out struct pages), coalescing is assumed > + * feasible. For net_iov-backed providers, the provider instance pointer > + * must match. > + */ > +static inline bool skb_mem_provider_compat(const struct sk_buff *skb1, > + const struct sk_buff *skb2) > +{ > + /* Check skb_frags_readable() first to reject readable/unreadable > + * mismatches and avoid chasing frags[0] and struct net_iov when > + * only one skb has unreadable frags. > + */ > + if (skb_frags_readable(skb1) != skb_frags_readable(skb2)) > + return false; > + > + return skb_net_iov_provider(skb1) == skb_net_iov_provider(skb2); > +} > + > +static inline bool skb_frags_can_coalesce(struct sk_buff *to, > + struct sk_buff *from) > +{ > + if (to->pp_recycle != from->pp_recycle) > + return false; > + > + if (skb_zcopy(to) || skb_zcopy(from)) > + return false; > + > + return skb_mem_provider_compat(to, from); > +} > + > /** > * skb_frag_address_safe - gets the address of the data contained in a paged fragment > * @frag: the paged fragment buffer > diff --git a/include/net/tcp.h b/include/net/tcp.h > index 25d11fab1b03..bf5f28e52fca 100644 > --- a/include/net/tcp.h > +++ b/include/net/tcp.h > @@ -1275,14 +1275,15 @@ static inline bool tcp_skb_can_collapse(const struct sk_buff *to, > mptcp_skb_can_collapse(to, from) && > !skb_cmp_decrypted(to, from) && > skb_pure_zcopy_same(to, from) && > - skb_frags_readable(to) == skb_frags_readable(from)); > + skb_mem_provider_compat(to, from)); > } > > static inline bool tcp_skb_can_collapse_rx(const struct sk_buff *to, > const struct sk_buff *from) > { > return likely(mptcp_skb_can_collapse(to, from) && > - !skb_cmp_decrypted(to, from)); > + !skb_cmp_decrypted(to, from) && > + skb_mem_provider_compat(to, from)); > } > > /* Events passed to congestion control interface */ > diff --git a/net/core/datagram.c b/net/core/datagram.c > index ecc30a6f8302..88cc0a6c62f6 100644 > --- a/net/core/datagram.c > +++ b/net/core/datagram.c > @@ -712,8 +712,8 @@ zerocopy_fill_skb_from_devmem(struct sk_buff *skb, struct iov_iter *from, > size_t virt_addr, size, off; > struct net_iov *niov; > > - if (i && skb_frags_readable(skb)) > - return -EFAULT; > + if (i && net_devmem_skb_binding(skb) != binding) > + return -EMSGSIZE; > > /* Devmem filling works by taking an IOVEC from the user where the > * iov_addrs are interpreted as an offset in bytes into the dma-buf to > diff --git a/net/core/dev.c b/net/core/dev.c > index a230ecce9327..51f5e4800eee 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c [..] > @@ -4175,8 +4175,7 @@ static struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb, > static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb, > struct net_device *dev) > { > - struct skb_shared_info *shinfo; > - struct net_iov *niov; > + struct net_devmem_dmabuf_binding *binding; > > if (likely(skb_frags_readable(skb) || > dev->netmem_tx == NETMEM_TX_NO_DMA)) > @@ -4185,14 +4184,11 @@ static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb, > if (dev->netmem_tx == NETMEM_TX_NONE) > goto out_free; > > - shinfo = skb_shinfo(skb); > - > /* All net_iovs in an unreadable skb share the same binding. */ > - if (shinfo->nr_frags > 0) { > - niov = netmem_to_net_iov(skb_frag_netmem(&shinfo->frags[0])); > - if (net_is_devmem_iov(niov) && > - (net_devmem_iov_binding(niov)->direction != DMA_TO_DEVICE || > - READ_ONCE(net_devmem_iov_binding(niov)->dev) != dev)) > + if (skb_shinfo(skb)->nr_frags > 0) { > + binding = net_devmem_skb_binding(skb); > + if (!binding || binding->direction != DMA_TO_DEVICE || > + READ_ONCE(binding->dev) != dev) > goto out_free; > } > Should we limit this patch to the real fixes only? This part does not look essential. validate_xmit_unreadable_skb already does skb_frags_readable check above, it already does nr_frags > 0 check here... so why go through the same stuff again via net_devmem_skb_binding? If you want, maybe move this to a separate patch at least? And do something like: binding = net_devmem_skb_binding(skb); /* I hope likely() below properly unwraps net_devmem_skb_binding similar * to existing likely(skb_frags_readable) case... */ if (likely(!binding)) goto out; if (dev->netmem_tx == NETMEM_TX_NO_DMA) goto out; if (dev->netmem_tx == NETMEM_TX_NONE) goto out_free; if (READ_ONCE(binding->dev) != dev) goto out_free; return skb; And call it cleanup with no fixes tags.