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 C3051A034C for ; Fri, 25 Feb 2022 18:18:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDC46410FD; Fri, 25 Feb 2022 18:18:24 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 35580410FD for ; Fri, 25 Feb 2022 18:18:23 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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-1.canonical.com (Postfix) with ESMTPS id 0D4B63F1DD for ; Fri, 25 Feb 2022 17:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809503; bh=s0ueA5QJbE807NmkEjR2GHe9lB9R5poLc7vt6DUrqkk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Phh5QL3GZ2g5S8xu9swTE8StJoSZ+/0yN9d+bPxAWX8kXw6nyN6w2dfNywqWup2le 0vvIrEfWJUinCwhBd3lpmJbMVIm99ZuMkVfO0OxUZ6CiwOG53aX5qfvsVc4k0OOiFH SDnAjDkmA23pN0xeekf87mLZg64V7+fnJmcWcJLuAFbzcWGPRQbxRPstjQ0I71bJzW 3Y8AjByCSYN8EdwqtQSunkBRVdZlkbEKm7IWbsD9jGzeH2utVDgOMqrBile6mRs6Wr fYTwJVCuanHOBkL6h4k7fAYZt+pE6VNe5Vvg3Am7GwJUwg1oCYjZy4cdyKd4BYWaI/ A/W3wQAX7ASQQ== Received: by mail-wm1-f71.google.com with SMTP id r8-20020a05600c35c800b0038118108e71so1596796wmq.7 for ; Fri, 25 Feb 2022 09:18:23 -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=s0ueA5QJbE807NmkEjR2GHe9lB9R5poLc7vt6DUrqkk=; b=LKVQkRJS2vOzKfEqCEjb089JJMUzXkz9GWC+xQFYtPDIFX6QEVLwYVOxZQIJxEMkAd 6/2vVoegYJb+NELpvbh9AWkKOJDqCO6HrKgJPVg8/DZT/SpZ4yY/+TSU50ofndkxv/mc 3ia+i5ADtCGTyq4kgT9Fg6KG1b/rOtXW3C2yPU9wtz6yRbxppNP4iB0DBfmKy8UX+nG+ EYgXM1E0k8x4CDQzs8mDciK5bj8IXajXg67luIMEiPoUWK85v9rJg+GlqdnJayYuRqHx PJmVQOtHM0ZG4TXMSwfoDloKTB/6iLja6ul9dHP+vfFAIy7xsGiM0pByj2LGI9yynDpu hu3Q== X-Gm-Message-State: AOAM530Z7VroVm6uB1+olb9hkxfjOzmVO6dUHp0LgQ2IPXkiqmRV7zfZ BkqqQzxwPPLQKc0q7XO+BNAweHAyv9FzWnw5jdGKIfo3hx2eLRZ0+D47N24n7xB+OosYg2XhJ9D 7p+W0b5lfL+H6QcXXVD3s9voa X-Received: by 2002:a05:600c:4e8a:b0:37d:1c28:20fc with SMTP id f10-20020a05600c4e8a00b0037d1c2820fcmr3543900wmq.166.1645809502398; Fri, 25 Feb 2022 09:18:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJy70EIl38mIBSDPZ2Dbrub4Y09tMLcmSdPtkwQF515YtQDOCJEj925ixjPWHqmzE6qbWSG9sg== X-Received: by 2002:a05:600c:4e8a:b0:37d:1c28:20fc with SMTP id f10-20020a05600c4e8a00b0037d1c2820fcmr3543885wmq.166.1645809502131; Fri, 25 Feb 2022 09:18:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:18:21 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Fri, 25 Feb 2022 18:15:45 +0100 Message-Id: <20220225171550.3499040-52-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/5b759d85bded9547924982fdba76b73928d9a5e3 Thanks. Christian Ehrhardt --- >From 5b759d85bded9547924982fdba76b73928d9a5e3 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 5b2a72ebf3..8206fa78e5 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -93,7 +93,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev); struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); struct sfc_rss *rss = &sas->rss; - uint64_t txq_offloads_def = 0; sfc_log_init(sa, "entry"); @@ -143,11 +142,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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:46.245580559 +0100 +++ 0052-net-sfc-do-not-push-fast-free-offload-to-default-TxQ.patch 2022-02-25 16:58:44.296990462 +0100 @@ -1 +1 @@ -From f67615ea626e23e61b71d27f894fe9a4ef716df3 Mon Sep 17 00:00:00 2001 +From 5b759d85bded9547924982fdba76b73928d9a5e3 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 5b2a72ebf3..8206fa78e5 100644 @@ -27 +28,2 @@ -@@ -94,7 +94,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -93,7 +93,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) + struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev); @@ -30 +31,0 @@ - struct sfc_mae *mae = &sa->mae; @@ -35 +36 @@ -@@ -146,11 +145,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -143,11 +142,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;