From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A320141C32; Tue, 7 Feb 2023 19:31:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3736D4021F; Tue, 7 Feb 2023 19:31:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id EE43B40151 for ; Tue, 7 Feb 2023 19:30:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675794659; 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; bh=dS7gO5IoVMrkcL3F7nvVDKTChLCVWlCGPcEO5g5LPPo=; b=Np4By1I2D/A3sH0EzHUjtDr8A65ZlpYPM/Ce79srl4gtC3e7+Om7scqEKkRJsULu+Yri6R wgjf07o5FPVMOS0Q/2SJ9DJLC2M4dFkslpPLHgqT5KYvrUc2cQ/qMAQGzTQeaKdKIGqWo3 MNItZtFiLrSPPzBGQJVR4xlEGps+RzA= Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-150-tFxNl1FDMYqtIRIKREusQw-1; Tue, 07 Feb 2023 13:30:58 -0500 X-MC-Unique: tFxNl1FDMYqtIRIKREusQw-1 Received: by mail-yb1-f198.google.com with SMTP id 200-20020a2505d1000000b0088347752c5fso8662341ybf.18 for ; Tue, 07 Feb 2023 10:30:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dS7gO5IoVMrkcL3F7nvVDKTChLCVWlCGPcEO5g5LPPo=; b=S9gDUnaEY/mRTIJ/8u7C+eMxux95qlHiaVF5AFXqXesk0pmP1KHp1PfOBv//bL6d7N KneI+lgkJNS2IJyDk9EfkBZPoW1kqx+6nJjsIErDrlCsrtEbg1jPX1VWHdYXmTG3uJnJ 9TGkEVHPFUeKJfwhjg27/JeuJ+64gWc5VoF169ERprHcE9GnNmzIboUArYylt68ryKWl 3KtAlRDDCDs90GRmocqgUBtgDOLnYE2t+kbI9NYSCIgSQQ+5w1Rz7Fn60pms95IfrrjF vk2PIRoRhr9jY3Eu9KkXn5MGK4NdqkhWuxg0wxEaW410TGtXEo2fl5KNEd6An6DCTzn2 Q31Q== X-Gm-Message-State: AO0yUKWXLkZ0WpzjhOFLYpdwZ+HJmvIwLcwljDPtgGjl+PmtZmzkSa5D J8pPZ5FPy7fUS4j1V9Oj6FJjdZxWMa5+0hCX+C/b/bUJpgGCjwhZSqY/V6XG7MMCk5qCaJoDXz2 53w2mz0bhFHjEPVfLjig= X-Received: by 2002:a25:c712:0:b0:85a:abeb:786 with SMTP id w18-20020a25c712000000b0085aabeb0786mr373835ybe.583.1675794657736; Tue, 07 Feb 2023 10:30:57 -0800 (PST) X-Google-Smtp-Source: AK7set+emWde4rl5w2TkIQHliCWcrgwadiSX9RKrz25ZWGz8MOZmUOwuhVQgIFzcnHnQS1RKaIPNAg9upNu4Y8L2OlU= X-Received: by 2002:a25:c712:0:b0:85a:abeb:786 with SMTP id w18-20020a25c712000000b0085aabeb0786mr373831ybe.583.1675794657494; Tue, 07 Feb 2023 10:30:57 -0800 (PST) MIME-Version: 1.0 References: <20230207151747.245808-1-maxime.coquelin@redhat.com> <20230207151747.245808-20-maxime.coquelin@redhat.com> In-Reply-To: <20230207151747.245808-20-maxime.coquelin@redhat.com> From: Eugenio Perez Martin Date: Tue, 7 Feb 2023 19:30:21 +0100 Message-ID: Subject: Re: [PATCH v2 19/21] net/virtio-user: forward control messages to shadow queue To: Maxime Coquelin Cc: dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com, stephen@networkplumber.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Tue, Feb 7, 2023 at 4:18 PM Maxime Coquelin wrote: > > This patch implements control messages forwarding from the > regular control queue to the shadow control queue. > > Signed-off-by: Maxime Coquelin Acked-by: Eugenio P=C3=A9rez > --- > .../net/virtio/virtio_user/virtio_user_dev.c | 35 +++++++++++++++---- > .../net/virtio/virtio_user/virtio_user_dev.h | 3 -- > drivers/net/virtio/virtio_user_ethdev.c | 6 ++-- > 3 files changed, 31 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/n= et/virtio/virtio_user/virtio_user_dev.c > index b0d603ee12..04d780189e 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c > @@ -750,7 +750,7 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev) > dev->ops->destroy(dev); > } > > -uint8_t > +static uint8_t > virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs) > { > uint16_t i; > @@ -775,14 +775,17 @@ virtio_user_handle_mq(struct virtio_user_dev *dev, = uint16_t q_pairs) > return ret; > } > > +#define CVQ_MAX_DATA_DESCS 32 > + > static uint32_t > -virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *v= ring, > +virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vr= ing *vring, > uint16_t idx_hdr) > { > struct virtio_net_ctrl_hdr *hdr; > virtio_net_ctrl_ack status =3D ~0; > uint16_t i, idx_data, idx_status; > uint32_t n_descs =3D 0; > + int dlen[CVQ_MAX_DATA_DESCS], nb_dlen =3D 0; > > /* locate desc for header, data, and status */ > idx_data =3D vring->desc[idx_hdr].next; > @@ -790,6 +793,7 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *d= ev, struct vring *vring, > > i =3D idx_data; > while (vring->desc[i].flags =3D=3D VRING_DESC_F_NEXT) { > + dlen[nb_dlen++] =3D vring->desc[i].len; > i =3D vring->desc[i].next; > n_descs++; > } > @@ -811,6 +815,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *= dev, struct vring *vring, > status =3D 0; > } > > + if (!status && dev->scvq) > + status =3D virtio_send_command(&dev->scvq->cq, > + (struct virtio_pmd_ctrl *)hdr, dlen, nb_d= len); > + > /* Update status */ > *(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = =3D status; > > @@ -836,6 +844,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user= _dev *dev, > uint16_t idx_data, idx_status; > /* initialize to one, header is first */ > uint32_t n_descs =3D 1; > + int dlen[CVQ_MAX_DATA_DESCS], nb_dlen =3D 0; > > /* locate desc for header, data, and status */ > idx_data =3D idx_hdr + 1; > @@ -846,6 +855,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user= _dev *dev, > > idx_status =3D idx_data; > while (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) { > + dlen[nb_dlen++] =3D vring->desc[idx_status].len; > idx_status++; > if (idx_status >=3D dev->queue_size) > idx_status -=3D dev->queue_size; > @@ -866,6 +876,10 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_use= r_dev *dev, > status =3D 0; > } > > + if (!status && dev->scvq) > + status =3D virtio_send_command(&dev->scvq->cq, > + (struct virtio_pmd_ctrl *)hdr, dlen, nb_d= len); > + > /* Update status */ > *(virtio_net_ctrl_ack *)(uintptr_t) > vring->desc[idx_status].addr =3D status; > @@ -877,7 +891,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user= _dev *dev, > return n_descs; > } > > -void > +static void > virtio_user_handle_cq_packed(struct virtio_user_dev *dev, uint16_t queue= _idx) > { > struct virtio_user_queue *vq =3D &dev->packed_queues[queue_idx]; > @@ -909,8 +923,8 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *= dev, uint16_t queue_idx) > } > } > > -void > -virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx) > +static void > +virtio_user_handle_cq_split(struct virtio_user_dev *dev, uint16_t queue_= idx) > { > uint16_t avail_idx, desc_idx; > struct vring_used_elem *uep; > @@ -924,7 +938,7 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, ui= nt16_t queue_idx) > & (vring->num - 1); > desc_idx =3D vring->avail->ring[avail_idx]; > > - n_descs =3D virtio_user_handle_ctrl_msg(dev, vring, desc_= idx); > + n_descs =3D virtio_user_handle_ctrl_msg_split(dev, vring,= desc_idx); > > /* Update used ring */ > uep =3D &vring->used->ring[avail_idx]; > @@ -935,6 +949,15 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, u= int16_t queue_idx) > } > } > > +void > +virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx) > +{ > + if (virtio_with_packed_queue(&dev->hw)) > + virtio_user_handle_cq_packed(dev, queue_idx); > + else > + virtio_user_handle_cq_split(dev, queue_idx); > +} > + > static void > virtio_user_control_queue_notify(struct virtqueue *vq, void *cookie) > { > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/n= et/virtio/virtio_user/virtio_user_dev.h > index e0db4faf3f..e8753f6019 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h > @@ -74,9 +74,6 @@ int virtio_user_dev_init(struct virtio_user_dev *dev, c= har *path, uint16_t queue > enum virtio_user_backend_type backend_type); > void virtio_user_dev_uninit(struct virtio_user_dev *dev); > void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_i= dx); > -void virtio_user_handle_cq_packed(struct virtio_user_dev *dev, > - uint16_t queue_idx); > -uint8_t virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pa= irs); > int virtio_user_dev_create_shadow_cvq(struct virtio_user_dev *dev, struc= t virtqueue *vq); > void virtio_user_dev_destroy_shadow_cvq(struct virtio_user_dev *dev); > int virtio_user_dev_set_status(struct virtio_user_dev *dev, uint8_t stat= us); > diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio= /virtio_user_ethdev.c > index 626bd95b62..d23959e836 100644 > --- a/drivers/net/virtio/virtio_user_ethdev.c > +++ b/drivers/net/virtio/virtio_user_ethdev.c > @@ -266,10 +266,8 @@ virtio_user_notify_queue(struct virtio_hw *hw, struc= t virtqueue *vq) > struct virtio_user_dev *dev =3D virtio_user_get_dev(hw); > > if (hw->cvq && (virtnet_cq_to_vq(hw->cvq) =3D=3D vq)) { > - if (virtio_with_packed_queue(vq->hw)) > - virtio_user_handle_cq_packed(dev, vq->vq_queue_in= dex); > - else > - virtio_user_handle_cq(dev, vq->vq_queue_index); > + virtio_user_handle_cq(dev, vq->vq_queue_index); > + > return; > } > > -- > 2.39.1 >