From patchwork Mon May 8 12:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 91127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2139291vqo; Mon, 8 May 2023 06:05:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Fo8p70YyN1kYolPWDtRHd9/bCloglGlBfM3YSpSNEXwa5GtWYHEuJFoE72e20fLBWleyj X-Received: by 2002:a05:6a00:1747:b0:644:ad29:fd5a with SMTP id j7-20020a056a00174700b00644ad29fd5amr8445071pfc.21.1683551114260; Mon, 08 May 2023 06:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683551114; cv=none; d=google.com; s=arc-20160816; b=eznuArRJKUFRlGwxKikM/TQA3fAGEpS5DaAm4Ylfd4oiHOLLLiQlOETMKsZ6e0Xrla GgrM0QNJ4NAjEVURlX8mnhahwgK5Uy9zLMRdiLYh9NGRuYiibb2TWHqsTloUishHPPQq qrnhS3a8+hjbDHYp2+inWH/6LScWeF0CVLruEov+43/ILbG3fsictIvbCxfROKqIktTB dCS06iU2SH7h/BF8ggHy+qWyab0o96hMnEytrdkTbAIA4WS7WlmONqqMm4mZVxFHbYmI oBiEdCPDrla7uUs/6OVx893HAcfAzuJcfS89SwrjfT1cIXCn9P3oXT+8B12wlBsCFTHS GTaQ== 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=cEhHne7cl9wc9uRuRR4sb/q3pMJpdLDquYri9JDz64o=; b=dWGjd6SkP99af8yDVFcMtC1Kps9lzPL58RkI7snnO9uhZ11XLa9yVCTZ+IWOQBNIih h1R8nr7at/EHH0Pd++5fNQaR9ZLa/KI7XFsPgpvxr80NY4DhABqVjmbnWnLo4nfe5dqQ Oc11agqd8yn7g5eC/OEvjj5MJsbaJK/82nhbkMDO0cQnuk3C3uUBQVT0CB7T1Lc1o58T VA+PtCaN9ntgdwf55Pt/2DZ3zL6VwIntel8AK3yHWLOIpQuymybzDDBXdPD1T8DdjIYp AqqcVhh4RYjVmCXVLOFDbT8LiazUzVRqfcJlJqZaCj04wUY7tqgt2DGnrHWEYs0KO3BI pWrQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a185-20020a621ac2000000b0063b86de9d22si8296370pfa.177.2023.05.08.06.04.58; Mon, 08 May 2023 06:05:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234968AbjEHMlr (ORCPT + 99 others); Mon, 8 May 2023 08:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234206AbjEHMlY (ORCPT ); Mon, 8 May 2023 08:41:24 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F18E039494; Mon, 8 May 2023 05:41:07 -0700 (PDT) Received: from dggpemm500005.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QFLTg4rC7zpWDH; Mon, 8 May 2023 20:39:51 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 8 May 2023 20:41:03 +0800 From: Yunsheng Lin To: CC: , , , , , , , , , , , Subject: [PATCH RFC 2/2] net: remove __skb_frag_set_page() Date: Mon, 8 May 2023 20:39:22 +0800 Message-ID: <20230508123922.39284-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230508123922.39284-1-linyunsheng@huawei.com> References: <20230508123922.39284-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500005.china.huawei.com (7.185.36.74) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765331293565303466?= X-GMAIL-MSGID: =?utf-8?q?1765331293565303466?= The remaining users calling __skb_frag_set_page() with page being NULL seems to doing defensive programming, as shinfo->nr_frags is already decremented, so remove them. Signed-off-by: Yunsheng Lin --- drivers/net/ethernet/broadcom/bnx2.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 - include/linux/skbuff.h | 12 ------------ 3 files changed, 14 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 466e1d62bcf6..0d917a9699c5 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -2955,7 +2955,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, shinfo = skb_shinfo(skb); shinfo->nr_frags--; page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]); - __skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL); cons_rx_pg->page = page; dev_kfree_skb(skb); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index efaff5018af8..f3f08660ec30 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1105,7 +1105,6 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp, unsigned int nr_frags; nr_frags = --shinfo->nr_frags; - __skb_frag_set_page(&shinfo->frags[nr_frags], NULL); cons_rx_buf->page = page; /* Update prod since possibly some pages have been diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0d1027ea81e0..a3c448757b4e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3491,18 +3491,6 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto, fragto->bv_page = fragfrom->bv_page; } -/** - * __skb_frag_set_page - sets the page contained in a paged fragment - * @frag: the paged fragment - * @page: the page to set - * - * Sets the fragment @frag to contain @page. - */ -static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page) -{ - frag->bv_page = page; -} - bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio); /**