From patchwork Mon Apr 10 15:57:19 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: 81556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2003002vqo; Mon, 10 Apr 2023 09:19:40 -0700 (PDT) X-Google-Smtp-Source: AKy350Z9opOWXTZvrU03iZ9bWIIIyK6/x7vCYVAtZ0jE65xL/vAzHA61JQTfQLX7wTRRgMFYh5kp X-Received: by 2002:a17:902:e5c9:b0:199:1996:71ec with SMTP id u9-20020a170902e5c900b00199199671ecmr15737028plf.16.1681143579842; Mon, 10 Apr 2023 09:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681143579; cv=none; d=google.com; s=arc-20160816; b=os94kPaIKtMgC9G0bA3fNMG3wx4s1H24vG0j5XyZ0V5KkBA5yJOUmSdzBSsEqGeXKI bpIi9aci6i+fvOOgpUtg0Q/9oY7k/vJAwcPadTXJeQTHpvlblEEakJ7OsLiJbO0FvpW5 oTxwgA/kY1IJQ93nV9p/92yTkB2TiZuKTKi/3x0VIG4NS7FG+xLWsQEgktlvpUxrzXiu nuWjmjrwFDGQzOceUo0YnA+jmcOVRvjh2KEzhuVhhfBk4/OS2HJgoiemAqdhsZbAH8rD 3atoOe0KqLCH0F8qqMJiJTXef/EAnRUpr/rDgWhnpc/4OkuhQKKox/K7wWJABUgWcvJH Mqag== 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=Ja9TgwS5N4suOtQLTbyS/gIU8Gqaq7P2vZU8t4dM1b84nHW/IxR+ZiHkYtMzkJf6Iw OpACXH1eUHPGUXPDNU+O7Ztay3NR7po1vPlQoUy0Aah8ZmG+2cDGYwnNWciJeQj1rk4c iQRJBaLG66rwl+Ptz2LO00HIGJp4e3nf1XXCzqDXSz2rbPPswsaQ7Pz4NgbmeLp71v21 zKfwzbo+kKbfw5fKYe9Zufbj/5kyCEfYV3pRrQpeyoZHqyLunwcfU6vMY4WdJogCcOzm HaHP1pIoeBJyCYjQM0p4ukh6pI2YN4sZkd/cYkQFDAG1EO0HsduteUca3wMy8UfiA3TZ of1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dcp1PGae; 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 l11-20020a170903120b00b001a3e545647csi12101094plh.446.2023.04.10.09.19.26; Mon, 10 Apr 2023 09:19:39 -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=dcp1PGae; 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 S230121AbjDJP6v (ORCPT + 99 others); Mon, 10 Apr 2023 11:58:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbjDJP6s (ORCPT ); Mon, 10 Apr 2023 11:58:48 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2938C30F6; Mon, 10 Apr 2023 08:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681142291; x=1712678291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M9jRW3+HhGvO5QbLOE/WrixZZSlVBopsf2U3mliQfB8=; b=dcp1PGaeViZKqomTqvgFFu+9AAgiAOYuN5saxJr7pT7KoNk1XMPXWL5V SpQ1LncRrxttDY8KlZQkCDl/cw//ayaqncHYa2dvXF8JJNlQr0Zla5rUZ AXD4QFKVGe5AUegKKPd+iHtHyMOFOQBHUZkmOBrG92eq8uMySjgFBPrqU OaSzDYA3445StWYbIBBqlNIJa0zpyeIbwqw+PJ6A5AcLHybhlXk8br60E VLQVOX2F+/y47LCY0CfCGE2NoXfRQcK/H9GxMtz0EpwfxENN5f1yQanK5 j2c/WG+65zIkmV83ntkQcGkkRYYR50hA6OqiTYqAkXwrgtwDVFB3orimC w==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="343391682" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="343391682" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 08:58:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="777601688" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="777601688" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2023 08:57:56 -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 v2 1/4] net: stmmac: restructure Rx hardware timestamping function Date: Mon, 10 Apr 2023 23:57:19 +0800 Message-Id: <20230410155722.335908-2-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410155722.335908-1-yoong.siang.song@intel.com> References: <20230410155722.335908-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?1762806810566381608?= X-GMAIL-MSGID: =?utf-8?q?1762806810566381608?= 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 15:57:20 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: 81543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1988587vqo; Mon, 10 Apr 2023 08:59:37 -0700 (PDT) X-Google-Smtp-Source: AKy350Yiq6rVTFFpuJtmkCDyNpT4tHgEuB5qurE5R+CTJf2PQqRQLNBYWunUXnLz82ADz//tCBDn X-Received: by 2002:a05:6a20:b716:b0:d3:78ab:77c3 with SMTP id fg22-20020a056a20b71600b000d378ab77c3mr11026477pzb.48.1681142376755; Mon, 10 Apr 2023 08:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681142376; cv=none; d=google.com; s=arc-20160816; b=a0T7LU+8b31cm+efswmtTu9N9UTmVN1+MmVcbwUTbwcUvV+HUIoMyN/1sXIYakSZ3d abHoN5hJVSWJvwS1tfqlRU7rZsT37xyy/Wle/rbtHyV+P1nyEzWyQGw1GCMaJexjvnjw +bWQt8u8rVOq7xl4KJMfpQcYASTYzFVVAzE41yOAhuZUd84lsJ05408uD2YoSDK0aaXz J+994dTH+UHXcSd9KqnSTX9fZDhZPQqHUMaWmupl+HRuM22KbNTMHpsS6VT6wa/iBpbQ 9DycyK8s3iOAGrNa/5NJXWKv3OAeHbXIL/ad9CLYovakB3+Wy1kH/s8Ai7YtWZzprtJR 9nJQ== 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=sh0CN0udGMhEMFBMrNK3OVy7n2/stKwoBA8DcyBiMivLUeMmKb0EuiD5OgsN7eKGha Nx+uXLk/EBtbtYVnmqq0OPUko0FzIQpEDOHEXdS8q/rmSSvfLxnIi3z2MYV6GOU6plza xRd/ddMkqTUoeyDK+kajDZLu2d5G4a2TITlrGHXeKY8gIR7unqr8UF6GBk+LkK3UGVjj 9MXFJNPEsNROrlGroYaTS1i9Tt1NYSyg1T+f0+frsh+8qxfopRIHDi6XD0Biu2yOByze e/o2Jzzk7JFGFohjqKF8ZC7EGb8Dud2A04Kq1D6qqcbM2pcplH4JHfJmeS026q+ITtcD +ipQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kzOdlsJi; 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 l63-20020a638842000000b00518d97e15ebsi4802295pgd.431.2023.04.10.08.59.24; Mon, 10 Apr 2023 08:59:36 -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=kzOdlsJi; 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 S230107AbjDJP6x (ORCPT + 99 others); Mon, 10 Apr 2023 11:58:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230112AbjDJP6t (ORCPT ); Mon, 10 Apr 2023 11:58:49 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AF163AA1; Mon, 10 Apr 2023 08:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681142294; x=1712678294; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Cpc+vWCiVUmsOySpGlMg+6/vKyP6bVmouafrvWfaSpU=; b=kzOdlsJiBNzy+PcCnU3m4pdrnyaoIBRidtJm6jq5EZSa+cBF50QUFW3h gqGNECwQMUPS+0SyE/IQTTIJKcJ0qphNNuxP2dr9qlF7vUP5LH3RAw4Da RJzka/+ekx/LIYhqqQONsGEKNtRGbuvel0A4EOR52BSOB+n3SDjzSCMrV RPN598xjxKi/cQ32vP4Emjs3EFWvcZDH01gYAwTnbYFwu3gFyvBasC5bO ZzqNlJI64bnDpRzHkY36zYy2QxNPHyFHkjMKR7isqP/NjO1sl0UjZslDm DKk6asNDFk8oEaxhzv75JjGpaR9K4q+oTm2Af8fZWBdUHh8pcPdAycgZT w==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="343391727" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="343391727" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 08:58:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="777601736" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="777601736" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2023 08:58:04 -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 v2 2/4] net: stmmac: introduce wrapper for struct xdp_buff Date: Mon, 10 Apr 2023 23:57:20 +0800 Message-Id: <20230410155722.335908-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410155722.335908-1-yoong.siang.song@intel.com> References: <20230410155722.335908-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?1762805548862929785?= X-GMAIL-MSGID: =?utf-8?q?1762805548862929785?= 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 15:57:21 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: 81547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1995443vqo; Mon, 10 Apr 2023 09:07:39 -0700 (PDT) X-Google-Smtp-Source: AKy350aVedsW79I7FxQ986+j1jyo7QOGu7wurGeeiAYqFAPKn/V5UcrKVNwz3L06rkB735bzSxxM X-Received: by 2002:a17:907:1686:b0:930:f953:962c with SMTP id hc6-20020a170907168600b00930f953962cmr9781963ejc.1.1681142859597; Mon, 10 Apr 2023 09:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681142859; cv=none; d=google.com; s=arc-20160816; b=P6+LcJVZRBDQs1TiQY+BM/iISLcquL+qPPWN47LFYCNxobRMA6mrhb/jpHelzYZa1c 61NVkOGyASg9xHGQTbG01KatD6aJiXWfZJolOsjyJIasQd6KBT/s5nGVJ7P718iYbxzg 6jhqx5WMWJ/eQ9duIvGrUFolFIViyEn09N7uJJFK/iZSQwYfG9zGjhZ4mHe5wfv34hgV ZtkWG1nhvIbaTE5PR2Hg8AqVun28ABVdJwKVpoupRCEzX1QLGT8467NmMJZGdvHtIsa4 2H0ty5aEsCin9ocE5zWnfw1QFq1flF5u8LEcMxVVMhKnkalUdvFF2gj+5XclovFNpy7f puOw== 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=8cRk9tpXMAe+b1lqmzw+3M/Np0cyMwykQ+kCbtPtqd4=; b=eLCU1AdCw/b9E/0F5DhACYNMkTveXZ6bLvLsMTcGsxRtFmmXHij4I8t5mwaEaIuWub MwllkezenJ2CNjP4bHI3hmIUJFJM8y556ohyVhJPquTjA/VGjQ4/JaBAHSx+ewEDtHC4 Jt1py/221R59rrAp9JidnNTyIj7gzoAUTj3wQvDJ+4m2rS4HvCBFVMQn6vwwx5CA6ilS VYwRzCq8MlWZO+p3wFlHDXq2xgxdzHouYZCJvZWt1jJexD2FacU+0r3tbbKfqjjDhzdK b+JKVEtjBta8S9C4Dhd+Bc0qD1q0KUBq0grWTIDf9oXrDvHyJx4hiMUzava3PtuF+KaB 042g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gc2pOgbN; 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 sd11-20020a170906ce2b00b00947b227020csi7611196ejb.825.2023.04.10.09.07.15; Mon, 10 Apr 2023 09:07:39 -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=gc2pOgbN; 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 S230190AbjDJP7M (ORCPT + 99 others); Mon, 10 Apr 2023 11:59:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjDJP7A (ORCPT ); Mon, 10 Apr 2023 11:59:00 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DAACE63; Mon, 10 Apr 2023 08:58: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=1681142325; x=1712678325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=epNmJmT4mdsPOw/HzfxOribgjhbn4L4BH4c8uTIvlqY=; b=gc2pOgbNhpTR+cAfeCCZM3x5stRMceQ9GDHo5K0y4IOOIkfVTPzgVV+1 Z3dTxq/+9GY6ssEFP5YKZKaypWITa3oPSOAAtyOVFrnPNkfhz5KM/Mek1 iYxHvdLS2D9dwxZ7WPuqJDiGJVFnNZEA0j/xZ2vVKC4vZOnT1/PeVl4TF W39dW3nxV3vQdEGLS4waFPr9PqMYeAnIYdg49ejrWjzAExusXMY8p2Vxj VYMb33EWSni34x9SmLZGF8ebr8RuAgpzX+7eaqPfqTKFpw2UKQE6LSGGp Zqc54Oxi1cyn/qc7eRzW8zFCTf2QzanqIH+7tkILjtNPJ8d76OXym2+3q A==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="343391789" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="343391789" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 08:58:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="777601767" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="777601767" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2023 08:58:12 -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 v2 3/4] net: stmmac: add Rx HWTS metadata to XDP receive pkt Date: Mon, 10 Apr 2023 23:57:21 +0800 Message-Id: <20230410155722.335908-4-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410155722.335908-1-yoong.siang.song@intel.com> References: <20230410155722.335908-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?1762806055244915521?= X-GMAIL-MSGID: =?utf-8?q?1762806055244915521?= 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..7f1c0c36de8c 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; +} + +static 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 15:57:22 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: 81551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1999008vqo; Mon, 10 Apr 2023 09:12:47 -0700 (PDT) X-Google-Smtp-Source: AKy350bxQrihuHxTW9lldKVw/DgEEoL9N8LvmhU+rQwyhf95nEH8KoPTG0hhBWQ5ovdsvFrOlDrz X-Received: by 2002:a17:906:c413:b0:948:fe00:77f2 with SMTP id u19-20020a170906c41300b00948fe0077f2mr8496587ejz.58.1681143167416; Mon, 10 Apr 2023 09:12:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681143167; cv=none; d=google.com; s=arc-20160816; b=sv0jq0sNiNmgbZV9Y3IQc+0xy/vjovWXtjYoZYetrDSUEeX4IUr6dLtF4Hyohd2+h1 PDTo9Uhpy+yIPDnqdn+2YarMEjnrOKf+BMbKzTdQigwG4/CY2jK6SJIfV3MlGEzwXTUx xgIFRb1zSlLCCn5CsDDFG5rJ4OMM2XH3yAhQYZNC0ZXiEkRIViDj0Rw9KzJuCUfVa8iE ZD6CrYR0VRyNkUv48cNuRuWMh971gwwqkleelc9HMr/NfHKkAxSr+FPlt6QJvDb4xwlN EfkoHYIf9vQJ1hvmDMD7M+gL2v5z0PDkn5dLBngPe04TxN9j1e6B9O8N2AbhecVcXBBJ Sdnw== 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=ambu0ZU4rEbJbkbt7EGhWT4CN8sTWCmsdM1ROjlpc6w=; b=N8AcnrsIqtlZOd4prUZ68y6Q33pRpGi84QEYfDMKAmUTJrCMOhj1W1pcZMVPMNaWbJ 1J2DP2VZnpt1iC4bJflzBO48fqjbZpeqS+T+yIJg/73VVM3pNYLcuFPVm/g8oS8bj0A7 7mL0Lyfv7kGSJtyiWMVp6YRXt+ou4hM2UnRmNCpPp+vY5NMx8sKe7ZGC40tq7Ykj6404 IX4mbgX6/0PDPzPjmHPtZIuX0l2bcs/u8BU+sjyNM6LQjLR52483Y3t0aus2nru2ecnK XglpZtBfyHcruBzu/7GD4gdhe35kiCq2nUDYkC6KrvqrPBN/oYb2dkxM19MRWHKJsFIf S4eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MDo8sR+T; 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 f26-20020a056402161a00b004bcedde1496si8393534edv.287.2023.04.10.09.12.22; Mon, 10 Apr 2023 09:12:47 -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=MDo8sR+T; 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 S230202AbjDJP7R (ORCPT + 99 others); Mon, 10 Apr 2023 11:59:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229953AbjDJP7E (ORCPT ); Mon, 10 Apr 2023 11:59:04 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 102A62D5A; Mon, 10 Apr 2023 08:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681142329; x=1712678329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7CyX8+iAb3kw4nJuS0qncc4N2aFERAptrvfH4AgZhAg=; b=MDo8sR+TGFjPyXw33RNAlhuj24FtjqmdBI/4Rj+t0Uj0aUvKynmN4Fin ulLDzaIhaVSNZ3Qc7g6aD+AkVUrAvRmQDKkDbfwT+HUIqyt6k+9egcJCS jlLsyB8QuUA7Mtld3o4DRd4WUrUMIR6KKbojB2DbbUzNlQUyBDl2z8TRy OouEJs37EhVhjkjHQndO4w31a5gkwj8DjL01J0o+ZLLRrXR7LvBuQkYa9 nkAhquMtvg8T2XcD3JUjXOIgvXM/qrsBMV+4cTvGmoDZaCO+lJCYv/51Z W40cD/EtR5iIjLqG5swIpi2f3RiGIiqijMlZ5AZgfdiB9ijXyvN2dj8kv g==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="343391855" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="343391855" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 08:58:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="777601811" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="777601811" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by FMSMGA003.fm.intel.com with ESMTP; 10 Apr 2023 08:58: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 v2 4/4] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Mon, 10 Apr 2023 23:57:22 +0800 Message-Id: <20230410155722.335908-5-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410155722.335908-1-yoong.siang.song@intel.com> References: <20230410155722.335908-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?1762806377953367942?= X-GMAIL-MSGID: =?utf-8?q?1762806377953367942?= 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 7f1c0c36de8c..bcaafeea118b 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: