From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 65FE25911 for ; Mon, 3 Dec 2018 11:28:06 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id l9so11523627wrt.13 for ; Mon, 03 Dec 2018 02:28:06 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=adAUVdwYp9gqWqJdkj1D7WLiLoAmvMPKpxXgrAtN/GE=; b=I423PGDMNMJGsI+CLJm/WntV0v9HYwa5tiFR0gCz6TZ1zL6C9h96VcKjpacUR9OmG3 q3KN02bEyYhe7i9KY2N7k3nGhaxYG2OcVByujLJtMSHBzNbK5PJVcoAnoCCICD5RoMjq WBhnhQumqZldpWpRsY5qLK5VuTW6tJHX6/V+N37REHFpLYaT8x/08ahlET+zr6fUHPAW NcZ0qa1p9jEQByvsHS4xF0IgD/2PvjYHn3/JQ1dtGUEgtcssN6qllpe9AMuqTVX2jjSR e+yFyDG/3cGGd/1TRVXFO1CPmYwFFGAxupZfg5YhOFr0vfx7WMLw+z+xgS6d1itSwRJc In0A== X-Gm-Message-State: AA+aEWZUxL8LGIPbLJszLaVqOfTAy9jlhJ9467D33HHhS3gWpRtGhc9B sc0o5mMdp+5+auSadHy1m4hhvnT5 X-Google-Smtp-Source: AFSGD/XpJVCT0JvmAyl3otlLd1N+Fw/fAqCKgRrPk93wv6aISwrYvPCfOVU07FpUxh7YAGpqyAtTqg== X-Received: by 2002:adf:db51:: with SMTP id f17mr12654945wrj.90.1543832885665; Mon, 03 Dec 2018 02:28:05 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t76sm15476910wme.33.2018.12.03.02.28.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Dec 2018 02:28:04 -0800 (PST) From: Luca Boccassi To: stable@dpdk.org Cc: yskoh@mellanox.com Date: Mon, 3 Dec 2018 10:27:54 +0000 Message-Id: <20181203102754.17543-1-bluca@debian.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 17.11] net/virtio: register/unregister intr handler on start/stop 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, 03 Dec 2018 10:28:06 -0000 [ backported from upstream commit f9b0d1902caf893493b5e07763ecf817c34fc75c ] Register and unregister the virtio interrupt handler when the device is started and stopped. This allows a virtio device to be hotplugged or unplugged. Fixes: c1f86306a026 ("virtio: add new driver") Signed-off-by: Brian Russell Signed-off-by: Luca Boccassi Reviewed-by: Maxime Coquelin --- Adjusted context for 17.11, no functional changes. drivers/net/virtio/virtio_ethdev.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 4da1ba32e..6eece5bcf 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1622,11 +1622,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) if (ret < 0) goto out; - /* Setup interrupt callback */ - if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) - rte_intr_callback_register(eth_dev->intr_handle, - virtio_interrupt_handler, eth_dev); - return 0; out: @@ -1652,11 +1647,6 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) rte_free(eth_dev->data->mac_addrs); eth_dev->data->mac_addrs = NULL; - /* reset interrupt callback */ - if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) - rte_intr_callback_unregister(eth_dev->intr_handle, - virtio_interrupt_handler, - eth_dev); if (eth_dev->device) rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev)); @@ -1833,6 +1823,12 @@ virtio_dev_start(struct rte_eth_dev *dev) dev->data->dev_conf.intr_conf.rxq) { virtio_intr_disable(dev); + /* Setup interrupt callback */ + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) + rte_intr_callback_register(dev->intr_handle, + virtio_interrupt_handler, + dev); + if (virtio_intr_enable(dev) < 0) { PMD_DRV_LOG(ERR, "interrupt enable failed"); return -EIO; @@ -1947,9 +1943,17 @@ virtio_dev_stop(struct rte_eth_dev *dev) PMD_INIT_LOG(DEBUG, "stop"); - if (intr_conf->lsc || intr_conf->rxq) + if (intr_conf->lsc || intr_conf->rxq) { virtio_intr_disable(dev); + /* Reset interrupt callback */ + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) { + rte_intr_callback_unregister(dev->intr_handle, + virtio_interrupt_handler, + dev); + } + } + hw->started = 0; memset(&link, 0, sizeof(link)); virtio_dev_atomic_write_link_status(dev, &link); -- 2.19.2