From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C09CCA052B; Tue, 28 Jul 2020 18:51:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B14FD1C02E; Tue, 28 Jul 2020 18:50:53 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 50DD61C02E for ; Tue, 28 Jul 2020 18:50:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595955051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nc/4WtlNrymGlRML0x8zbSWGgcOoKSiDhon9MUaWof0=; b=Ej1BaaJPjXNialAViKfM4JdKAQNhezxiKGq1+rNXrdHJaYnCE+Cu4rEh9kVEZSYf7Zzdm2 5Y8DdVhHZ2lj4P26r6pxwHh8TjzJyjI+nGqE84VMYd2CSbJunIJcqtiCk2wEFwB87OEO7L 3lv/L3qy+6nrYpoC5YJeedsT2z3v0ys= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-225-UJSNgt1HOCuSFblLW9pEWA-1; Tue, 28 Jul 2020 12:50:42 -0400 X-MC-Unique: UJSNgt1HOCuSFblLW9pEWA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D22A802805; Tue, 28 Jul 2020 16:50:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80CEA5D9E8; Tue, 28 Jul 2020 16:50:38 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, matan@mellanox.com, chenbo.xia@intel.com, yong.liu@intel.com, yinan.wang@intel.com Cc: thomas@monjalon.net, ferruh.yigit@intel.com, david.marchand@redhat.com, Maxime Coquelin Date: Tue, 28 Jul 2020 18:50:21 +0200 Message-Id: <20200728165021.216291-4-maxime.coquelin@redhat.com> In-Reply-To: <20200728165021.216291-1-maxime.coquelin@redhat.com> References: <20200728165021.216291-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 3/3] net/vhost: fix interrupt mode 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" At .new_device() time, only the first vring pair is now ready, other vrings are consfigured later. Problem is that when application will setup and enable interrupts, only the first queue pair Rx interrupt will be enabled. This patches fixes the issue by setting the number of max interrupts to the number of Rx queues that will be later initialized. Then, as soon as a Rx vring is ready, it removes the corresponding uninitialized epoll event, and install a new one with the valid FD. Fixes: 604052ae5395 ("net/vhost: support queue update") Signed-off-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 39 ++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 951929c663..0f6a0bbbf7 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -593,7 +594,6 @@ eth_vhost_install_intr(struct rte_eth_dev *dev) { struct rte_vhost_vring vring; struct vhost_queue *vq; - int count = 0; int nb_rxq = dev->data->nb_rx_queues; int i; int ret; @@ -623,6 +623,8 @@ eth_vhost_install_intr(struct rte_eth_dev *dev) VHOST_LOG(INFO, "Prepare intr vec\n"); for (i = 0; i < nb_rxq; i++) { + dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i; + dev->intr_handle->efds[i] = -1; vq = dev->data->rx_queues[i]; if (!vq) { VHOST_LOG(INFO, "rxq-%d not setup yet, skip!\n", i); @@ -641,14 +643,12 @@ eth_vhost_install_intr(struct rte_eth_dev *dev) "rxq-%d's kickfd is invalid, skip!\n", i); continue; } - dev->intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + i; dev->intr_handle->efds[i] = vring.kickfd; - count++; VHOST_LOG(INFO, "Installed intr vec for rxq-%d\n", i); } - dev->intr_handle->nb_efd = count; - dev->intr_handle->max_intr = count + 1; + dev->intr_handle->nb_efd = nb_rxq; + dev->intr_handle->max_intr = nb_rxq + 1; dev->intr_handle->type = RTE_INTR_HANDLE_VDEV; return 0; @@ -836,8 +836,11 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf; struct pmd_internal *internal = eth_dev->data->dev_private; struct rte_vhost_vring vring; + struct rte_intr_handle *handle; + struct rte_epoll_event rev; int rx_idx = vring_id % 2 ? (vring_id - 1) >> 1 : -1; int ret = 0; + int epfd; /* * The vring kickfd may be changed after the new device notification. @@ -857,7 +860,31 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) if (vring.kickfd != eth_dev->intr_handle->efds[rx_idx]) { VHOST_LOG(INFO, "kickfd for rxq-%d was changed.\n", rx_idx); - eth_dev->intr_handle->efds[rx_idx] = vring.kickfd; + + /* + * First remove invalid epoll event, and then isntall + * the new one. May be solved with a proper API in the + * future. + */ + handle = eth_dev->intr_handle; + handle->efds[rx_idx] = vring.kickfd; + epfd = handle->elist[rx_idx].epfd; + rev = handle->elist[rx_idx]; + ret = rte_epoll_ctl(epfd, EPOLL_CTL_DEL, rev.fd, + &handle->elist[rx_idx]); + if (ret) { + VHOST_LOG(ERR, "Delete epoll event failed.\n"); + return ret; + } + + rev.fd = vring.kickfd; + handle->elist[rx_idx] = rev; + ret = rte_epoll_ctl(epfd, EPOLL_CTL_ADD, rev.fd, + &handle->elist[rx_idx]); + if (ret) { + VHOST_LOG(ERR, "Add epoll event failed.\n"); + return ret; + } } } -- 2.26.2