From patchwork Wed Oct 31 18:39:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 47633 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E857D4C8A; Wed, 31 Oct 2018 19:40:12 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id EA48F34EF; Wed, 31 Oct 2018 19:40:08 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id y144-v6so15423453wmd.4; Wed, 31 Oct 2018 11:40:08 -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:mime-version:content-transfer-encoding; bh=s9whBD7MJWJWV5zd4ST0bIXPe+U9+snVxwLA9B+UJo4=; b=M9aHn5T7LhkB1jllvCZflo1IuUuHUvB1JX/HeIOUD1BOxKYprIglB0v4fuXScWuakU papAmR62L6yLEMDW4VzDCp4sjhTADxgGad41vCtp26yueciNuX18pY58OkVaE5j2tOrO j2V/4KrbzW6LM+2d4Pg9NYC5UPSlhjqERcZMLyXlfQYWz9ZTUOp1bq4KOgczDC6UKv5T LK4bBqbA8bIB5x11R5nMbLyoUojC4UWtUmTmxAdrS8nPHsHCHgcqBqtGluB3Ht9CPU55 1Q37tfFBsjBrYwYhxLXlGcEXYlk6ffdUy2xefyEfAlDdOZkixiZWiVM3Gyy2u0+fIyb7 HHBg== X-Gm-Message-State: AGRZ1gIrl4xVb9DcVhgIExtlR78GlwqeNtIWkbjKsQvVVJ7KaMO2P56S JGt3SAA+Aq6nRDJxr7DXq3HZ3J+A X-Google-Smtp-Source: AJdET5edwoyuQBPXCie1EFQhzoGNizcm82PpVfcaFjRh/p/EOX+ySYuGxCYRNTjbgifMKebHtLtEbw== X-Received: by 2002:a1c:8c8c:: with SMTP id o134-v6mr3253411wmd.35.1541011208051; Wed, 31 Oct 2018 11:40:08 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id b71-v6sm22794753wma.13.2018.10.31.11.40.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 11:40:07 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: yongwang@vmware.com, 3chas3@gmail.com, bruce.richardson@intel.com, anatoly.burakov@intel.com, thomas@monjalon.net, llouis@vmware.com, Luca Boccassi , stable@dpdk.org, Brian Russell Date: Wed, 31 Oct 2018 18:39:44 +0000 Message-Id: <20181031183945.29509-2-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181031183945.29509-1-bluca@debian.org> References: <20180816135032.28283-1-bluca@debian.org> <20181031183945.29509-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. Also set RTE_ETH_DEV_CLOSE_REMOVE on close so that the port resources can be deallocated. Return EBUSY if remove is called before stop. Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation") Cc: stable@dpdk.org Signed-off-by: Brian Russell Signed-off-by: Luca Boccassi --- v2: add back extra close() call in uninit() for buggy applications as requested by the reviewers, and add debug log noting the issue v3: remove extra close() call in uninit() as requested, and return -EBUSY instead. set RTE_ETH_DEV_CLOSE_REMOVE in close(). drivers/net/vmxnet3/vmxnet3_ethdev.c | 43 +++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 41bcd450a..84acd9dbb 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -360,8 +360,10 @@ eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - if (hw->adapter_stopped == 0) - vmxnet3_dev_close(eth_dev); + if (hw->adapter_stopped == 0) { + PMD_INIT_LOG(DEBUG, "Device has not been closed."); + return -EBUSY; + } eth_dev->dev_ops = NULL; eth_dev->rx_pkt_burst = NULL; @@ -805,7 +807,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; } @@ -829,7 +831,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); @@ -839,6 +840,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; } /* @@ -847,12 +872,16 @@ 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); + + /* + * flag to rte_eth_dev_close() that it should release the port resources + * (calling rte_eth_dev_release_port()) in addition to closing it. + */ + dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; } static void