From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id A7BBA1B270 for ; Mon, 30 Oct 2017 16:37:39 +0100 (CET) Received: by mail-wr0-f196.google.com with SMTP id y9so13044188wrb.2 for ; Mon, 30 Oct 2017 08:37:39 -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=e9tIp98wXHOuIBCW2ViI0WLWD3NxScHT1LFFbobHHwA=; b=pbzTyi14kSAUyq82cQlhBsYSUvKWrdLq4iQrohDNW2Z++jPdsCX5sOB+uRrjdtr70c zoA53mDksUo2kNRXt51Z/J0IQcwnkhhb5y9lUSrSs8fIQJP4AGcZzivE6z9X753eTMGN ee3u957fMOayb+iaR1pEhHD8hn/0zzny0bwor3bwtoWJv5HBloFqrln06ITOIrfOAn+3 iMGGBMnlbyG+/kTS1WYP+iAJAtZavIF4Usb+7MHzrW+Wj0W4tLS68sIVVqEcdYr5l4XF Ca38kNq4/i84L1T9PkGWYPtlLUQDpLqCb4XFv/T1ibODil8w4syv0Yi0bRMyp6zJIMiT PRFA== 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=e9tIp98wXHOuIBCW2ViI0WLWD3NxScHT1LFFbobHHwA=; b=NP30maXU/W1AzizINooMiwY2kCHvl7KWjbofvntJKqqkOZRt+kkPiB9XsKVxnXjZce GyYlo+4WOCuPFvJ7tR8AwEh9Y5KBVl6SF3/6Xoqoqlxso2RqBSBa5+tOtviPcVKITHnt n6WIRQ0NGJ1ZWpLgLWggB4xOwaKTTW+S62u8whD2MV1nVntPaYPg/K7vW14h7d/32PGm FnfumDo+ZvSKPsYql5VD0gY48xDOe3auhZQq+vJooy9sg+kGoCHbtNLE8EKsU4oZG0on ZgSsEiQOmKnKP6waOBSLn+//zeAlzU0YsoApzTZe8Au3m9vr6hH34Vl0bF7Rpm0qMZVl 8XuQ== X-Gm-Message-State: AMCzsaXloZDRk67o9a9acwWzDUbay6FHfYI8OS58mJKniDLUrTvPHDzB GIC56Uu47zPdcFjpq4FJUfM= X-Google-Smtp-Source: ABhQp+Sxtm8vKhMx0JlNX89E6IsXnUNP8wMsdUKCaXDHCYcuJ2RXZj6Rh6qIt9Aqh9EN6u/bhAXGCA== X-Received: by 10.223.138.175 with SMTP id y44mr8860513wry.273.1509377859325; Mon, 30 Oct 2017 08:37:39 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id c37sm20482481wrc.92.2017.10.30.08.37.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:37:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Dai Cc: Lijuan Tu , Jingjing Wu , dpdk stable Date: Mon, 30 Oct 2017 15:34:34 +0000 Message-Id: <20171030153511.13322-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e: fix mirror rule reset when port is closed' has been queued to LTS release 16.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, 30 Oct 2017 15:37:39 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 11/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 62766a6f94a552fa2b2379440f2f8801330932da Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Mon, 25 Sep 2017 14:36:53 +0800 Subject: [PATCH] net/i40e: fix mirror rule reset when port is closed [ upstream commit 77a45aeb6b2b4f8dbf8ca53e8bfae8aa18382157 ] When an i40e PF port is stopped, all mirror rules should be reserved. But when an i40e PF port is closed, all mirror rules should be removed. When a mirror rule is removed, its associated hardware and software resource should also be removed. Fixes: a4def5edf0fc ("i40e: enable port mirroring") Signed-off-by: Wei Dai Tested-by: Lijuan Tu Acked-by: Jingjing Wu --- drivers/net/i40e/i40e_ethdev.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 5be7f0af6..d63d5b483 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -422,6 +422,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); @@ -1819,7 +1825,6 @@ i40e_dev_stop(struct rte_eth_dev *dev) { struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_vsi *main_vsi = pf->main_vsi; - struct i40e_mirror_rule *p_mirror; struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; int i; @@ -1845,13 +1850,6 @@ i40e_dev_stop(struct rte_eth_dev *dev) /* Set link down */ i40e_dev_set_link_down(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); - } - pf->nb_mirror_rule = 0; - if (!rte_intr_allow_others(intr_handle)) /* resume to the default handler */ rte_intr_callback_register(intr_handle, @@ -1871,13 +1869,35 @@ i40e_dev_close(struct rte_eth_dev *dev) { struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct i40e_mirror_rule *p_mirror; uint32_t reg; int i; + int ret; PMD_INIT_FUNC_TRACE(); i40e_dev_stop(dev); hw->adapter_stopped = 1; + + /* Remove all mirror rules */ + while ((p_mirror = TAILQ_FIRST(&pf->mirror_list))) { + 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); + + /* remove mirror software resource anyway */ + TAILQ_REMOVE(&pf->mirror_list, p_mirror, rules); + rte_free(p_mirror); + pf->nb_mirror_rule--; + } + i40e_dev_free_queues(dev); /* Disable interrupt */ -- 2.11.0