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 527C241E9F for ; Wed, 15 Mar 2023 15:37:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4EC2542BDA; Wed, 15 Mar 2023 15:37:13 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0FB0242D0C for ; Wed, 15 Mar 2023 15:37:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wlr9B6QfuFr3I9wF/zUGrx+GLdJzTZATdd+QsX/kCQw=; b=b2oB5oB8rhNU6wvgTBVSMvqRDYZ4CJtwMNw2dj6G0E2z7V26uXunnK6IBFrW3Q4pNQaT6Z I7I0dKnfPCrdQeuHv3GZLduLtzm0LLVi1+tNJq8jfXndaH7d1JLFZPFHz40O4TVuhCO+JA qijGUSE8gH+mO1FBvl7Um7BAIX7nATI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-410-1cHpr54kPFyDi_rK71Ozrg-1; Wed, 15 Mar 2023 10:37:05 -0400 X-MC-Unique: 1cHpr54kPFyDi_rK71Ozrg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84B5B3C66721; Wed, 15 Mar 2023 14:37:05 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EA6E40C6E67; Wed, 15 Mar 2023 14:37:04 +0000 (UTC) From: Kevin Traynor To: Long Wu Cc: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , dpdk stable Subject: patch 'net/nfp: fix getting RSS configuration' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:11 +0000 Message-Id: <20230315143640.677317-18-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.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 03/20/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2d42946f45224e6024d740c7cab4eb69d43fc5fc Thanks. Kevin --- >From 2d42946f45224e6024d740c7cab4eb69d43fc5fc Mon Sep 17 00:00:00 2001 From: Long Wu Date: Tue, 21 Feb 2023 13:52:22 +0800 Subject: [PATCH] net/nfp: fix getting RSS configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ] "NFP_NET_CFG_RSS_IPV4" and "NFP_NET_CFG_RSS_IPV6" represent that firmware will calculate RSS base on L3 rather than UDP or TCP information from packets. So the logic of return RSS configuration in driver is wrong. Modify code to return the right configuration. Fixes: 934e4c60fbff ("nfp: add RSS") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index b81eec58d3..ae087d0153 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1249,5 +1249,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4) - rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_NONFRAG_IPV4_UDP; + rss_hf |= RTE_ETH_RSS_IPV4; if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP) @@ -1264,5 +1264,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) - rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_NONFRAG_IPV6_UDP; + rss_hf |= RTE_ETH_RSS_IPV6; /* Propagate current RSS hash functions to caller */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.044601255 +0000 +++ 0018-net-nfp-fix-getting-RSS-configuration.patch 2023-03-15 14:30:20.571123651 +0000 @@ -1 +1 @@ -From ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd Mon Sep 17 00:00:00 2001 +From 2d42946f45224e6024d740c7cab4eb69d43fc5fc Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 837056cc12..5922bfea8e 100644 +index b81eec58d3..ae087d0153 100644 @@ -30 +31 @@ -@@ -1421,5 +1421,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -1249,5 +1249,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, @@ -37 +38 @@ -@@ -1436,5 +1436,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -1264,5 +1264,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, @@ -43 +44 @@ - if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP) + /* Propagate current RSS hash functions to caller */