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 7752CA052A; Fri, 24 Jul 2020 17:43:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 633851C02C; Fri, 24 Jul 2020 17:43:35 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id E01CAA3 for ; Fri, 24 Jul 2020 17:43:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595605413; 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:autocrypt:autocrypt; bh=5bBby9F68V+fvPEmLMd6ImZBxCG2h4cXDVhVls5SM1g=; b=IwtDI/wl4XW4rZEkQeEc+yT/4IL3EsrzvukgVsJ1ZWDHIP4TNXqCQrLtdjP64Jeff4zwW6 AD0fEEr07jeJzEvNY81LdxqV0698+Q9tWQdwiUWhpsi6w/bRDVifn4pMRPY0V3Nehr6ZR/ 4c2eTFm92pxNiZGyweB0bBRVrdaD5oo= 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-333-8KMrzQSrNMO0AFcN6-SRPw-1; Fri, 24 Jul 2020 11:43:25 -0400 X-MC-Unique: 8KMrzQSrNMO0AFcN6-SRPw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6F93189CEF1; Fri, 24 Jul 2020 15:43:23 +0000 (UTC) Received: from [10.36.110.21] (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A09B8183AB; Fri, 24 Jul 2020 15:43:18 +0000 (UTC) From: Maxime Coquelin To: "Wang, Yinan" , "dev@dpdk.org" , "matan@mellanox.com" , "Xia, Chenbo" , "Liu, Yong" Cc: "thomas@monjalon.net" , "Yigit, Ferruh" , "david.marchand@redhat.com" References: <20200723130854.322771-1-maxime.coquelin@redhat.com> <5a8329d8-4835-de6b-bce3-498b587c3cc9@redhat.com> Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: Date: Fri, 24 Jul 2020 17:43:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH 0/2] Fix vhost performance regression 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" On 7/24/20 10:54 AM, Maxime Coquelin wrote: > > > On 7/24/20 9:06 AM, Maxime Coquelin wrote: >> Hi Yinan, >> >> On 7/24/20 6:55 AM, Wang, Yinan wrote: >>> Hi Maxime, >>> >>> The performance drop issue can be fixed, thanks! >>> The multi-queues interrupt issue still exist w/ this patch set. >> >> Thanks for the test report, so that's only half good. >> I'm setting up the multi-queues interrupt test case to further debug it. > > I have now a reproducer, i.e. only interrupts are received on rxq0. > > (gdb) p *((struct internal_list *)internal_list)->eth_dev->intr_handle > $20 = { > { > vfio_dev_fd = 0, > uio_cfg_fd = 0 > }, > fd = 0, > type = RTE_INTR_HANDLE_VDEV, > max_intr = 2, > nb_efd = 1, > efd_counter_size = 8 '\b', > efds = {622, 621, 624, 626, 628, 630, 632, 634, 636, 638, 640, 642, > 692, 646, 701, 650, 0 }, > elist = {{ > status = 1, > fd = 622, > epfd = 645, > epdata = { > event = 2147483651, > data = 0x1, > cb_fun = 0x8af840 , > cb_arg = 0x7f4df0001580 > } > }, { > status = 0, > fd = 0, > epfd = 0, > epdata = { > event = 0, > data = 0x0, > cb_fun = 0x0, > cb_arg = 0x0 > } > } }, > intr_vec = 0x7f4df0007db0 > } > > In above dump, we can see the efds are well set via the fix provided by > Matan, but max_intr and nb_efd aren't so polling won't take them into > account. > > I'm working on a fix. So it is a bit more complex than I imagined. There are no DPDK API to update the FD in the epoll, so it seems we need to do it directly in the driver by removing the old one and adding the new one. I have cooked a patch that makes it work, but I would like to know if that would be acceptable for this release? We could imagine introducing new rte_epoll API to handle that properly in v20.11. Matan, could you review below patch and confirm whether it is safe? (The patch needs some style clean-up before being submitted). Thanks in advance, Maxime ================================================================== diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 14b7b59f67..f36ea4b24c 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. @@ -852,9 +855,17 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) return ret; if (vring.kickfd != eth_dev->intr_handle->efds[rx_idx]) { + handle = eth_dev->intr_handle; VHOST_LOG(INFO, "kickfd for rxq-%d was changed.\n", rx_idx); - eth_dev->intr_handle->efds[rx_idx] = vring.kickfd; + + handle->efds[rx_idx] = vring.kickfd; + epfd = handle->elist[rx_idx].epfd; + rev = handle->elist[rx_idx]; + rev.fd = vring.kickfd; + rte_epoll_ctl(epfd, EPOLL_CTL_DEL, handle->elist[rx_idx].fd, &handle->elist[rx_idx]); + handle->elist[rx_idx] = rev; + rte_epoll_ctl(epfd, EPOLL_CTL_ADD, rev.fd, &handle->elist[rx_idx]); } } > Regards, > Maxime > >> Regards, >> Maxime >> >>> BR, >>> Yinan >>> >>>> -----Original Message----- >>>> From: Maxime Coquelin >>>> Sent: 2020?7?23? 21:09 >>>> To: dev@dpdk.org; matan@mellanox.com; Xia, Chenbo >>>> ; Liu, Yong ; Wang, Yinan >>>> >>>> Cc: thomas@monjalon.net; Yigit, Ferruh ; >>>> david.marchand@redhat.com; Maxime Coquelin >>>> >>>> Subject: [PATCH 0/2] Fix vhost performance regression >>>> >>>> Hi, >>>> >>>> This series aims at fixing the performance degradation reported >>>> by Intel QE. I managed to reproduce the issue, and this series >>>> fixes it. >>>> >>>> I only tested the first test case provided in the Bz[0], but wanted >>>> to send early for Intel QE to try and confirm it solves the issue. >>>> >>>> I will work on reproducing the other test cases, and see if this >>>> also fixes them. >>>> >>>> Thanks to Intel QE team for finding this issue. >>>> Maxime >>>> >>>> [0]: https://bugs.dpdk.org/show_bug.cgi?id=507#c0 >>>> >>>> Maxime Coquelin (2): >>>> vhost: fix guest notification setting >>>> net/vhost: fix queue update >>>> >>>> drivers/net/vhost/rte_eth_vhost.c | 25 ++++++------------------- >>>> lib/librte_vhost/vhost.c | 24 ++++++++++++++++++++---- >>>> lib/librte_vhost/vhost.h | 5 +++++ >>>> lib/librte_vhost/vhost_user.c | 11 ++++++++--- >>>> 4 files changed, 39 insertions(+), 26 deletions(-) >>>> >>>> -- >>>> 2.26.2 >>> >> >