From patchwork Thu May 11 01:12:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 92335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4037392vqo; Wed, 10 May 2023 18:26:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6t4fPaJJSJxqf/j9OVa8Tx3iJ7JlCfNh+QmkhfJHDguPNo3BppRJirZCeNkSnX4gg83HsH X-Received: by 2002:a17:90b:3881:b0:246:c097:6a17 with SMTP id mu1-20020a17090b388100b00246c0976a17mr20342912pjb.24.1683768404841; Wed, 10 May 2023 18:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683768404; cv=none; d=google.com; s=arc-20160816; b=FVwIyv8FRzGQ3hfgkuHKhoJvBLZTiKztybpqu827Z2i6TTVO9RWe2OjZjO2R46gezi rblshvdc3OBeC5RAK77l1IqGb0vk9qZGSayVriZta4ktvbK5/m+9VB8v+LrZfVITnqJw Cn/9wmKlcIEnorQFJrog/ctxEKA+9E6oslhX0eGIFuzyao3qkNSNIer4vt6ytQoeZ4oR jdGHrEztR/2jtih4I+a7CJEoZkFJnJoe5c0Dyq2rFGDDawTTH8W/2Y5r0WDBNf954SNQ KuI3yjVQn2T753pzC8FcJ6bkFStp5x9u5APgtT20vzs67VKFNY/Yz7ZX2tF+7X7n8SKL 06NA== 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=VX+ey6I+EINdc8kqy4qosUdhkFhiVuIUGDOYpJYpGh0=; b=QLOlaIZeoJHL/c9PKRUniRof6RhaMlHuRWcZ3gmq4IJRJRhb1Q/CCwviZYRuXmGsBZ OXAIHuPwRpLVYt22yAc88dxSPseBGv/wFdKFra76KpScsj8Yw7vjlKrS05kpRLswJdS+ NWi/bKm8KxtMWjXUU7uQ8qIV8Uv6uAtAteOkAba6V4B1nFpGPhZFh2Gsp0ae0sIVnSeB 14ziTetBXM53a8TbirWhI3o9Xr4boQ+yDpeRBDN2tbv2wz4gXCcea22uKMQcAXRXhppJ iuPyXiyxJ62L8vX3iRV3Dg08nV95wfnWDSAUY5Txbz9Ckt+gQmN+lF2PJyncGexFhcTm n27w== 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 f11-20020a63754b000000b0051fb9c77447si5313338pgn.477.2023.05.10.18.26.32; Wed, 10 May 2023 18:26:44 -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 S236691AbjEKBO6 (ORCPT + 99 others); Wed, 10 May 2023 21:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236189AbjEKBOz (ORCPT ); Wed, 10 May 2023 21:14:55 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A9DD10EB; Wed, 10 May 2023 18:14:54 -0700 (PDT) Received: from dggpemm500005.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QGv3457C0z18LMY; Thu, 11 May 2023 09:10:40 +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; Thu, 11 May 2023 09:14:52 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Leon Romanovsky , Michael Chan , Jesse Brandeburg , Simon Horman , Rasesh Mody , , Eric Dumazet Subject: [PATCH net-next v2 2/2] net: remove __skb_frag_set_page() Date: Thu, 11 May 2023 09:12:13 +0800 Message-ID: <20230511011213.59091-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230511011213.59091-1-linyunsheng@huawei.com> References: <20230511011213.59091-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1765559138847890884?= X-GMAIL-MSGID: =?utf-8?q?1765559138847890884?= 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 Reviewed-by: Michael Chan Reviewed-by: Jesse Brandeburg Reviewed-by: Simon Horman --- 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); /**