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 5F2A0A0032 for ; Fri, 18 Feb 2022 13:45:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A76740395; Fri, 18 Feb 2022 13:45:21 +0100 (CET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id D582940141 for ; Fri, 18 Feb 2022 13:45:20 +0100 (CET) Received: by mail-ed1-f46.google.com with SMTP id f17so15320222edd.2 for ; Fri, 18 Feb 2022 04:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sonUBNg7nKE2T5TBs710ABvOyq3Pvy9ProIeIvdfeeo=; b=lsZfn24uI4+rgTUf5rtf0HGrx4nkPtpOdoJ0XHBlBRtUlCKdeLP68DN/EoWBcCoGzF kcRxtTKA4oE8EF51UMexg9rFOhXUnNXk3FrMKPcOglBISbMhobH+ht2R3QE7QVtA3Evz n3jfS7L7YCOh01NycYUqAjJd4i4UlYp4ZjVDmA/LOmAma4lenURwp4pQYcqmoYOk0gs1 Cpl8lrfVNdpAYonigO/Fsl62BaTcluBTumJJ8B/nu0Q2jfP/68piLH3QTeeWKhMhlgPt hwtq8DEL+1dxz/KgMOBFrYTzoF/inpfp8HvNzJv8+AWDy8dSuVjkw8PwLBtrm2XGTspR JVXQ== 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=sonUBNg7nKE2T5TBs710ABvOyq3Pvy9ProIeIvdfeeo=; b=8NcmMXjcdJ3xZq0KQqJiTcLN0MdhZXUPcIx/mxbPn4HFix/Xs9rtuaZVYdx6RoQxoh TfXoWqRGPaaOutu6kMdqQ3YPIqcf20Pg1flEh1/lKcdBHwLeoXNXVwjomNr1T/op4/Pm eIaTquIIH5hXU9ZYV7Yggniwa/djjytvY/U1HfuD79N7YyhiPQ/VZirga6ug022XcLz5 N5Za0wjtNW4CfaOn2NhQDcArmGFJqx/exQKZbwJZTB/t+Iwjw+kRK+34y4ZlYintQ1JH mVo/+VJL73fRE1M+gHcnnZQYtK4GGbSooTD9yDTRbfBPDeHnkqD2EqYeg/SWA9ua2vKM TAvA== X-Gm-Message-State: AOAM532fbn6Rtce0g1vbq3XvpBdLlYY1j7EZpY+IrsnLvh5CebK5JKDi KPKCT9AIVD7/9gEuGr6T3pWaejRTb3ZUaDuA X-Google-Smtp-Source: ABdhPJyOE943wxFd6Y5VCosBgkESF9HDVNu/EfJ97rK4MgwUucnlchOZpasuRcn2fBRfQSqZgdazQQ== X-Received: by 2002:aa7:cc82:0:b0:410:d2b0:1a07 with SMTP id p2-20020aa7cc82000000b00410d2b01a07mr7784180edt.359.1645188320580; Fri, 18 Feb 2022 04:45:20 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j23sm2178426eja.204.2022.02.18.04.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:20 -0800 (PST) From: luca.boccassi@gmail.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 20.11.5 Date: Fri, 18 Feb 2022 12:39:20 +0000 Message-Id: <20220218123931.1749595-111-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/813b5994cfcbbbe75eaf9ed25918979e0fd74cf9 Thanks. Luca Boccassi --- >From 813b5994cfcbbbe75eaf9ed25918979e0fd74cf9 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 24602e3d10..7c6bac694d 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -269,6 +269,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) { @@ -280,6 +281,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:42.022139407 +0000 +++ 0111-net-sfc-demand-Tx-fast-free-offload-on-EF10-simple-d.patch 2022-02-18 12:37:37.846795404 +0000 @@ -1 +1 @@ -From 24a491bb882a3269b9b4e2754e1d5b43d83b9821 Mon Sep 17 00:00:00 2001 +From 813b5994cfcbbbe75eaf9ed25918979e0fd74cf9 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 24602e3d10..7c6bac694d 100644 @@ -22 +23 @@ -@@ -308,6 +308,7 @@ sfc_tx_qinit_info(struct sfc_adapter *sa, sfc_sw_index_t sw_index) +@@ -269,6 +269,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) +@@ -280,6 +281,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) {