From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Dai Subject: [PATCH v4] net/i40e: fix mirror rule reset when port is stopped Date: Wed, 20 Sep 2017 10:12:09 +0800 Message-ID: <1505873529-64121-1-git-send-email-wei.dai@intel.com> References: <1505872770-63412-1-git-send-email-wei.dai@intel.com> Cc: dev@dpdk.org, Wei Dai , stable@dpdk.org To: jingjing.wu@intel.com, beilei.xing@intel.com Return-path: In-Reply-To: <1505872770-63412-1-git-send-email-wei.dai@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When an i40e PF port is stopped, all mirror rules should be removed. All rule related software and hardware resources should also be removed. Fixes: a4def5edf0fc ("i40e: enable port mirroring") Cc: stable@dpdk.org Signed-off-by: Wei Dai Tested-by: Lijuan Tu --- drivers/net/i40e/i40e_ethdev.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index f12aefa..99f2486 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -361,6 +361,12 @@ static int i40e_dev_sync_phy_type(struct i40e_hw *hw); static void i40e_configure_registers(struct i40e_hw *hw); static void i40e_hw_init(struct rte_eth_dev *dev); static int i40e_config_qinq(struct i40e_hw *hw, struct i40e_vsi *vsi); +static enum i40e_status_code i40e_aq_del_mirror_rule(struct i40e_hw *hw, + uint16_t seid, + uint16_t rule_type, + uint16_t *entries, + uint16_t count, + uint16_t rule_id); static int i40e_mirror_rule_set(struct rte_eth_dev *dev, struct rte_eth_mirror_conf *mirror_conf, uint8_t sw_id, uint8_t on); @@ -2069,6 +2075,7 @@ i40e_dev_stop(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; int i; + int ret; if (hw->adapter_stopped == 1) return; @@ -2096,10 +2103,22 @@ i40e_dev_stop(struct rte_eth_dev *dev) /* Remove all mirror rules */ while ((p_mirror = TAILQ_FIRST(&pf->mirror_list))) { - TAILQ_REMOVE(&pf->mirror_list, p_mirror, rules); - rte_free(p_mirror); + ret = i40e_aq_del_mirror_rule(hw, + pf->main_vsi->veb->seid, + p_mirror->rule_type, + p_mirror->entries, + p_mirror->num_entries, + p_mirror->id); + if (ret < 0) + PMD_DRV_LOG(ERR, "failed to remove mirror rule: " + "status = %d, aq_err = %d.", ret, + hw->aq.asq_last_status); + else { + TAILQ_REMOVE(&pf->mirror_list, p_mirror, rules); + rte_free(p_mirror); + pf->nb_mirror_rule--; + } } - pf->nb_mirror_rule = 0; if (!rte_intr_allow_others(intr_handle)) /* resume to the default handler */ -- 2.7.5