From patchwork Wed May 25 17:37:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 111856 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 13B5AA0555; Wed, 25 May 2022 19:37:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADC2640143; Wed, 25 May 2022 19:37:42 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2059.outbound.protection.outlook.com [40.107.96.59]) by mails.dpdk.org (Postfix) with ESMTP id 19257400EF; Wed, 25 May 2022 19:37:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kvg8RUqbvpVMZTjs0IHAis7uRtD5bP9vH1mWkL1pT47nia4vl+nXIjYDVp1KD1m47Kkwy3OoN3z0jt06E4JP8xahZX3Ev/UCSjLWvSmf17sItmKhL6CH3S7ggUQAIX1nyapSOVnVODCiSirzdduCi7wZP7VSzHpNncaB4CZi5EY85QQ+xnJVaSh+JOKHZaZWTlX/m1KNyMWsoZ0Sc0ZW/NAXbXsfBiPsQdaa2ADSjIliMLTkmxGyqLk5Co4MRgkWWG9/L0wFqiEa/46a+X/PmnmQjigGnQ5xdbnup2AzZ9TNro4coDWgCbC5Z6xCS3qjUXdV9c+kxKcqAUxR0Xh98w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l0KlM/3ULZjt2thYFSNOBud7WDO+oATjVREv0I8xpGs=; b=EL38BCd0ZuoquhoUMPcbRo1IdSHhBsj3jVOHA3LZ1+ZYJDCOcM/93lkFw6QoZFOCzQ47eV4QZnPGBgybFVp9AV7E+rqFiO7OTAJIlhEdUZmmMQsVjtPHLMaHfANreZZqJ7R4hfEf5lbJ2c/PKXkqyh2nuEoPoOp61coSAwfbwRMAt1AbSeXJ25IDJUq+aGalTwCZj6oXKsVJEucnVSQKMa9CggeVPKjDAdZYDK/TWhFjOHxXV0hGI8idkg7tNjE7wuWx3M+Cd3X07270P5Clr21D5RMtz3ggeXTHuRDdQqMdyMebj97/El5xdJ40pJBuio+/+AcKMVLYpk2XEBhhhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=intel.com smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l0KlM/3ULZjt2thYFSNOBud7WDO+oATjVREv0I8xpGs=; b=bQr1YFkdMN2lvpYvfZ5Tk9ahRLNrokHg//OYjCB0aWKhAsT7MWl2GGFSn6ZYJjXejAdHtXvtM+QG4gxOsahes97NyxAiVzPuCFUcZj/2DEgRdtlQ35O+ZwH20RzT6mY0WOXiOGqVSmFeC4md9R0U9RJ7jkS5Yee/EMK0rwDWwac= Received: from DS7PR05CA0064.namprd05.prod.outlook.com (2603:10b6:8:57::26) by SN6PR02MB3935.namprd02.prod.outlook.com (2603:10b6:805:2b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Wed, 25 May 2022 17:37:40 +0000 Received: from DM3NAM02FT021.eop-nam02.prod.protection.outlook.com (2603:10b6:8:57:cafe::a2) by DS7PR05CA0064.outlook.office365.com (2603:10b6:8:57::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Wed, 25 May 2022 17:37:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; pr=C Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT021.mail.protection.outlook.com (10.13.4.249) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5293.13 via Frontend Transport; Wed, 25 May 2022 17:37:39 +0000 Received: from xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Wed, 25 May 2022 18:37:38 +0100 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Wed, 25 May 2022 18:37:38 +0100 Envelope-to: ferruh.yigit@xilinx.com, xiaoyun.li@intel.com, aman.deep.singh@intel.com, yuying.zhang@intel.com, helin.zhang@intel.com, jingjing.wu@intel.com, thomas.monjalon@6wind.com, dev@dpdk.org, thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, stable@dpdk.org Received: from [172.21.78.13] (port=42046 helo=xirdcglab01.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1ntuwz-0006dh-H5; Wed, 25 May 2022 18:37:38 +0100 From: Ferruh Yigit To: Xiaoyun Li , Aman Singh , Yuying Zhang , Helin Zhang , Jingjing Wu , Thomas Monjalon CC: , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Subject: [PATCH 1/3] app/testpmd: fix displaying RSS info Date: Wed, 25 May 2022 18:37:34 +0100 Message-ID: <20220525173736.3394787-1-ferruh.yigit@xilinx.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72e93e60-4989-409a-c9c9-08da3e754412 X-MS-TrafficTypeDiagnostic: SN6PR02MB3935:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q2cubCLRhVYxzYM2UvcW2YsbPavYE/HUcYLVAdOU+tnXuQ600qaRSaoe87LwlOLZi/TVc+ZZimwWRU3LZn6Q9Hv9RLM9hjUj7EIlu2xV6zp9u0hYyjIzkQAkbo1ayx8Bm0hUPzWinRxYP7KTnxRqjYIBb13RRZsTqblLO4d9h4eQe08DOtQzrg+3ppVbv6qXcga5L8CN+dkJWwesQ18+rL5RFH7gltl2iOw/WIEUfLWA9dlJTgKcnVCm0CMargv9Kk/XZYbfSQFSgreiduMvGQACozkdPjjaDmZLmKk6kT4GadtFTCTfBN+gNlOb2w4ldGKSyUy11jUHxbtD5xqWuEwGxuhHeUHNfwOcCUIGY2NJ2IUJcBa7Tdz+GjPYefr/PeCCV5GLpZvoqQMvn1cj408GX3RZxASZhaIkJKenzvk+ytxHmxbWk63jE3MJ77k0QGOYz2mSRm/P/cieLvc5PawPezXPzvoaeug8w6jqxXnOuIHoV1N2k60iOJNKQFT4cs+ixQw90q+80QSnfWL4ZQAc+yP4Wj+h2wmCUJdhOoiid/FKd+4N+mP04Lz46z2yor0Oc4oRuy46hPwf9xBJDBQkpghnlfDg9QF4BCrR1ZsQExInvxX4mfnRLjjKIIPtUHM7C9rAlMewxQUVdEvhJudrXboACNagGVrTEmSFnuTMFf1Dw9QThAlZaXT7nmOk+3wAVvhw5UL814LQ98uM8w== X-Forefront-Antispam-Report: CIP:149.199.80.198; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:xir-pvapexch02.xlnx.xilinx.com; PTR:unknown-80-198.xilinx.com; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(4326008)(8676002)(40460700003)(6666004)(316002)(26005)(5660300002)(70206006)(70586007)(508600001)(186003)(83380400001)(7636003)(2906002)(54906003)(356005)(82310400005)(47076005)(336012)(2616005)(1076003)(426003)(7696005)(8936002)(9786002)(7416002)(110136005)(44832011)(36860700001)(36756003)(102446001); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 17:37:39.8336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72e93e60-4989-409a-c9c9-08da3e754412 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.80.198]; Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: DM3NAM02FT021.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB3935 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When supported RSS offload flow types are printed via 'show port info #' command, flow names are get from flow type array which is wrong and causing some RSS flow types not being displayed. Instead RSS flow type array should be used. Also helper functions added and existing code updated to use helpers. Fixes: b12964f621dc ("ethdev: unification of RSS offload types") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- Cc: helin.zhang@intel.com Note: In ethdev, flow type macros 'RTE_ETH_FLOW_*' and RSS type macros 'RTE_ETH_RSS_*' are related, buy they seems diverged a little, may need to check that too. --- app/test-pmd/config.c | 92 ++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 28 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 72d2606d19d5..c353d224ef06 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -147,6 +147,32 @@ const struct rss_type_info rss_type_table[] = { { NULL, 0 }, }; +static const char * +rsstype_to_str(uint64_t rss_type) +{ + int i; + + for (i = 0; rss_type_table[i].str != NULL; i++) { + if (rss_type_table[i].rss_type == rss_type) + return rss_type_table[i].str; + } + + return NULL; +} + +static uint64_t +str_to_rsstype(const char *str) +{ + int i; + + for (i = 0; rss_type_table[i].str != NULL; i++) { + if (!strcmp(rss_type_table[i].str, str)) + return rss_type_table[i].rss_type; + } + + return 0; +} + static const struct { enum rte_eth_fec_mode mode; const char *name; @@ -779,19 +805,21 @@ port_infos_display(portid_t port_id) if (!dev_info.flow_type_rss_offloads) printf("No RSS offload flow type is supported.\n"); else { + uint64_t rss_types = dev_info.flow_type_rss_offloads; uint16_t i; - char *p; printf("Supported RSS offload flow types:\n"); - for (i = RTE_ETH_FLOW_UNKNOWN + 1; - i < sizeof(dev_info.flow_type_rss_offloads) * CHAR_BIT; i++) { - if (!(dev_info.flow_type_rss_offloads & (1ULL << i))) - continue; - p = flowtype_to_str(i); - if (p) - printf(" %s\n", p); - else - printf(" user defined %d\n", i); + for (i = 0; rss_types != 0; i++) { + if (rss_types & 1) { + uint64_t rss_type = 1ULL << i; + const char *p = rsstype_to_str(rss_type); + + if (p) + printf(" %s\n", p); + else + printf(" user defined 0x%"PRIx64"\n", rss_type); + } + rss_types >>= 1; } } @@ -1547,6 +1575,7 @@ port_flow_complain(struct rte_flow_error *error) static void rss_config_display(struct rte_flow_action_rss *rss_conf) { + uint64_t rss_types; uint8_t i; if (rss_conf == NULL) { @@ -1582,16 +1611,23 @@ rss_config_display(struct rte_flow_action_rss *rss_conf) } printf(" types:\n"); - if (rss_conf->types == 0) { + rss_types = rss_conf->types; + if (rss_types == 0) { printf(" none\n"); return; } - for (i = 0; rss_type_table[i].str; i++) { - if ((rss_conf->types & - rss_type_table[i].rss_type) == - rss_type_table[i].rss_type && - rss_type_table[i].rss_type != 0) - printf(" %s\n", rss_type_table[i].str); + + for (i = 0; rss_types != 0; i++) { + if (rss_types & 1) { + uint64_t rss_type = 1ULL << i; + const char *p = rsstype_to_str(rss_type); + + if (p) + printf(" %s\n", p); + else + printf(" user defined 0x%"PRIx64"\n", rss_type); + } + rss_types >>= 1; } } @@ -3823,11 +3859,16 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key) return; } printf("RSS functions:\n "); - for (i = 0; rss_type_table[i].str; i++) { - if (rss_type_table[i].rss_type == 0) - continue; - if ((rss_hf & rss_type_table[i].rss_type) == rss_type_table[i].rss_type) - printf("%s ", rss_type_table[i].str); + for (i = 0; rss_hf != 0; i++) { + if (rss_hf & 1) { + uint64_t rss_type = 1ULL << i; + const char *p = rsstype_to_str(rss_type); + if (p) + printf("%s ", p); + else + printf("0x%"PRIx64" ", rss_type); + } + rss_hf >>= 1; } printf("\n"); if (!show_rss_key) @@ -3844,15 +3885,10 @@ port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key, { struct rte_eth_rss_conf rss_conf; int diag; - unsigned int i; rss_conf.rss_key = NULL; rss_conf.rss_key_len = 0; - rss_conf.rss_hf = 0; - for (i = 0; rss_type_table[i].str; i++) { - if (!strcmp(rss_type_table[i].str, rss_type)) - rss_conf.rss_hf = rss_type_table[i].rss_type; - } + rss_conf.rss_hf = str_to_rsstype(rss_type); diag = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf); if (diag == 0) { rss_conf.rss_key = hash_key;