From patchwork Wed Apr 12 09:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Yoong Siang X-Patchwork-Id: 82358 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp202333vqo; Wed, 12 Apr 2023 03:02:16 -0700 (PDT) X-Google-Smtp-Source: AKy350ZlCX7SR1erYmWuxEQOOBcGjnS3h8Khtks51ANHudHeF/0VZA3foCF/7A2QuPTk9VpDR92l X-Received: by 2002:a17:906:fe4b:b0:94a:6b4b:6b52 with SMTP id wz11-20020a170906fe4b00b0094a6b4b6b52mr10247891ejb.76.1681293735985; Wed, 12 Apr 2023 03:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681293735; cv=none; d=google.com; s=arc-20160816; b=tQAeInAZ4o5Zum+Qy+ZyaaaDzWUPJq/RKnbnikY+7hYRcPfN6ZR5ZzYbFSxRyU0Wjg OCdd7CFP3t3eDvD2Gt1Auu4+2QOFpKOCsf24fF4J+kWHFTqksWxfmWgNUDsMMy7ASbtj ALbckBrf6SZrfisyzZLZTX1Zkg0SGh/XSS1xV1LC2j5iJU0fsfxEqyf4u4TmosRIdLEq 4BFJATsUoa/KQrgh1BdGsjLbc98vTWmh56cKvWxaUyCoBSoQZF7bIm0HD8d70owEkVHc JlVFUQaFgR/oMl4M64WXIO/4mMh3aotLokP3IGME9Q/Opmb5W5LxALZQm25P4kZ8jfDi Ht1A== 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 :dkim-signature; bh=QCx9hgLcSgp3SXlERbpYtGZXuDz2eKYdWPPdHAse8Og=; b=vVJKKtcF1EFZt4jooJrtMzMgNQVRllbzlOIMm25PvT1NProRiGfNb+9b1m5EtJo5hN 1wOprXLdNQaRaQZlqcW4hbYqIHpr9DiPF4A41PiRgbE4pPzA1HveDMMijvkdbICng/tc sJ57THptx4nX5RBOaOe+QLXRuxPBBLQOV7hUfCINELeVDJqczpfOpUN8KKqKg7ReoGl1 KMagAsRsx53O3s+QZi3/TEAmXonOLHgQYlhlOvVbw1c0r51vhlilAJChsyPEx0sH/fzT virIVRJDN7uuybLCFdx9pJBW7vziEEgH+ksPvjZHyBodL4V46sa+dRWahCZNRDoMUltc CnJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=beua4jA4; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z18-20020a1709063ad200b00947bf51effbsi11324938ejd.580.2023.04.12.03.01.52; Wed, 12 Apr 2023 03:02:15 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=beua4jA4; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231602AbjDLJnr (ORCPT + 99 others); Wed, 12 Apr 2023 05:43:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231235AbjDLJnd (ORCPT ); Wed, 12 Apr 2023 05:43:33 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2607D61A7; Wed, 12 Apr 2023 02:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681292609; x=1712828609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Cpc+vWCiVUmsOySpGlMg+6/vKyP6bVmouafrvWfaSpU=; b=beua4jA4s1Mf/lsblZ2BXvVEpuIZ72Q4iiYBAn+CK52WbIkCoTQ9nWQn g7qvCEdxgD/pmITVGras+3zB+JnQ9ApuZagzj7ogkZc/I3lBAwNgapMfU JWl3ibdjC98EUMEMRg3vPv8YU3LXs20YZ0wvhzn6mSYK6gk3zUHiRtVMC 0PL1BLexkF+siEVWTy3qnqF8gSRtFZY7TU/lOD3f7GqXL3m5SgzVy60o6 I6pwslO0cn2bBfkfHmfhmOLtnb1BCApvgk8FYbdWwgt9+oAg7vdbIcjhJ SZhYxDZ+9iUl/bI/kfa1pl3lsC/uT7gDS6tQYfvcArIgTFW3rdXNRJwjF A==; X-IronPort-AV: E=McAfee;i="6600,9927,10677"; a="346526388" X-IronPort-AV: E=Sophos;i="5.98,338,1673942400"; d="scan'208";a="346526388" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 02:43:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10677"; a="682430937" X-IronPort-AV: E=Sophos;i="5.98,338,1673942400"; d="scan'208";a="682430937" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by orsmga007.jf.intel.com with ESMTP; 12 Apr 2023 02:43:22 -0700 From: Song Yoong Siang To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Alexander Duyck , Ong Boon Leong Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, xdp-hints@xdp-project.net, Song Yoong Siang Subject: [PATCH net-next v3 2/4] net: stmmac: introduce wrapper for struct xdp_buff Date: Wed, 12 Apr 2023 17:42:33 +0800 Message-Id: <20230412094235.589089-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230412094235.589089-1-yoong.siang.song@intel.com> References: <20230412094235.589089-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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?1762964260706054399?= X-GMAIL-MSGID: =?utf-8?q?1762964260706054399?= Introduce struct stmmac_xdp_buff as a preparation to support XDP Rx metadata via kfuncs. Signed-off-by: Song Yoong Siang Reviewed-by: Jacob Keller --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 ++++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 3d15e1e92e18..ac8ccf851708 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -92,6 +92,10 @@ struct stmmac_rx_buffer { dma_addr_t sec_addr; }; +struct stmmac_xdp_buff { + struct xdp_buff xdp; +}; + struct stmmac_rx_queue { u32 rx_count_frames; u32 queue_index; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 2cc6237a9c28..f7bbdf04d20c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5189,9 +5189,9 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) int status = 0, coe = priv->hw->rx_csum; unsigned int next_entry = rx_q->cur_rx; enum dma_data_direction dma_dir; + struct stmmac_xdp_buff ctx = {}; unsigned int desc_size; struct sk_buff *skb = NULL; - struct xdp_buff xdp; int xdp_status = 0; int buf_sz; @@ -5313,17 +5313,17 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) dma_sync_single_for_cpu(priv->device, buf->addr, buf1_len, dma_dir); - xdp_init_buff(&xdp, buf_sz, &rx_q->xdp_rxq); - xdp_prepare_buff(&xdp, page_address(buf->page), + xdp_init_buff(&ctx.xdp, buf_sz, &rx_q->xdp_rxq); + xdp_prepare_buff(&ctx.xdp, page_address(buf->page), buf->page_offset, buf1_len, false); - pre_len = xdp.data_end - xdp.data_hard_start - + pre_len = ctx.xdp.data_end - ctx.xdp.data_hard_start - buf->page_offset; - skb = stmmac_xdp_run_prog(priv, &xdp); + skb = stmmac_xdp_run_prog(priv, &ctx.xdp); /* Due xdp_adjust_tail: DMA sync for_device * cover max len CPU touch */ - sync_len = xdp.data_end - xdp.data_hard_start - + sync_len = ctx.xdp.data_end - ctx.xdp.data_hard_start - buf->page_offset; sync_len = max(sync_len, pre_len); @@ -5333,7 +5333,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) if (xdp_res & STMMAC_XDP_CONSUMED) { page_pool_put_page(rx_q->page_pool, - virt_to_head_page(xdp.data), + virt_to_head_page(ctx.xdp.data), sync_len, true); buf->page = NULL; priv->dev->stats.rx_dropped++; @@ -5361,7 +5361,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) if (!skb) { /* XDP program may expand or reduce tail */ - buf1_len = xdp.data_end - xdp.data; + buf1_len = ctx.xdp.data_end - ctx.xdp.data; skb = napi_alloc_skb(&ch->rx_napi, buf1_len); if (!skb) { @@ -5371,7 +5371,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) } /* XDP program may adjust header */ - skb_copy_to_linear_data(skb, xdp.data, buf1_len); + skb_copy_to_linear_data(skb, ctx.xdp.data, buf1_len); skb_put(skb, buf1_len); /* Data payload copied into SKB, page ready for recycle */