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 EB28BA0518 for ; Fri, 24 Jul 2020 14:10:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E0CBC1C20A; Fri, 24 Jul 2020 14:10:32 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id EDBC91C224 for ; Fri, 24 Jul 2020 14:10:31 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id p14so7394451wmg.1 for ; Fri, 24 Jul 2020 05:10:31 -0700 (PDT) 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=TjviaPOvkblOoWUy3ChFEd9L/j9kVn+9at5f2mMyasI=; b=FdPfFuSd1MN+v8kzLGkth2Cn7+2OlesLjgAV6CRlNzQqWIU/xvbrOjstUiV2cv9vgV T8gD4kKMOtV18RoflT7azvjDliXYy/vrSl3KrHcN22daoDq6LIfl11IXx6w1Wc97Ttv7 IyKrVUf8ehiFaUDLAey4Ux6nBEL0FneG20e1v7/EJim57xi79VDxWvucWFf32XY2K5TQ NqVT1kEg3RtbUI9hhpLsBl33+QpZbojNiYqK3pWybIlZKL5OdWZyZKQjYRhrn6AjroLs 6xiTxOSaT8PK6EM5t9Ds0YigIJ314VQPM/qrxkQQFjn9jPFyVsyHEsrKPfyYsJ7GPf8T nW4Q== 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=TjviaPOvkblOoWUy3ChFEd9L/j9kVn+9at5f2mMyasI=; b=av5S0axZyiVisa9w/Clla8dg6kBuNrPll63ZlvQEYv2s/6dncM/QSFYlxcD7+LKrOG wRWbrXpNmHOb6AMNZSSZ4mS6VhwpRsPo7rUxbeOAb+hHvk5NLxPnP2VDREtVpa90ICbW 13uapaOe1JFCPV6BRRHr05lx392uMqDqZNLtOkR/higeP3kA1uY8/XxozptUeAcUtmp4 i/KJOp4dCYN5LuqcyFkUhWALBdh5rg18mUBI//WND9vjM2TbZcaVDT/j6+GTem2l78li jwU8oBKIwDNYHbdPVLz8E3gDtLnkE0DE3+p4AOeHu3JMLA48CCKZhesd+dG0g8TdbDKi mfPQ== X-Gm-Message-State: AOAM5339pFsq/WCvgMgMPjG3m6VsxNSOGNjsLtqo7dCy/6sWP//TUGYT xrv4DpSqhH4Pi6o+aFadhAdlq7vWQk5MSg== X-Google-Smtp-Source: ABdhPJwMG/pwNtQc9QkaTdu+3+ZfYW4QeE+Zj5hOKFutZSp/+Pk8M94iHkZkZswPf9GkzzsxTaqUbw== X-Received: by 2002:a1c:7315:: with SMTP id d21mr8183774wmb.108.1595592631708; Fri, 24 Jul 2020 05:10:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g145sm10801965wmg.23.2020.07.24.05.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Lijun Ou Cc: Wei Hu , dpdk stable Date: Fri, 24 Jul 2020 12:59:51 +0100 Message-Id: <20200724120030.1863487-153-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix RSS configuration on empty RSS type' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From ee3db912a5c774334e7992beb804e5e607715101 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Tue, 14 Jul 2020 14:16:09 +0800 Subject: [PATCH] net/hns3: fix RSS configuration on empty RSS type [ upstream commit 2bc3b95deb4145d42bb4159b70d8a7a0451badde ] According to the definition of RSS types of action attributes from testpmd, the driver will not disable RSS but instead requests the unspecified "best-effort" settings when upper application call rte_flow_create API function to create flow using empty RSS types. As a result, here use the default RSS types when RSS types is empty. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Lijun Ou Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_flow.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 7d5ba61c6..0301d6b16 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1484,7 +1484,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, } /* Filter the unsupported flow types */ - flow_types = rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT; + flow_types = conf->conf.types ? + rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : + hw->rss_info.conf.types; if (flow_types != rss_flow_conf.types) hns3_warn(hw, "modified RSS types based on hardware support, " "requested:%" PRIx64 " configured:%" PRIx64, @@ -1492,9 +1494,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, /* Update the useful flow types */ rss_flow_conf.types = flow_types; - if ((rss_flow_conf.types & ETH_RSS_PROTO_MASK) == 0) - return hns3_disable_rss(hw); - rss_info = &hw->rss_info; if (!add) { if (hns3_action_rss_same(&rss_info->conf, &rss_flow_conf)) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.467554297 +0100 +++ 0153-net-hns3-fix-RSS-configuration-on-empty-RSS-type.patch 2020-07-24 12:53:48.519010782 +0100 @@ -1,8 +1,10 @@ -From 2bc3b95deb4145d42bb4159b70d8a7a0451badde Mon Sep 17 00:00:00 2001 +From ee3db912a5c774334e7992beb804e5e607715101 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Tue, 14 Jul 2020 14:16:09 +0800 Subject: [PATCH] net/hns3: fix RSS configuration on empty RSS type +[ upstream commit 2bc3b95deb4145d42bb4159b70d8a7a0451badde ] + According to the definition of RSS types of action attributes from testpmd, the driver will not disable RSS but instead requests the unspecified "best-effort" settings when upper application call @@ -11,7 +13,6 @@ As a result, here use the default RSS types when RSS types is empty. Fixes: c37ca66f2b27 ("net/hns3: support RSS") -Cc: stable@dpdk.org Signed-off-by: Lijun Ou Signed-off-by: Wei Hu (Xavier) @@ -20,10 +21,10 @@ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c -index 1e58ad70f..7ec46aef8 100644 +index 7d5ba61c6..0301d6b16 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c -@@ -1486,7 +1486,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, +@@ -1484,7 +1484,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, } /* Filter the unsupported flow types */ @@ -34,7 +35,7 @@ if (flow_types != rss_flow_conf.types) hns3_warn(hw, "modified RSS types based on hardware support, " "requested:%" PRIx64 " configured:%" PRIx64, -@@ -1494,9 +1496,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, +@@ -1492,9 +1494,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev, /* Update the useful flow types */ rss_flow_conf.types = flow_types;