diff mbox series

[v1,13/21] net/virtio-user: simplify queues setup

Message ID	20221130155639.150553-14-maxime.coquelin@redhat.com (mailing list archive)
State	Superseded, archived
Delegated to:	Maxime Coquelin
Headers	From: Maxime Coquelin <maxime.coquelin@redhat.com> To: dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com, eperezma@redhat.com Cc: Maxime Coquelin <maxime.coquelin@redhat.com> Subject: [PATCH v1 13/21] net/virtio-user: simplify queues setup Date: Wed, 30 Nov 2022 16:56:31 +0100 Message-Id: <20221130155639.150553-14-maxime.coquelin@redhat.com> In-Reply-To: <20221130155639.150553-1-maxime.coquelin@redhat.com> References: <20221130155639.150553-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Add control queue & MQ support to Virtio-user vDPA \| [v1,00/21] Add control queue & MQ support to Virtio-user vDPA [v1,01/21] net/virtio: move CVQ code into a dedicated file [v1,02/21] net/virtio: introduce notify callback for control queue [v1,03/21] net/virtio: virtqueue headers alloc refactoring [v1,04/21] net/virtio: remove port ID info from Rx queue [v1,05/21] net/virtio: remove unused fields in Tx queue struct [v1,06/21] net/virtio: remove unused queue ID field in Rx queue [v1,07/21] net/virtio: remove unused Port ID in control queue [v1,08/21] net/virtio: move vring memzone to virtqueue struct [v1,09/21] net/virtio: refactor indirect desc headers init [v1,10/21] net/virtio: alloc Rx SW ring only if vectorized path [v1,11/21] net/virtio: extract virtqueue init from virtio queue init [v1,12/21] net/virtio-user: fix device starting failure handling [v1,13/21] net/virtio-user: simplify queues setup [v1,14/21] net/virtio-user: use proper type for number of queue pairs [v1,15/21] net/virtio-user: get max number of queue pairs from device [v1,16/21] net/virtio-user: allocate shadow control queue [v1,17/21] net/virtio-user: send shadow virtqueue info to the backend [v1,18/21] net/virtio-user: add new callback to enable control queue [v1,19/21] net/virtio-user: forward control messages to shadow queue [v1,20/21] net/virtio-user: advertize control VQ support with vDPA [v1,21/21] net/virtio-user: remove max queues limitation

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Maxime Coquelin Nov. 30, 2022, 3:56 p.m. UTC

  The only reason two loops were needed to iterate over
queues at setup time was to be able to print whether it
was a Tx or Rx queue.

This patch changes queues iteration to a single loop.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Comments

Chenbo Xia Jan. 31, 2023, 5:21 a.m. UTC | #1

> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Wednesday, November 30, 2022 11:57 PM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>;
> david.marchand@redhat.com; eperezma@redhat.com
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH v1 13/21] net/virtio-user: simplify queues setup
> 
> The only reason two loops were needed to iterate over
> queues at setup time was to be able to print whether it
> was a Tx or Rx queue.
> 
> This patch changes queues iteration to a single loop.
> 
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  drivers/net/virtio/virtio_user/virtio_user_dev.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 19599aa3f6..873c6aa036 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -118,19 +118,11 @@ static int
>  virtio_user_queue_setup(struct virtio_user_dev *dev,
>  			int (*fn)(struct virtio_user_dev *, uint32_t))
>  {
> -	uint32_t i, queue_sel;
> +	uint32_t i;
> 
> -	for (i = 0; i < dev->max_queue_pairs; ++i) {
> -		queue_sel = 2 * i + VTNET_SQ_RQ_QUEUE_IDX;
> -		if (fn(dev, queue_sel) < 0) {
> -			PMD_DRV_LOG(ERR, "(%s) setup rx vq %u failed", dev->path,
> i);
> -			return -1;
> -		}
> -	}
> -	for (i = 0; i < dev->max_queue_pairs; ++i) {
> -		queue_sel = 2 * i + VTNET_SQ_TQ_QUEUE_IDX;
> -		if (fn(dev, queue_sel) < 0) {
> -			PMD_DRV_LOG(INFO, "(%s) setup tx vq %u failed", dev-
> >path, i);
> +	for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
> +		if (fn(dev, i) < 0) {
> +			PMD_DRV_LOG(ERR, "(%s) setup VQ %u failed", dev->path,
> i);
>  			return -1;
>  		}
>  	}
> --
> 2.38.1

Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 19599aa3f6..873c6aa036 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -118,19 +118,11 @@  static int
 virtio_user_queue_setup(struct virtio_user_dev *dev,
 			int (*fn)(struct virtio_user_dev *, uint32_t))
 {
-	uint32_t i, queue_sel;
+	uint32_t i;
 
-	for (i = 0; i < dev->max_queue_pairs; ++i) {
-		queue_sel = 2 * i + VTNET_SQ_RQ_QUEUE_IDX;
-		if (fn(dev, queue_sel) < 0) {
-			PMD_DRV_LOG(ERR, "(%s) setup rx vq %u failed", dev->path, i);
-			return -1;
-		}
-	}
-	for (i = 0; i < dev->max_queue_pairs; ++i) {
-		queue_sel = 2 * i + VTNET_SQ_TQ_QUEUE_IDX;
-		if (fn(dev, queue_sel) < 0) {
-			PMD_DRV_LOG(INFO, "(%s) setup tx vq %u failed", dev->path, i);
+	for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
+		if (fn(dev, i) < 0) {
+			PMD_DRV_LOG(ERR, "(%s) setup VQ %u failed", dev->path, i);
 			return -1;
 		}
 	}