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 4179AA0526; Tue, 21 Jul 2020 19:27:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 251BE1BFEF; Tue, 21 Jul 2020 19:27:59 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id D9698E07 for ; Tue, 21 Jul 2020 19:27:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595352477; 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=GdzDmq8YuX3QP+pKiRTTRHIn+s8DflEzEVATsOL/mx8=; b=c0FGkLbDc/D/R/ETRNTOOfbOiDNBErKDAxYa7rOypWz4Ph0vJgk0j2mRNB7Jzpdm1aMXoE oKvSahZyinCHX/F88Ol9ft/4IsIdZCBglO29lhATmCXDz7Aq2AZAV6LyaUDdOs87D7npw2 SUJ2npOshYayWBhOltsv03yAwbAbUAg= 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-334-UIIkMMz5MViF2j4U7s9Uew-1; Tue, 21 Jul 2020 13:27:53 -0400 X-MC-Unique: UIIkMMz5MViF2j4U7s9Uew-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46AE9800468; Tue, 21 Jul 2020 17:27:52 +0000 (UTC) Received: from [10.36.110.35] (unknown [10.36.110.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 011B42B4DB; Tue, 21 Jul 2020 17:27:47 +0000 (UTC) To: Matan Azrad Cc: dev@dpdk.org, Ferruh Yigit , chenbo.xia@intel.com, david.marchand@redhat.com, thomas@monjalon.net References: <1595175493-21497-1-git-send-email-matan@mellanox.com> <20200721163816.15057-1-matan@mellanox.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <556ff867-3a34-f81d-8acb-8630adaedf38@redhat.com> Date: Tue, 21 Jul 2020 19:27:45 +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: <20200721163816.15057-1-matan@mellanox.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] net/vhost: support queue update 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" Thanks Matan for the fix. On 7/21/20 6:38 PM, Matan Azrad wrote: > The commit below changed the readiness condition of vhost device to fix > multi-queues issues showed with QEMU versions. > > Now, the vhost device is ready when the first queue-pair is ready. > When more queues are being ready, the queue state callback will be > triggered to notify the vhost manager. > > In case of Rx interrupt configuration, the vhost driver set the > kickfd queue file descriptor in order to be notified on Rx traffic. > > So, when queue becomes ready, the kickfd may be changed and should be > updated in the Rx interrupt structure. > > Update kickfd when the queue state callback is invoked. > Also update event notification when it is enabled by the user. > > Fixes: d0fcc38f5fa4 ("vhost: improve device readiness notifications") > > Signed-off-by: Matan Azrad > --- > drivers/net/vhost/rte_eth_vhost.c | 49 +++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c > index 9fbf39f66b..bbf79b2c0e 100644 > --- a/drivers/net/vhost/rte_eth_vhost.c > +++ b/drivers/net/vhost/rte_eth_vhost.c > @@ -94,6 +94,7 @@ struct vhost_queue { > struct rte_mempool *mb_pool; > uint16_t port; > uint16_t virtqueue_id; > + bool intr_en; > struct vhost_stats stats; > }; > > @@ -546,6 +547,8 @@ eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid) > rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1); > rte_wmb(); > > + vq->intr_en = true; > + > return ret; > } > > @@ -571,6 +574,8 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) > rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0); > rte_wmb(); > > + vq->intr_en = false; > + > return 0; > } > > @@ -830,6 +835,45 @@ destroy_device(int vid) > _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); > } > > +static int > +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 vhost_queue *vq; > + int rx_idx = vring_id % 2 ? (vring_id - 1) >> 1 : -1; > + int ret = 0; > + > + /* > + * The vring kickfd may be changed after the new device notification. > + * Update it when the vring state is updated. > + */ > + if (rx_idx >= 0 && rx_idx < eth_dev->data->nb_rx_queues && > + rte_atomic32_read(&internal->dev_attached) && > + rte_atomic32_read(&internal->started) && > + dev_conf->intr_conf.rxq) { I am not sure we need to filter on rxq, we could just call rte_vhost_enable_guest_notification(). It would be disabled for tx queues, as it is done in the .new_device callback so harmless and this function would be simpler. But I think your code work, so we should get it in -rc2 to get proper testing: Reviewed-by: Maxime Coquelin Thanks, Maxime > + vq = eth_dev->data->rx_queues[rx_idx]; > + ret = rte_vhost_get_vhost_vring(vid, vring_id, &vring); > + if (!ret) { > + 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; > + } > + > + rte_vhost_enable_guest_notification(vid, vring_id, > + vq->intr_en); > + rte_wmb(); > + } > + } > + > + return ret; > +} > + > static int > vring_state_changed(int vid, uint16_t vring, int enable) > { > @@ -848,6 +892,11 @@ vring_state_changed(int vid, uint16_t vring, int enable) > eth_dev = list->eth_dev; > /* won't be NULL */ > state = vring_states[eth_dev->data->port_id]; > + > + if (enable && vring_conf_update(vid, eth_dev, vring)) > + VHOST_LOG(INFO, "Failed to update vring-%d configuration.\n", > + (int)vring); > + > rte_spinlock_lock(&state->lock); > if (state->cur[vring] == enable) { > rte_spinlock_unlock(&state->lock); >