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 7F07643345 for ; Thu, 16 Nov 2023 14:24:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76AB2402DD; Thu, 16 Nov 2023 14:24:43 +0100 (CET) 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 EAAB9402C6 for ; Thu, 16 Nov 2023 14:24:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141080; 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=eVaxGEgP7fiJ7A1hogeYxUr15oro293KbRif+9VKtAU=; b=Pml4iTV4BHEGSSkvX4QE1ozQW13JyTffBaJFO+GoLEp0J7SuHhS1xWWOn+9ikFQwdVfWkc lchJ13BRq9EzXItSs5f681u//sIU2FfalESIE4s4C4231PCiuASOOpQli85r32wfFtW1uO xJ8UPhBDV98AwKB1iojyEBCWKgEcvok= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-TyXZ3J9oNCyAeAX7sXfFgw-1; Thu, 16 Nov 2023 08:24:37 -0500 X-MC-Unique: TyXZ3J9oNCyAeAX7sXfFgw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 195A582A661; Thu, 16 Nov 2023 13:24:37 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id E416F2166B28; Thu, 16 Nov 2023 13:24:35 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Dongdong Liu , Reshma Pattan , Chengwen Feng , Huisong Li , dpdk stable Subject: patch 'app/procinfo: fix RSS info' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:10 +0000 Message-ID: <20231116132348.557257-28-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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.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/21/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/ff10f5d05bc2abad53a6adc6f70802e1ad34c3c4 Thanks. Kevin --- >From ff10f5d05bc2abad53a6adc6f70802e1ad34c3c4 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Thu, 2 Nov 2023 16:20:16 +0800 Subject: [PATCH] app/procinfo: fix RSS info [ upstream commit 33079eccf5c1a99af722fe168d8465f602bc98b2 ] Command show-port should show RSS info (rss_key, len and rss_hf), However, the information is shown only when rss_conf.rss_key is not NULL. Since no memory is allocated for rss_conf.rss_key, rss_key will always be NULL and the rss_info will never show. This patch fixes it. Fixes: 8a37f37fc243 ("app/procinfo: add --show-port") Signed-off-by: Jie Hai Signed-off-by: Dongdong Liu Acked-by: Reshma Pattan Acked-by: Chengwen Feng Acked-by: Huisong Li --- app/proc-info/main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index f628377c19..41f983d52b 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -101,4 +101,6 @@ static uint32_t enable_dump_regs; static char *dump_regs_file_prefix; +#define RSS_HASH_KEY_SIZE 64 + /**< display usage */ static void @@ -724,4 +726,5 @@ show_port(void) struct rte_ether_addr mac; struct rte_eth_dev_owner owner; + uint8_t rss_key[RSS_HASH_KEY_SIZE]; /* Skip if port is not in mask */ @@ -867,15 +870,15 @@ show_port(void) } + rss_conf.rss_key = rss_key; + rss_conf.rss_key_len = dev_info.hash_key_size; ret = rte_eth_dev_rss_hash_conf_get(i, &rss_conf); if (ret == 0) { - if (rss_conf.rss_key) { - printf(" - RSS\n"); - printf("\t -- RSS len %u key (hex):", - rss_conf.rss_key_len); - for (k = 0; k < rss_conf.rss_key_len; k++) - printf(" %x", rss_conf.rss_key[k]); - printf("\t -- hf 0x%"PRIx64"\n", - rss_conf.rss_hf); - } + printf(" - RSS\n"); + printf("\t -- RSS len %u key (hex):", + rss_conf.rss_key_len); + for (k = 0; k < rss_conf.rss_key_len; k++) + printf(" %x", rss_conf.rss_key[k]); + printf("\t -- hf 0x%"PRIx64"\n", + rss_conf.rss_hf); } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.226358994 +0000 +++ 0028-app-procinfo-fix-RSS-info.patch 2023-11-16 13:21:52.456946392 +0000 @@ -1 +1 @@ -From 33079eccf5c1a99af722fe168d8465f602bc98b2 Mon Sep 17 00:00:00 2001 +From ff10f5d05bc2abad53a6adc6f70802e1ad34c3c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33079eccf5c1a99af722fe168d8465f602bc98b2 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index ce53bc30df..3a441ba075 100644 +index f628377c19..41f983d52b 100644 @@ -28,2 +29,2 @@ -@@ -152,4 +152,6 @@ static struct desc_param rx_desc_param; - static struct desc_param tx_desc_param; +@@ -101,4 +101,6 @@ static uint32_t enable_dump_regs; + static char *dump_regs_file_prefix; @@ -33 +34 @@ - /* display usage */ + /**< display usage */ @@ -35 +36 @@ -@@ -1012,4 +1014,5 @@ show_port(void) +@@ -724,4 +726,5 @@ show_port(void) @@ -41 +42 @@ -@@ -1170,15 +1173,15 @@ show_port(void) +@@ -867,15 +870,15 @@ show_port(void)