From: Huisong Li <lihuis...@huawei.com>
This 'hns3_restore_filter' is an internal interface of driver.
Currently, it uses 'struct rte_eth_dev *dev' as input parameter,
This is inconvenient for the function to call in driver because
caller has to obtain its device address by global variable
'rte_eth_devices[]'. So this patch fix the input of this function.
Fixes: 920be799dbc3 ("net/hns3: fix RSS indirection table configuration")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li <lihuis...@huawei.com>
Signed-off-by: Dongdong Liu <liudongdo...@huawei.com>
---
drivers/net/hns3/hns3_ethdev.c | 3 +--
drivers/net/hns3/hns3_ethdev_vf.c | 3 +--
drivers/net/hns3/hns3_flow.c | 30 ++++++++++++------------------
drivers/net/hns3/hns3_flow.h | 2 +-
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 15d622a900..330a913cb8 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5006,7 +5006,6 @@ static int
hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
{
struct hns3_hw *hw = &hns->hw;
- struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
bool link_en;
int ret;
@@ -5043,7 +5042,7 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)
if (ret)
goto err_set_link_speed;
- return hns3_restore_filter(dev);
+ return hns3_restore_filter(hns);
err_set_link_speed:
(void)hns3_cfg_mac_mode(hw, false);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index bc8f5ecec2..446a0cdbc7 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1727,7 +1727,6 @@ static int
hns3vf_do_start(struct hns3_adapter *hns, bool reset_queue)
{
struct hns3_hw *hw = &hns->hw;
- struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
uint16_t nb_rx_q = hw->data->nb_rx_queues;
uint16_t nb_tx_q = hw->data->nb_tx_queues;
int ret;
@@ -1742,7 +1741,7 @@ hns3vf_do_start(struct hns3_adapter *hns, bool
reset_queue)
if (ret)
hns3_err(hw, "failed to init queues, ret = %d.", ret);
- return hns3_restore_filter(dev);
+ return hns3_restore_filter(hns);
}
static int
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index dd61ecd2aa..a2c1589c39 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1508,11 +1508,9 @@ hns3_hw_rss_hash_set(struct hns3_hw *hw, struct
rte_flow_action_rss *rss_config)
}
static int
-hns3_update_indir_table(struct rte_eth_dev *dev,
+hns3_update_indir_table(struct hns3_hw *hw,
const struct rte_flow_action_rss *conf, uint16_t num)
{
- struct hns3_adapter *hns = dev->data->dev_private;
- struct hns3_hw *hw = &hns->hw;
uint16_t indir_tbl[HNS3_RSS_IND_TBL_SIZE_MAX];
uint16_t j;
uint32_t i;
@@ -1535,11 +1533,9 @@ hns3_update_indir_table(struct rte_eth_dev *dev,
}
static int
-hns3_config_rss_filter(struct rte_eth_dev *dev,
+hns3_config_rss_filter(struct hns3_hw *hw,
const struct hns3_rss_conf *conf, bool add)
{
- struct hns3_adapter *hns = dev->data->dev_private;
- struct hns3_hw *hw = &hns->hw;
struct hns3_rss_conf *rss_info;
uint64_t flow_types;
uint16_t num;
@@ -1591,13 +1587,13 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
}
/* Set rx queues to use */
- num = RTE_MIN(dev->data->nb_rx_queues, rss_flow_conf.queue_num);
+ num = RTE_MIN(hw->data->nb_rx_queues, rss_flow_conf.queue_num);
if (rss_flow_conf.queue_num > num)
hns3_warn(hw, "Config queue numbers %u are beyond the scope of
truncated",
rss_flow_conf.queue_num);
hns3_info(hw, "Max of contiguous %u PF queues are configured", num);
if (num) {
- ret = hns3_update_indir_table(dev, &rss_flow_conf, num);
+ ret = hns3_update_indir_table(hw, &rss_flow_conf, num);
if (ret)
return ret;
}
@@ -1627,7 +1623,7 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev)
rss_filter_ptr = TAILQ_FIRST(&hw->flow_rss_list);
while (rss_filter_ptr) {
TAILQ_REMOVE(&hw->flow_rss_list, rss_filter_ptr, entries);
- ret = hns3_config_rss_filter(dev, &rss_filter_ptr->filter_info,
+ ret = hns3_config_rss_filter(hw, &rss_filter_ptr->filter_info,
false);
if (ret)
rss_rule_fail_cnt++;
@@ -1647,11 +1643,9 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev)
}
static int
-hns3_restore_rss_filter(struct rte_eth_dev *dev)
+hns3_restore_rss_filter(struct hns3_hw *hw)
{
- struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_rss_conf_ele *filter;
- struct hns3_hw *hw = &hns->hw;
int ret = 0;
pthread_mutex_lock(&hw->flows_lock);
@@ -1659,7 +1653,7 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
if (!filter->filter_info.valid)
continue;
- ret = hns3_config_rss_filter(dev, &filter->filter_info, true);
+ ret = hns3_config_rss_filter(hw, &filter->filter_info, true);
if (ret != 0) {
hns3_err(hw, "restore RSS filter failed, ret=%d", ret);
goto out;
@@ -1673,16 +1667,16 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
}
int
-hns3_restore_filter(struct rte_eth_dev *dev)
+hns3_restore_filter(struct hns3_adapter *hns)
{
- struct hns3_adapter *hns = dev->data->dev_private;
+ struct hns3_hw *hw = &hns->hw;
int ret;
ret = hns3_restore_all_fdir_filter(hns);
if (ret != 0)
return ret;
- return hns3_restore_rss_filter(dev);
+ return hns3_restore_rss_filter(hw);
}
static int
@@ -1699,7 +1693,7 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev,
return -EINVAL;
}
- return hns3_config_rss_filter(dev, conf, add);
+ return hns3_config_rss_filter(hw, conf, add);
}
static int
@@ -1960,7 +1954,7 @@ hns3_flow_destroy(struct rte_eth_dev *dev, struct
rte_flow *flow,
break;
case RTE_ETH_FILTER_HASH:
rss_filter_ptr = (struct hns3_rss_conf_ele *)flow->rule;
- ret = hns3_config_rss_filter(dev, &rss_filter_ptr->filter_info,
+ ret = hns3_config_rss_filter(hw, &rss_filter_ptr->filter_info,
false);
if (ret)
return rte_flow_error_set(error, EIO,
diff --git a/drivers/net/hns3/hns3_flow.h b/drivers/net/hns3/hns3_flow.h
index 0f5de129a3..854fbb7ff0 100644
--- a/drivers/net/hns3/hns3_flow.h
+++ b/drivers/net/hns3/hns3_flow.h
@@ -49,6 +49,6 @@ int hns3_dev_flow_ops_get(struct rte_eth_dev *dev,
const struct rte_flow_ops **ops);
void hns3_flow_init(struct rte_eth_dev *dev);
void hns3_flow_uninit(struct rte_eth_dev *dev);
-int hns3_restore_filter(struct rte_eth_dev *dev);
+int hns3_restore_filter(struct hns3_adapter *hns);
#endif /* _HNS3_FLOW_H_ */
--
2.22.0
