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 0B60EA052A; Mon, 3 Aug 2020 11:50:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B1822BE1; Mon, 3 Aug 2020 11:50:51 +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 696BA2BD8 for ; Mon, 3 Aug 2020 11:50:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596448248; 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=8orAYaNhdMAO2mweJmlzTE7QrbyG4I4P8Fzr2Wzllfo=; b=Xl1ix2MDt/4b2QOqQiR1JF99DnJZ0aTcerUqPD/fZ2Y98nCX63vxlBTEWlp2JmanHQJmKk /xQkEUwS6EnaTrwp7Z9LL0aFP/XPCziKsvj2bQM4bfnryxtp7bQtwneBUoh+BNwTn1sRjz y4dLlNoCq0L4VC8MFP/I5hadjX5mSmc= 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-504-4VkI04H0MGSeidtNap9Uxg-1; Mon, 03 Aug 2020 05:50:47 -0400 X-MC-Unique: 4VkI04H0MGSeidtNap9Uxg-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 F207E8005B0; Mon, 3 Aug 2020 09:50:45 +0000 (UTC) Received: from [10.36.110.16] (unknown [10.36.110.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F3DAD5D9F7; Mon, 3 Aug 2020 09:50:43 +0000 (UTC) To: Xueming Li Cc: dev@dpdk.org, Asaf@dpdk.org, "Penso <1596360111-5088-1-git-send-email-xuemingl@mellanox.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: Date: Mon, 3 Aug 2020 11:50:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <1596360111-5088-1-git-send-email-xuemingl@mellanox.com> Content-Language: en-US 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=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [v2] vdpa/mlx5: fix queue update synchronization 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 8/2/20 11:21 AM, Xueming Li wrote: > The driver CQ event management is done by non vhost library thread, > either the dpdk host thread or the internal vDPA driver thread. > > When a queue is updated the CQ may be destroyed and created by the vhost > library thread via the queue state operation. > > When the queue update feature was added, it didn't synchronize the CQ > management to the queue update what may cause invalid memory access. > > Add the aforementioned synchronization by a new per device configuration > mutex. > > Fixes: c47d6e83334e ("vdpa/mlx5: support queue update") > > Signed-off-by: Xueming Li > Acked-by: Matan Azrad > --- > drivers/vdpa/mlx5/mlx5_vdpa.c | 8 +++++++- > drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + > drivers/vdpa/mlx5/mlx5_vdpa_event.c | 8 ++++++++ > 3 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c > index c0b87bcc01..a8f3e4b1de 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c > @@ -133,6 +133,7 @@ mlx5_vdpa_set_vring_state(int vid, int vring, int state) > struct rte_vdpa_device *vdev = rte_vhost_get_vdpa_device(vid); > struct mlx5_vdpa_priv *priv = > mlx5_vdpa_find_priv_resource_by_vdev(vdev); > + int ret; > > if (priv == NULL) { > DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name); > @@ -142,7 +143,10 @@ mlx5_vdpa_set_vring_state(int vid, int vring, int state) > DRV_LOG(ERR, "Too big vring id: %d.", vring); > return -E2BIG; > } > - return mlx5_vdpa_virtq_enable(priv, vring, state); > + pthread_mutex_lock(&priv->vq_config_lock); > + ret = mlx5_vdpa_virtq_enable(priv, vring, state); > + pthread_mutex_unlock(&priv->vq_config_lock); > + return ret; > } > > static int > @@ -742,6 +746,7 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, > } > mlx5_vdpa_config_get(pci_dev->device.devargs, priv); > SLIST_INIT(&priv->mr_list); > + pthread_mutex_init(&priv->vq_config_lock, NULL); > pthread_mutex_lock(&priv_list_lock); > TAILQ_INSERT_TAIL(&priv_list, priv, next); > pthread_mutex_unlock(&priv_list_lock); > @@ -793,6 +798,7 @@ mlx5_vdpa_pci_remove(struct rte_pci_device *pci_dev) > priv->var = NULL; > } > mlx5_glue->close_device(priv->ctx); > + pthread_mutex_destroy(&priv->vq_config_lock); > rte_free(priv); > } > return 0; > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h > index 57044d9d33..462805a352 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa.h > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h > @@ -120,6 +120,7 @@ enum { > struct mlx5_vdpa_priv { > TAILQ_ENTRY(mlx5_vdpa_priv) next; > uint8_t configured; > + pthread_mutex_t vq_config_lock; > uint64_t last_traffic_tic; > pthread_t timer_tid; > pthread_mutex_t timer_lock; > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_event.c b/drivers/vdpa/mlx5/mlx5_vdpa_event.c > index 7dc1ac0fa9..4a8b7b0bd9 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa_event.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa_event.c > @@ -274,6 +274,7 @@ mlx5_vdpa_poll_handle(void *arg) > priv->event_us; > while (1) { > max = 0; > + pthread_mutex_lock(&priv->vq_config_lock); > for (i = 0; i < priv->nr_virtqs; i++) { > cq = &priv->virtqs[i].eqp.cq; > if (cq->cq && !cq->armed) { > @@ -298,6 +299,7 @@ mlx5_vdpa_poll_handle(void *arg) > priv->vdev->device->name); > mlx5_vdpa_arm_all_cqs(priv); > pthread_mutex_lock(&priv->timer_lock); > + pthread_mutex_unlock(&priv->vq_config_lock); Is it mandatory to hold timer_lock before releasing vq_config_lock? If not, swapping would be maybe safer. > priv->timer_on = 0; > while (!priv->timer_on) > pthread_cond_wait(&priv->timer_cond, > @@ -312,6 +314,7 @@ mlx5_vdpa_poll_handle(void *arg) > } else { > priv->last_traffic_tic = current_tic; > } > + pthread_mutex_unlock(&priv->vq_config_lock); > mlx5_vdpa_timer_sleep(priv, max); > } > return NULL; > @@ -327,6 +330,7 @@ mlx5_vdpa_interrupt_handler(void *cb_arg) > uint8_t buf[sizeof(struct mlx5dv_devx_async_event_hdr) + 128]; > } out; > > + pthread_mutex_lock(&priv->vq_config_lock); > while (mlx5_glue->devx_get_event(priv->eventc, &out.event_resp, > sizeof(out.buf)) >= > (ssize_t)sizeof(out.event_resp.cookie)) { > @@ -337,12 +341,15 @@ mlx5_vdpa_interrupt_handler(void *cb_arg) > struct mlx5_vdpa_virtq *virtq = container_of(eqp, > struct mlx5_vdpa_virtq, eqp); > > + if (!virtq->enable) > + continue; > mlx5_vdpa_cq_poll(cq); > /* Notify guest for descs consuming. */ > if (cq->callfd != -1) > eventfd_write(cq->callfd, (eventfd_t)1); > if (priv->event_mode == MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT) { > mlx5_vdpa_cq_arm(priv, cq); > + pthread_mutex_unlock(&priv->vq_config_lock); > return; > } > /* Don't arm again - timer will take control. */ > @@ -363,6 +370,7 @@ mlx5_vdpa_interrupt_handler(void *cb_arg) > pthread_cond_signal(&priv->timer_cond); > } > pthread_mutex_unlock(&priv->timer_lock); > + pthread_mutex_unlock(&priv->vq_config_lock); > } > > int >