From: Eugenio Perez Martin <eperezma@redhat.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com,
stephen@networkplumber.org
Subject: Re: [PATCH v2 19/21] net/virtio-user: forward control messages to shadow queue
Date: Tue, 7 Feb 2023 19:30:21 +0100 [thread overview]
Message-ID: <CAJaqyWf7ZLLC2Uu9jOYkHADixZF_ctgLGboC=MUOWsr14ANiqA@mail.gmail.com> (raw)
In-Reply-To: <20230207151747.245808-20-maxime.coquelin@redhat.com>
On Tue, Feb 7, 2023 at 4:18 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> This patch implements control messages forwarding from the
> regular control queue to the shadow control queue.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Eugenio Pérez <eperezma@redhat.com>
> ---
> .../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/net/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 *vring,
> +virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vring,
> uint16_t idx_hdr)
> {
> struct virtio_net_ctrl_hdr *hdr;
> virtio_net_ctrl_ack status = ~0;
> uint16_t i, idx_data, idx_status;
> uint32_t n_descs = 0;
> + int dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0;
>
> /* locate desc for header, data, and status */
> idx_data = vring->desc[idx_hdr].next;
> @@ -790,6 +793,7 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
>
> i = idx_data;
> while (vring->desc[i].flags == VRING_DESC_F_NEXT) {
> + dlen[nb_dlen++] = vring->desc[i].len;
> i = vring->desc[i].next;
> n_descs++;
> }
> @@ -811,6 +815,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
> status = 0;
> }
>
> + if (!status && dev->scvq)
> + status = virtio_send_command(&dev->scvq->cq,
> + (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen);
> +
> /* Update status */
> *(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = 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 = 1;
> + int dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0;
>
> /* locate desc for header, data, and status */
> idx_data = idx_hdr + 1;
> @@ -846,6 +855,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
>
> idx_status = idx_data;
> while (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) {
> + dlen[nb_dlen++] = vring->desc[idx_status].len;
> idx_status++;
> if (idx_status >= dev->queue_size)
> idx_status -= dev->queue_size;
> @@ -866,6 +876,10 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
> status = 0;
> }
>
> + if (!status && dev->scvq)
> + status = virtio_send_command(&dev->scvq->cq,
> + (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen);
> +
> /* Update status */
> *(virtio_net_ctrl_ack *)(uintptr_t)
> vring->desc[idx_status].addr = 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 = &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, uint16_t queue_idx)
> & (vring->num - 1);
> desc_idx = vring->avail->ring[avail_idx];
>
> - n_descs = virtio_user_handle_ctrl_msg(dev, vring, desc_idx);
> + n_descs = virtio_user_handle_ctrl_msg_split(dev, vring, desc_idx);
>
> /* Update used ring */
> uep = &vring->used->ring[avail_idx];
> @@ -935,6 +949,15 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_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/net/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, char *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_idx);
> -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_pairs);
> int virtio_user_dev_create_shadow_cvq(struct virtio_user_dev *dev, struct 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 status);
> 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, struct virtqueue *vq)
> struct virtio_user_dev *dev = virtio_user_get_dev(hw);
>
> if (hw->cvq && (virtnet_cq_to_vq(hw->cvq) == vq)) {
> - if (virtio_with_packed_queue(vq->hw))
> - virtio_user_handle_cq_packed(dev, vq->vq_queue_index);
> - else
> - virtio_user_handle_cq(dev, vq->vq_queue_index);
> + virtio_user_handle_cq(dev, vq->vq_queue_index);
> +
> return;
> }
>
> --
> 2.39.1
>
next prev parent reply other threads:[~2023-02-07 18:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 15:17 [PATCH v2 00/21] Add control queue & MQ support to Virtio-user vDPA Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 01/21] net/virtio: move CVQ code into a dedicated file Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 02/21] net/virtio: introduce notify callback for control queue Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 03/21] net/virtio: virtqueue headers alloc refactoring Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 04/21] net/virtio: remove port ID info from Rx queue Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 05/21] net/virtio: remove unused fields in Tx queue struct Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 06/21] net/virtio: remove unused queue ID field in Rx queue Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 07/21] net/virtio: remove unused Port ID in control queue Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 08/21] net/virtio: move vring memzone to virtqueue struct Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 09/21] net/virtio: refactor indirect desc headers init Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 10/21] net/virtio: alloc Rx SW ring only if vectorized path Maxime Coquelin
2023-02-08 1:05 ` Xia, Chenbo
2023-02-07 15:17 ` [PATCH v2 11/21] net/virtio: extract virtqueue init from virtio queue init Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 12/21] net/virtio-user: fix device starting failure handling Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 13/21] net/virtio-user: simplify queues setup Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 14/21] net/virtio-user: use proper type for number of queue pairs Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 15/21] net/virtio-user: get max number of queue pairs from device Maxime Coquelin
2023-02-07 18:02 ` Eugenio Perez Martin
2023-02-07 15:17 ` [PATCH v2 16/21] net/virtio-user: allocate shadow control queue Maxime Coquelin
2023-02-07 18:06 ` Eugenio Perez Martin
2023-02-09 8:48 ` Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 17/21] net/virtio-user: send shadow virtqueue info to the backend Maxime Coquelin
2023-02-07 18:08 ` Eugenio Perez Martin
2023-02-07 15:17 ` [PATCH v2 18/21] net/virtio-user: add new callback to enable control queue Maxime Coquelin
2023-02-07 18:10 ` Eugenio Perez Martin
2023-02-09 8:50 ` Maxime Coquelin
2023-02-07 15:17 ` [PATCH v2 19/21] net/virtio-user: forward control messages to shadow queue Maxime Coquelin
2023-02-07 18:30 ` Eugenio Perez Martin [this message]
2023-02-08 1:06 ` Xia, Chenbo
2023-02-07 15:17 ` [PATCH v2 20/21] net/virtio-user: advertize control VQ support with vDPA Maxime Coquelin
2023-02-07 18:17 ` Eugenio Perez Martin
2023-02-07 15:17 ` [PATCH v2 21/21] net/virtio-user: remove max queues limitation Maxime Coquelin
2023-02-08 1:06 ` Xia, Chenbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJaqyWf7ZLLC2Uu9jOYkHADixZF_ctgLGboC=MUOWsr14ANiqA@mail.gmail.com' \
--to=eperezma@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).