From patchwork Sat Apr 15 06:45:01 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: 83642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp870550vqo; Fri, 14 Apr 2023 23:58:34 -0700 (PDT) X-Google-Smtp-Source: AKy350Y6kHYMNS5DBhpmxJyLjEbCegMyEWjlw+NXp2VBG8IpsbhqrOyBCW+OpxAz0Q9VDzdS0lZM X-Received: by 2002:a17:90a:3b06:b0:246:af1f:62ef with SMTP id d6-20020a17090a3b0600b00246af1f62efmr7946319pjc.5.1681541913882; Fri, 14 Apr 2023 23:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681541913; cv=none; d=google.com; s=arc-20160816; b=zvVXFAMdLC3CdmQNb6FJlA/z0xhDJdN+JLuIrFT6ZZAFssNmNRvDBZovN5N+zEIjIN Kj27EDwtSkG3eUt4a1wuOfx0p7GJ/JNTQbKrDXOmIiYqxbg5+iRCN3oPwhYX+/qq4q9s B+0z9Son4z7kloYIUnkf9LD+aZO6pF/5P+EDYwwjK4tjfVjynkGUYyfxgNRFXvJCGqNI IHeI1PlMV58qbZ17MoS8PS58nP+1ldx2pSAFexKvsXdjW/PtBN1yMx5tTMVIC2Jzk0j4 nAwYa7DfDnaCQ2fZsE0HMwYz/ye3cD4WB0GlexPDgrn+09X+bUkbR4wLIEfH+yai3usx a2sw== 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=ORSSzTPE8Nqio7rqVgYoNmFm2taZj7sLIk3/EJHeYk0=; b=EJFz1bw+lWGrR2U09+31COXZp+BbA1n2MtOu33B5Rrf6WkPwra5hV/0wIw5mXXJ+Ez 0ReIc6DoKfkRcKN61BI95uwP2u8aGa6NBFsqV8ywBkikE2Ur+kdhjZP48LATf8TDcZUo rq6mlUvw4vMbpKB9ljfQ6BaF7qIhRkmLDHhCusubEpOBC9AWDHdZt5aisP1UdJtY4fN0 0UkvKN5iHE8KYLpzZG52r48vBXMqFKEd3ljl41CZJW32uafCP66YO+RfuNG1CxY8TXwd iKd/slzS5bZ3GPpL4Z8mUR7ywMiR8JepZ/BlwhAGD7yM5x1S1+ARx7SbxZn3pXXefAcP 5/Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XbkNAH0a; 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 y7-20020a17090a86c700b0024696599329si9121569pjv.77.2023.04.14.23.58.19; Fri, 14 Apr 2023 23:58:33 -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=XbkNAH0a; 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 S229705AbjDOGpu (ORCPT + 99 others); Sat, 15 Apr 2023 02:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbjDOGps (ORCPT ); Sat, 15 Apr 2023 02:45:48 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33C5559B; Fri, 14 Apr 2023 23:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681541146; x=1713077146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P5PNsfQVnf7JGUSyHYyZ0/5wiiYeZCsFRVfR1e/0etg=; b=XbkNAH0aelNCGt1+1yPbDjGIRs1cR0Z94stqB6xDuZSm4P8pqdYQlp5q K3BW7coHkPuZrqxF0EJxV1r7qlutIEq4VPCMxVo5BASRIM980imQA95F7 T61VarKICULLnWubBVweIqfmjRhI8pymuhxefbu1Kw1txCHhm87fx8NP+ YaVYl0ulOHB3L4vvUMMlcbRhd5G6Gh5mFFyrpJlFS3M+Du0/INwyvhcJq mzEKDWGWo4q/IVbmSDgptFLGJgq7bulO306tJqClJ0uudY3gXZd4Z1p/Q GwHEICqvPlg1Qxa0ePCrNh9GTMC5Cn3JrXWb4KRNGRPw0ryklyqEuryl0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="343379277" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="343379277" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2023 23:45:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="754727543" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="754727543" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 14 Apr 2023 23:45:40 -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 , Jesper Dangaard Brouer , Ong Boon Leong , Jacob Keller 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 v6 1/3] net: stmmac: introduce wrapper for struct xdp_buff Date: Sat, 15 Apr 2023 14:45:01 +0800 Message-Id: <20230415064503.3225835-2-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230415064503.3225835-1-yoong.siang.song@intel.com> References: <20230415064503.3225835-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,T_SCC_BODY_TEXT_LINE,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?1763224493703280440?= X-GMAIL-MSGID: =?utf-8?q?1763224493703280440?= 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 Acked-by: Jesper Dangaard Brouer --- 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 d7fcab057032..10b9f8912bb2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5190,7 +5190,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) enum dma_data_direction dma_dir; unsigned int desc_size; struct sk_buff *skb = NULL; - struct xdp_buff xdp; + struct stmmac_xdp_buff ctx; int xdp_status = 0; int buf_sz; @@ -5311,17 +5311,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); @@ -5331,7 +5331,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++; @@ -5359,7 +5359,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) { @@ -5369,7 +5369,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 */