From patchwork Mon Apr 10 10:09:37 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: 81451 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1795735vqo; Mon, 10 Apr 2023 03:18:25 -0700 (PDT) X-Google-Smtp-Source: AKy350bnNddUeTkI4n/2gcI6xyxvo0I8eh3RwzJoxV/yCgJti9cJN1Mv0LRGMomOYUUyI+LgcpxD X-Received: by 2002:a17:903:41c5:b0:1a1:ad5e:bdb2 with SMTP id u5-20020a17090341c500b001a1ad5ebdb2mr15380670ple.57.1681121905470; Mon, 10 Apr 2023 03:18:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681121905; cv=none; d=google.com; s=arc-20160816; b=VIYcKg2Xh1/npyt4H3vvBDLWMYDxEq9tRjQYlCuswCRRdbKSi7Wxqvll1Uh+wIdRow uUvtKPNDCvltIrRY0vFOAMuDVQKfGAyvcIlDph99Tcm/jm+0BSFMjpZCvN2ahWaTwjmm lrpnTFDAKNtyrA9GzaSOZbhlCCacLHQ975blkN9oyRCGdLfUfG0PvZFEsX/yhOA1KE8u N5XoVqffuDIYyj5u+pfqtWx7BPsl8gDd+g7iiQep3ZapZToY5Pk05OHWMgP4ahFPChP+ aVgVQ8reR2NCghHaqIwpd1Vz5VryIBvOy3RgJpZu6PooueV62UVXjoJJOaI2rgygoLAS 7i3g== 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=TWhIKN9cjsVwq+hBpbXobS/hXF3utb7BOz7IDoMjjFsqfao/shJIMkJod2t/0Jz17W GrQJEoYP2440rSu3B3Jurha30k+rbmDIpaw0a/66BGXdSB8kxCFa9iVahASbtgY4r52d LRUC7pGWCihX7W013uGBIvN5bAtgENG7dh9keFPTsNXQ94BsFAyZiyUA/AWvgymp2FKC IQiSqDxcEjCQsAexj6B1JJ8+v0MeuZztv9oz253/hRf6JIQDJACumbkMFJxQyPH+u4sr iM0WiuUnNcoV/48ayLjfzlbQAz2YKVp954vWtWE+IgYqcm0NQ5zb6JOBq9isbk9FYbGK PcmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jFAHBjdH; 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 o17-20020a170902d4d100b001a1bbc5bea5si11439209plg.537.2023.04.10.03.18.13; Mon, 10 Apr 2023 03:18:25 -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=jFAHBjdH; 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 S229878AbjDJKLE (ORCPT + 99 others); Mon, 10 Apr 2023 06:11:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229789AbjDJKK5 (ORCPT ); Mon, 10 Apr 2023 06:10:57 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3029259DC; Mon, 10 Apr 2023 03:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681121445; x=1712657445; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Cpc+vWCiVUmsOySpGlMg+6/vKyP6bVmouafrvWfaSpU=; b=jFAHBjdHgDOxnW6MAHLk7Q4nT+uoo/vUFZCLmU7Ew2Cb8mDf3g08wTHo nvU/KDwFLq35Pb79ZqpSKVglfz6rLVmKmkWbPywIYLhaUkQ9FzNKeq4Uq CrKoRXcrfpZ65o26IEhMgbWTK6QRBZcYgqxYCIWuvFfqpGdwrhoM7dqke 1BUfOvg1q0pZA7UnNMVREnmcx9fx22EyrHHztf+0pm1lwl4RkBBoBhqCy yoN7XvZ6cF3iKuxTWAhUUTSJg6UfXLbvK7qHpKKDiR2Ub6Ve0HgrmaTff 75iq+CifsMt8oAdzM0sP+3y+J59fq7Ns4YoIFrBVk3qGI8nQRI1X06lVY w==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="340815349" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="340815349" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 03:10:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="752716141" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="752716141" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2023 03:10:39 -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 2/4] net: stmmac: introduce wrapper for struct xdp_buff Date: Mon, 10 Apr 2023 18:09:37 +0800 Message-Id: <20230410100939.331833-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410100939.331833-1-yoong.siang.song@intel.com> References: <20230410100939.331833-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable 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?1762784083116172840?= X-GMAIL-MSGID: =?utf-8?q?1762784083116172840?= Introduce struct stmmac_xdp_buff as a preparation to support XDP Rx metadata via kfuncs. Signed-off-by: Song Yoong Siang --- 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 */