From patchwork Tue May 9 11:43:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 91562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2837370vqo; Tue, 9 May 2023 05:23:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4RUXNkiK12Ft8sdIXrBxbX4FuZ+kqNucsxufgXMnR/uZV+V85jEnjapmAJ3IkYskz62b3j X-Received: by 2002:a17:90b:4d92:b0:24e:36c:1681 with SMTP id oj18-20020a17090b4d9200b0024e036c1681mr13945782pjb.36.1683634999492; Tue, 09 May 2023 05:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683634999; cv=none; d=google.com; s=arc-20160816; b=OesJh5V8yhL9zlf9OJoslwocSKrqS0fUx7l1WsO1ystJdP/thQGDFmCDWJ5zh/Y434 RS3jBz3IjvNXJbvoFvXXySp1ZsKoRqgUlOdWF4/MnS/gVk3Qnu/Ict/s2vnbkqJCCSh/ kWYOooZtxrldpNBxodrg6Uv5k5LI4Q5woYgELBAvBqb1izYHAxgQDRTbcPld0HkPCWcJ LcaE8UaR4oeePzwXjkCt92c9SXxJbtMoCNldLkzngIDgxsMpvdgRLJUVmycxfp16c4G/ 4XYTbhhH8wcLRUwOelPTllaE28nMZpgJ7nRa3n07DcQDJmLL98YoB8OCFz1NQw9+Lfzr EmqA== 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=DGY0dcqQclmk1XQQOW/lMmRWBr+Yc1d2PrBM/9ekQRM=; b=XkL4XthLIOOj2ehGRXE7WutJSxPyNEqe/OTK/rLFeq1oT/2LSHcXUZfWAUpxsK6Gza 2v03ClLbjrz+/yhX6Ql1N9DDe0QrqvEvs8hJPCTk3Co75Wa/HxV3TS+r7bN3bd6CN+qC i6lU1EpgBehPlLTVk1bK7T9epgf7hB2+RFKWQsgQq43qJxDRqIyR+vnLRbnxfwz5I/H1 iYqz/tv3MlEQnBPIOj+hhPgMOAC+GBdGgobzIJMK16B8soTwNtcqNx0dTLUNTS+NiASq h6fZ/wEhvxoZCcLqTZenMXkezvb+ExIiARfUTCSV8QVu5s01g1m45KHWLJ1ev23wK5aV sIcg== 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 bt30-20020a63291e000000b0051948f1993bsi1365109pgb.210.2023.05.09.05.23.07; Tue, 09 May 2023 05:23:19 -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 S235427AbjEILpY (ORCPT + 99 others); Tue, 9 May 2023 07:45:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235281AbjEILpW (ORCPT ); Tue, 9 May 2023 07:45:22 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C74A619BC; Tue, 9 May 2023 04:45:20 -0700 (PDT) Received: from dggpemm500005.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QFx7T09CYz18LLH; Tue, 9 May 2023 19:41:09 +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; Tue, 9 May 2023 19:45:18 +0800 From: Yunsheng Lin To: , , CC: , Subject: [PATCH net-next v1 2/2] net: remove __skb_frag_set_page() Date: Tue, 9 May 2023 19:43:37 +0800 Message-ID: <20230509114337.21005-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230509114337.21005-1-linyunsheng@huawei.com> References: <20230509114337.21005-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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, RCVD_IN_MSPIKE_H2,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?1765419253524625799?= X-GMAIL-MSGID: =?utf-8?q?1765419253524625799?= The remaining users calling __skb_frag_set_page() with page being NULL seems to be doing defensive programming, as shinfo->nr_frags is already decremented, so remove them. Signed-off-by: Yunsheng Lin Reviewed-by: Leon Romanovsky --- RFC: remove a local variable as pointed out by Simon. --- drivers/net/ethernet/broadcom/bnx2.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +---- include/linux/skbuff.h | 12 ------------ 3 files changed, 1 insertion(+), 17 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..f42e51bd3e42 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -1102,10 +1102,7 @@ static u32 __bnxt_rx_agg_pages(struct bnxt *bp, xdp_buff_set_frag_pfmemalloc(xdp); if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) { - unsigned int nr_frags; - - nr_frags = --shinfo->nr_frags; - __skb_frag_set_page(&shinfo->frags[nr_frags], NULL); + --shinfo->nr_frags; 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 30be21c7d05f..00e8c435fa1a 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); /**