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 4ADE849CF; Thu, 16 Aug 2018 15:50:51 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id a108-v6so1573452wrc.13; Thu, 16 Aug 2018 06:50:51 -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=jdlSLGN2bUj4gZzylPUKxXMDsg7i4UbGUSUDmqgIIW4=; b=YcznK6gOuCu3JpvbupalZ25aOh36B51UubZ7PCM7PGJrsD2bBtHSYwvt2pyof+s5kj mfCNca9Nb2gu504tURc+cupvBImnzbO3gqbdXIjviMB2IdY+wUyX62WUadXIgOti0+W2 pGTiQDkKJUYXM9d8OaUpHpJ+e15XdUQbEtQcE5f9OHOPa7HnBkz3sjvSgLl4j+cs2MUX V9dO9azfJSU3lEO1Zs9f9qcj9R4RXhzfCccDoQ86Oj0VbnRuKSJ5l41lDWW4t3S9CTNS P6504nw19nAJDykZ+MBN2TE6zfW6U/VHhJ+i/9AtBytfLKmvrQIgfc69QMkkHouMB8D/ +lWA== X-Gm-Message-State: AOUpUlF+n0tJvOiR0H8bNxPnq8pc+QNeX9F4IJWWPluJoHNqjiaViBUE VbskHBazDnAlDCINd7xb/fQLssn4J7w= X-Google-Smtp-Source: AA+uWPySk69tGSagw7BDY+VUWHKR/ueSH3UKV4z8cm+zAixhwiwAdneRXTHWqTbuCgR7D14h7dcKPw== X-Received: by 2002:adf:f410:: with SMTP id g16-v6mr19119619wro.256.1534427450644; Thu, 16 Aug 2018 06:50:50 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:41aa:5bfa:6cf3:7531]) by smtp.gmail.com with ESMTPSA id n12-v6sm17727825wrm.62.2018.08.16.06.50.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Aug 2018 06:50:49 -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:30 +0100 Message-Id: <20180816135032.28283-2-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 1/3] net/virtio: register/unregister intr handler on start/stop 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:51 -0000 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") Cc: stable@dpdk.org Signed-off-by: Brian Russell Signed-off-by: Luca Boccassi --- 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 614357da74..3195443a1b 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1679,11 +1679,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: @@ -1709,11 +1704,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)); @@ -1972,6 +1962,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; @@ -2081,9 +2077,17 @@ virtio_dev_stop(struct rte_eth_dev *dev) PMD_INIT_LOG(DEBUG, "stop"); rte_spinlock_lock(&hw->state_lock); - 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)); rte_eth_linkstatus_set(dev, &link); -- 2.18.0