From patchwork Thu Apr 13 03:25:41 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: 82742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp758106vqo; Wed, 12 Apr 2023 20:30:55 -0700 (PDT) X-Google-Smtp-Source: AKy350aFTLSVTwDTD6q5Qu5Cpnl0FFCNY2U8XeG+1pnnN34CzzKpTSjVBHfUf32Xgci6DrnE37Hg X-Received: by 2002:a17:902:e887:b0:1a6:7ed0:147e with SMTP id w7-20020a170902e88700b001a67ed0147emr847481plg.33.1681356655002; Wed, 12 Apr 2023 20:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681356654; cv=none; d=google.com; s=arc-20160816; b=rOzKj6U+V4/j5EVTeRCynlFfWlrTrNy0192aJKFVBxBv1uGb4v1BO+hRNJF78sk7Vp z1FTCy/Yx6b2XfqDrE587zNqmRpd/8DkuzXmTz1/Nq15tJiadk4QvuMFvJvNsxhlzfzb YmfhTVirANyV5YRDjPoU+XCHyZnrudMvRYQ+Eny3EXWLCrSYpX4tzpgLrl3mdk4Ph75N VZRoe6BeW8epiEMg6x5t8RplkMVY1GHm6zQgHWL6sV7pcA/dia2Y672j8lW0IQcUZwZP FVOifBH/YjCkh7i3jlL9I6Fq0and7FbFpLpSDAsb///gXSsm6ZFSTwQA8FALZt3IPAgA gPfA== 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=5tPpgnq70xrvz7+7/CJgqY/U2qJ2j4vOjqZOZVQwPbc=; b=c0n2krNvmS3BF+H9Yf0LhACWJDUAoqeQL4Tj8FO04z8REBPlSAO3vLkQvfMioIWX36 Xav7gb7gLS+scHwGOOKn8OVggYQXprRCeGXnGel7daWuxbTp0J6YkTLnudIpd2wS5q7V +BTI/sk2esvifo4cinmlOU2eACeZO3HmrNkNTOROdudlCOOK08fQWbIzohV1sLS2yxlv 8Yf7iPWJbFM/uA3y9XGZFsRiva4v5S42qiXLDBeqINWjyyC+tvpVbGqlGBBmILQs5Qnw NdOOG99Ufsfb8M50XOeK15MaRDAgs5F24vbKuTFacb7x+N0aZqXb4lRDlbcZpZYmytsG 5E5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Wc3SnkiG; 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 r24-20020a635158000000b0050bf0f1b79csi887491pgl.699.2023.04.12.20.30.43; Wed, 12 Apr 2023 20:30:54 -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=Wc3SnkiG; 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 S229703AbjDMD16 (ORCPT + 99 others); Wed, 12 Apr 2023 23:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbjDMD1c (ORCPT ); Wed, 12 Apr 2023 23:27:32 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 994EF8694; Wed, 12 Apr 2023 20:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681356435; x=1712892435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uJGAj1dfOd8XxqdoXjmCOKtKsk7xuP8pGuTOMXLVpzw=; b=Wc3SnkiGvKtwn3F830VZ+ivx1LEDp+DfZZpAuBNd0UiCM8mPvheSr0/6 RYDYc256QX7cacxwnOzERe4X+uSuKgMIoBQSlFdjswM73RU3FJ+O9iEej JComcgHrL9pgltGzN8cM9FDnfNWP6kYFFXJRsB+VwhvXzIcKqHhE2WXMn hwWhZSzWX+cxj9CX6V40vFRw4G6XCLXzdXtclw+KpGrqzBkvotoIhjOcm rOux20nkuj3XXYtL0d/Ub0i1hymIASeKts/E9QhnoePRShCgKoq2GglHf xQ7VPpcMifatFjXDS0kukErdQl9dl1v2BUWc5FNqLwGFUKKWDdD1/12OC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332781745" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332781745" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 20:26:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="800597218" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="800597218" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2023 20:26:34 -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 v4 3/3] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Thu, 13 Apr 2023 11:25:41 +0800 Message-Id: <20230413032541.885238-4-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230413032541.885238-1-yoong.siang.song@intel.com> References: <20230413032541.885238-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?1763030235814177915?= X-GMAIL-MSGID: =?utf-8?q?1763030235814177915?= Add receive hardware timestamp metadata support via kfunc to XDP Zero Copy receive packets. Signed-off-by: Song Yoong Siang --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 831a3e22e0d8..25ec39aa3bf0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1614,6 +1614,12 @@ static int stmmac_alloc_rx_buffers_zc(struct stmmac_priv *priv, struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue]; int i; + /* struct stmmac_xdp_buff is using cb field (maximum size of 24 bytes) + * in struct xdp_buff_xsk to stash driver specific information. Thus, + * use this macro to make sure no size violations. + */ + XSK_CHECK_PRIV_TYPE(struct stmmac_xdp_buff); + for (i = 0; i < dma_conf->dma_rx_size; i++) { struct stmmac_rx_buffer *buf; dma_addr_t dma_addr; @@ -4998,6 +5004,16 @@ static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget) return ret; } +static struct stmmac_xdp_buff *xsk_buff_to_stmmac_ctx(struct xdp_buff *xdp) +{ + /* In XDP zero copy data path, xdp field in struct xdp_buff_xsk is used + * to represent incoming packet, whereas cb field in the same structure + * is used to store driver specific info. Thus, struct stmmac_xdp_buff + * is laid on top of xdp and cb fields of struct xdp_buff_xsk. + */ + return (struct stmmac_xdp_buff *)xdp; +} + static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) { struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue]; @@ -5027,6 +5043,7 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) } while (count < limit) { struct stmmac_rx_buffer *buf; + struct stmmac_xdp_buff *ctx; unsigned int buf1_len = 0; struct dma_desc *np, *p; int entry; @@ -5112,6 +5129,11 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) goto read_again; } + ctx = xsk_buff_to_stmmac_ctx(buf->xdp); + ctx->priv = priv; + ctx->p = p; + ctx->np = np; + /* XDP ZC Frame only support primary buffers for now */ buf1_len = stmmac_rx_buf1_len(priv, p, status, len); len += buf1_len;