From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 457AA4C8D; Thu, 16 Aug 2018 15:50:53 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id w11-v6so1663163wrc.5; Thu, 16 Aug 2018 06:50:53 -0700 (PDT) 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=7Wr9677b5iwdExfPwcV+czGu85hikIoJgd8K24KjYBU=; b=S0ERiDQPWWezUAJmPrrkpCTfxYmIdzfGP19rW/jZcRae4en+6LOT8C+6JQcFOe7Qm2 ioyPB2hYmduLA+H9WKDZEKS95+1o+i0CoIPVc3L609eGLqYNpcg+NDpA4V9kQ0dIWvIZ mrt4m3RQO3cl7IRql700BvETDqZqjfRpI3g/5iSJDVjZ58klIGiq7Vwp54DO5h/RhxoF 2CFlxp7j9kvI8QRsdI7uD/bsChjfyAKKPpFdsQFrKzyLSjsyzDqP9jqeXWiPXwEEIIUw ydddrjR5lPaUSTLP83lQjvrsYrDadq9bUVP1yGM1pI65DEZcpmVRj9dak/Zw+/eCXiZx G1Ig== X-Gm-Message-State: AOUpUlGM3VlcMiipwsGfbaUrtcanlFaSVYa8iVmr3EyyyGxOwm2P7ATO Mr77PZOk6oqFAXFN/YvmkIHRNGRuOGI= X-Google-Smtp-Source: AA+uWPyM0F2FYYwdVxK19m2WlGE2Uh1+gBYqmuO8xgxaRHAGOSGtXpKbaAZcGReKgpRlzTBR59qDsw== X-Received: by 2002:adf:ee4e:: with SMTP id w14-v6mr19637957wro.63.1534427452431; Thu, 16 Aug 2018 06:50:52 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:41aa:5bfa:6cf3:7531]) by smtp.gmail.com with ESMTPSA id t19-v6sm736489wmi.42.2018.08.16.06.50.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Aug 2018 06:50:51 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, tiwei.bie@intel.com, yongwang@vmware.com, 3chas3@gmail.com, bruce.richardson@intel.com, jianfeng.tan@intel.com, anatoly.burakov@intel.com, Luca Boccassi , stable@dpdk.org, Brian Russell Date: Thu, 16 Aug 2018 14:50:31 +0100 Message-Id: <20180816135032.28283-3-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180816135032.28283-1-bluca@debian.org> References: <20180816135032.28283-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 2/3] net/vmxnet3: fix vmxnet3 dev_uninit() hot-unplug X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 13:50:53 -0000 The vmxnet3 driver can't call back into dev_close(), and possibly dev_stop(), in dev_uninit(). When dev_uninit() is called, anything that those routines would want to clean up has already been released. Further, for complete cleanup, it is necessary to release any of the queue resources during dev_close(). This allows a vmxnet3 device to be hot-unplugged without leaking queues. Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation") Cc: stable@dpdk.org Signed-off-by: Brian Russell Signed-off-by: Luca Boccassi --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 36 ++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 2613cd1358..b5d4be5e24 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -348,16 +348,11 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) static int eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev) { - struct vmxnet3_hw *hw = eth_dev->data->dev_private; - PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - if (hw->adapter_stopped == 0) - vmxnet3_dev_close(eth_dev); - eth_dev->dev_ops = NULL; eth_dev->rx_pkt_burst = NULL; eth_dev->tx_pkt_burst = NULL; @@ -803,7 +798,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); if (hw->adapter_stopped == 1) { - PMD_INIT_LOG(DEBUG, "Device already closed."); + PMD_INIT_LOG(DEBUG, "Device already stopped."); return; } @@ -827,7 +822,6 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) /* reset the device */ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV); PMD_INIT_LOG(DEBUG, "Device reset."); - hw->adapter_stopped = 0; vmxnet3_dev_clear_queues(dev); @@ -837,6 +831,30 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) link.link_speed = ETH_SPEED_NUM_10G; link.link_autoneg = ETH_LINK_FIXED; rte_eth_linkstatus_set(dev, &link); + + hw->adapter_stopped = 1; +} + +static void +vmxnet3_free_queues(struct rte_eth_dev *dev) +{ + int i; + + PMD_INIT_FUNC_TRACE(); + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + void *rxq = dev->data->rx_queues[i]; + + vmxnet3_dev_rx_queue_release(rxq); + } + dev->data->nb_rx_queues = 0; + + for (i = 0; i < dev->data->nb_tx_queues; i++) { + void *txq = dev->data->tx_queues[i]; + + vmxnet3_dev_tx_queue_release(txq); + } + dev->data->nb_tx_queues = 0; } /* @@ -845,12 +863,10 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) static void vmxnet3_dev_close(struct rte_eth_dev *dev) { - struct vmxnet3_hw *hw = dev->data->dev_private; - PMD_INIT_FUNC_TRACE(); vmxnet3_dev_stop(dev); - hw->adapter_stopped = 1; + vmxnet3_free_queues(dev); } static void -- 2.18.0