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 E3E0142DA6 for ; Sat, 15 Jul 2023 00:35:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D98C940EDC; Sat, 15 Jul 2023 00:35:29 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 594EC40DFB for ; Sat, 15 Jul 2023 00:35:28 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fb4146e8deso23958955e9.0 for ; Fri, 14 Jul 2023 15:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374128; x=1691966128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VtOmT8N7dhD/sHxGFrDFZirIQ2qjax7nzCjiz9eSw3w=; b=eef8zh9cl9ti3c3+4vyCTjp5K091SoE9A6URmOmPb6GcZhTnEbYnwcZ+3REnsn1wOa aDuIVQ6i6I70rYiZVYxJMrXafaYrrLTXckcLbnSKkk68ea4gHKKNCg1y9sfkfJDXVQU1 +xV8I+GjfAzVaxtUN9HHr0gpKbGBw1/6GY+oF2m76E/aKLE2/ZYMZ+Xz09riIM8K0FMq U5R/Q48qnE5iYWicEPq2yKtQge2lbMwsIgbdmklrPCMlo3vYPyQ11iFVU4aJhSOUvYaF 9lsmvkrMw9Ziv5rhU8d4aWJ185ES+vKcGolFZpFWJR48z8MjNhFEitOGii1XfOvhy+t7 8Gyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374128; x=1691966128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VtOmT8N7dhD/sHxGFrDFZirIQ2qjax7nzCjiz9eSw3w=; b=jA9aq9tT7g+Zj1CD1fzOolcCSopW//6c1DP6frKWTv4c0iqrSSz7t5mtY5xol68zdr GnKBmQygYFcrHaAp13+wvHLr0A9KT01TjpscXanVGPeBiGjFrnieDhYVoS7+Ut9l4HUr d/7nfcbKWGWbbV/AgHG96d/zelN95igWGz2quQziyQzOy/PUCq7DJEwb2YjnoiwT3fXw wTMptvtANVZm+XQcEHuCwnQzIU7pbQcZZNp1SQ/+U7L3z1e0oABSQ19I61k3dStssZ8y 7gRXaUy/ruci0p30C18HOya0ZbA30SsXjqRJ6wy1QugEmHx1n1yiBbHyZ36Q6byHoSx3 l+LQ== X-Gm-Message-State: ABy/qLbVn2ObGZ8TQP6ORUUYx6Qeryi49kkNSjQwk+rboMfdREOz3Y5Y yzl/0mpRFIJV4bDGtM0M04MJRTpV5zDn6qV3 X-Google-Smtp-Source: APBJJlFdOyqcTpLTlhDMJgAjdK40zeFfiyBsziedsvPgayRjpLrGUsd+AKzMqMUUD7NGt+34cV3PvA== X-Received: by 2002:a7b:c38d:0:b0:3fc:f9c:a3ed with SMTP id s13-20020a7bc38d000000b003fc0f9ca3edmr6152889wmj.22.1689374127726; Fri, 14 Jul 2023 15:35:27 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id h7-20020a5d5487000000b0030ae901bc54sm11989169wrv.62.2023.07.14.15.35.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Yuying Zhang Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix RSS hash key generation' has been queued to stable release 20.11.9 Date: Fri, 14 Jul 2023 23:34:40 +0100 Message-Id: <20230714223447.1092828-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-1-luca.boccassi@gmail.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 20.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/512e8b2399ce794aec64da9921c4ff91702ff8e0 Thanks. Luca Boccassi --- >From 512e8b2399ce794aec64da9921c4ff91702ff8e0 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 5a49868855..e4df6847d2 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3226,7 +3226,8 @@ 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; if (nb_q == 0) { @@ -3267,7 +3268,10 @@ static int ice_init_rss(struct ice_pf *pf) vsi->rss_key_size)); 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) goto out; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:08.957591867 +0100 +++ 0011-net-ice-fix-RSS-hash-key-generation.patch 2023-07-14 23:33:08.495305267 +0100 @@ -1 +1 @@ -From b9f28be1bf72e120041416b461325941fd97cac0 Mon Sep 17 00:00:00 2001 +From 512e8b2399ce794aec64da9921c4ff91702ff8e0 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 5a49868855..e4df6847d2 100644 @@ -26 +27 @@ -@@ -3350,7 +3350,8 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -3226,7 +3226,8 @@ static int ice_init_rss(struct ice_pf *pf) @@ -36 +37 @@ -@@ -3391,7 +3392,10 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -3267,7 +3268,10 @@ static int ice_init_rss(struct ice_pf *pf)