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 A3A3442ECF for ; Thu, 20 Jul 2023 17:32:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FB0642C54; Thu, 20 Jul 2023 17:32:23 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 113FB400D6 for ; Thu, 20 Jul 2023 17:32:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867140; 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=tn3S3ZGjqi5C4DB335JNJNBrAfmRL5LWqB2jsRSQQTo=; b=DwvPas13gYznC5E9KQ5z6abA27PhLy5hj1ClasXWWD6dBznOy9YUnkQufDUE6a3bM+uJDU EzaYPtt1+cwoByJbp3QjCXkFRgHTGMd9oCB161YiOkcwl5kMu9jLbKyPfVTri+GH8ufJAw w/HqBb9x/iZrz/Rw7cRPb48Uy0A+RjI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-364-ErJ0zNOmMmioMjKZMuYwNQ-1; Thu, 20 Jul 2023 11:23:46 -0400 X-MC-Unique: ErJ0zNOmMmioMjKZMuYwNQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D83B8887122; Thu, 20 Jul 2023 15:23:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C81864A9004; Thu, 20 Jul 2023 15:23:16 +0000 (UTC) From: Kevin Traynor To: Yuying Zhang Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix RSS hash key generation' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:23 +0100 Message-ID: <20230720151942.262154-132-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.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 07/25/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/670782b1d7eba6737279eb53d8869c4b030ce6e2 Thanks. Kevin --- >From 670782b1d7eba6737279eb53d8869c4b030ce6e2 Mon Sep 17 00:00:00 2001 From: Yuying Zhang Date: Fri, 7 Jul 2023 02:10:46 +0000 Subject: [PATCH] net/ice: fix RSS hash key generation [ upstream commit b9f28be1bf72e120041416b461325941fd97cac0 ] Current code just generated 40 bytes standard rss hash key of ice driver. The extended 12 bytes were filled by hardware and were invalid for users. This patch generate 52 bytes rss hash key for ice driver just as other drivers. Fixes: 50370662b727 ("net/ice: support device and queue ops") Fixes: 20d6a017e148 ("net/ice: fix build with GCC 12") Signed-off-by: Yuying Zhang Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index e81a66b106..cefbccd3e4 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3200,5 +3200,6 @@ static int ice_init_rss(struct ice_pf *pf) rss_conf = &dev_data->dev_conf.rx_adv_conf.rss_conf; nb_q = dev_data->nb_rx_queues; - vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE; + vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE + + ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE; vsi->rss_lut_size = pf->hash_lut_size; @@ -3241,5 +3242,8 @@ static int ice_init_rss(struct ice_pf *pf) rte_memcpy(key.standard_rss_key, vsi->rss_key, - RTE_MIN(sizeof(key.standard_rss_key), vsi->rss_key_size)); + ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE); + rte_memcpy(key.extended_hash_key, + &vsi->rss_key[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE], + ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE); ret = ice_aq_set_rss_key(hw, vsi->idx, &key); if (ret) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.691033846 +0100 +++ 0132-net-ice-fix-RSS-hash-key-generation.patch 2023-07-20 16:17:55.201752713 +0100 @@ -1 +1 @@ -From b9f28be1bf72e120041416b461325941fd97cac0 Mon Sep 17 00:00:00 2001 +From 670782b1d7eba6737279eb53d8869c4b030ce6e2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9f28be1bf72e120041416b461325941fd97cac0 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 949b13324f..4bad39c2c1 100644 +index e81a66b106..cefbccd3e4 100644 @@ -26 +27 @@ -@@ -3351,5 +3351,6 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -3200,5 +3200,6 @@ static int ice_init_rss(struct ice_pf *pf) @@ -34 +35 @@ -@@ -3392,5 +3393,8 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -3241,5 +3242,8 @@ static int ice_init_rss(struct ice_pf *pf)