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 |