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 17/21] net/virtio-user: send shadow virtqueue info to the backend
Date: Tue, 7 Feb 2023 19:08:08 +0100 [thread overview]
Message-ID: <CAJaqyWdys6FLnfuJ5zUqmn0d+69-n-WY=fDyndAt8z6zh=QJyg@mail.gmail.com> (raw)
In-Reply-To: <20230207151747.245808-18-maxime.coquelin@redhat.com>
On Tue, Feb 7, 2023 at 4:18 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> This patch adds sending the shadow control queue info
> to the backend.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Acked-by: Eugenio Pérez <eperezma@redhat.com>
> ---
> .../net/virtio/virtio_user/virtio_user_dev.c | 28 ++++++++++++++++---
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 16a0e07413..1a5386a3f6 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -66,6 +66,18 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
> .flags = 0, /* disable log */
> };
>
> + if (queue_sel == dev->max_queue_pairs * 2) {
> + if (!dev->scvq) {
> + PMD_INIT_LOG(ERR, "(%s) Shadow control queue expected but missing",
> + dev->path);
> + goto err;
> + }
> +
> + /* Use shadow control queue information */
> + vring = &dev->scvq->vq_split.ring;
> + pq_vring = &dev->scvq->vq_packed.ring;
> + }
> +
> if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) {
> addr.desc_user_addr =
> (uint64_t)(uintptr_t)pq_vring->desc;
> @@ -118,9 +130,13 @@ static int
> virtio_user_queue_setup(struct virtio_user_dev *dev,
> int (*fn)(struct virtio_user_dev *, uint32_t))
> {
> - uint32_t i;
> + uint32_t i, nr_vq;
>
> - for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
> + nr_vq = dev->max_queue_pairs * 2;
> + if (dev->hw_cvq)
> + nr_vq++;
> +
> + for (i = 0; i < nr_vq; i++) {
> if (fn(dev, i) < 0) {
> PMD_DRV_LOG(ERR, "(%s) setup VQ %u failed", dev->path, i);
> return -1;
> @@ -381,11 +397,15 @@ virtio_user_dev_init_mac(struct virtio_user_dev *dev, const char *mac)
> static int
> virtio_user_dev_init_notify(struct virtio_user_dev *dev)
> {
> - uint32_t i, j;
> + uint32_t i, j, nr_vq;
> int callfd;
> int kickfd;
>
> - for (i = 0; i < dev->max_queue_pairs * 2; i++) {
> + nr_vq = dev->max_queue_pairs * 2;
> + if (dev->hw_cvq)
> + nr_vq++;
> +
> + for (i = 0; i < nr_vq; i++) {
> /* May use invalid flag, but some backend uses kickfd and
> * callfd as criteria to judge if dev is alive. so finally we
> * use real event_fd.
> --
> 2.39.1
>
next prev parent reply other threads:[~2023-02-07 18:08 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 [this message]
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
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='CAJaqyWdys6FLnfuJ5zUqmn0d+69-n-WY=fDyndAt8z6zh=QJyg@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).