From patchwork Mon Apr 10 10:09:36 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: 81450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1794277vqo; Mon, 10 Apr 2023 03:14:22 -0700 (PDT) X-Google-Smtp-Source: AKy350Y0qxUXh3dk8ZjNt2jLUtU8G++b6wdwUbgkj6n0T20vzElSb5a2Nl8hq/6e7GPOZ5moDX5L X-Received: by 2002:a17:902:bf41:b0:1a1:a800:96a7 with SMTP id u1-20020a170902bf4100b001a1a80096a7mr12055093pls.8.1681121662149; Mon, 10 Apr 2023 03:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681121662; cv=none; d=google.com; s=arc-20160816; b=XJ17slfIENezRxLdA9Q9/+WzaeorekcgY0UmY+bruAjvx+bCMZ9PZZ0kOr/tZWd2TE Bc3Q0uvLCDkD1oq98HlcgXHzDxzQugiBHxZp1dKjjkk2lzGpwv/L5gRecijEvGBkb/Sb K5raKFsyD3uw2xd+nYlkOvWNK7MuBOtMAwbCtmGC96kRmrDtcha5hNUP/yPwK+M2veB7 BIJRW4DzA8BWTvI5nk+SvytChgwJSoeoyY4XA2NvisFSCurSYSk4HS7AuRa8nq7pH9sx 3D0bimTSzmjpre3a+9h89pPbFnrn0Ztf+tOHbTACBNJJ2FqxbWaEp1iIj4LEjATdmcor tRGw== 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=/Y6eWEc5CsYDgq9fhIp3p8rcHVvYty3BqNJISl8jxOQ=; b=bv5rmQPuccgzuAzd+fMVyBfwJXqTfE7Jz3bptb9tCletNGBeZSZf7LTIWfe8AjGBLv VwE1WC37YLW5HU1/gCtWy3YUDPSL3IZjjng5unoS2fQL2wYl/ts13WD3IQTgKDHmYuih dyQrsEcIZfs96SXJwPYuxmz7LVcXVwadlpnuU5Y7UD0juRgoqJoEhK7cRuXPE9WcdDPg 780YZOni3la1y6SSphCZddOpO6+MRK0+aSMUihFZHQv8qk9gQuc24RjlbRnjCucAORg5 rNIderhZI+wr9EyR3J+rH1dn6paiqTm1FSyzjWWzS9ka7R6e8WksOhBJzhqB1L69OIEg ysjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="FK/7OlFV"; 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.14.10; Mon, 10 Apr 2023 03:14:22 -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="FK/7OlFV"; 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 S229876AbjDJKKo (ORCPT + 99 others); Mon, 10 Apr 2023 06:10:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbjDJKKi (ORCPT ); Mon, 10 Apr 2023 06:10:38 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B51905FC4; Mon, 10 Apr 2023 03:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681121434; x=1712657434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M9jRW3+HhGvO5QbLOE/WrixZZSlVBopsf2U3mliQfB8=; b=FK/7OlFVAXDJ6dhrwo4xVczezqRsLQ4f9GAEKeEp5kF4rjE4RXWQPP4x g/ck1w7PTKLXGZig2tiUtgUJm5yfWaJ9Nt4+XmxwfKP5UkoqdisL4qTE9 KjgSAJFVx3BNGU9QMM51YEHsOBIX9DzErdb0ZXI2vlEmemvrXEya+JR1i PnLFw9EQr3ZljQpoiC76LuLQCGvkKj5Wa7wFfpf2Umm1OTJg63Aie0WAv VcjSSOcGPH5vduIqh7GhVer1Qn9JcPhSZvVbHcmp4nBK2JBrYIjimKMi2 SaiDAynMoj95DzBVz7JmTp0DN3HmSGMCTKSSNLBZF835Brg5tWqoTyFnW w==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="340815314" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="340815314" 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:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="752716095" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="752716095" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2023 03:10:28 -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 1/4] net: stmmac: restructure Rx hardware timestamping function Date: Mon, 10 Apr 2023 18:09:36 +0800 Message-Id: <20230410100939.331833-2-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?1762783828160596810?= X-GMAIL-MSGID: =?utf-8?q?1762783828160596810?= From: Ong Boon Leong Rearrange the function of getting Rx hardware timestamp for skb so that it can be reused for XDP later. Signed-off-by: Ong Boon Leong Signed-off-by: Song Yoong Siang --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 04fbb7770618..2cc6237a9c28 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -570,15 +570,14 @@ static void stmmac_get_tx_hwtstamp(struct stmmac_priv *priv, * @priv: driver private structure * @p : descriptor pointer * @np : next descriptor pointer - * @skb : the socket buffer + * @hwtstamp : hardware timestamp * Description : * This function will read received packet's timestamp from the descriptor * and pass it to stack. It also perform some sanity checks. */ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, - struct dma_desc *np, struct sk_buff *skb) + struct dma_desc *np, ktime_t *hwtstamp) { - struct skb_shared_hwtstamps *shhwtstamp = NULL; struct dma_desc *desc = p; u64 ns = 0; @@ -595,9 +594,7 @@ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, ns -= priv->plat->cdc_error_adj; netdev_dbg(priv->dev, "get valid RX hw timestamp %llu\n", ns); - shhwtstamp = skb_hwtstamps(skb); - memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps)); - shhwtstamp->hwtstamp = ns_to_ktime(ns); + *hwtstamp = ns_to_ktime(ns); } else { netdev_dbg(priv->dev, "cannot get RX hw timestamp\n"); } @@ -4909,6 +4906,7 @@ static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue, struct xdp_buff *xdp) { struct stmmac_channel *ch = &priv->channel[queue]; + struct skb_shared_hwtstamps *shhwtstamp = NULL; unsigned int len = xdp->data_end - xdp->data; enum pkt_hash_types hash_type; int coe = priv->hw->rx_csum; @@ -4921,7 +4919,10 @@ static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue, return; } - stmmac_get_rx_hwtstamp(priv, p, np, skb); + shhwtstamp = skb_hwtstamps(skb); + memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps)); + stmmac_get_rx_hwtstamp(priv, p, np, &shhwtstamp->hwtstamp); + stmmac_rx_vlan(priv->dev, skb); skb->protocol = eth_type_trans(skb, priv->dev); @@ -5213,6 +5214,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) rx_q->dma_rx_phy, desc_size); } while (count < limit) { + struct skb_shared_hwtstamps *shhwtstamp = NULL; unsigned int buf1_len = 0, buf2_len = 0; enum pkt_hash_types hash_type; struct stmmac_rx_buffer *buf; @@ -5407,7 +5409,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) /* Got entire packet into SKB. Finish it. */ - stmmac_get_rx_hwtstamp(priv, p, np, skb); + shhwtstamp = skb_hwtstamps(skb); + memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps)); + stmmac_get_rx_hwtstamp(priv, p, np, &shhwtstamp->hwtstamp); + stmmac_rx_vlan(priv->dev, skb); skb->protocol = eth_type_trans(skb, priv->dev); 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 */ From patchwork Mon Apr 10 10:09:38 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: 81452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1796929vqo; Mon, 10 Apr 2023 03:21:28 -0700 (PDT) X-Google-Smtp-Source: AKy350YkdiefNsv4Nuuon1SPZQGNBnjZ5vL0dThNy+c14/qElSOT61ArkiVu1Xv791i+t2TFVLc0 X-Received: by 2002:a17:903:294c:b0:1a2:8924:2259 with SMTP id li12-20020a170903294c00b001a289242259mr11460206plb.23.1681122088656; Mon, 10 Apr 2023 03:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681122088; cv=none; d=google.com; s=arc-20160816; b=GYKnAdFFe97FO00V42gwkueWH5UECHAwQXNczMeCPEV7Ih8Yk1Xhh0NWDGsriyHb+l atl4PegIBRkSmb1wYv5ooh9W6iJLYDSeNZPSySbF2nYNgtJHu0OrbhT74YtIyOoycY+R W39qJDIMkFw/WLt3ei+Ige8lyGgC9DUBDPKKbw6oOpYsw9xe7iWIcZnOVX1MqkwzwUUx g8fzmakgRKxp7ronRfo64JrSo4H0ORUCcqe+kuZcZnBVTfPVRzMdI3GG8BnZCP2Ihueb KnOzAFSAGPAy9NRC4E1dWRWo+E9ZPAzl6n6mPxLWERYNlg+5gpIuFExOVIkY7ygALEXV 1igw== 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=vq1f7P7DFp7BL6iQSdzbtfMFoWa8u99Dl1A1Ob9d3vk=; b=HcXaQuMtsiSTYkYqdA+76fR58XRFySjoXj0D/KRXBVbN0h+o6qVLAKs9H1LGUamPYq 17lRb7Snjh1WBQpI+DeZ+pbV5My0jw/iwYQ8g8wkAb7Fff4+xwv7GlLvFZ3SFvbqcjVb Enm5pZ6MZqVzDMIIlsbxgCX2L98Y3llCwgZizEJiScQVL7ovBuXCnuwg3qQY6vDuhIEc KDtsIy99Bs+2rXanf49KjnXCC1feUGx+wWffaWjOm4/MW+rsowsmlVFiYuAKtkKcYuQr cr6HsZUfBytF9vvje9geAh2h8XLMnp2Vgv7iddFhZ6DAyr1NsbjTpeSgHcPGSc2vE/Qn 2efw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MigQtS8k; 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.21.16; Mon, 10 Apr 2023 03:21:28 -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=MigQtS8k; 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 S229661AbjDJKLf (ORCPT + 99 others); Mon, 10 Apr 2023 06:11:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjDJKLd (ORCPT ); Mon, 10 Apr 2023 06:11:33 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706246197; Mon, 10 Apr 2023 03:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681121472; x=1712657472; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CnnmBEFT4Gdze5o43Pjrwyz8lLC6ClCHyehlDppYg+k=; b=MigQtS8kRNslOWGZc3xAYSWAlsBXzQCIwqTm8Vk6C93ESjUviP+1siuN 2iqt3OHmBgRSGfg+Ar+VaywmYL6whkPB/nVB3BDLgdskCc1+kxlvvlSSj 86+xmoZl6p8mcln8E8BOn+K0PIS9fG0JhWh1v2wAuG6UFjIEUmJzvIt0f ces3Wo8/d3UJCKnMvJ2JhszHe6MlNdvtjWa1AzrgRAGtHXAwAvOf+NIvE wLG7OXcDx1ubP/zmplU/f85cuklYAbGdI5eGs+6rseOAAvKwGotmo+ezq 4ngDjIyC8UKAkhZXZb13VJeyt9Jm6KDYB6bV3MI3x4JYBW+Q2Kzlpnwyf A==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="340815381" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="340815381" 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:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="752716162" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="752716162" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2023 03:10:47 -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 3/4] net: stmmac: add Rx HWTS metadata to XDP receive pkt Date: Mon, 10 Apr 2023 18:09:38 +0800 Message-Id: <20230410100939.331833-4-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?1762784275035992873?= X-GMAIL-MSGID: =?utf-8?q?1762784275035992873?= Add receive hardware timestamp metadata support via kfunc to XDP receive packets. Signed-off-by: Song Yoong Siang --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index ac8ccf851708..760445275da8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -94,6 +94,7 @@ struct stmmac_rx_buffer { struct stmmac_xdp_buff { struct xdp_buff xdp; + ktime_t rx_hwts; }; struct stmmac_rx_queue { diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index f7bbdf04d20c..ca183fbfde85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5307,6 +5307,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) } } + stmmac_get_rx_hwtstamp(priv, p, np, &ctx.rx_hwts); + if (!skb) { unsigned int pre_len, sync_len; @@ -5315,7 +5317,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 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); + buf->page_offset, buf1_len, true); pre_len = ctx.xdp.data_end - ctx.xdp.data_hard_start - buf->page_offset; @@ -5411,7 +5413,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) shhwtstamp = skb_hwtstamps(skb); memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps)); - stmmac_get_rx_hwtstamp(priv, p, np, &shhwtstamp->hwtstamp); + shhwtstamp->hwtstamp = ctx.rx_hwts; stmmac_rx_vlan(priv->dev, skb); skb->protocol = eth_type_trans(skb, priv->dev); @@ -7071,6 +7073,22 @@ void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable) } } +static int stmmac_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp) +{ + const struct stmmac_xdp_buff *ctx = (void *)_ctx; + + if (ctx->rx_hwts) { + *timestamp = ctx->rx_hwts; + return 0; + } + + return -ENODATA; +} + +const struct xdp_metadata_ops stmmac_xdp_metadata_ops = { + .xmo_rx_timestamp = stmmac_xdp_rx_timestamp, +}; + /** * stmmac_dvr_probe * @device: device pointer @@ -7178,6 +7196,8 @@ int stmmac_dvr_probe(struct device *device, ndev->netdev_ops = &stmmac_netdev_ops; + ndev->xdp_metadata_ops = &stmmac_xdp_metadata_ops; + ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM; ndev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | From patchwork Mon Apr 10 10:09:39 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: 81453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1797831vqo; Mon, 10 Apr 2023 03:23:46 -0700 (PDT) X-Google-Smtp-Source: AKy350b9I8uJLYF2rYgf+dHUMY7EZYgzknRtIqBi2pZW9LQ7QKCEJ4SH6DwxQdVxNCJG3InNy2Jo X-Received: by 2002:a05:6a20:b192:b0:d9:77f7:d62e with SMTP id ee18-20020a056a20b19200b000d977f7d62emr10410510pzb.36.1681122226113; Mon, 10 Apr 2023 03:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681122226; cv=none; d=google.com; s=arc-20160816; b=DCTpwfCmwiy68ehehNKUSLsRZUFw/D27AiTHsVHmneHq8KWpxHq/jPsWDNfbaWdv1+ ocLmDp3J4X9u1qB7F0k8pdiH4vqAheNhZAMMWeBNcUq2OauovWYPfWXxnGTabDK1WDv7 rEkUCh+f+z79/zkxlqnxEAxMU6Z8jHqQ0ZZk6egap3DEcskLrJrxgDu+2LSglAkUcnKU OKP1fTAUr35cvCPIRENgG8eE0OmzFm14Jfv8EVTik0FmU77Lev18k6dibo6uAXz992M6 pxC7sx0sRAU4sVwyv2KUyyibgitSc6sEW+W63kPSBFWwXib/UL+FsMV3zQ3Cc5VR9eLX JH0w== 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=52oS2QONyKcAKrmC5TAbEFkS6PcKVPhRv/95M93s0EQ=; b=ZCe1Kw71fN4yROtWi6UC/bM2ALXo43arS0SYTM/4AZo0sdPqHwOUxQiQIjws4MD+Ub v6x9wYXJcQPoGvxZUv1uK6N5qa8uUNlLWwr2ILQ4TQUf1gNF1N7Cxe0Y8mefHW+sDUah EJlyTfRiJE2Wu34xKC8bzKK+TAC4cBAc2eaf2hVyQoasp9AhiwLlpNiVO/1d1yLvzAAf S3SU2KQBeEHMlSVvvL4IoVZwsWzOCzUpJYxdTal6lKnzPZexFwJ1QSf7SfdQr1W5ZtwR cSlV6njlQislkUvwkCn5Z1BbwEgVU4Yd1RWmPelsxrMiHKR2XJj/riTP+YKM2Q+ngK6A vWkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IFcOeWPX; 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 k26-20020aa7973a000000b00627d5397423si10700040pfg.145.2023.04.10.03.23.33; Mon, 10 Apr 2023 03:23:46 -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=IFcOeWPX; 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 S229883AbjDJKLm (ORCPT + 99 others); Mon, 10 Apr 2023 06:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbjDJKLh (ORCPT ); Mon, 10 Apr 2023 06:11:37 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C8A659E3; Mon, 10 Apr 2023 03:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681121477; x=1712657477; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Bc+nspG2xkjaRPTpa9y3nJcvI9rS5o1YkarF2xS12Dk=; b=IFcOeWPXAPUs9y/KbdCM6kQRjvxEbiYmDylNZnCaMygB7NnqBr7NGEzA oOGzrESufaveYVnJzNUi9g/FESgUrmeqiS9TTkWQnBeMfkjY7/wG5LjXJ 4D8+seLZatIV53IXEaSzTQkO3vnonyE5zQkT3ZpC3dE2li3SQeCAnLQtI jeWidoji5f/ZrLVwN4eqT800QaJcU7zZ51dE2EYPJHH0NYrpp4V+Bgjy2 Rz0oDPZUDD31pscJ7LtRGHj6B68M87O/GpHeF2NSrLjPASwpnjWCiQrrN 6lXeRRpn+vJqLYHyBcFkCzyG2ffgJFCSgX/zUJcAUI2pp/gxRpTlQrqhQ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="340815413" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="340815413" 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:11:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="752716209" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="752716209" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2023 03:11:00 -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 4/4] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Mon, 10 Apr 2023 18:09:39 +0800 Message-Id: <20230410100939.331833-5-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?1762784418963379828?= X-GMAIL-MSGID: =?utf-8?q?1762784418963379828?= 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 | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ca183fbfde85..a4545e9eb8fd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1611,6 +1611,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; @@ -4903,7 +4909,7 @@ static struct sk_buff *stmmac_construct_skb_zc(struct stmmac_channel *ch, static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue, struct dma_desc *p, struct dma_desc *np, - struct xdp_buff *xdp) + struct xdp_buff *xdp, ktime_t rx_hwts) { struct stmmac_channel *ch = &priv->channel[queue]; struct skb_shared_hwtstamps *shhwtstamp = NULL; @@ -4921,7 +4927,7 @@ static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue, shhwtstamp = skb_hwtstamps(skb); memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps)); - stmmac_get_rx_hwtstamp(priv, p, np, &shhwtstamp->hwtstamp); + shhwtstamp->hwtstamp = rx_hwts; stmmac_rx_vlan(priv->dev, skb); skb->protocol = eth_type_trans(skb, priv->dev); @@ -4999,6 +5005,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]; @@ -5028,8 +5044,10 @@ 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; + ktime_t rx_hwts = 0; int entry; int res; @@ -5113,6 +5131,10 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) goto read_again; } + stmmac_get_rx_hwtstamp(priv, p, np, &rx_hwts); + ctx = xsk_buff_to_stmmac_ctx(buf->xdp); + ctx->rx_hwts = rx_hwts; + /* XDP ZC Frame only support primary buffers for now */ buf1_len = stmmac_rx_buf1_len(priv, p, status, len); len += buf1_len; @@ -5132,7 +5154,8 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) switch (res) { case STMMAC_XDP_PASS: - stmmac_dispatch_skb_zc(priv, queue, p, np, buf->xdp); + stmmac_dispatch_skb_zc(priv, queue, p, np, buf->xdp, + rx_hwts); xsk_buff_free(buf->xdp); break; case STMMAC_XDP_CONSUMED: