From patchwork Thu Apr 13 03:25:39 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: 82745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp762034vqo; Wed, 12 Apr 2023 20:43:35 -0700 (PDT) X-Google-Smtp-Source: AKy350bT1a0vqTDs4Cv3QQORcun7i4dviBsqQllwNc0BiYvYxoEKxQH+KSkPOb9lmlDGCL/mFmc6 X-Received: by 2002:a17:906:4b10:b0:94b:d57e:9d4b with SMTP id y16-20020a1709064b1000b0094bd57e9d4bmr990980eju.2.1681357415560; Wed, 12 Apr 2023 20:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681357415; cv=none; d=google.com; s=arc-20160816; b=WSRK6Wf2uIIaYA5ZCRrS4UBu+UNegXM5/eb0EJDpNcvJdY3QzYCdM5zqT2w8l65Jlf TTZFOIk4NhQVJUE0ZNxPCl6vEX80jn/cu9V6JKmNlDxRWb5S9+iYByIa3Cu4+ndh8Rjo QdzMPRfHwZ9DqO8wTTOvXvGaH8KQUOLM/dNqJ0/x/1XpQCBCxGmQfhsFZFZ0hktG/OF7 QBytSOjAYB305zS+PEea7NPtJFDtCYSVjZ7gyLY642lgKUiIf+CbAca1eY4BYjofjZMM 0wCjj135gaeZ1u+33SCb2dWa0UILirNJkoq/nf7MeZ4WDGlLTKKQMd7VxMGhl1rwo8Vd okjg== 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=mMfnks6uItfJ3+XYgWV1oKTx3G/4KAMmnIfLxUzEGCw=; b=AXdC+meERQE1BshgRtlMc8pqorqfa4ib6VAnncw5LXAg6gbqSSFBsCgYRXscfwr3Zg KLJMHySPBdPhpNu019wfJ1YGRFfVSyXMSqyyZFt0N4c+3HOKUAOwHf19hkvQHOw9SzDj w/Z4SmHXoD1U3tieDm/mds/5HOZ44103hRhRuj6yFEva1T5TiGedcl4hb9+5TeCMiUpn cUvTYP05D6TtDYGlerzP8g++ok5XFk6p8dA4utpGvsISIfg+6tb+bpN3bF8Is6M/TQG/ 05CrslQ31Y5x1KuykC7E2+YTqo/VuznACc292q7EedDi6rg5FF63Ogk+QIQB42Tsj0m8 Qolg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="nZbbSu+/"; 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 et18-20020a170907295200b008df5a5088bcsi673830ejc.123.2023.04.12.20.43.12; Wed, 12 Apr 2023 20:43:35 -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="nZbbSu+/"; 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 S229747AbjDMD0c (ORCPT + 99 others); Wed, 12 Apr 2023 23:26:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjDMD00 (ORCPT ); Wed, 12 Apr 2023 23:26:26 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11B16526C; Wed, 12 Apr 2023 20:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681356385; x=1712892385; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pL4q42CrpzLZpFIa2Sgvsf2gW8kvjKkSwOWcp1h+M68=; b=nZbbSu+//FyuT3oSpxgXqjaU011ls9M6m7nwxBTEx3B4fuVPAKHqejZh BUnc0SfB7ILJNLqwJ/DRPbHg8snabVudV3uRmsqqxhquRFG4sHWz8Jj4R kZkFtV32MOr9i2njLXS5o6ALrEabfBdo/D/d60P0PYefEBIcMDmhL4zHO NrflYTWIMmjDykZXnLwRfc1NFiz4DA2wTH99OuvXMzw41JF/WDwvNG+v0 L22jd+uHrpt0BIBr7DqCVKQlOLg4R5ftHlpMTUM0yDIaZq9yLJhP9DR5w Jb8F6viDGDlA/vGH9uPmsju4syEJpGmak47U1TQR6CyVlVUE5ewsGitOa Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332781640" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332781640" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 20:26:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="800597041" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="800597041" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2023 20:26:18 -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 v4 1/3] net: stmmac: introduce wrapper for struct xdp_buff Date: Thu, 13 Apr 2023 11:25:39 +0800 Message-Id: <20230413032541.885238-2-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230413032541.885238-1-yoong.siang.song@intel.com> References: <20230413032541.885238-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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?1763031033607469695?= X-GMAIL-MSGID: =?utf-8?q?1763031033607469695?= Introduce struct stmmac_xdp_buff as a preparation to support XDP Rx metadata via kfuncs. Reviewed-by: Jacob Keller Signed-off-by: Song Yoong Siang --- 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..6ffce52ca837 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5188,9 +5188,9 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) int status = 0, coe = priv->hw->rx_csum; unsigned int next_entry = rx_q->cur_rx; enum dma_data_direction dma_dir; + struct stmmac_xdp_buff ctx = {}; unsigned int desc_size; struct sk_buff *skb = NULL; - struct xdp_buff xdp; 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 Thu Apr 13 03:25:40 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: 82741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp758044vqo; Wed, 12 Apr 2023 20:30:44 -0700 (PDT) X-Google-Smtp-Source: AKy350acxhFbUcVfnHVGbcEkicG7k2SUVXczgnwmy6M1bWEtmwIfEsoB30WK6nAkzS4kw1QCyGZH X-Received: by 2002:a05:6a20:e94:b0:c2:b6cf:96db with SMTP id fk20-20020a056a200e9400b000c2b6cf96dbmr663620pzb.39.1681356644078; Wed, 12 Apr 2023 20:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681356644; cv=none; d=google.com; s=arc-20160816; b=SFxWlH3EsUX55DxtjxHjpue9ykZvrPO5vju4HTsiA6oe7R5NnUlxNbKBB3j0k8uuAa es+pVELbJe7V8HD9/jTawIK11G3yRg7Z0GMlx/YJv2aUkqXPU0vQRde3D0wJA9oW7oB9 uwln+xjGzKsypEHDyBi8P9/8YDYpCmFvHCFh7roqzRlsbK/VctkW+BmFuGp2hX2L/30/ nV/MSW7H4raEEIseo3LhVmOc+45u3Vo+X+CAsE4cH5mBPDSu6jPs0MJXos7ZhaSe58Jo 84quvwfkrSI+e/EAl9fDk8lF1ABwxQzTzSfv1L1aFycoajBDtB5kzSisnIRcagstzvg4 BlTw== 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=VRa/DTmQavB9+sgJbw4iP/c84d2R5vjDx/dXA/ywuEE=; b=AEKqY3cHx+m7mcYqH/I8Chqlc7JxnT/f0sryCHZdmUKj4WuBzWm2rejA2BGXwt+J/M r+ekQuO4Yf0jn/0WVqMOOzvSB6mTkMMc55f/fdrD+txiu81Q4IpZ2nuIXGDv+bYfbATh 9kbPnsSO9NjLcz5viKoZH1eDCLzJR3etHGlww4e1GE6P3tbfuY41yHGumJLcGaW9GaNc TCdF2v9X8sehdmrWkle8Yp9jxTPtcZhs8b9u++4KIexk6rhIVHDY6tUtPfrgehhySd8E F3ow6r95rCBTksw+NMkozGZwnrAMVUKFP0thesOdkpiI63D338fd4eQ9NhO+O/T/5wmA GKTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=brhemA7L; 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 y31-20020a634b1f000000b0050f8a43b1b9si866736pga.187.2023.04.12.20.30.32; Wed, 12 Apr 2023 20:30:44 -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=brhemA7L; 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 S229729AbjDMD07 (ORCPT + 99 others); Wed, 12 Apr 2023 23:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229838AbjDMD0q (ORCPT ); Wed, 12 Apr 2023 23:26:46 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 478A183D8; Wed, 12 Apr 2023 20:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681356398; x=1712892398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TbjWbgkXZyRJmhXzWEr6PAioc/rwjJEJL/AlqKlt9RE=; b=brhemA7LyTaiDSwxujiwecjnYdjjl86ek+AdBtecLESPgcr9LuHutfys Z6uoinlaBFt6lNabEaSaGAas2rXX2a2O7WhGnP1bZPnMfPBXnDAVAnY/0 2Mv2pBY2cFjiZdAWn7OZ3vyNhh0R/fgWm0ByaLsb/YZKplcwzA2IigJCY 29uxbfEIIpgXE8q3Ed+AzCgsWDflc6v+8IcVA/G3bSzAjC/X5AG+51h6U 8kuX3AdbMavu/T7xINGQtf9eZGjFyzfMzFF47PKL0Z9d0gF52kFgDPaIf h9mhjOnkS5flM9Ev9gq1n6zefjxf12ZnLQHT2l13tQX0gTLAkT3N+qHV9 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332781681" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332781681" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 20:26:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="800597050" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="800597050" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2023 20:26:25 -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 v4 2/3] net: stmmac: add Rx HWTS metadata to XDP receive pkt Date: Thu, 13 Apr 2023 11:25:40 +0800 Message-Id: <20230413032541.885238-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230413032541.885238-1-yoong.siang.song@intel.com> References: <20230413032541.885238-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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?1763030224190720247?= X-GMAIL-MSGID: =?utf-8?q?1763030224190720247?= 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 --- 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..826ac0ec88c6 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 *p; + struct dma_desc *np; }; 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 6ffce52ca837..831a3e22e0d8 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.p = p; + ctx.np = 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 stmmac_priv *priv = ctx->priv; + struct dma_desc *desc = ctx->p; + struct dma_desc *np = ctx->np; + struct dma_desc *p = ctx->p; + 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 = np; + + /* Check if timestamp is available */ + if (stmmac_get_rx_timestamp_status(priv, p, np, priv->adv_ts)) { + stmmac_get_timestamp(priv, desc, 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 Thu Apr 13 03:25:41 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: 82742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp758106vqo; Wed, 12 Apr 2023 20:30:55 -0700 (PDT) X-Google-Smtp-Source: AKy350aFTLSVTwDTD6q5Qu5Cpnl0FFCNY2U8XeG+1pnnN34CzzKpTSjVBHfUf32Xgci6DrnE37Hg X-Received: by 2002:a17:902:e887:b0:1a6:7ed0:147e with SMTP id w7-20020a170902e88700b001a67ed0147emr847481plg.33.1681356655002; Wed, 12 Apr 2023 20:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681356654; cv=none; d=google.com; s=arc-20160816; b=rOzKj6U+V4/j5EVTeRCynlFfWlrTrNy0192aJKFVBxBv1uGb4v1BO+hRNJF78sk7Vp z1FTCy/Yx6b2XfqDrE587zNqmRpd/8DkuzXmTz1/Nq15tJiadk4QvuMFvJvNsxhlzfzb YmfhTVirANyV5YRDjPoU+XCHyZnrudMvRYQ+Eny3EXWLCrSYpX4tzpgLrl3mdk4Ph75N VZRoe6BeW8epiEMg6x5t8RplkMVY1GHm6zQgHWL6sV7pcA/dia2Y672j8lW0IQcUZwZP FVOifBH/YjCkh7i3jlL9I6Fq0and7FbFpLpSDAsb///gXSsm6ZFSTwQA8FALZt3IPAgA gPfA== 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=5tPpgnq70xrvz7+7/CJgqY/U2qJ2j4vOjqZOZVQwPbc=; b=c0n2krNvmS3BF+H9Yf0LhACWJDUAoqeQL4Tj8FO04z8REBPlSAO3vLkQvfMioIWX36 Xav7gb7gLS+scHwGOOKn8OVggYQXprRCeGXnGel7daWuxbTp0J6YkTLnudIpd2wS5q7V +BTI/sk2esvifo4cinmlOU2eACeZO3HmrNkNTOROdudlCOOK08fQWbIzohV1sLS2yxlv 8Yf7iPWJbFM/uA3y9XGZFsRiva4v5S42qiXLDBeqINWjyyC+tvpVbGqlGBBmILQs5Qnw NdOOG99Ufsfb8M50XOeK15MaRDAgs5F24vbKuTFacb7x+N0aZqXb4lRDlbcZpZYmytsG 5E5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Wc3SnkiG; 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 r24-20020a635158000000b0050bf0f1b79csi887491pgl.699.2023.04.12.20.30.43; Wed, 12 Apr 2023 20:30:54 -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=Wc3SnkiG; 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 S229703AbjDMD16 (ORCPT + 99 others); Wed, 12 Apr 2023 23:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbjDMD1c (ORCPT ); Wed, 12 Apr 2023 23:27:32 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 994EF8694; Wed, 12 Apr 2023 20:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681356435; x=1712892435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uJGAj1dfOd8XxqdoXjmCOKtKsk7xuP8pGuTOMXLVpzw=; b=Wc3SnkiGvKtwn3F830VZ+ivx1LEDp+DfZZpAuBNd0UiCM8mPvheSr0/6 RYDYc256QX7cacxwnOzERe4X+uSuKgMIoBQSlFdjswM73RU3FJ+O9iEej JComcgHrL9pgltGzN8cM9FDnfNWP6kYFFXJRsB+VwhvXzIcKqHhE2WXMn hwWhZSzWX+cxj9CX6V40vFRw4G6XCLXzdXtclw+KpGrqzBkvotoIhjOcm rOux20nkuj3XXYtL0d/Ub0i1hymIASeKts/E9QhnoePRShCgKoq2GglHf xQ7VPpcMifatFjXDS0kukErdQl9dl1v2BUWc5FNqLwGFUKKWDdD1/12OC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332781745" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332781745" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 20:26:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="800597218" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="800597218" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2023 20:26:34 -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 v4 3/3] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Thu, 13 Apr 2023 11:25:41 +0800 Message-Id: <20230413032541.885238-4-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230413032541.885238-1-yoong.siang.song@intel.com> References: <20230413032541.885238-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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?1763030235814177915?= X-GMAIL-MSGID: =?utf-8?q?1763030235814177915?= Add receive hardware timestamp metadata support via kfunc to XDP Zero Copy receive packets. Signed-off-by: Song Yoong Siang --- .../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 831a3e22e0d8..25ec39aa3bf0 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->p = p; + ctx->np = np; + /* XDP ZC Frame only support primary buffers for now */ buf1_len = stmmac_rx_buf1_len(priv, p, status, len); len += buf1_len;