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: 13206473 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD551C77B70 for ; Mon, 10 Apr 2023 15:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbjDJP6u (ORCPT ); Mon, 10 Apr 2023 11:58:50 -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 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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);