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 57770432DA for ; Wed, 8 Nov 2023 20:27:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50CA342E26; Wed, 8 Nov 2023 20:27:01 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id AEC4240395 for ; Wed, 8 Nov 2023 20:26:59 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4079ed65471so53969205e9.1 for ; Wed, 08 Nov 2023 11:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471619; x=1700076419; darn=dpdk.org; 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=QQ9H9WPauZdLh/4oPkATr5VPqsSRziKsfNVedBr0CH8=; b=dt//tB33qhRvdUF8m6v39CQ2dNG7t7RYgpgRT4LI+t/eadpse8y/q0UCmICXds0VfR Vo4umXzl/5f6z7TpLKL4VtQ7QOeSSE6Ymy/meRTOd99pgtV3h5PxgGCLIaGEBkYb16NE ORHrfqJCoB0/yTNYhltHtWkyvbJNQdugQOTF5MIFLrctCUR8t7JnSfwMeuQQ/7DhF1ie ZgYvGNUKWE3Ak1qlErxWKkib7WFOK+dLxU3hqu6TjQYs0HRX24s7AfAMpjdHFoJfJRRf GH3pSzISAjdv2LZoZh1DVJbJB03MWVkwyMR3R4AY37UHjxfa0+DT8Kfs/Rq4K9o2BHRT 4Mnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471619; x=1700076419; 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=QQ9H9WPauZdLh/4oPkATr5VPqsSRziKsfNVedBr0CH8=; b=vU6ai3UHswKSPXbErMlTKZLlM2eSsGZRRhxb8miiinTZOIoeKY3yPhq18BkLIpFuRR +uaZDG06Yss9mmZc9jvSuTwO2ybg158iFRbhywKDhuyMOhKvzuEZ8KtI116JfWaeYDBv a7Z0oEHanowbXhVvIA/ZM8rgsWyNw+3uK7arYXuGx0iAESJB2ez2AcA8ec1zfQX61SSB lsGnhe3zGwXoFXNcBjzi7vlq9AE1bxx+ETZALPh9qUoPGo/01lBLo2IDXuP9t7BCK36c 0h550I1+meM0b5D5Hn101g0boT0/nLPjqTpWFxHhthDjx5npnoTCTdhxW0oaE+Si9+Nr aoEA== X-Gm-Message-State: AOJu0YziZj1pPwPPW0g1qreBQWsV5yef2/oYPCm8i9qvN3Yy53byLFGn K7gyWNSoygIpGPNguLQuKi4vvu3Av95ZSw== X-Google-Smtp-Source: AGHT+IFm7l0k9PIp21cVI9h5wu9Z93ovpJj1RoIc0mDmK44glI0dRsIvdoAZiZ22a9MK6kOM/Wsqjw== X-Received: by 2002:a05:600c:4fc3:b0:406:535a:cfb4 with SMTP id o3-20020a05600c4fc300b00406535acfb4mr2591887wmq.1.1699471619311; Wed, 08 Nov 2023 11:26:59 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id jg2-20020a05600ca00200b004065daba6casm20404847wmb.46.2023.11.08.11.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:26:58 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.10 Date: Wed, 8 Nov 2023 19:25:25 +0000 Message-Id: <20231108192535.922238-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-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.10 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/10/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/9b55b196c03980d24b7e2b86ada4207371f1c630 Thanks. Luca Boccassi --- >From 9b55b196c03980d24b7e2b86ada4207371f1c630 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 befb90a2be..247d8b256c 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -94,6 +94,8 @@ static char *mempool_name; static uint32_t enable_iter_mempool; static char *mempool_iter_name; +#define RSS_HASH_KEY_SIZE 64 + /**< display usage */ static void proc_info_usage(const char *prgname) @@ -703,6 +705,7 @@ show_port(void) struct rte_eth_fc_conf fc_conf; 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 */ if ((enabled_port_mask & (1ul << i)) == 0) @@ -846,17 +849,17 @@ show_port(void) printf("\n"); } + 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); } #ifdef RTE_LIB_SECURITY -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:53.288968644 +0000 +++ 0027-app-procinfo-fix-RSS-info.patch 2023-11-08 19:23:51.809397038 +0000 @@ -1 +1 @@ -From 33079eccf5c1a99af722fe168d8465f602bc98b2 Mon Sep 17 00:00:00 2001 +From 9b55b196c03980d24b7e2b86ada4207371f1c630 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 befb90a2be..247d8b256c 100644 @@ -28,3 +29,3 @@ -@@ -151,6 +151,8 @@ struct desc_param { - static struct desc_param rx_desc_param; - static struct desc_param tx_desc_param; +@@ -94,6 +94,8 @@ static char *mempool_name; + static uint32_t enable_iter_mempool; + static char *mempool_iter_name; @@ -34 +35 @@ - /* display usage */ + /**< display usage */ @@ -37 +38 @@ -@@ -1011,6 +1013,7 @@ show_port(void) +@@ -703,6 +705,7 @@ show_port(void) @@ -45 +46 @@ -@@ -1169,17 +1172,17 @@ show_port(void) +@@ -846,17 +849,17 @@ show_port(void)