From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4207FA034E for ; Fri, 29 May 2020 05:59:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A2301DC2E; Fri, 29 May 2020 05:59:06 +0200 (CEST) Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by dpdk.org (Postfix) with ESMTP id 3B5731D5EC for ; Fri, 29 May 2020 05:59:05 +0200 (CEST) Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 4DE142964B3872E0D863 for ; Fri, 29 May 2020 11:59:03 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Fri, 29 May 2020 11:58:53 +0800 From: "Wei Hu (Xavier)" To: CC: , Date: Fri, 29 May 2020 11:57:31 +0800 Message-ID: <1590724654-23075-4-git-send-email-xavier.huwei@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590724654-23075-1-git-send-email-xavier.huwei@huawei.com> References: <1590724654-23075-1-git-send-email-xavier.huwei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-stable] [PATCH 19.11 3/6] net/hns3: fix RSS indirection table configuration 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Lijun Ou [ upstream commit 3e791e07b7e1d66141b0c5a0e9a0924e77911b0b ] For the current hns3 PMD driver, there are some RSS related bugs at the following scenes: 1. Start the application with the number of Rx queues equals 1(--rxq=1), modify the number of Rx queue to some number greater than 1 during normal operation. As a result, upper application can't receive packets from multiple rx queues. 2. Start testpmd application with the option disable-rss and the number of Rx queue is greater than 1(--disable-rss --rxq=N, N>1). As a result, upper application still can receive packets from multiple rx queues. The root cause as below: There are some error configuration in the RSS indirection table of hns3 network engine. This patch fixes them with the following modification. 1. When RSS size is changed, we need to update RSS redirection table maintained by driver and configure them to hardware. Besides, during the entire reset process, we need to ensure that the RSS table information are not overwritten and configured directly to the hardware in the RESET_STAGE_RESTORE stage of the reset process. 2. When sarting testpmd application with the options disable-rss, it doesn't need to configure RSS redirection table to hardware. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Cc: stable@dpdk.org Signed-off-by: Lijun Ou Signed-off-by: Huisong Li Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_dcb.c | 15 +++++++++++++++ drivers/net/hns3/hns3_ethdev.c | 8 ++++++++ drivers/net/hns3/hns3_ethdev_vf.c | 9 +++++++++ drivers/net/hns3/hns3_flow.c | 13 +++++++++++++ drivers/net/hns3/hns3_rss.c | 28 ++++++++++++++++++---------- drivers/net/hns3/hns3_rss.h | 2 ++ 6 files changed, 65 insertions(+), 10 deletions(-) diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index 369a40e..8688de2 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -580,7 +580,9 @@ hns3_dcb_pri_shaper_cfg(struct hns3_hw *hw) void hns3_set_rss_size(struct hns3_hw *hw, uint16_t nb_rx_q) { + struct hns3_rss_conf *rss_cfg = &hw->rss_info; uint16_t rx_qnum_per_tc; + int i; rx_qnum_per_tc = nb_rx_q / hw->num_tc; rx_qnum_per_tc = RTE_MIN(hw->rss_size_max, rx_qnum_per_tc); @@ -590,6 +592,19 @@ hns3_set_rss_size(struct hns3_hw *hw, uint16_t nb_rx_q) hw->alloc_rss_size = rx_qnum_per_tc; } hw->used_rx_queues = hw->num_tc * hw->alloc_rss_size; + + /* + * When rss size is changed, we need to update rss redirection table + * maintained by driver. Besides, during the entire reset process, we + * need to ensure that the rss table information are not overwritten + * and configured directly to the hardware in the RESET_STAGE_RESTORE + * stage of the reset process. + */ + if (rte_atomic16_read(&hw->reset.resetting) == 0) { + for (i = 0; i < HNS3_RSS_IND_TBL_SIZE; i++) + rss_cfg->rss_indirection_tbl[i] = + i % hw->alloc_rss_size; + } } void diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 84615c1..f70f43f 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4281,6 +4281,12 @@ hns3_map_rx_interrupt(struct rte_eth_dev *dev) return ret; } +static void +hns3_restore_filter(struct rte_eth_dev *dev) +{ + hns3_restore_rss_filter(dev); +} + static int hns3_dev_start(struct rte_eth_dev *dev) { @@ -4311,6 +4317,8 @@ hns3_dev_start(struct rte_eth_dev *dev) hns3_mp_req_start_rxtx(dev); rte_eal_alarm_set(HNS3_SERVICE_INTERVAL, hns3_service_handler, dev); + hns3_restore_filter(dev); + hns3_info(hw, "hns3 dev start successful!"); return 0; } diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index bbe4ee7..feb49df 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1488,6 +1488,12 @@ hns3vf_map_rx_interrupt(struct rte_eth_dev *dev) return ret; } +static void +hns3vf_restore_filter(struct rte_eth_dev *dev) +{ + hns3_restore_rss_filter(dev); +} + static int hns3vf_dev_start(struct rte_eth_dev *dev) { @@ -1515,6 +1521,9 @@ hns3vf_dev_start(struct rte_eth_dev *dev) hns3_set_rxtx_function(dev); hns3_mp_req_start_rxtx(dev); rte_eal_alarm_set(HNS3VF_SERVICE_INTERVAL, hns3vf_service_handler, dev); + + hns3vf_restore_filter(dev); + return ret; } diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index cd56c99..1b9dc1d 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1547,6 +1547,19 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev) return hns3_config_rss_filter(dev, &hw->rss_info, false); } +/* Restore the rss filter */ +int +hns3_restore_rss_filter(struct rte_eth_dev *dev) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + + if (hw->rss_info.conf.queue_num == 0) + return 0; + + return hns3_config_rss_filter(dev, &hw->rss_info, true); +} + static int hns3_flow_parse_rss(struct rte_eth_dev *dev, const struct hns3_rss_conf *conf, bool add) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index ff2da5a..f19b799 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -127,7 +127,7 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint8_t *indir, uint16_t size) req->rss_set_bitmap = rte_cpu_to_le_16(HNS3_RSS_SET_BITMAP_MSK); for (j = 0; j < HNS3_RSS_CFG_TBL_SIZE; j++) { num = i * HNS3_RSS_CFG_TBL_SIZE + j; - req->rss_result[j] = indir[num] % hw->alloc_rss_size; + req->rss_result[j] = indir[num]; } ret = hns3_cmd_send(hw, &desc, 1); if (ret) { @@ -422,7 +422,7 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, shift = i % RTE_RETA_GROUP_SIZE; if (reta_conf[idx].mask & (1ULL << shift)) reta_conf[idx].reta[shift] = - rss_cfg->rss_indirection_tbl[i] % hw->alloc_rss_size; + rss_cfg->rss_indirection_tbl[i]; } rte_spinlock_unlock(&hw->lock); return 0; @@ -529,7 +529,7 @@ hns3_config_rss(struct hns3_adapter *hns) enum rte_eth_rx_mq_mode mq_mode = hw->data->dev_conf.rxmode.mq_mode; - /* When there is no open RSS, redirect the packet queue 0 */ + /* When RSS is off, redirect the packet queue 0 */ if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG) == 0) hns3_rss_uninit(hns); @@ -543,10 +543,16 @@ hns3_config_rss(struct hns3_adapter *hns) if (ret) return ret; - ret = hns3_set_rss_indir_table(hw, rss_cfg->rss_indirection_tbl, - HNS3_RSS_IND_TBL_SIZE); - if (ret) - goto rss_tuple_uninit; + /* + * When RSS is off, it doesn't need to configure rss redirection table + * to hardware. + */ + if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG)) { + ret = hns3_set_rss_indir_table(hw, rss_cfg->rss_indirection_tbl, + HNS3_RSS_IND_TBL_SIZE); + if (ret) + goto rss_tuple_uninit; + } ret = hns3_set_rss_tc_mode(hw); if (ret) @@ -555,9 +561,11 @@ hns3_config_rss(struct hns3_adapter *hns) return ret; rss_indir_table_uninit: - ret1 = hns3_rss_reset_indir_table(hw); - if (ret1 != 0) - return ret; + if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG)) { + ret1 = hns3_rss_reset_indir_table(hw); + if (ret1 != 0) + return ret; + } rss_tuple_uninit: hns3_rss_tuple_uninit(hw); diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 7ffc151..8f065af 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -121,4 +121,6 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); int hns3_set_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, const uint8_t *key); +int hns3_restore_rss_filter(struct rte_eth_dev *dev); + #endif /* _HNS3_RSS_H_ */ -- 2.7.4