From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20066.outbound.protection.outlook.com [40.107.2.66]) by dpdk.org (Postfix) with ESMTP id 2B25B44CF for ; Mon, 13 Aug 2018 22:38:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DBIA3KCI0FMwHpMPmWYp7WDPkkX8+zeF5hZ3LuUw0m0=; b=CCsjgIPUy/6iAsm0krY9wowQPtAbrTLU9O0u4EmuWuXam3hg3/CbohPie1O0JzrNj5bBKInvkoZSmB3a2huJP3yavbH63rchEfgG6yrVHlwEQBhNypEMcSrmdaMkKMkRa/oy7RQ51/UlBC0mJ/XjU7QLWDHJO5FI6Ya2tCzGKGc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0502MB3984.eurprd05.prod.outlook.com (2603:10a6:803:24::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.22; Mon, 13 Aug 2018 20:38:15 +0000 From: Yongseok Koh To: Konstantin Ananyev Cc: Bernard Iremonger , dpdk stable Date: Mon, 13 Aug 2018 13:37:49 -0700 Message-Id: <20180813203749.25171-9-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180813203749.25171-1-yskoh@mellanox.com> References: <20180813203749.25171-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: DM5PR2001CA0017.namprd20.prod.outlook.com (2603:10b6:4:16::27) To VI1PR0502MB3984.eurprd05.prod.outlook.com (2603:10a6:803:24::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64127d27-fd1d-4dea-0d9c-08d6015cb279 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0502MB3984; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3984; 3:B8pTps8l+a6VTcjYfBJT+bUvN2yrKnt1cGQ5zu/ZqvFhluyZbYtUEac83O8NVC9ChE+wmF+0fT/AOz+8BQYDZ8UKfQ/TddOQGkfq6o+hV3Eg4qA/hzI2onXbwnwLbxVXp2JyxjMmkMFhiGTs060hgIj9YLkpC6LXQhwGDT+mD+IuJc1cQyw9CFFAZuN8py9LmQfO9r8WkPKzM+ienCUbjTksL2yX2tblNlV52ypsc8khx6zcKy0/qrBjBf1UYxlz; 25:/ugC6LPvEKXeUo2duWdYq2/179pGezXcqjNxZftN5C4HNagazoXS3BO6NrFAEpXSPMAVMrt2EL4nVRqUFXYVMXVivuqLPONygA7nuOT2NMiUasrZCIOAEfHSeEh5JckJt4Fe0dTJzftEumrAPnPzv4W8Ki3oxDRpZyKK2MUZorLmVTbO4AxQYVeVM+f2DS13AcN56x3GtmfmiyHo6tuvJIm5llYishjSa8IBfuSJkl22/qg8yR/fPhEbXsaXJOjOmwNhQJSKirrpYLmfzV07rgFeoA4EzeHLXakJRVDwW69zR9xWwgFbtbf/NctoETwcBdeBBLnC8gRPrrvc3mYzog==; 31:9i3KNYZcCVBaLsmk28h5Y3J1sEQBSlz+LSr7IVXN/iyg2NJ0JKk7XZUnH1MtB/hsmoRuKXQ1r22MLp/ZYlM9uaDK56hXdZ8FB1X9VLni7M9ObQFjWbE4gpoaVvm0iBujl7G0iNtYqjI8vuWinJBt1Yx7mfUU7ygRQlnkksYVGciy0oAekNXpp+x52CjvJlou2Qw8zmNXoEiAfBbxGI67UVlp0HvTvJaQiDkME1FSdVc= X-MS-TrafficTypeDiagnostic: VI1PR0502MB3984: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3984; 20:DiFft8oaagsyAIFWcWqS4HlXlbq7/mC52hELbS1lQitGJKYSSWcGXQ4z75Rla75VES6FWtUSU0/cHG6ehnU9rIvkzZkooGvqmz/VjOoreRBV1p+klU0pQdutEk7pT8N+BTte4XP+d3gwqi1UV3zmClkBfqXUCd7EjvI/oEsQBGieOSIQ1Ty+hlUfWfc0EnGPA9LpWz0Pkj5FIZ+ewQZSiREngWg9/pKISP9zHWfZOZfij6y+35ahoI90xlgLZeKrhrm9duyvDq8rGOrmXLO46elo1YRC6eWec4Jzh6BX6bu76p9cHi8utdHrQnPALZ3eypzpCYk30CsLLU53LXIVewh6/qNqmA2Txivv5WByrk417QXE3S/6sa5B+S3qeRbb4TyWkvBnKThO5/lCUh+VznLhqqgfg/UcmBEGX4ysLM0tqNO9XBmLSVlCjMJdFpE89tiq1GdN61A4bK5mQg5KUxc/Of69IRZesj2bkntL0FBAkX6YaHV6NceuiPQyZxAQ; 4:Hp7Rv/UDbRcTva51jwY9Qe3LLP9Dm8NQv3QZKeGP6cFDlDjNVohpJ7QXLeuyYBhO8LdQX3510gWrCqduVwJeydx4+l/vm4gCQOX7z6dL5oYRtxeBF5tc6k69qC9Nw1kArCrBPT/to7VfpNbQdK2eG0P/RkmOcp99RTryNCBugwH1WrhZAj5+2hr5Sdu5uyFxE+l1Bm0ucFBaUiIXbWadh0vRvAPw0bHUmmFL7e/lGy0lx6g73BS7maPfXQpPf2dYMfRXZbkSHExN/t+KcckL8pU9EmAmyomUcLUK5cPIFb4oubvZjk2pod1vJUbin44t X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0502MB3984; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0502MB3984; X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(376002)(136003)(39860400002)(396003)(28163001)(189003)(199004)(69234005)(3846002)(5660300001)(186003)(6116002)(305945005)(86362001)(16526019)(6666003)(54906003)(14444005)(8676002)(81156014)(97736004)(25786009)(8936002)(106356001)(66066001)(105586002)(4326008)(966005)(50226002)(81166006)(1076002)(6916009)(47776003)(48376002)(11346002)(68736007)(51416003)(7736002)(52116002)(2616005)(7696005)(478600001)(476003)(486006)(956004)(76176011)(69596002)(2906002)(1720100001)(26005)(316002)(6306002)(55016002)(53936002)(50466002)(53376002)(16586007)(21086003)(446003)(53546011)(36756003)(386003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0502MB3984; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0502MB3984; 23:YpxpUO2XScCGkgj/rF//FkeGRAVrmHFsNJy9cUW?= =?us-ascii?Q?PAlVx5CTfVcI9IugWPDOHnIKQyO/++XNJl7tWqydDotL8OBqrY82xhgqOx8v?= =?us-ascii?Q?c5+Q4g9Gra98zLxzCIMFk1YWUMpcXsNhfBsoM1K/Ji/SQ13QyAJEJg7qFOdT?= =?us-ascii?Q?U+CaotujelQOKzidUY25Gw1l69dNhR1P+BtSuyrY38Tq2ILMzV9x4/fnIvID?= =?us-ascii?Q?34Y7Bs77owCKq1S5RyCIKYoTJA25CNGBvFtZu11THO/FVXFvNJgQhjYI8d31?= =?us-ascii?Q?lfHq6t6Zvn+pwoyAPt3fULh8pH93NmEa8+kUCANx0krjIJLKn92DPzPLDb1Z?= =?us-ascii?Q?QPvh36OIWt4DsAla4XuQxc5/BTXL4kxlJCy4aslBQvPjEvCf9nElW/TM/xe/?= =?us-ascii?Q?/Szs1ke4Dd2LuTRBlLwous1Gjw7bCJ9p+9jA7GLqyNyXfbOARx37i0pPSfgz?= =?us-ascii?Q?h4yrEETnHanuGldWgeLdGf38louVPpZL/Ci6ZuHiBDA3Hfo88mCVW/oK/zmt?= =?us-ascii?Q?pT2tbxEtJVkt4MzPI06LWDzdXWDEgw6woXnazqL9NcDeLrcDbpi/x+/dDlHm?= =?us-ascii?Q?8u8LxDAqqmMesT47xy8Cra243jdKBU96+clyRBdfQqzFbqS+0iGep7AHcL6y?= =?us-ascii?Q?NgK/XVEtrvOTGaz4n3jKRBd9flqfvzcjybFXqI5Me0cqk8Du5lX0ihKVHjvG?= =?us-ascii?Q?Th0U/C76/Q0V7ZrbXCe35JIid+h2EONvtfJ0CL4Cyvyq8aVOQFE8u3v9GrI2?= =?us-ascii?Q?43cVVC4i75rgARRmImmJavJW9ZjpPhcYR9XFAWsBgH4a1B+vFZmc2QMmNeAl?= =?us-ascii?Q?wRpwqkZDswIW1zZEX6lfUfKciGHXlFaCn7kgZFW8cLvAtoDY/S4VCiW5XQqP?= =?us-ascii?Q?xbTgrhB6+gXEBZ7z+TqnUf1TRtCkbTabp2uIU8iyF5RGRyT7V7K/llb/c/O3?= =?us-ascii?Q?Wv4JLG5jiuzI0hUXY805BqeKYXIxSB12TWOSCQhiTFYWCc12tCRgWaMsZA51?= =?us-ascii?Q?9m41ed+6IS5ZyE5dti5bAoLLbft3AntJK+82Ox9WxnKjYD8IEhzddCa3XSlv?= =?us-ascii?Q?C5Nag3rhwzMIUg8HNED1d5IGFTPR4ASAdFhDj8WOt9nj7LQdlWls3lKyOq+3?= =?us-ascii?Q?iKMgdgr46r77bJjxhJhjx3sfwPbVIIsxJEyiIbq2+m0L/vgpOKPExE8O8GON?= =?us-ascii?Q?DexHPIotRri/dErlBg6oaOfuj2RjNlpwIncgTKoHTT+9UPJM209FeeqyxcrG?= =?us-ascii?Q?uNnY6sKGZu61KLhhWiIbJaR1/ppIJTM65QIuMaTuUA03zBDAuNoYE3f8FsNM?= =?us-ascii?Q?1Cl+mvQc7yMcG1K38pxHUgrAIoBqSVh8rzExH746bz4IoruusfYTppJ5Rvtu?= =?us-ascii?Q?VKfNAdFQd80OZ7mjdjOLVxU2r8zdNrQssZpob0+CEu9xf0ehp?= X-Microsoft-Antispam-Message-Info: jT0bUyZjAV5kLxyXv8TrYAdF//TTLzyzBnFbCua8vaN+d56WRgwXialH0KZ2ClBqLKkxCno8Yngike50PEootkvPxCHCxwXBbI9IPiEvWSKYn8LlMJPC7W5LAXgLkKrTC6/VGpFyQXGGQ5qekf88gx5MZzcouKiqzw+hOPjooCn3+W1eycY94qiPTe41WtcFHj9LDZ0txFSsEdynJCzzw4Wsi7XvG1ZcBJyZH8Xeynkz+NsA6L7MjsPQUIEQnsX0Y19/QkMmVioIv1JYbmAXXGSbXevzy0P+qdEZtTu4SNp8ETVklju6HrxZE3xBCr6UTTSpXL5WgHzZslWrzXiqRRMeKT7zJwZR2jydSp5vTHI= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0502MB3984; 6:QVLyCytc9Ysikan6rCPyuR4fZS2GnqFxUyVJ+HRpQC9Q79PKmhD0UWtAkGu+OR6SQY5PVEmbEPNrJ2gBMmut0oaXsHQFaJDQ8/hUq21Km5GAf2wYRw+REupdhO5tIUGmsXCzTscxNnPBkf4n/f5d9WoVN7jzm6GrdR9Aek1GspSdT0AyeIlmEBU1jdsdaOWsDoVaFa9qmJrz7Ijwtn+Hd/eN/TRq9Ql5cWg2lz5mbuqHN5zcG8eVYMej9VMRrvAqH5UkknlcTXt0fOUX7759R8UVgGK+21+LPdYaLJEVbYL2KCOY5bvCHuqlq/wZalwR3zpczg+0OGa5Bxg2pkEEYAdRjWrpdKjDCWMiCsj4sjF74/HoY03g/hTN3mcOZU+V2uwml9I0S9+wXQrGuFizOhegvujwmXDI84w3p0Pkh0tyBdStgRg7vuwe3LGpvmg1NxCUyuIz1MzBg1U8l4+zyQ==; 5:89NrEFU7D4VcxzMvYc/6fC+mg3k5zcoskins4G3e/Jdm/MB5OOC97Oqy89DUKt+/Qc9tqJj+gtxvR4xuHFdzH0F8KUcoVee8craLlcwCt2wFBKiWtZ3rRQ040QCykm3XxvDQEufW3eVTGHihQrUYJhz40ler8TzFT0IgE+E1OqE=; 7:940bYZp9v2tZxLvfQH65TA8pEHUXTvWwqT3dmyE+HoGPtUlTp4E6IYsbAsS76ipo7yL6RfiWImAUJ+qgfmJzs5adNOHyycdPtCtaW1zf5EzIxV+2okcc87ooTX6LYLlwwsFdoeYUqwcrd6i9ws+3iNnAsPH3/DFW3PbG1LMyWNQnxZeOLnp1r7urmL8JJgm4ix+VQquROqiWo2WcNCGYE1K4W9pLPT5D+a2fAG72fzopqHu65Tz5a5fT1gPWCna2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2018 20:38:15.2244 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 64127d27-fd1d-4dea-0d9c-08d6015cb279 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB3984 Subject: [dpdk-stable] patch 'app/testpmd: fix DCB config' has been queued to LTS release 17.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2018 20:38:17 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/15/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From 5ba02de4781d473d98f256e755410deaf6f52106 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Tue, 31 Jul 2018 15:43:34 +0100 Subject: [PATCH] app/testpmd: fix DCB config [ upstream commit ac7c491c3fecb835d637e867467dcf7cc8736828 ] After adding RSS hash offload check, default rss_hf will fail on devices that do not support all bits. This will lead to dcb config failure. The patch fixes this issue by reading current valid rss_conf from the device. Fixes: 8863a1fbfc66 ("ethdev: add supported hash function check") Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class") Signed-off-by: Konstantin Ananyev Acked-by: Bernard Iremonger --- app/test-pmd/testpmd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 6aa2f2c7c..32d687172 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2297,12 +2297,14 @@ const uint16_t vlan_tags[] = { }; static int -get_eth_dcb_conf(struct rte_eth_conf *eth_conf, +get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf, enum dcb_mode_enable dcb_mode, enum rte_eth_nb_tcs num_tcs, uint8_t pfc_en) { uint8_t i; + int32_t rc; + struct rte_eth_rss_conf rss_conf; /* * Builds up the correct configuration for dcb+vt based on the vlan tags array @@ -2342,6 +2344,10 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct rte_eth_dcb_tx_conf *tx_conf = ð_conf->tx_adv_conf.dcb_tx_conf; + rc = rte_eth_dev_rss_hash_conf_get(pid, &rss_conf); + if (rc != 0) + return rc; + rx_conf->nb_tcs = num_tcs; tx_conf->nb_tcs = num_tcs; @@ -2349,8 +2355,9 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, rx_conf->dcb_tc[i] = i % num_tcs; tx_conf->dcb_tc[i] = i % num_tcs; } + eth_conf->rxmode.mq_mode = ETH_MQ_RX_DCB_RSS; - eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_hf; + eth_conf->rx_adv_conf.rss_conf = rss_conf; eth_conf->txmode.mq_mode = ETH_MQ_TX_DCB; } @@ -2381,7 +2388,7 @@ init_port_dcb_config(portid_t pid, dcb_config = 1; /*set configuration of DCB in vt mode and DCB in non-vt mode*/ - retval = get_eth_dcb_conf(&port_conf, dcb_mode, num_tcs, pfc_en); + retval = get_eth_dcb_conf(pid, &port_conf, dcb_mode, num_tcs, pfc_en); if (retval < 0) return retval; port_conf.rxmode.hw_vlan_filter = 1; -- 2.11.0