From patchwork Sun Dec 3 16:51:28 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: 172965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2320253vqy; Sun, 3 Dec 2023 08:52:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEj9YgGgPl2MgfG+FDinm+eF+Oh0r+KY2Lh3AI+v3HXkonNxdpfFBhwUclLkdshbxPsGbVJ X-Received: by 2002:a05:6a21:1ca5:b0:18f:97c:4f62 with SMTP id sf37-20020a056a211ca500b0018f097c4f62mr919847pzb.110.1701622360274; Sun, 03 Dec 2023 08:52:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701622360; cv=none; d=google.com; s=arc-20160816; b=XQlUg2PDTWR0p+rlYT/dmDiWideRagaA5U5ltWS4oMYc+OQmCnyrWyvFDtQ8izTox6 O9NmGhu5id6Ig8Xm6zOoG7AC8IRR7zPOGglCSJjdx8uAALvDRWfkp4iXNq7JScDv1r3i TKtdbQoeJhN9paVFnFaAJnEHXycqAv8+v2hCwJKehMF9BEcZxsKwIJ36QB2WSZfw9nzr Gc+W6sYRVKJrAOb5OZEIZ5cZnR8ABGtzR3Eg1ehUtqdPBOtFMu57LoPEQ3FZO2SP1kLt WPf0pN9i7noXU8lv745e/sGhcwXCIxaF21s9of8EXnFhp9iCT2gyfoRJ/y2Y4q1KX6vl Xk4g== 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=8JetTupvqFJ3rrLn0j1wHgLMzx2HPz3QzSF1QG23Q0k=; fh=YTkuaskr0lgfdZdN3raKefSjBLb6uuCywA/U9wJpjjU=; b=MK3OmClIoKPy2Vor9gwrXyVSxPycGQ21KXFOW2mJEPXBGxXyOm1aiG3/HrECW50w49 jH+5cy8OhqoKL1QqEJdiE61vWPMv7/nBscjFPVNAzBevoYim6OCTkWlLg26M4vkz+Wcw bMNXEpsgMoNKkcyn6SLgpm7C2KqENK2muluDoVNfSEvsvs5+ZW7Z8y7x7+k7rbQstnZ3 KzglgoiSL0Q4/nFhNVhg6pomDeicXO2pJjQ4p8+Vv/KR7+XgE6lS3vELqST5We2Ar1+b j3RamiXNSRzUcnauiouPsj9FzCrOksVD0NIZy/992zeoLfdDtPboWf5yPkMUKjRpqbJT DuNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NKC9j9i7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id g10-20020a656cca000000b005ae22729b09si6655970pgw.683.2023.12.03.08.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 08:52:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NKC9j9i7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id E8C30806AFC8; Sun, 3 Dec 2023 08:52:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233744AbjLCQwR (ORCPT + 99 others); Sun, 3 Dec 2023 11:52:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233770AbjLCQwP (ORCPT ); Sun, 3 Dec 2023 11:52:15 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ED08E8; Sun, 3 Dec 2023 08:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701622342; x=1733158342; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=N9rjqssMGbAvr291sISynJdKrrI2CBF9OefB6kNHY6c=; b=NKC9j9i7fQN66ptshVzMwsPIkZ6w9V0TLjCogwmW6NfxoZ7E4KC9EH2v 3fzRanbpbMgFXA0lJ/YHWEO6NpP3Mav7DaDMIe+ZZwAMRxNHQCKTSkM+6 YiLt2pYP352za6SUGCL4OqQPwcuNyt21wEEplhMcm/yBhjkvsstpm2SsO WX22kMRmfM6VaUa2dOb7fArR16Ni7jQiGzwM9KXRWPqZml1Oh8iuZ9pnV f6c8s0gAVyHSdoD9tmk7UaC/wfOEob7fRLOxy1hZADIyFXgJHrKLPobu5 DkTVtyNyvMIg0qA1Z/KHzrvf/Rp5wItutX2dJzwPVGoMxRMZ9WlXGTw0z Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="706847" X-IronPort-AV: E=Sophos;i="6.04,247,1695711600"; d="scan'208";a="706847" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2023 08:52:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="799345480" X-IronPort-AV: E=Sophos;i="6.04,247,1695711600"; d="scan'208";a="799345480" Received: from p12ill20yoongsia.png.intel.com ([10.88.227.28]) by orsmga008.jf.intel.com with ESMTP; 03 Dec 2023 08:52:11 -0800 From: Song Yoong Siang To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Corbet , Bjorn Topel , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Lorenzo Bianconi , Tariq Toukan , Willem de Bruijn , Maxime Coquelin , Andrii Nakryiko , Mykola Lysenko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , Shuah Khan , Alexandre Torgue , Jose Abreu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, xdp-hints@xdp-project.net, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Song Yoong Siang Subject: [PATCH bpf-next v3 2/3] net: stmmac: add Launch Time support to XDP ZC Date: Mon, 4 Dec 2023 00:51:28 +0800 Message-Id: <20231203165129.1740512-3-yoong.siang.song@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231203165129.1740512-1-yoong.siang.song@intel.com> References: <20231203165129.1740512-1-yoong.siang.song@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 03 Dec 2023 08:52:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784280367866943131 X-GMAIL-MSGID: 1784280367866943131 This patch enables Launch Time (Time-Based Scheduling) support to XDP zero copy via XDP Tx metadata framework. Signed-off-by: Song Yoong Siang --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 686c94c2e8a7..e8538af6e207 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -105,6 +105,8 @@ struct stmmac_metadata_request { struct stmmac_priv *priv; struct dma_desc *tx_desc; bool *set_ic; + struct dma_edesc *edesc; + int tbs; }; struct stmmac_xsk_tx_complete { diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c2ac88aaffed..1fe80bfae24b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2465,9 +2465,20 @@ static u64 stmmac_xsk_fill_timestamp(void *_priv) return 0; } +static void stmmac_xsk_request_launch_time(u64 launch_time, void *_priv) +{ + struct stmmac_metadata_request *meta_req = _priv; + struct timespec64 ts = ns_to_timespec64(launch_time); + + if (meta_req->tbs & STMMAC_TBS_EN) + stmmac_set_desc_tbs(meta_req->priv, meta_req->edesc, ts.tv_sec, + ts.tv_nsec); +} + static const struct xsk_tx_metadata_ops stmmac_xsk_tx_metadata_ops = { .tmo_request_timestamp = stmmac_xsk_request_timestamp, .tmo_fill_timestamp = stmmac_xsk_fill_timestamp, + .tmo_request_launch_time = stmmac_xsk_request_launch_time, }; static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget) @@ -2545,6 +2556,8 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget) meta_req.priv = priv; meta_req.tx_desc = tx_desc; meta_req.set_ic = &set_ic; + meta_req.tbs = tx_q->tbs; + meta_req.edesc = &tx_q->dma_entx[entry]; xsk_tx_metadata_request(meta, &stmmac_xsk_tx_metadata_ops, &meta_req); if (set_ic) {