From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794117625; b=dnudyqx7wqBp8J8R+anqq7PV2ZVU0bGS24lekDOZ/pfxT0qPjCACLS8XXU/jZE8rnesN LvSQvv11XEcXfpKzff0R93srTq6BRSlp5jOWAa+VwadV8/FJm1Mn0o9yT8z/Vajy4uMUr 6gignz1P6wrrURtL4zonABSawb2eQRNhon662HSAGuuRa2PfutKepoMPDib1hhGIaynnE zAEH62cYKIjHU4WPrH0U0IkovGhjqfYXrpdPS3U7yXODabenpzw5Pf54C1IbUDVm+EiF4 C5qhPrGST6jLV5DcarI4L+hY2SlkDGR7UOz2rg348nZdK9oGpKsUtwcsG97TbGO4lEQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794117625; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=zMjClMAhSRqoCMrDS5bvxCNb79WE0UiAP81MU3z8MjY=; b=h9FERkylpkYxVZzdToAeUG1hU6MuHCkuQpBC0Vy/3lmAmwXnQtYC4bSzDdoxptDcU1yB z5OHK6S93omsFMUOARv7X5iqe9XiVDkekl4Uel4EQGuAG/t8Gn7o29JuT7rbV+BIk+O4x NxYKO38u6Duf9xpqy0LPm1ZmA4rZcmOo8IHBiJu/H3MCu8n8fe9oXpeu46s1bQs+/ZZ1D Ks4x1q+BeED/qc00Lmpg7y/LGBf/SCaaoYURcODZfozkmxd9XP8IDhOJRNAwlCu4M1EL5 W9OAvYN8SzzsS+AE0cVH6HgVdRm5Z0+h6Eh8+++LKHKNYvRJowRiF12X6XqVI2x63fw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=AOOaqqZM; arc=none smtp.remote-ip=74.125.82.200 Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) (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 2FB42606A31E for ; Sun, 8 Nov 2026 06:00:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2FB42606A31E 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.a=rsa-sha256 header.s=20260707 header.b=AOOaqqZM Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-3724667bc16so345305eec.1 for ; Sat, 07 Nov 2026 22:00:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794117624; x=1794722424; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zMjClMAhSRqoCMrDS5bvxCNb79WE0UiAP81MU3z8MjY=; b=AOOaqqZMji7+Q/zfawmXGXQrs6SiqoHb+7qcTMXm0rg3z+I6ghj9F3xYJmzvMDyFpv ALBc7Hs3AMAja3g9vn+BJaKCrDWzc/upL3S97EJZxWgC8s1O57pq/38jERBrFiW+bwQO OkdeTyN3o1q8jAL0ea76rsmZIyMvKoX5x8ExceaupBwQDXjZukypdxJvHIDu+2mjymO7 vW2U89hayazp910LZTzjdgclmEWw4XsHgCVof/zU851983splAEQmvGFKaQo8GobYFBM KTrrCyVvDIjy5YIuIgWnXyN+pjCOihCLbWxu0jWFHx69b1yuDfA5lqzkffR8uejQzovs IZyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794117624; x=1794722424; h=content-type: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:content-type; bh=zMjClMAhSRqoCMrDS5bvxCNb79WE0UiAP81MU3z8MjY=; b=rrg0lmeh2qcHCtE3LEl125mk0bJtN4U2FklZoMGU8pOvEDVHhSQgVZgd9t5f1M9488 rkJvfsNLq/CAHjIplr1ASa+3El6l/LuOM2iDjewkGAajr1wKJ1GAXKSFuC3LQDkFoHiB zDa9rlspsumQxKWgKqJLL+DL4mLUWicq7zdh04E8NmPM5NUrTwFHJ7WQnaKnh9ubrHpb 1PiqNqedgnnRx242rCEkVWzhHT9SI5VG4vAoUjTFiyUGoJtQjIKCJJ+7ShbskijjW6zE oWQExSRyenemMYVoTcfRuSXlhdCRUUw1CZC3vX7FZc+VIJWFqr/TVhEF/S+8w+7I4hsT Whnw== X-Forwarded-Encrypted: i=1; AL+hErGs74dszvyJlSyMnBdr71vAppp/pMSxYI7rSgWCN+jg691AWQqZ25dJBC+D/D72U+5BFV7fL2Gl+AI=@vger.kernel.org X-Gm-Message-State: APuU4Z/6jvuQIVVWJllcismID/ERQuzo3PlwvFNnRyK/CKZDRlJ/eXwg 2E56tsIImPEqwoif6zdOlPAgANAmogBBrH9op2xMJ3mh83WlxCo/3RuQpjgaMLGCa02GbBx6cNP mim9ZG1dk4yx77jTdZA6aeb8NsQ== X-Received: from dycc22.prod.google.com ([2002:a05:693c:60d6:b0:36c:9a9b:3677]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:20c8:10b0:36a:2473:9b2f with SMTP id 5a478bee46e88-370f7f80e04mr5298946eec.23.1794117619069; Sat, 07 Nov 2026 22:00:19 -0800 (PST) Date: Sun, 8 Nov 2026 06:00:12 +0000 In-Reply-To: <20261108060016.2131509-1-almasrymina@google.com> X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261108060016.2131509-1-almasrymina@google.com> X-Mailer: git-send-email 2.56.0.455.g6c5a503b38-goog Message-ID: <20261108060016.2131509-2-almasrymina@google.com> Subject: [PATCH net-next v2 1/5] net: skbuff: skip managed zerocopy frags in skb_frag_ref() From: Mina Almasry To: netdev@vger.kernel.org Cc: Mina Almasry , Jesper Dangaard Brouer , Ilias Apalodimas , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , Pavel Begunkov , Bobby Eshleman , Stanislav Fomichev , linux-kernel@vger.kernel.org, Steffen Klassert , Herbert Xu , Willem de Bruijn , John Fastabend , Sabrina Dubroca , Andrew Lunn , "Michael S. Tsirkin" , Jason Wang , "=?UTF-8?q?Eugenio=20P=C3=A9rez?=" , Xuan Zhuo , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Alexei Starovoitov , Daniel Borkmann , Johannes Berg , Byungchul Park , Zi Yan , virtualization@lists.linux.dev, linux-mm@kvack.org, bpf@vger.kernel.org, linux-wireless@vger.kernel.org, Jonathan Corbet , Shuah Khan , Randy Dunlap , Lorenzo Bianconi , Wen Gu , Philo Lu , Justin Chen , Florian Fainelli , Vikas Gupta , Michael Chan , Pavan Chebbi , Doug Berger , Nicolai Buchwitz , Broadcom internal kernel review list , Satish Kharat , Wei Fang , Frank Li , Shenwei Wang , Joshua Washington , Harshitha Ramamurthy , Jijie Shao , Jian Shen , Fan Gong , Tony Nguyen , Przemek Kitszel , Marcin Wojtas , Russell King , Sunil Goutham , Geetha sowjanya , Ratheesh Kannoth , Subbaraya Sundeep , Bharat Bhushan , Felix Fietkau , Matthias Brugger , AngeloGioacchino Del Regno , Tariq Toukan , Saeed Mahameed , Mark Bloch , Leon Romanovsky , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Daniel Machon , Steen Hegelund , Haiyang Zhang , Wei Liu , Dexuan Cui , Yibo Dong , Brett Creeley , Justin Lai , Larry Chiu , "=?UTF-8?q?Niklas=20S=C3=B6derlund?=" , Paul Barker , Masahisa Kojima , Maxime Chevallier , Maxime Coquelin , Alexandre Torgue , FUJITA Tomonori , Siddharth Vadapalli , Roger Quadros , MD Danish Anwar , Jiawen Wu , Mengyuan Lou , Ronak Doshi , Ryder Lee , Shayne Chen , Sean Wang , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Jordan Rhee , Ankit Garg , Tim Hostetler , Eric Joyner , Prabu Thayalan , "Nikhil P. Rao" , Chintan Vankar , Nora Schiffer , Alexander Sverdlin , Kevin Hao , Karl Mehltretter , Aleksandr Loktionov , Meghana Malladi , Jacob Keller , StanleyYP Wang , linux-doc@vger.kernel.org, imx@lists.linux.dev, linux-rdma@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-omap@vger.kernel.org Content-Type: text/plain; charset="UTF-8" skb_frag_unref() and skb_release_data() skip releasing references on managed zerocopy fragments (SKBFL_MANAGED_FRAG_REFS), whereas skb_frag_ref() acquires a reference unconditionally. If skb_frag_ref() is called on a managed zerocopy SKB, the acquired reference is never released by skb_frag_unref() or skb_release_data(). Skip acquiring a reference in skb_frag_ref() when skb_zcopy_managed(skb) is true so skb_frag_ref() matches skb_frag_unref() and skb_release_data(), and disable share_ok in iptfs_output_queued() when skb_zcopy_managed(skb) is true so iptfs_consume_frags() does not append unreferenced fragments into a managed zerocopy outer SKB. Signed-off-by: Mina Almasry --- include/linux/skbuff_ref.h | 10 +++++++--- net/core/net_test.c | 10 ++++++++++ net/xfrm/xfrm_iptfs.c | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/linux/skbuff_ref.h b/include/linux/skbuff_ref.h index b6f6da556ee90..e94c599ce83d2 100644 --- a/include/linux/skbuff_ref.h +++ b/include/linux/skbuff_ref.h @@ -36,12 +36,16 @@ static __always_inline void skb_netmem_ref(netmem_ref netmem, bool recycle) * * Acquires a reference on the @f'th fragment of @skb via skb_netmem_ref() * (pp_ref_count if skb->pp_recycle and page_pool-backed, else non-pp - * backing refcount). Counterpart to skb_frag_unref(). + * backing refcount), skipping managed zerocopy fragments. Counterpart to + * skb_frag_unref(). */ static __always_inline void skb_frag_ref(struct sk_buff *skb, int f) { - skb_netmem_ref(skb_frag_netmem(&skb_shinfo(skb)->frags[f]), - skb->pp_recycle); + struct skb_shared_info *shinfo = skb_shinfo(skb); + + if (!skb_zcopy_managed(skb)) + skb_netmem_ref(skb_frag_netmem(&shinfo->frags[f]), + skb->pp_recycle); } bool napi_pp_put_page(netmem_ref netmem); diff --git a/net/core/net_test.c b/net/core/net_test.c index 2b5080c226636..e20059a00003c 100644 --- a/net/core/net_test.c +++ b/net/core/net_test.c @@ -571,6 +571,16 @@ static void netmem_ref_test_page(struct kunit *test) skb_frag_unref(skb, 0); KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref); + /* SKBFL_MANAGED_FRAG_REFS skips both skb_frag_ref and skb_frag_unref */ + skb_shinfo(skb)->flags |= SKBFL_ZEROCOPY_ENABLE | + SKBFL_MANAGED_FRAG_REFS; + skb_frag_ref(skb, 0); + KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref); + skb_frag_unref(skb, 0); + KUNIT_EXPECT_EQ(test, page_ref_count(page), base_ref); + skb_shinfo(skb)->flags &= ~(SKBFL_ZEROCOPY_ENABLE | + SKBFL_MANAGED_FRAG_REFS); + skb_shinfo(skb)->nr_frags = 0; consume_skb(skb); __free_page(page); diff --git a/net/xfrm/xfrm_iptfs.c b/net/xfrm/xfrm_iptfs.c index 103cf7c5dbfb9..04ef833074fc8 100644 --- a/net/xfrm/xfrm_iptfs.c +++ b/net/xfrm/xfrm_iptfs.c @@ -2258,7 +2258,8 @@ static void iptfs_output_queued(struct xfrm_state *x, struct sk_buff_head *list) nextp = &(*nextp)->next; } - if (shi->frag_list || skb_cloned(skb) || skb_shared(skb)) + if (shi->frag_list || skb_cloned(skb) || skb_shared(skb) || + skb_zcopy_managed(skb)) share_ok = false; /* See if we have enough space to simply append. -- 2.56.0.455.g6c5a503b38-goog