From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 9519C8E76 for ; Mon, 6 Aug 2018 12:56:29 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id w24-v6so13797852wmc.1 for ; Mon, 06 Aug 2018 03:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MpDW/YlUssW7iDq/QOTRofTq+QpcLVCpsRim0Ov8BPU=; b=EcwDnEy2387w1wJm8HNKiKVjhP/MOXdmhaYcDhOZxNG+d2yRxoofm95hzuH31ugtHS w6eaPoq0aPhcInFriNofK6MDg8vhUp/3TEOQbCqnppb7EkcIw2GBTYHURM8rUzPfmbqC rKKV5N/72D3zXh2+edGLAO3xtRbIWBictFRfy8PVjGrBG/2+JfVGoxqsJRTOeShOBs+8 pRUji0ufCjnd/VEXDUg2t9Rj5MnhT57gn3SHZTWtyNXcYyicwHwOLQhnbyt+Z4/28R8T lubEl1lJNmw0EAKh62/Pwx/q1HbAHVDWPydPvv1UxzfTwUd2gPaTC8QkGRxdTk018cr1 p5ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MpDW/YlUssW7iDq/QOTRofTq+QpcLVCpsRim0Ov8BPU=; b=CzDNenog/+6Xe7Cyz8RkSbrANP7XDE/pO84sO5dGAW190wMVxgkr9G6Td1ycdQLRZA XPcoRS6p/cJvnZZiIjQ7pHZZx8/y227quLJ271g9fS2uXN3avdJ+f8bjVyjWlXBk+s/K vjRqmy7jevlmwsElne27N/y2OPGBrDTRWTK6KhOC+Y+PYjaOUfUWn4ibtXLRjaQpo64u yHVUh+jvg4rREiceVX24tGxnWwhXXaG+rGtYGOwdkzlVV7f0ECMP0zsfLKCfnHhR8on9 J25xM2NgqPmqagXnf4MRathDmJyQ1J2phgNy9E14u7D/usINQOZZ7M42LhH7l9wtbHv2 R3HA== X-Gm-Message-State: AOUpUlEjao7bKhmV0myW2UobvIwYGA1UEzPMGDUaRVGjEkIGndTiG/o/ Bk1Wpz2SgWa919qVgU1W4jI= X-Google-Smtp-Source: AAOMgpfBqX1/J3GNzWykLLfjoKLitowPA5TmFbqouO7zGPul5MzNu1X33OQe7b0dCdstHMRBiIN+sQ== X-Received: by 2002:a1c:588d:: with SMTP id m135-v6mr11015380wmb.118.1533552989331; Mon, 06 Aug 2018 03:56:29 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id y128-v6sm9423414wmy.26.2018.08.06.03.56.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Aug 2018 03:56:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Konstantin Ananyev Cc: Bernard Iremonger , dpdk stable Date: Mon, 6 Aug 2018 11:56:11 +0100 Message-Id: <20180806105619.24253-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180806105619.24253-1-luca.boccassi@gmail.com> References: <20180727101748.30228-1-luca.boccassi@gmail.com> <20180806105619.24253-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'app/testpmd: fix DCB config' has been queued to LTS release 16.11.8 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, 06 Aug 2018 10:56:29 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.8 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/08/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From d79ab5481fa497535c23b89e0a9fa50aa8fd720b 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 64e14cee2f..e48cf8a1ab 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1905,12 +1905,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 @@ -1950,6 +1952,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; @@ -1957,8 +1963,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; } @@ -1989,7 +1996,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.18.0