From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mail.toke.dk (Postfix) with ESMTPS id 5CF129FC8E3 for ; Mon, 10 Apr 2023 12:10:35 +0200 (CEST) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Fye8g4Sq DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681121435; x=1712657435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M9jRW3+HhGvO5QbLOE/WrixZZSlVBopsf2U3mliQfB8=; b=Fye8g4SqkEEaq91hxopKYDUyFUCr/6ZoqeTSn9NEpNArNCTI1Xgq7aBs nRofuql92yUCKbxgrhH3wAQdumOefZET3ckTL5BsFvUHJ7VsWNbV+z9L2 VY/AoZvGptI5a+l0Ep7yKyxEHmFDEMUsbX5BdrIdsvb4seQNEkQ6N3F1V 7j++cdNVjptcNNq7Kb06wRZBIsSCNsuUmQxKUlCaff7k/ei7rlNZdHWTI m6UW0xFXQ6U5AwPIkBULryTVpko0PrsrIS9hFeEpP4RXNmf38UZUbzylz v7313hB8FeXeYnVdaSoCdccBfXROMlvT8HtQD5wMpOtCqdr908ObraVHA w==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="340815313" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="340815313" 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 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 Content-Transfer-Encoding: 8bit Message-ID-Hash: FNHCEPBWHMDEQXQTT637TP46BYINZJR5 X-Message-ID-Hash: FNHCEPBWHMDEQXQTT637TP46BYINZJR5 X-MailFrom: yoong.siang.song@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header 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 X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] [PATCH net-next 1/4] net: stmmac: restructure Rx hardware timestamping function List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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); -- 2.34.1