Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1401521pxj; Fri, 21 May 2021 13:21:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEo/K5IBI4HiofodQYGuJp1HfVCU6BsnG5N1FJ2gq4HyMnoP4HPPRGFzRVDgRw05XVQ7ac X-Received: by 2002:a05:6e02:2149:: with SMTP id d9mr700145ilv.162.1621628491273; Fri, 21 May 2021 13:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621628491; cv=none; d=google.com; s=arc-20160816; b=ihtaoO6PQnuAneYQUpiVobMUgmQglKjmLJfJgrtGXfbYGw9IRJWlYcq8hxPOjuqZx+ UFEykhncQ2RFtTBB6cK20u5xGGUGCsnC6upWVH/00DVhKvk9/ns3wQpAeZilH2mIrJ1j UsLFW8/ScoMAuxJXkk74ZhfQD/3V/C2BhprBg6EuYUMic/iQNmn+154TGdTiox/7D+H5 t8J01ZsbGL7I8UJ8CnZCP/Aet9kVJHyayNHx1eWisxSuLshy0D0YK0tdTzQjEkdBr/Du lGF2ewfqoXObsv+5IqZHR20XEJ1Z+Z1oj9S7lUycNtbjN7oo3KXWXfonWS8zp9bYuhb4 VsYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0NpvO6mejm2YD3XXfyOawknELXlmCuYeK+r5UZXV1Uw=; b=J2wFuToQuyI7RHSgjnn5eDXSYJ/l/f/X8CvGbbOO+pkfM/UDT2HNCwG1NigDWhjekT 3jTSy1L33QJ30Qx4Ogy/XhloOKX4YeXW9I6Q5+inqwSVePCWFTwmskkf2fK2YprWuMLr HSjL+dW5HVuiy0wG9QtNmtDjsm9ON9y8PlN+blDAYVR0OMfbMT3+ajSXgz3sM2SdzotG LGdKdd1K6R2+vOuTtG8I+vGd3wDL3y8CScIfFDgj2n0Vo7pEmZkM5RA0GZYVTStFWXgu R2o2UhQko6Yh9jEwCkwiLRjn9uTkhFhHqaBbXZSZUxR15uD/SvYoJGoWfZdvmS3zSXEN /uag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s4si7871218ilv.29.2021.05.21.13.21.18; Fri, 21 May 2021 13:21:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237500AbhEUQRb (ORCPT + 99 others); Fri, 21 May 2021 12:17:31 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:36524 "EHLO mail-ej1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237407AbhEUQRZ (ORCPT ); Fri, 21 May 2021 12:17:25 -0400 Received: by mail-ej1-f47.google.com with SMTP id c20so31345435ejm.3; Fri, 21 May 2021 09:16:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0NpvO6mejm2YD3XXfyOawknELXlmCuYeK+r5UZXV1Uw=; b=mYyFpdpYM5CaRjug97abiKKW+h+dSIYNoJ5Z0RAHjd0OybInR7jtyEc0yqA8zrxGX/ J2gWLIwWjeT7/FlBZMnVc3DUmAlB6f3C0RrljbrInXjPUU2mMOio62i8lt/9UxdemyRN C0OXTdS3S0HEmNxpa2WyxWukiY6s1aiqfYBB7G1cqAC8mjf0e30MO4pJoSctJDrnzBcN zkE4rsgxl/MvhVvuxjvs9SDvhOqcwbCvUCq1l9JFnjysP3o7wrX5urWX6tX2cBtE4OH3 tLov1JUkGZow1lpXy9gxMD5ygMr9hXlwqCCXkqAu/25V+W7sk3TnpKX6PXYtU7jbPng6 kN0w== X-Gm-Message-State: AOAM532GTNhxJJgbaNhCsTpi2UgxxbWZsZaPx0ChGjh7UwAvZ7T7REEg Omiz/DTy2E+jv7Yyo6BedAoMQkfQ8OpByyHl X-Received: by 2002:a17:906:c1ca:: with SMTP id bw10mr11269459ejb.512.1621613759408; Fri, 21 May 2021 09:15:59 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-5-94-253-60.cust.vodafonedsl.it. [5.94.253.60]) by smtp.gmail.com with ESMTPSA id f7sm3871644ejz.95.2021.05.21.09.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 09:15:58 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org, linux-mm@kvack.org Cc: Ayush Sawal , Vinay Kumar Yadav , Rohit Maheshwari , "David S. Miller" , Jakub Kicinski , Thomas Petazzoni , Marcin Wojtas , Russell King , Mirko Lindner , Stephen Hemminger , Tariq Toukan , Jesper Dangaard Brouer , Ilias Apalodimas , Alexei Starovoitov , Daniel Borkmann , John Fastabend , Boris Pismenny , Arnd Bergmann , Andrew Morton , "Peter Zijlstra (Intel)" , Vlastimil Babka , Yu Zhao , Will Deacon , Fenghua Yu , Roman Gushchin , Hugh Dickins , Peter Xu , Jason Gunthorpe , Jonathan Lemon , Alexander Lobakin , Cong Wang , wenxu , Kevin Hao , Jakub Sitnicki , Marco Elver , Willem de Bruijn , Miaohe Lin , Yunsheng Lin , Guillaume Nault , linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, bpf@vger.kernel.org, Matthew Wilcox , Eric Dumazet , David Ahern , Lorenzo Bianconi , Saeed Mahameed , Andrew Lunn , Paolo Abeni , Sven Auhagen Subject: [PATCH net-next v6 2/5] skbuff: add a parameter to __skb_frag_unref Date: Fri, 21 May 2021 18:15:24 +0200 Message-Id: <20210521161527.34607-3-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521161527.34607-1-mcroce@linux.microsoft.com> References: <20210521161527.34607-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matteo Croce This is a prerequisite patch, the next one is enabling recycling of skbs and fragments. Add an extra argument on __skb_frag_unref() to handle recycling, and update the current users of the function with that. Signed-off-by: Matteo Croce --- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- include/linux/skbuff.h | 8 +++++--- net/core/skbuff.c | 4 ++-- net/tls/tls_device.c | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 222c32367b2c..aa0cde1dc5c0 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -2503,7 +2503,7 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space, if (length == 0) { /* don't need this page */ - __skb_frag_unref(frag); + __skb_frag_unref(frag, false); --skb_shinfo(skb)->nr_frags; } else { size = min(length, (unsigned) PAGE_SIZE); diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index e35e4d7ef4d1..cea62b8f554c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -526,7 +526,7 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv, fail: while (nr > 0) { nr--; - __skb_frag_unref(skb_shinfo(skb)->frags + nr); + __skb_frag_unref(skb_shinfo(skb)->frags + nr, false); } return 0; } diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index dbf820a50a39..7fcfea7e7b21 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3081,10 +3081,12 @@ static inline void skb_frag_ref(struct sk_buff *skb, int f) /** * __skb_frag_unref - release a reference on a paged fragment. * @frag: the paged fragment + * @recycle: recycle the page if allocated via page_pool * - * Releases a reference on the paged fragment @frag. + * Releases a reference on the paged fragment @frag + * or recycles the page via the page_pool API. */ -static inline void __skb_frag_unref(skb_frag_t *frag) +static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle) { put_page(skb_frag_page(frag)); } @@ -3098,7 +3100,7 @@ static inline void __skb_frag_unref(skb_frag_t *frag) */ static inline void skb_frag_unref(struct sk_buff *skb, int f) { - __skb_frag_unref(&skb_shinfo(skb)->frags[f]); + __skb_frag_unref(&skb_shinfo(skb)->frags[f], false); } /** diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3ad22870298c..12b7e90dd2b5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -664,7 +664,7 @@ static void skb_release_data(struct sk_buff *skb) skb_zcopy_clear(skb, true); for (i = 0; i < shinfo->nr_frags; i++) - __skb_frag_unref(&shinfo->frags[i]); + __skb_frag_unref(&shinfo->frags[i], false); if (shinfo->frag_list) kfree_skb_list(shinfo->frag_list); @@ -3495,7 +3495,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen) fragto = &skb_shinfo(tgt)->frags[merge]; skb_frag_size_add(fragto, skb_frag_size(fragfrom)); - __skb_frag_unref(fragfrom); + __skb_frag_unref(fragfrom, false); } /* Reposition in the original skb */ diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 76a6f8c2eec4..ad11db2c4f63 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -127,7 +127,7 @@ static void destroy_record(struct tls_record_info *record) int i; for (i = 0; i < record->num_frags; i++) - __skb_frag_unref(&record->frags[i]); + __skb_frag_unref(&record->frags[i], false); kfree(record); } -- 2.31.1