qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cindy Lu <lulu@redhat.com>, Eli Cohen <eli@mellanox.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>,
	Liuxiangdong <liuxiangdong5@huawei.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Zhu Lingshan <lingshan.zhu@intel.com>,
	Jason Wang <jasowang@redhat.com>,
	Harpreet Singh Anand <hanand@xilinx.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Parav Pandit <parav@mellanox.com>,
	Gautam Dawar <gdawar@xilinx.com>,
	Stefano Garzarella <sgarzare@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Gonglei (Arei)" <arei.gonglei@huawei.com>
Subject: [PATCH 2/5] vdpa: Add vhost_vdpa_net_load_mq
Date: Fri, 19 Aug 2022 19:13:26 +0200	[thread overview]
Message-ID: <20220819171329.3597027-3-eperezma@redhat.com> (raw)
In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com>

Same way as with the MAC, restore the expected number of queues at
device's start.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 net/vhost-vdpa.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 1e0dbfcced..96fd3bc835 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -391,6 +391,35 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s,
     return 0;
 }
 
+static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
+                                  const VirtIONet *n)
+{
+    uint64_t features = n->parent_obj.guest_features;
+    ssize_t dev_written;
+    void *cursor = s->cvq_cmd_out_buffer;
+    if (!(features & BIT_ULL(VIRTIO_NET_F_MQ))) {
+        return 0;
+    }
+
+    *(struct virtio_net_ctrl_hdr *)cursor = (struct virtio_net_ctrl_hdr) {
+        .class = VIRTIO_NET_CTRL_MQ,
+        .cmd = VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET,
+    };
+    cursor += sizeof(struct virtio_net_ctrl_hdr);
+    *(struct virtio_net_ctrl_mq *)cursor = (struct virtio_net_ctrl_mq) {
+        .virtqueue_pairs = cpu_to_le16(n->curr_queue_pairs),
+    };
+    cursor += sizeof(struct virtio_net_ctrl_mq);
+
+    dev_written = vhost_vdpa_net_cvq_add(s, cursor - s->cvq_cmd_out_buffer,
+                                             sizeof(virtio_net_ctrl_ack));
+    if (unlikely(dev_written < 0)) {
+        return dev_written;
+    }
+
+    return *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) != VIRTIO_NET_OK;
+}
+
 static int vhost_vdpa_net_load(NetClientState *nc)
 {
     VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
@@ -409,6 +438,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)
     if (unlikely(r < 0)) {
         return r;
     }
+    r = vhost_vdpa_net_load_mq(s, n);
+    if (unlikely(r)) {
+        return r;
+    }
 
     return 0;
 }
-- 
2.31.1



  parent reply	other threads:[~2022-08-19 17:53 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-19 17:13 [PATCH 0/5] Vhost-vdpa Shadow Virtqueue multiqueue support Eugenio Pérez
2022-08-19 17:13 ` [PATCH 1/5] vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load Eugenio Pérez
2022-08-24  4:18   ` Jason Wang
2022-08-19 17:13 ` Eugenio Pérez [this message]
2022-08-24  4:23   ` [PATCH 2/5] vdpa: Add vhost_vdpa_net_load_mq Jason Wang
2022-08-24  7:46     ` Eugenio Perez Martin
2022-08-24  8:52       ` Jason Wang
2022-08-24  9:06         ` Eugenio Perez Martin
2022-08-24  9:07           ` Jason Wang
2022-08-24  9:18             ` Eugenio Perez Martin
2022-08-19 17:13 ` [PATCH 3/5] vdpa: validate MQ CVQ commands Eugenio Pérez
2022-08-19 17:13 ` [PATCH 4/5] virtio-net: Update virtio-net curr_queue_pairs in vdpa backends Eugenio Pérez
2022-08-24  4:27   ` Jason Wang
2022-08-25  0:38     ` Si-Wei Liu
2022-08-25  2:53       ` Jason Wang
2022-08-25  3:05         ` Jason Wang
2022-08-26  3:58           ` Si-Wei Liu
2022-08-26  3:49         ` Si-Wei Liu
2022-08-25  6:19       ` Eugenio Perez Martin
2022-08-26  4:28         ` Si-Wei Liu
2022-08-26  8:22           ` Eugenio Perez Martin
2022-08-19 17:13 ` [PATCH 5/5] vdpa: Allow MQ feture in SVQ Eugenio Pérez

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=20220819171329.3597027-3-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=cohuck@redhat.com \
    --cc=eli@mellanox.com \
    --cc=gdawar@xilinx.com \
    --cc=hanand@xilinx.com \
    --cc=jasowang@redhat.com \
    --cc=lingshan.zhu@intel.com \
    --cc=liuxiangdong5@huawei.com \
    --cc=lulu@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=parav@mellanox.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    /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).