From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5BF9BA0527 for ; Mon, 9 Nov 2020 19:44:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 557666883; Mon, 9 Nov 2020 19:44:52 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by dpdk.org (Postfix) with ESMTP id 2773B6883 for ; Mon, 9 Nov 2020 19:44:50 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id k2so6493231wrx.2 for ; Mon, 09 Nov 2020 10:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XCE2/9nOaFKX3xIfEuSgxStLJ2HDFGAwzKSBSwWeWaA=; b=dC0TuUu7SWLYzv2OLgA+Dfz/bWoQW1yzjb/bsbdpD5SHbY10mHBEKEDSJhIpPpMSEg Dchpsv7FTZvw/zK7/YQuVb1BhbTt3v2H9+TyQJ4Ssxla/Zw+E+x8PGSunAbuS3w/htPJ uVvZXtFZl2g47wzsLQcX7WC8Wi2wosSHIDZCDQxvSdrZrPHRTHEXIpNxa/V/Ku25ASwZ FWIWYZzWXUuAF76doJG1fJli8jI16rzJYOzlBryyvcGvCUutRT1eNarl+sbcTZvnf9QG r3Fqm/1PEwZowmTs0eI1ef2d8PavS6Q3w5B/mC8Bn+nQp/Sc/lZqOD/cICNn67V38K3z Q3Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XCE2/9nOaFKX3xIfEuSgxStLJ2HDFGAwzKSBSwWeWaA=; b=iwtU/b3NyatYgl0QyInxhyAioE9fOTGR97NYtnEx2ixtePJylS7m7ViqL1DB3HWUO6 LnCfnHzANEyf5PBH3jCXgnOTCechS78OVKLqB4VeHykL+0PGSPAcFKVnErrgZ/7AkDY6 TK6+xTgOZAuoCburLquUuqItooWv7u946tEVnB9ND7yQxXGQPDvR+9B0U2TASmEA1Ntx 2yX977yabQ5XB/Uoom3PbHgzqUjqm4SpC/qehIerqTmK3fTlkvJI/zp3BXNdBybaQTHL lUriLjgsrknSUgiz/WVNBi67ZnY0Id+3NOloIAUMyNOlW6WbFPAZdaoYheuEoLlMmHf5 pQdg== X-Gm-Message-State: AOAM531zniytajhE8fTF5hUmWNG+E9Im7SFz2gCLFQ/FCvEXks7WW3DL mO2KWGYYGfnCXiUc3t7V75c= X-Google-Smtp-Source: ABdhPJzx+Z54hWr7GFUdvVYOmNlKHdYLloAfLmLGm/KwIiUgynH7qnjjnIyT4kA13yJHRYihnM251Q== X-Received: by 2002:adf:ebc6:: with SMTP id v6mr18625315wrn.427.1604947488921; Mon, 09 Nov 2020 10:44:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b124sm348571wmh.13.2020.11.09.10.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:48 -0800 (PST) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Andrew Rybchenko , Viacheslav Ovsiienko , dpdk stable Date: Mon, 9 Nov 2020 18:40:49 +0000 Message-Id: <20201109184111.3463090-61-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx: do not enforce RSS hash offload' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/247f3abafd373c621aace1cf70bfa4504ab169c7 Thanks. Luca Boccassi --- >From 247f3abafd373c621aace1cf70bfa4504ab169c7 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 27 Oct 2020 15:14:36 +0000 Subject: [PATCH] net/mlx: do not enforce RSS hash offload [ upstream commit 6db1fde3891c493b9d352487fc8b6384cc6d06f3 ] Rx RSS hash offload should be controlled by the user and should not be enforced by RSS multi-queue Rx mode. Fixes: 8b945a7f7dcb ("drivers/net: update Rx RSS hash offload capabilities") Author: Andrew Rybchenko Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx4/mlx4.c | 3 --- drivers/net/mlx5/mlx5_ethdev.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 9dda4ef330..8de265230d 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -252,9 +252,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev) struct rte_flow_error error; int ret; - if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) - dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; - /* Prepare internal flow rules. */ ret = mlx4_flow_sync(priv, &error); if (ret) { diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index ef332536ee..a6a091259e 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -405,9 +405,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev) return -rte_errno; } - if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) - dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; - memcpy(priv->rss_conf.rss_key, use_app_rss_key ? dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key : -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.507850592 +0000 +++ 0061-net-mlx-do-not-enforce-RSS-hash-offload.patch 2020-11-09 18:40:11.195312278 +0000 @@ -1 +1 @@ -From 6db1fde3891c493b9d352487fc8b6384cc6d06f3 Mon Sep 17 00:00:00 2001 +From 247f3abafd373c621aace1cf70bfa4504ab169c7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6db1fde3891c493b9d352487fc8b6384cc6d06f3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/mlx5/mlx5_ethdev.c | 2 -- - 2 files changed, 5 deletions(-) + drivers/net/mlx5/mlx5_ethdev.c | 3 --- + 2 files changed, 6 deletions(-) @@ -21 +22 @@ -index 34c2bbb373..d5d8c96351 100644 +index 9dda4ef330..8de265230d 100644 @@ -24 +25 @@ -@@ -249,9 +249,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev) +@@ -252,9 +252,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev) @@ -35 +36 @@ -index 2cd05c5f80..ee97480dcb 100644 +index ef332536ee..a6a091259e 100644 @@ -38 +39 @@ -@@ -85,8 +85,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev) +@@ -405,9 +405,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev) @@ -44,3 +45,4 @@ - if ((dev->data->dev_conf.txmode.offloads & - DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) && - rte_mbuf_dyn_tx_timestamp_register(NULL, NULL) != 0) { +- + memcpy(priv->rss_conf.rss_key, + use_app_rss_key ? + dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key :