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 43E4DA0032 for ; Fri, 18 Feb 2022 13:45:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F33241143; Fri, 18 Feb 2022 13:45:11 +0100 (CET) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mails.dpdk.org (Postfix) with ESMTP id CD46040141 for ; Fri, 18 Feb 2022 13:45:09 +0100 (CET) Received: by mail-ej1-f50.google.com with SMTP id p15so14750335ejc.7 for ; Fri, 18 Feb 2022 04:45:09 -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=k40jFcHDIfGY5Ixg3HWVBXEt0jzaWvOYoJ6QXSI1sPc=; b=n+eg6g6KNw/YRY5tuDNqYvac6MUUP2lqEJ3HAMwSS+fSGNPNZoBC0eBG7V7ChP90HG WQKFark0GAER+6RUsjUZnYyUyEiNrcMbNQ4uyPsNqjXldtynsI2mQ+AegEV5QF7XVIo4 qOKrxrOb/PG8JB/vHQooter+57xD7mMXK5zIerpKZlKpaF3zmo61h1n8VNCYpFHgqXcS JGgoDFl4mVWFdZW66qMo/0ni6SGCUQRFJ9OVQYCq9PItJuQSBBkV1hwP3v6P0OrxIBWT M8H5znz0n4dIX2gK2X02Q0Cs26FQvNSp8XXGBVIU+8t6qlGglxZwNILh6P0q2BWS64iv RfNw== 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=k40jFcHDIfGY5Ixg3HWVBXEt0jzaWvOYoJ6QXSI1sPc=; b=mN+dGf2PoDki5kq3TJ3UoBlw39cjpEefkUqr+mzXXDZN3k247/i4cZxWGNCvy2qmeb zC/q0a6dqcayYa0FiT9ejuDQTby3Mwebj7pE23ilzYT7jerWtte1wjGc0GZFnOBlu1+K wFa/FzpGNauPEr42K1Ypff30e3OTtnkkE1pH5CVI6u+ZfiWMMJRyABKanz11mpEvJdJ0 G8Wd3Mf4o0enp9zUoV3aEamPfZ8UEf+riwpp5Uf6ZZU01lBVJLxc4H0aMy+g2Qa78Kyy y76cHuxyCWesjUq9oot5h9ooypnCUZwI7vJV9MqLiu99L45wo+Q2b3VLESSJtB4l034i sHBw== X-Gm-Message-State: AOAM532cqOUeUsv7p5oDzMVMk3jXn/41QHTIMcymPxizEkmwZqptot1Y iUGg2YhmlahSguGbWRggVwkNm/+NXpTlN7+3 X-Google-Smtp-Source: ABdhPJwSVdgvTjxrVl4Vs+cgkFZnLvg086k8kMabX7MyArM7lHmPPX7XvF8z1/NJP4X9ttn0TqF51A== X-Received: by 2002:a17:906:d0ce:b0:6cf:37f0:2718 with SMTP id bq14-20020a170906d0ce00b006cf37f02718mr6360901ejb.224.1645188309506; Fri, 18 Feb 2022 04:45:09 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c3sm2215311ejc.120.2022.02.18.04.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:09 -0800 (PST) From: luca.boccassi@gmail.com To: Ivan Malov Cc: Andrew Rybchenko , Andy Moreton , dpdk stable Subject: patch 'net/sfc: do not push fast free offload to default TxQ config' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:19 +0000 Message-Id: <20220218123931.1749595-110-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/964a78f4be1e1e5be526541d8f1e00494946f641 Thanks. Luca Boccassi --- >From 964a78f4be1e1e5be526541d8f1e00494946f641 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 9 Feb 2022 02:26:47 +0300 Subject: [PATCH] net/sfc: do not push fast free offload to default TxQ config [ upstream commit f67615ea626e23e61b71d27f894fe9a4ef716df3 ] Doing so is wrong since fast free is an adapter-wide offload. Technically, the offending commit (see "Fixes" tag) does not induce failures, however, such started to occur after commit a4996bd89c42 ("ethdev: new Rx/Tx offloads API") had shown up, because of the strict offload validation in the generic code. 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_ethdev.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 7c2bf78da0..1b02759f93 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -86,7 +86,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); struct sfc_rss *rss = &sas->rss; struct sfc_mae *mae = &sa->mae; - uint64_t txq_offloads_def = 0; sfc_log_init(sa, "entry"); @@ -138,11 +137,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->tx_offload_capa = sfc_tx_get_dev_offload_caps(sa) | dev_info->tx_queue_offload_capa; - if (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) - txq_offloads_def |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; - - dev_info->default_txconf.offloads |= txq_offloads_def; - if (rss->context_type != EFX_RX_SCALE_UNAVAILABLE) { uint64_t rte_hf = 0; unsigned int i; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.988873671 +0000 +++ 0110-net-sfc-do-not-push-fast-free-offload-to-default-TxQ.patch 2022-02-18 12:37:37.846795404 +0000 @@ -1 +1 @@ -From f67615ea626e23e61b71d27f894fe9a4ef716df3 Mon Sep 17 00:00:00 2001 +From 964a78f4be1e1e5be526541d8f1e00494946f641 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f67615ea626e23e61b71d27f894fe9a4ef716df3 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index abf7b8d287..b04a05bd9f 100644 +index 7c2bf78da0..1b02759f93 100644 @@ -27 +28 @@ -@@ -94,7 +94,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -86,7 +86,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -35 +36 @@ -@@ -146,11 +145,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -138,11 +137,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -39,2 +40,2 @@ -- if (dev_info->tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) -- txq_offloads_def |= RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE; +- if (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) +- txq_offloads_def |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;