From patchwork Sat Apr 15 06:45:01 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: 83642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp870550vqo; Fri, 14 Apr 2023 23:58:34 -0700 (PDT) X-Google-Smtp-Source: AKy350Y6kHYMNS5DBhpmxJyLjEbCegMyEWjlw+NXp2VBG8IpsbhqrOyBCW+OpxAz0Q9VDzdS0lZM X-Received: by 2002:a17:90a:3b06:b0:246:af1f:62ef with SMTP id d6-20020a17090a3b0600b00246af1f62efmr7946319pjc.5.1681541913882; Fri, 14 Apr 2023 23:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681541913; cv=none; d=google.com; s=arc-20160816; b=zvVXFAMdLC3CdmQNb6FJlA/z0xhDJdN+JLuIrFT6ZZAFssNmNRvDBZovN5N+zEIjIN Kj27EDwtSkG3eUt4a1wuOfx0p7GJ/JNTQbKrDXOmIiYqxbg5+iRCN3oPwhYX+/qq4q9s B+0z9Son4z7kloYIUnkf9LD+aZO6pF/5P+EDYwwjK4tjfVjynkGUYyfxgNRFXvJCGqNI IHeI1PlMV58qbZ17MoS8PS58nP+1ldx2pSAFexKvsXdjW/PtBN1yMx5tTMVIC2Jzk0j4 nAwYa7DfDnaCQ2fZsE0HMwYz/ye3cD4WB0GlexPDgrn+09X+bUkbR4wLIEfH+yai3usx a2sw== 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=ORSSzTPE8Nqio7rqVgYoNmFm2taZj7sLIk3/EJHeYk0=; b=EJFz1bw+lWGrR2U09+31COXZp+BbA1n2MtOu33B5Rrf6WkPwra5hV/0wIw5mXXJ+Ez 0ReIc6DoKfkRcKN61BI95uwP2u8aGa6NBFsqV8ywBkikE2Ur+kdhjZP48LATf8TDcZUo rq6mlUvw4vMbpKB9ljfQ6BaF7qIhRkmLDHhCusubEpOBC9AWDHdZt5aisP1UdJtY4fN0 0UkvKN5iHE8KYLpzZG52r48vBXMqFKEd3ljl41CZJW32uafCP66YO+RfuNG1CxY8TXwd iKd/slzS5bZ3GPpL4Z8mUR7ywMiR8JepZ/BlwhAGD7yM5x1S1+ARx7SbxZn3pXXefAcP 5/Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XbkNAH0a; 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 y7-20020a17090a86c700b0024696599329si9121569pjv.77.2023.04.14.23.58.19; Fri, 14 Apr 2023 23:58:33 -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=XbkNAH0a; 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 S229705AbjDOGpu (ORCPT + 99 others); Sat, 15 Apr 2023 02:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbjDOGps (ORCPT ); Sat, 15 Apr 2023 02:45:48 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33C5559B; Fri, 14 Apr 2023 23:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681541146; x=1713077146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P5PNsfQVnf7JGUSyHYyZ0/5wiiYeZCsFRVfR1e/0etg=; b=XbkNAH0aelNCGt1+1yPbDjGIRs1cR0Z94stqB6xDuZSm4P8pqdYQlp5q K3BW7coHkPuZrqxF0EJxV1r7qlutIEq4VPCMxVo5BASRIM980imQA95F7 T61VarKICULLnWubBVweIqfmjRhI8pymuhxefbu1Kw1txCHhm87fx8NP+ YaVYl0ulOHB3L4vvUMMlcbRhd5G6Gh5mFFyrpJlFS3M+Du0/INwyvhcJq mzEKDWGWo4q/IVbmSDgptFLGJgq7bulO306tJqClJ0uudY3gXZd4Z1p/Q GwHEICqvPlg1Qxa0ePCrNh9GTMC5Cn3JrXWb4KRNGRPw0ryklyqEuryl0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="343379277" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="343379277" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2023 23:45:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="754727543" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="754727543" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 14 Apr 2023 23:45:40 -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 , Jesper Dangaard Brouer , Ong Boon Leong , Jacob Keller 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 v6 1/3] net: stmmac: introduce wrapper for struct xdp_buff Date: Sat, 15 Apr 2023 14:45:01 +0800 Message-Id: <20230415064503.3225835-2-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230415064503.3225835-1-yoong.siang.song@intel.com> References: <20230415064503.3225835-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1763224493703280440?= X-GMAIL-MSGID: =?utf-8?q?1763224493703280440?= Introduce struct stmmac_xdp_buff as a preparation to support XDP Rx metadata via kfuncs. Signed-off-by: Song Yoong Siang Reviewed-by: Jacob Keller Acked-by: Jesper Dangaard Brouer --- 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 d7fcab057032..10b9f8912bb2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5190,7 +5190,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) enum dma_data_direction dma_dir; unsigned int desc_size; struct sk_buff *skb = NULL; - struct xdp_buff xdp; + struct stmmac_xdp_buff ctx; int xdp_status = 0; int buf_sz; @@ -5311,17 +5311,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); @@ -5331,7 +5331,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++; @@ -5359,7 +5359,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) { @@ -5369,7 +5369,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 Sat Apr 15 06:45:02 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: 83641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp868114vqo; Fri, 14 Apr 2023 23:50:05 -0700 (PDT) X-Google-Smtp-Source: AKy350ZeYhO1Di7x+kPzjX014Vc4Y51Wkhr1imQzSRznT1nZM3YagJDskKvClxxM6veGHSmeY0zj X-Received: by 2002:a05:6a20:734a:b0:e8:d218:739f with SMTP id v10-20020a056a20734a00b000e8d218739fmr15456192pzc.21.1681541404767; Fri, 14 Apr 2023 23:50:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681541404; cv=none; d=google.com; s=arc-20160816; b=kp0N0FfdfFr6GX27OhZI3QhKDlx/fPG718w8MefRNYMuJYRlDeKaLQvYK7YWCY12S8 W8TuhGpFVMOAFBWLl27eT1V5K6KN/M8FvWP1j27/hUs7SW3yj95sZIfKFChBdrHQcWeg UL5gOeN7e9uDBIlT133cEfi7J6K5P06i3Y3paScdrxIkfcSRPNeurLdPdswkI5frXOt2 Y8f4r7IDRY5PI/bATNa14QewEFiL4z7X/SCyJL/cBBPrSypK11syLrQESlijsmiMDQGy kUwcWrxTe5K1ABM25yJQdgV4xYh++6/kBXez9gsWEU9B3N/I06Gvr958Sd+1iigXgPxO 72EQ== 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=riuYI2VhEBauDyNc9ODwC8Ff4YT25uPCXIb3BXn9y8w=; b=w1ibjlcQIeCuhjZ1KgQeVZWgcdhGtb5ViWiPSj43IWlqEjRWi2ZdF6rNurr4EBCSGV 0X5IDJpulWvsusBpUCs5KRY922i0rGcFAHPUKZ8e4JQ91a/x5fzOLLoHsYhy8cy5ain3 Jsi0Cj9j0h76kFnUap7rrpT/O9UCGPqHavJP2xF3XnrUsIXJVOgu7/yDA9SXVGBTkYvp cl8ve6xqkcrlAZxJyCqXOferLT0l0FvsR7OLVAMfwcjenHLNfQtW9zo+9/TYXl9wk9+D 8AvUYtWEyIN/tEDTi6ur1GDw9wDrHqa4RFPy7QTtqd4Hnw8pJw7OL51zyQsSXwM/EV1A kvzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Y4/YrPkW"; 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 d9-20020a63bd49000000b00517a6547355si6317800pgp.235.2023.04.14.23.49.49; Fri, 14 Apr 2023 23:50:04 -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="Y4/YrPkW"; 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 S229782AbjDOGqF (ORCPT + 99 others); Sat, 15 Apr 2023 02:46:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229774AbjDOGqA (ORCPT ); Sat, 15 Apr 2023 02:46:00 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25C7E728A; Fri, 14 Apr 2023 23:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681541154; x=1713077154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WZl572e0Aj7Ti4/ah2gEM5fYLre/3GyIiGhM4yJzXzc=; b=Y4/YrPkWe4Sz7UBBt4G8xEXVb6I73yUsA67fdht1wYv1TVKIzrbK5AXj INZ8hwBDMSc+sWp763Y/lY9sDyweDWEvie0xwpdAgtt+0hjXDwc2BbiNJ Duc31bKTDTeZE+CXddB0yvqeIH30GBhkcy3aV5gx1lryi68INlUbaC8P4 /BbwdFTs3DN303Wh1a2jXqruFkrGUZTOBOsfruYv5UPShfjDCtAIhkeuB 7UGc07dmnVbqFgpkTw+NGeE3o6o/zgNrxhTEveCPlCjPMMyv/hp1FhqGj Eh23Y5Bl+iVOmLbzJSSINYrzHT8XdeoXJnoBE6HbDKL7x+3F1fzxK3+2H w==; X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="343379293" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="343379293" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2023 23:45:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="754727557" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="754727557" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 14 Apr 2023 23:45:48 -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 , Jesper Dangaard Brouer , Ong Boon Leong , Jacob Keller 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 v6 2/3] net: stmmac: add Rx HWTS metadata to XDP receive pkt Date: Sat, 15 Apr 2023 14:45:02 +0800 Message-Id: <20230415064503.3225835-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230415064503.3225835-1-yoong.siang.song@intel.com> References: <20230415064503.3225835-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1763223960389101758?= X-GMAIL-MSGID: =?utf-8?q?1763223960389101758?= Add receive hardware timestamp metadata support via kfunc to XDP receive packets. Suggested-by: Stanislav Fomichev Signed-off-by: Song Yoong Siang Acked-by: Stanislav Fomichev Acked-by: Jesper Dangaard Brouer --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 ++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 40 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index ac8ccf851708..07ea5ab0a60b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -94,6 +94,9 @@ struct stmmac_rx_buffer { struct stmmac_xdp_buff { struct xdp_buff xdp; + struct stmmac_priv *priv; + struct dma_desc *desc; + struct dma_desc *ndesc; }; 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 10b9f8912bb2..2bfcc5347d6a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5313,10 +5313,15 @@ 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; + + ctx.priv = priv; + ctx.desc = p; + ctx.ndesc = np; + skb = stmmac_xdp_run_prog(priv, &ctx.xdp); /* Due xdp_adjust_tail: DMA sync for_device * cover max len CPU touch @@ -7060,6 +7065,37 @@ 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; + struct dma_desc *desc_contains_ts = ctx->desc; + struct stmmac_priv *priv = ctx->priv; + struct dma_desc *ndesc = ctx->ndesc; + struct dma_desc *desc = ctx->desc; + u64 ns = 0; + + if (!priv->hwts_rx_en) + return -ENODATA; + + /* For GMAC4, the valid timestamp is from CTX next desc. */ + if (priv->plat->has_gmac4 || priv->plat->has_xgmac) + desc_contains_ts = ndesc; + + /* Check if timestamp is available */ + if (stmmac_get_rx_timestamp_status(priv, desc, ndesc, priv->adv_ts)) { + stmmac_get_timestamp(priv, desc_contains_ts, priv->adv_ts, &ns); + ns -= priv->plat->cdc_error_adj; + *timestamp = ns_to_ktime(ns); + 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 @@ -7167,6 +7203,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 Sat Apr 15 06:45:03 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: 83643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp871339vqo; Sat, 15 Apr 2023 00:00:32 -0700 (PDT) X-Google-Smtp-Source: AKy350bSqMFYAO8iCRqHv3z/PdcCWdNamcshkmZMzk1DeME3LFRFQoofCVIXdAtwyrVdMB5xWITR X-Received: by 2002:a05:6a00:2285:b0:639:435:1375 with SMTP id f5-20020a056a00228500b0063904351375mr13175931pfe.31.1681542032209; Sat, 15 Apr 2023 00:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681542032; cv=none; d=google.com; s=arc-20160816; b=IZJt8jWwVaNadjpZAWv3qRXqjHYjaRRZtzTV5DQYfonOc95o3+NJSu2eNBia9qjvLo kEYBVDpEPB3QWFScu4UdwkxSrAI688JFm85ugdckjCxMiLHEpF6Jn39gGdFxWZzbooH0 cFaOE7JJWctnTlR0zTHf4yubvKip+K1WHhaXjsAeycmRexTgQMSHeM4/3qiNjIWLf2TR nzEnp0OhGUwGJtGY8YO96sF5iBKDTClBDRCWSuhUuH3VhnTLA7fC2DaDHDuQIkyuRvkw BHydnHmi8BTiDGcvJgUxjNCN95Blw5xwTprzHFrclxqZ3dO1/d81jXMUaruv2B9EoTK/ mZuQ== 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=+nz0QSONs4mHv7oR3w+mgwHQw7Zva0Jt7BGebWOiM5E=; b=cSaZr4jsWbnBLKCKeHkhoLNDp05nMPilYvE+Zx5eG5zbCE5hOc9zWZeYFf7487DvzT xF+wT3KtYTTP4hYh3udlYYcawhTnkPmjSm2U9gonIpMI9pllAdXcI/qfiibvsQwao+x4 aJdqUxWpuWdKS1iUU13PbHUHePB/Q0Ynn45xcbsocJ7NSy9l4/bebCWhZzLnjewBb252 w3R+hM/hcecK/LvBmBm4V6BxRqZyeoMjCZwFNAlO10xfM3A0J7Kp8fpB/rQWnYI3YJiO LXOnUxxD5ZIXwU7CTY44MdTse1b+6tVX3iMXbZ0i0MPoNF4L2ix+aerGKkP6v6rGUa0F EEmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=L4diEDkC; 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 h15-20020aa796cf000000b0063b6e71d1fbsi2724732pfq.319.2023.04.15.00.00.14; Sat, 15 Apr 2023 00:00:32 -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=L4diEDkC; 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 S229766AbjDOGqX (ORCPT + 99 others); Sat, 15 Apr 2023 02:46:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbjDOGqR (ORCPT ); Sat, 15 Apr 2023 02:46:17 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57F045B8E; Fri, 14 Apr 2023 23:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681541161; x=1713077161; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rr53Ducgp0LeWa/C3dMJZpRzn/yRbmXHBfZUhtLC8nk=; b=L4diEDkCeLJCTIj9Cxqgjey0stOIAVZ/TdP9zYq8u0QIQKMzpxBIw5Lt A2yvPRFGX3aHL/hnUK13jcN2ez7TNW1WuzdZe+4oL78v2qHX+mfkYfQpQ 3IcTMmGx79TIyQYbU0s0jwWn9najuWmkPGlQ6kIUxfhAQO2R4a3jUZVzt bbbAn5toxUFqNwhfS2xdZzUhafAb9ht0cJSZC2qV4StRRen3MpJNbIcF+ qRfQzRsDDVOrL+oaGH8QC24lBSp5EvlX7e6RPLyEtj3yYtXkkltB04ljr E02MP0RS27GbkQiXdXjC6OJ8/fafyLXSDfXz1GJ32Xc9KvhaIZYTw4uQx Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="343379312" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="343379312" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2023 23:46:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10680"; a="754727565" X-IronPort-AV: E=Sophos;i="5.99,199,1677571200"; d="scan'208";a="754727565" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga008.fm.intel.com with ESMTP; 14 Apr 2023 23:45:55 -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 , Jesper Dangaard Brouer , Ong Boon Leong , Jacob Keller 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 v6 3/3] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Sat, 15 Apr 2023 14:45:03 +0800 Message-Id: <20230415064503.3225835-4-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230415064503.3225835-1-yoong.siang.song@intel.com> References: <20230415064503.3225835-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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?1763224618009665380?= X-GMAIL-MSGID: =?utf-8?q?1763224618009665380?= Add receive hardware timestamp metadata support via kfunc to XDP Zero Copy receive packets. Signed-off-by: Song Yoong Siang Acked-by: Jesper Dangaard Brouer --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 2bfcc5347d6a..c0e90fda572a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1614,6 +1614,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; @@ -4998,6 +5004,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]; @@ -5027,6 +5043,7 @@ 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; int entry; @@ -5112,6 +5129,11 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) goto read_again; } + ctx = xsk_buff_to_stmmac_ctx(buf->xdp); + ctx->priv = priv; + ctx->desc = p; + ctx->ndesc = np; + /* XDP ZC Frame only support primary buffers for now */ buf1_len = stmmac_rx_buf1_len(priv, p, status, len); len += buf1_len;