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 7C562A0597; Thu, 9 Apr 2020 17:18:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DDAE01C2F9; Thu, 9 Apr 2020 17:18:21 +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 D3D7C1C2F7 for ; Thu, 9 Apr 2020 17:18:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586445499; 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=p0xaCaCZSM3oJXCUlLnCMK0KfORi7U42EDOR1AtLAj0=; b=QnngMW/dzrK9Zjk+l3mggAQntaw/9o4NeQZKg4UqVzsWRqEVp+yE2WzTPauttZdJcF/tkO ITAapcsJEmpSovP76uTo92KHtitthGgIlDWv0mPBMxuURU17S3CCxEv5mkiz+W/rd9dyw1 t9l6cJbxmIo9sKdXtI0VkD5P5fSSIxw= 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-437-keC-SL0LNYaXtGsTnQoPEA-1; Thu, 09 Apr 2020 11:18:15 -0400 X-MC-Unique: keC-SL0LNYaXtGsTnQoPEA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 48DE78018A5; Thu, 9 Apr 2020 15:18:14 +0000 (UTC) Received: from [10.36.110.61] (unknown [10.36.110.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B33715C1C5; Thu, 9 Apr 2020 15:18:12 +0000 (UTC) To: Matan Azrad , dev@dpdk.org Cc: Viacheslav Ovsiienko , Shahaf Shuler References: <1585653143-21987-1-git-send-email-matan@mellanox.com> <1585653143-21987-2-git-send-email-matan@mellanox.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <87dd22ef-1de3-6da3-c16d-906ba17e640a@redhat.com> Date: Thu, 9 Apr 2020 17:18:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <1585653143-21987-2-git-send-email-matan@mellanox.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 1/3] vdpa/mlx5: manage virtqs by array 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 3/31/20 1:12 PM, Matan Azrad wrote: > As a preparation to listen the virtqs status before the device is > configured, manage the virtqs structures in array instead of list. > > Signed-off-by: Matan Azrad > Acked-by: Viacheslav Ovsiienko > --- > drivers/vdpa/mlx5/mlx5_vdpa.c | 43 ++++++++++++++++------------------ > drivers/vdpa/mlx5/mlx5_vdpa.h | 2 +- > drivers/vdpa/mlx5/mlx5_vdpa_lm.c | 43 ++++++++++++++++------------------ > drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 18 +++++++-------- > drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 46 +++++++++++++++---------------------- > 5 files changed, 68 insertions(+), 84 deletions(-) > > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c > index f10647b..b22f074 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c > @@ -116,20 +116,18 @@ > { > int did = rte_vhost_get_vdpa_device_id(vid); > struct mlx5_vdpa_priv *priv = mlx5_vdpa_find_priv_resource_by_did(did); > - struct mlx5_vdpa_virtq *virtq = NULL; > > if (priv == NULL) { > DRV_LOG(ERR, "Invalid device id: %d.", did); > return -EINVAL; > } > - SLIST_FOREACH(virtq, &priv->virtq_list, next) > - if (virtq->index == vring) > - break; > - if (!virtq) { > + if (!priv->configured || vring >= RTE_MIN((int)priv->nr_virtqs, > + (int)priv->caps.max_num_virtio_queues * 2) || > + !priv->virtqs[vring].virtq) { > DRV_LOG(ERR, "Invalid or unconfigured vring id: %d.", vring); > return -EINVAL; > } > - return mlx5_vdpa_virtq_enable(virtq, state); > + return mlx5_vdpa_virtq_enable(&priv->virtqs[vring], state); > } > > static int > @@ -482,28 +480,28 @@ > rte_errno = ENODEV; > return -rte_errno; > } > - priv = rte_zmalloc("mlx5 vDPA device private", sizeof(*priv), > - RTE_CACHE_LINE_SIZE); > - if (!priv) { > - DRV_LOG(ERR, "Failed to allocate private memory."); > - rte_errno = ENOMEM; > - goto error; > - } > ret = mlx5_devx_cmd_query_hca_attr(ctx, &attr); > if (ret) { > DRV_LOG(ERR, "Unable to read HCA capabilities."); > rte_errno = ENOTSUP; > goto error; > - } else { > - if (!attr.vdpa.valid || !attr.vdpa.max_num_virtio_queues) { > - DRV_LOG(ERR, "Not enough capabilities to support vdpa," > - " maybe old FW/OFED version?"); > - rte_errno = ENOTSUP; > - goto error; > - } > - priv->caps = attr.vdpa; > - priv->log_max_rqt_size = attr.log_max_rqt_size; > + } else if (!attr.vdpa.valid || !attr.vdpa.max_num_virtio_queues) { > + DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe " > + "old FW/OFED version?"); > + rte_errno = ENOTSUP; > + goto error; > + } > + priv = rte_zmalloc("mlx5 vDPA device private", sizeof(*priv) + > + sizeof(struct mlx5_vdpa_virtq) * > + attr.vdpa.max_num_virtio_queues * 2, > + RTE_CACHE_LINE_SIZE); > + if (!priv) { > + DRV_LOG(ERR, "Failed to allocate private memory."); > + rte_errno = ENOMEM; > + goto error; > } > + priv->caps = attr.vdpa; > + priv->log_max_rqt_size = attr.log_max_rqt_size; > priv->ctx = ctx; > priv->dev_addr.pci_addr = pci_dev->addr; > priv->dev_addr.type = PCI_ADDR; > @@ -519,7 +517,6 @@ > goto error; > } > SLIST_INIT(&priv->mr_list); > - SLIST_INIT(&priv->virtq_list); > pthread_mutex_lock(&priv_list_lock); > TAILQ_INSERT_TAIL(&priv_list, priv, next); > pthread_mutex_unlock(&priv_list_lock); > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h > index 75af410..baec106 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa.h > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h > @@ -120,11 +120,11 @@ struct mlx5_vdpa_priv { > uint16_t nr_virtqs; > uint64_t features; /* Negotiated features. */ > uint16_t log_max_rqt_size; > - SLIST_HEAD(virtq_list, mlx5_vdpa_virtq) virtq_list; > struct mlx5_vdpa_steer steer; > struct mlx5dv_var *var; > void *virtq_db_addr; > SLIST_HEAD(mr_list, mlx5_vdpa_query_mr) mr_list; > + struct mlx5_vdpa_virtq virtqs[]; > }; > > /** > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c > index 4457760..77f2eda 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c > @@ -15,13 +15,12 @@ > .type = MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_DUMP_ENABLE, > .dirty_bitmap_dump_enable = enable, > }; > - struct mlx5_vdpa_virtq *virtq; > + int i; > > - SLIST_FOREACH(virtq, &priv->virtq_list, next) { > - attr.queue_index = virtq->index; > - if (mlx5_devx_cmd_modify_virtq(virtq->virtq, &attr)) { > - DRV_LOG(ERR, "Failed to modify virtq %d logging.", > - virtq->index); > + for (i = 0; i < priv->nr_virtqs; ++i) { > + attr.queue_index = i; > + if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) { > + DRV_LOG(ERR, "Failed to modify virtq %d logging.", i); > return -1; > } > } > @@ -47,7 +46,7 @@ > .dirty_bitmap_size = log_size, > }; > struct mlx5_vdpa_query_mr *mr = rte_malloc(__func__, sizeof(*mr), 0); > - struct mlx5_vdpa_virtq *virtq; > + int i; > > if (!mr) { > DRV_LOG(ERR, "Failed to allocate mem for lm mr."); > @@ -67,11 +66,10 @@ > goto err; > } > attr.dirty_bitmap_mkey = mr->mkey->id; > - SLIST_FOREACH(virtq, &priv->virtq_list, next) { > - attr.queue_index = virtq->index; > - if (mlx5_devx_cmd_modify_virtq(virtq->virtq, &attr)) { > - DRV_LOG(ERR, "Failed to modify virtq %d for lm.", > - virtq->index); > + for (i = 0; i < priv->nr_virtqs; ++i) { > + attr.queue_index = i; > + if (mlx5_devx_cmd_modify_virtq(priv->virtqs[i].virtq, &attr)) { > + DRV_LOG(ERR, "Failed to modify virtq %d for lm.", i); > goto err; > } > } > @@ -94,9 +92,9 @@ > mlx5_vdpa_lm_log(struct mlx5_vdpa_priv *priv) > { > struct mlx5_devx_virtq_attr attr = {0}; > - struct mlx5_vdpa_virtq *virtq; > uint64_t features; > int ret = rte_vhost_get_negotiated_features(priv->vid, &features); > + int i; > > if (ret) { > DRV_LOG(ERR, "Failed to get negotiated features."); > @@ -104,27 +102,26 @@ > } > if (!RTE_VHOST_NEED_LOG(features)) > return 0; > - SLIST_FOREACH(virtq, &priv->virtq_list, next) { > - ret = mlx5_vdpa_virtq_modify(virtq, 0); > + for (i = 0; i < priv->nr_virtqs; ++i) { > + ret = mlx5_vdpa_virtq_modify(&priv->virtqs[i], 0); > if (ret) > return -1; > - if (mlx5_devx_cmd_query_virtq(virtq->virtq, &attr)) { > - DRV_LOG(ERR, "Failed to query virtq %d.", virtq->index); > + if (mlx5_devx_cmd_query_virtq(priv->virtqs[i].virtq, &attr)) { > + DRV_LOG(ERR, "Failed to query virtq %d.", i); > return -1; > } > DRV_LOG(INFO, "Query vid %d vring %d: hw_available_idx=%d, " > - "hw_used_index=%d", priv->vid, virtq->index, > + "hw_used_index=%d", priv->vid, i, > attr.hw_available_index, attr.hw_used_index); > - ret = rte_vhost_set_vring_base(priv->vid, virtq->index, > + ret = rte_vhost_set_vring_base(priv->vid, i, > attr.hw_available_index, > attr.hw_used_index); > if (ret) { > - DRV_LOG(ERR, "Failed to set virtq %d base.", > - virtq->index); > + DRV_LOG(ERR, "Failed to set virtq %d base.", i); > return -1; > } > - rte_vhost_log_used_vring(priv->vid, virtq->index, 0, > - MLX5_VDPA_USED_RING_LEN(virtq->vq_size)); > + rte_vhost_log_used_vring(priv->vid, i, 0, > + MLX5_VDPA_USED_RING_LEN(priv->virtqs[i].vq_size)); > } > return 0; > } > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > index 9c11452..96ffc21 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c > @@ -76,13 +76,13 @@ > static int > mlx5_vdpa_rqt_prepare(struct mlx5_vdpa_priv *priv) > { > - struct mlx5_vdpa_virtq *virtq; > + int i; > uint32_t rqt_n = RTE_MIN(MLX5_VDPA_DEFAULT_RQT_SIZE, > 1 << priv->log_max_rqt_size); > struct mlx5_devx_rqt_attr *attr = rte_zmalloc(__func__, sizeof(*attr) > + rqt_n * > sizeof(uint32_t), 0); > - uint32_t i = 0, j; > + uint32_t k = 0, j; > int ret = 0; > > if (!attr) { > @@ -90,15 +90,15 @@ > rte_errno = ENOMEM; > return -ENOMEM; > } > - SLIST_FOREACH(virtq, &priv->virtq_list, next) { > - if (is_virtq_recvq(virtq->index, priv->nr_virtqs) && > - virtq->enable) { > - attr->rq_list[i] = virtq->virtq->id; > - i++; > + for (i = 0; i < priv->nr_virtqs; i++) { > + if (is_virtq_recvq(i, priv->nr_virtqs) && > + priv->virtqs[i].enable) { > + attr->rq_list[k] = priv->virtqs[i].virtq->id; > + k++; > } > } > - for (j = 0; i != rqt_n; ++i, ++j) > - attr->rq_list[i] = attr->rq_list[j]; > + for (j = 0; k != rqt_n; ++k, ++j) > + attr->rq_list[k] = attr->rq_list[j]; > attr->rq_type = MLX5_INLINE_Q_TYPE_VIRTQ; > attr->rqt_max_size = rqt_n; > attr->rqt_actual_size = rqt_n; > diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c > index 8bebb92..3575272 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c > @@ -59,12 +59,9 @@ > usleep(MLX5_VDPA_INTR_RETRIES_USEC); > } > } > - virtq->intr_handle.fd = -1; > } > - if (virtq->virtq) { > + if (virtq->virtq) > claim_zero(mlx5_devx_cmd_destroy(virtq->virtq)); > - virtq->virtq = NULL; > - } > for (i = 0; i < RTE_DIM(virtq->umems); ++i) { > if (virtq->umems[i].obj) > claim_zero(mlx5_glue->devx_umem_dereg > @@ -72,27 +69,20 @@ > if (virtq->umems[i].buf) > rte_free(virtq->umems[i].buf); > } > - memset(&virtq->umems, 0, sizeof(virtq->umems)); > if (virtq->eqp.fw_qp) > mlx5_vdpa_event_qp_destroy(&virtq->eqp); > + memset(virtq, 0, sizeof(*virtq)); > + virtq->intr_handle.fd = -1; > return 0; > } > > void > mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) > { > - struct mlx5_vdpa_virtq *entry; > - struct mlx5_vdpa_virtq *next; > + int i; > > - entry = SLIST_FIRST(&priv->virtq_list); > - while (entry) { > - next = SLIST_NEXT(entry, next); > - mlx5_vdpa_virtq_unset(entry); > - SLIST_REMOVE(&priv->virtq_list, entry, mlx5_vdpa_virtq, next); > - rte_free(entry); > - entry = next; > - } > - SLIST_INIT(&priv->virtq_list); > + for (i = 0; i < priv->nr_virtqs; i++) > + mlx5_vdpa_virtq_unset(&priv->virtqs[i]); > if (priv->tis) { > claim_zero(mlx5_devx_cmd_destroy(priv->tis)); > priv->tis = NULL; > @@ -106,6 +96,7 @@ > priv->virtq_db_addr = NULL; > } > priv->features = 0; > + priv->nr_virtqs = 0; > } > > int > @@ -140,9 +131,9 @@ > } > > static int > -mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, > - struct mlx5_vdpa_virtq *virtq, int index) > +mlx5_vdpa_virtq_setup(struct mlx5_vdpa_priv *priv, int index) > { > + struct mlx5_vdpa_virtq *virtq = &priv->virtqs[index]; > struct rte_vhost_vring vq; > struct mlx5_devx_virtq_attr attr = {0}; > uint64_t gpa; > @@ -340,7 +331,6 @@ > mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv) > { > struct mlx5_devx_tis_attr tis_attr = {0}; > - struct mlx5_vdpa_virtq *virtq; > uint32_t i; > uint16_t nr_vring = rte_vhost_get_vring_num(priv->vid); > int ret = rte_vhost_get_negotiated_features(priv->vid, &priv->features); > @@ -349,6 +339,12 @@ > DRV_LOG(ERR, "Failed to configure negotiated features."); > return -1; > } > + if (nr_vring > priv->caps.max_num_virtio_queues * 2) { > + DRV_LOG(ERR, "Do not support more than %d virtqs(%d).", > + (int)priv->caps.max_num_virtio_queues * 2, > + (int)nr_vring); > + return -E2BIG; All returns in thid function are either -1 or 0 except this one, so it looks inconsistent. > + } > /* Always map the entire page. */ > priv->virtq_db_addr = mmap(NULL, priv->var->length, PROT_READ | > PROT_WRITE, MAP_SHARED, priv->ctx->cmd_fd, > @@ -372,16 +368,10 @@ > DRV_LOG(ERR, "Failed to create TIS."); > goto error; > } > - for (i = 0; i < nr_vring; i++) { > - virtq = rte_zmalloc(__func__, sizeof(*virtq), 0); > - if (!virtq || mlx5_vdpa_virtq_setup(priv, virtq, i)) { > - if (virtq) > - rte_free(virtq); > - goto error; > - } > - SLIST_INSERT_HEAD(&priv->virtq_list, virtq, next); > - } > priv->nr_virtqs = nr_vring; > + for (i = 0; i < nr_vring; i++) > + if (mlx5_vdpa_virtq_setup(priv, i)) > + goto error; > return 0; > error: > mlx5_vdpa_virtqs_release(priv); >