From patchwork Tue Mar 28 08:21:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Tan X-Patchwork-Id: 22568 X-Patchwork-Delegate: yuanhan.liu@linux.intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E8EF1D018; Tue, 28 Mar 2017 10:21:27 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 81F66CF80 for ; Tue, 28 Mar 2017 10:21:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490689275; x=1522225275; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=q9VHW4EmhgaUQVbUtQV8asZ4zqDlZApUoogQrv9J1nQ=; b=BTxv6lPj8msElh7vWOc4WusV7/lZ4nAPjq1nz/hbB+Z4xZxtcp8+Y/JC neal3cHV5OMUkLBuvy16JHkG/gPnjw==; Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2017 01:21:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,236,1486454400"; d="scan'208";a="81788016" Received: from dpdk06.sh.intel.com ([10.239.129.195]) by fmsmga006.fm.intel.com with ESMTP; 28 Mar 2017 01:21:13 -0700 From: Jianfeng Tan To: dev@dpdk.org Cc: yuanhan.liu@linux.intel.com, david.marchand@6wind.com, maxime.coquelin@redhat.com, Jianfeng Tan Date: Tue, 28 Mar 2017 08:21:53 +0000 Message-Id: <1490689316-131625-3-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490689316-131625-1-git-send-email-jianfeng.tan@intel.com> References: <1488563803-87754-1-git-send-email-jianfeng.tan@intel.com> <1490689316-131625-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH v2 2/5] net/virtio: add interrupt configure for vdev 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" For virtio PCI devices, interrupt should be configured before setting VIRTIO_CONFIG_STATUS_DRIVER_OK so that QEMU can properly set eventfds in the host. For virtio virtual devices, VIRTIO_CONFIG_STATUS_DRIVER_OK should be set firstly, so that intr_handle is initialized in virtio_user_start_device(). To accommodate both requirements, we rearrange the sequence like this: a. set interrupt configure for PCI devices. b. set VIRTIO_CONFIG_STATUS_DRIVER_OK. c. set interrupt configure for virtual devices. Signed-off-by: Jianfeng Tan --- drivers/net/virtio/virtio_ethdev.c | 57 ++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d9986ab..f0213ba 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1275,7 +1275,7 @@ virtio_queues_unbind_intr(struct rte_eth_dev *dev) } static int -virtio_configure_intr(struct rte_eth_dev *dev) +virtio_configure_intr_pci(struct rte_eth_dev *dev) { struct virtio_hw *hw = dev->data->dev_private; @@ -1327,6 +1327,37 @@ virtio_configure_intr(struct rte_eth_dev *dev) return 0; } +static int +virtio_configure_intr_vdev(struct rte_eth_dev *dev) +{ + struct virtio_hw *hw = dev->data->dev_private; + + if (!dev->intr_handle->intr_vec) { + dev->intr_handle->intr_vec = + rte_zmalloc("intr_vec", + hw->max_queue_pairs * sizeof(int), 0); + if (!dev->intr_handle->intr_vec) { + PMD_INIT_LOG(ERR, "Failed to allocate %u rxq vectors", + hw->max_queue_pairs); + return -ENOMEM; + } + } + + /* Re-register callback to update max_intr */ + rte_intr_callback_unregister(dev->intr_handle, + virtio_interrupt_handler, + dev); + rte_intr_callback_register(dev->intr_handle, + virtio_interrupt_handler, + dev); + + if (virtio_queues_bind_intr(dev) < 0) { + PMD_INIT_LOG(ERR, "Failed to bind queue/interrupt"); + return -1; + } + + return 0; +} /* reset device and renegotiate features if needed */ static int virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) @@ -1450,15 +1481,29 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) if (ret < 0) return ret; - if (eth_dev->data->dev_conf.intr_conf.rxq) { - if (virtio_configure_intr(eth_dev) < 0) { - PMD_INIT_LOG(ERR, "failed to configure interrupt"); - return -1; - } + /* For virtio PCI devices, setup interrupt configuration before + * setting VIRTIO_CONFIG_STATUS_DRIVER_OK, required by QEMU. + */ + if (pci_dev && + eth_dev->data->dev_conf.intr_conf.rxq && + virtio_configure_intr_pci(eth_dev) < 0) { + PMD_INIT_LOG(ERR, "failed to configure interrupt"); + return -1; } vtpci_reinit_complete(hw); + /* For virtio vdev, setup interrupt configuration after + * setting VIRTIO_CONFIG_STATUS_DRIVER_OK, so that intr_handle + * is initialized in virtio_user_start_device(). + */ + if (!pci_dev && + eth_dev->data->dev_conf.intr_conf.rxq && + virtio_configure_intr_vdev(eth_dev) < 0) { + PMD_INIT_LOG(ERR, "failed to configure interrupt"); + return -1; + } + if (pci_dev) PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x", eth_dev->data->port_id, pci_dev->id.vendor_id,