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 73730A0540; Sun, 19 Jul 2020 18:18:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB1A81C11E; Sun, 19 Jul 2020 18:18:26 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 920571C0DA for ; Sun, 19 Jul 2020 18:18:25 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@mellanox.com) with SMTP; 19 Jul 2020 19:18:20 +0300 Received: from pegasus25.mtr.labs.mlnx. (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 06JGIJCh003651; Sun, 19 Jul 2020 19:18:19 +0300 From: Matan Azrad To: Maxime Coquelin Cc: dev@dpdk.org, Ferruh Yigit , chenbo.xia@intel.com, david.marchand@redhat.com, thomas@monjalon.net Date: Sun, 19 Jul 2020 16:18:13 +0000 Message-Id: <1595175493-21497-1-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH v1] 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" 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. Fixes: d0fcc38f5fa4 ("vhost: improve device readiness notifications") Signed-off-by: Matan Azrad --- drivers/net/vhost/rte_eth_vhost.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 9fbf39f..805d75e 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -831,6 +831,39 @@ struct vhost_xstats_name_off { } 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; + 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) { + 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; + } + } + } + + return ret; +} + +static int vring_state_changed(int vid, uint16_t vring, int enable) { struct rte_vhost_vring_state *state; @@ -848,6 +881,11 @@ struct vhost_xstats_name_off { eth_dev = list->eth_dev; /* won't be NULL */ state = vring_states[eth_dev->data->port_id]; + + if (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); -- 1.8.3.1