From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32589A034C for ; Fri, 25 Feb 2022 18:18:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AC1641148; Fri, 25 Feb 2022 18:18:29 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 57F5341148 for ; Fri, 25 Feb 2022 18:18:27 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2ED9B3FE4B for ; Fri, 25 Feb 2022 17:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809507; bh=M2qyClWYeBs/g8djCfwCEZf99BLD/8ZoWDQS/kKvyGA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BNsQXnLegPB8k/FYritbAL2eL/f7dY6q1xGVcaxvneVQ2T+y0NP2aJ5xuiWPQzpRb Ynta+LDwvCIxbANrFKaYPtskWkIxCyQiSvmzfIiGBluN4NZdjX2wmIcbR1TLR7qTv7 iwKEXln5gT7j0G0CPWpAPIcsgQMTswEAOcYxAfdSSX3r5zzmkrhYA49w9wR1Kg57Sg QSRRm5v9YudK+Xbh988b1PSwKLLcJ/juZC7tHWc0FTWNaCTZMWwnNCkZjxtRAnIeGB vbJJZbLbSiuNR3ZVLSCsFIJTBjtYFtZksnoQT3jqBdBdzFUeVF6ejfK1j8C7fHnJal SETsmwBdcGkUQ== Received: by mail-wm1-f72.google.com with SMTP id o21-20020a05600c511500b00380f8be8cf4so271411wms.2 for ; Fri, 25 Feb 2022 09:18:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M2qyClWYeBs/g8djCfwCEZf99BLD/8ZoWDQS/kKvyGA=; b=hV4sUzu4ZIDS/7BTSao7JeP45M8FJ4IUMRJBtgUvg5MM2mrsXVCXRGIjSkPnsRo4mB leJuqoDRqa4O/YkiMQdXDTDtHM6N+qIbGE0sw76CFuXI2GprL0/BEH83KxtifmWncNla kZgeWxvRUHlMUzJzO++/rvslcb9cF5LfgYTkJX8SxKNPonzhuDh/r914x//sMqxIUq39 ZRhXKB7PTFyWpQuJYHnQKU+Ytroy1LZOzl4l6FxJ8WTLC47gvLCmTxJ9myta4bZ/XYFT EuI2t0Lasbo7kX/zEbeyz/ejWm2Joqs7oCaYS7QDyZeXjFLU0YXAklA39LT9Hv3QAwNJ 1hgA== X-Gm-Message-State: AOAM531ilgG5eDTeUuWYsO9iPf6xZzrkCPfq86YZOS0iopO7a9h9gq3n ib+508OnLP3k5386eAXK6RJzsFXCyR5+lAWNjfhbw7XCAV8OcV3LDVhmmq3E1pHxPP+L0tRR5g4 mbmPIaDXuyOROwkoVOWejBCm+ X-Received: by 2002:a05:600c:3590:b0:34a:5f6:9e6 with SMTP id p16-20020a05600c359000b0034a05f609e6mr3641927wmq.182.1645809503630; Fri, 25 Feb 2022 09:18:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzL9OTyJeeWK+8lwm/JYae7HjnMQ7n0huBDPjjMzEiM2XHRHEuRCMTC852QZrKGMFi2qvd+4w== X-Received: by 2002:a05:600c:3590:b0:34a:5f6:9e6 with SMTP id p16-20020a05600c359000b0034a05f609e6mr3641920wmq.182.1645809503419; Fri, 25 Feb 2022 09:18:23 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id u4-20020adfdb84000000b001e8d8ac5394sm2880337wri.110.2022.02.25.09.18.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:18:22 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ivan Malov Cc: Andrew Rybchenko , Andy Moreton , dpdk stable Subject: patch 'net/sfc: demand Tx fast free offload on EF10 simple datapath' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:46 +0100 Message-Id: <20220225171550.3499040-53-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f7faec39ae7937d3ce6b7025b0670810d7afe435 Thanks. Christian Ehrhardt --- >From f7faec39ae7937d3ce6b7025b0670810d7afe435 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 9 Feb 2022 02:26:48 +0300 Subject: [PATCH] net/sfc: demand Tx fast free offload on EF10 simple datapath [ upstream commit 24a491bb882a3269b9b4e2754e1d5b43d83b9821 ] Enforce this offload as it is immutable on the said datapath. Fixes: c78d280e88ef ("net/sfc: convert to new Tx offload API") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_tx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c index 7d0e18a6bd..9738ed9660 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -258,6 +258,7 @@ sfc_tx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index) static int sfc_tx_check_mode(struct sfc_adapter *sa, const struct rte_eth_txmode *txmode) { + uint64_t dev_tx_offload_cap = sfc_tx_get_dev_offload_caps(sa); int rc = 0; switch (txmode->mq_mode) { @@ -269,6 +270,13 @@ sfc_tx_check_mode(struct sfc_adapter *sa, const struct rte_eth_txmode *txmode) rc = EINVAL; } + if ((dev_tx_offload_cap & DEV_TX_OFFLOAD_MBUF_FAST_FREE) != 0 && + (txmode->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) == 0) { + sfc_err(sa, "There is no FAST_FREE flag in the attempted Tx mode configuration"); + sfc_err(sa, "FAST_FREE is always active as per the current Tx datapath variant"); + rc = EINVAL; + } + /* * These features are claimed to be i40e-specific, * but it does make sense to double-check their absence -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:46.282460454 +0100 +++ 0053-net-sfc-demand-Tx-fast-free-offload-on-EF10-simple-d.patch 2022-02-25 16:58:44.296990462 +0100 @@ -1 +1 @@ -From 24a491bb882a3269b9b4e2754e1d5b43d83b9821 Mon Sep 17 00:00:00 2001 +From f7faec39ae7937d3ce6b7025b0670810d7afe435 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 24a491bb882a3269b9b4e2754e1d5b43d83b9821 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cd927cf2f7..f376f24f7b 100644 +index 7d0e18a6bd..9738ed9660 100644 @@ -22 +23 @@ -@@ -308,6 +308,7 @@ sfc_tx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index) +@@ -258,6 +258,7 @@ sfc_tx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index) @@ -30 +31 @@ -@@ -319,6 +320,13 @@ sfc_tx_check_mode(struct sfc_adapter *sa, const struct rte_eth_txmode *txmode) +@@ -269,6 +270,13 @@ sfc_tx_check_mode(struct sfc_adapter *sa, const struct rte_eth_txmode *txmode) @@ -34,2 +35,2 @@ -+ if ((dev_tx_offload_cap & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) != 0 && -+ (txmode->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) == 0) { ++ if ((dev_tx_offload_cap & DEV_TX_OFFLOAD_MBUF_FAST_FREE) != 0 && ++ (txmode->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) == 0) {