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);