From patchwork Wed Apr 12 09:42:35 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: 82370 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp217344vqo; Wed, 12 Apr 2023 03:31:25 -0700 (PDT) X-Google-Smtp-Source: AKy350Z6x2F9mLtiBveJpB2E5ER84sACzLhWqexUPPuGPtJk1Az8FPoP6DL7azTVqCEW8sapi3jj X-Received: by 2002:a17:902:e392:b0:1a3:d5af:9b73 with SMTP id g18-20020a170902e39200b001a3d5af9b73mr5360634ple.58.1681295484756; Wed, 12 Apr 2023 03:31:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681295484; cv=none; d=google.com; s=arc-20160816; b=Y5YvVwTETRkdjOrMYaBLqk6x3okjIodyr5nNBp5wDryt/jyD5zoZTgmKogrMKCzStU oc+UKYAAy/OMeKI7iTPO1DNv2xTbzY/XpDyLW4kZ3JaL7yCi/YYFbUDROGvKw1wpXBkm stQd35L3VxWqWsECCunEdhD4xU0OAbo3j/WiIj4x9FZBy8aQCJVP42Dlu5uvkycqD8h0 batJyoiXkTOT/XSCd+UdX2HIj9C281h14BIH2nPfGQWqaTnKjI+2IgMGSlJ0U4yCHMpT mt106YgNgJmGZYfsBuVvVZpUgNp59wPYKIEFebd65I+6ab6r1XISAZ7eSE3jUefU67oE fVQw== 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=tKEhjyiGJNPJyq53tSiTPTazDR37uV2sqEL2PtH4PVo=; b=f9JpGr5QYNVhOZiZaPaTehODn8kDd/0884+foEF1KpAm6+YrPgeT+XmdZvGpGDhcaY 9V9ScIwdxmwV/T2eIgq+D7CNygJqemO0wRMT/RGNzagV9oGvdtpTjH/EUrD9s0StDCOL Be2CIIO9xPOL2AJk2Gyu1ZtK7FRKB7e647UzMCNKzmasdnueMkFrtu4qWyVjv+l3Lydp MpX6OMCuoz2KHHDLpepL1HmqEZ7tpS29AYkeC2p4owqjP95kbOmKizNWLh/m7+n9kdGA xJ6fccpCNArv5VZEN2UIWZstu7Zg/z2gVzhcsES4q3BOBo6DHDFYNF68tv5hetFzAB6D C9ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fcIBJlSu; 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 b12-20020a170902d50c00b001a5d5b97c74si9883779plg.259.2023.04.12.03.31.12; Wed, 12 Apr 2023 03:31:24 -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=fcIBJlSu; 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 S231599AbjDLJoU (ORCPT + 99 others); Wed, 12 Apr 2023 05:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbjDLJoN (ORCPT ); Wed, 12 Apr 2023 05:44:13 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 611DA6A78; Wed, 12 Apr 2023 02:43: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=1681292626; x=1712828626; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LwEHEzc7bD+80SZfiRcNMHZOLAyRIwPq6TVR/GpsF7s=; b=fcIBJlSuCcMeU2IKjtOhoATQ3OWgvWyDB5mBmmQNqb34JADJoFvHbpFB E+dzHsEadE/78GxW15s2gainU8BB2payTNEoszrjH4T5OYBS5hTW1Oi7a 1m7dZRhGw5vadcDaHVCjCNcjOcc5fcRxokfhc8dYwLJ66NtGYKIzfa+z3 LyRt9e00YhZYbEE2sAtNdT8hnbh3cqaAojg++XSxeO8rOBZOs2p7qoDHv Ujo00W+0xzs0qiu++4OFMBThfs5VLW1iRfmttow5uAcT9fzAatRyyI99O Ns6eFs6n4dx2VmFqhtKezypMFpjWVSFzhATbVYUQ837CXjr6Jw3nuYQcJ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10677"; a="346526472" X-IronPort-AV: E=Sophos;i="5.98,338,1673942400"; d="scan'208";a="346526472" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2023 02:43:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10677"; a="682430970" X-IronPort-AV: E=Sophos;i="5.98,338,1673942400"; d="scan'208";a="682430970" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by orsmga007.jf.intel.com with ESMTP; 12 Apr 2023 02:43:38 -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 v3 4/4] net: stmmac: add Rx HWTS metadata to XDP ZC receive pkt Date: Wed, 12 Apr 2023 17:42:35 +0800 Message-Id: <20230412094235.589089-5-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230412094235.589089-1-yoong.siang.song@intel.com> References: <20230412094235.589089-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,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?1762966094286694310?= X-GMAIL-MSGID: =?utf-8?q?1762966094286694310?= 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 ed660927b628..1c4dbac90717 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1611,6 +1611,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; @@ -4999,6 +5005,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]; @@ -5028,6 +5044,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; @@ -5113,6 +5130,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;