From: Cindy Lu <lulu@redhat.com>
To: mst@redhat.com, armbru@redhat.com, eblake@redhat.com,
cohuck@redhat.com, jasowang@redhat.com
Cc: mhabets@solarflare.com, qemu-devel@nongnu.org,
rob.miller@broadcom.com, saugatm@xilinx.com, lulu@redhat.com,
hanand@xilinx.com, hch@infradead.org, eperezma@redhat.com,
jgg@mellanox.com, shahafs@mellanox.com, kevin.tian@intel.com,
parav@mellanox.com, vmireyno@marvell.com,
cunming.liang@intel.com, gdawar@xilinx.com, jiri@mellanox.com,
xiao.w.wang@intel.com, stefanha@redhat.com,
zhihong.wang@intel.com, aadam@redhat.com, rdunlap@infradead.org,
maxime.coquelin@redhat.com, lingshan.zhu@intel.com
Subject: [RFC v2 3/9] virtio_net: introduce vhost_set_state
Date: Sat, 9 May 2020 00:32:12 +0800 [thread overview]
Message-ID: <20200508163218.22592-4-lulu@redhat.com> (raw)
In-Reply-To: <20200508163218.22592-1-lulu@redhat.com>
Introduce a function to set the state to the vhost driver.
vDPA need to sync the driver's state to NIC
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/net/vhost_net.c | 9 +++++++++
hw/net/virtio-net.c | 9 +++++++++
include/hw/virtio/vhost-backend.h | 2 ++
include/net/vhost_net.h | 2 +-
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index d1d421e3d9..63b2a85d6e 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -465,3 +465,12 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu)
return vhost_ops->vhost_net_set_mtu(&net->dev, mtu);
}
+int vhost_set_state(NetClientState *nc, uint8_t state)
+{
+ struct vhost_net *net = get_vhost_net(nc);
+ struct vhost_dev *hdev = &net->dev;
+ if (hdev->vhost_ops->vhost_set_state) {
+ return hdev->vhost_ops->vhost_set_state(hdev, state);
+ }
+ return 0;
+}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index db3d7c38e6..1bddb4b4af 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -206,6 +206,9 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
VirtIODevice *vdev = VIRTIO_DEVICE(n);
NetClientState *nc = qemu_get_queue(n->nic);
int queues = n->multiqueue ? n->max_queues : 1;
+ NetClientState *peer = qemu_get_peer(nc, 0);
+ uint8_t status_set = vdev->status ;
+ uint8_t vhost_started_pre = n->vhost_started;
if (!get_vhost_net(nc->peer)) {
return;
@@ -245,6 +248,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
return;
}
}
+ status_set = status_set | VIRTIO_CONFIG_S_DRIVER_OK;
n->vhost_started = 1;
r = vhost_net_start(vdev, n->nic->ncs, queues);
@@ -252,11 +256,16 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
error_report("unable to start vhost net: %d: "
"falling back on userspace virtio", -r);
n->vhost_started = 0;
+ status_set = status_set & ~VIRTIO_CONFIG_S_DRIVER_OK;
}
} else {
vhost_net_stop(vdev, n->nic->ncs, queues);
+ status_set = status_set & ~VIRTIO_CONFIG_S_DRIVER_OK;
n->vhost_started = 0;
}
+ if (vhost_started_pre != n->vhost_started) {
+ vhost_set_state(peer, status_set);
+ }
}
static int virtio_net_set_vnet_endian_one(VirtIODevice *vdev,
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index 6f6670783f..f823055167 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -112,6 +112,7 @@ typedef int (*vhost_get_inflight_fd_op)(struct vhost_dev *dev,
typedef int (*vhost_set_inflight_fd_op)(struct vhost_dev *dev,
struct vhost_inflight *inflight);
+typedef int (*vhost_set_state_op)(struct vhost_dev *dev, uint8_t state);
typedef struct VhostOps {
VhostBackendType backend_type;
vhost_backend_init vhost_backend_init;
@@ -152,6 +153,7 @@ typedef struct VhostOps {
vhost_backend_mem_section_filter_op vhost_backend_mem_section_filter;
vhost_get_inflight_fd_op vhost_get_inflight_fd;
vhost_set_inflight_fd_op vhost_set_inflight_fd;
+ vhost_set_state_op vhost_set_state;
} VhostOps;
extern const VhostOps user_ops;
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 77e47398c4..6548a5a105 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -39,5 +39,5 @@ int vhost_set_vring_enable(NetClientState * nc, int enable);
uint64_t vhost_net_get_acked_features(VHostNetState *net);
int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);
-
+int vhost_set_state(NetClientState *nc, uint8_t state);
#endif
--
2.21.1
next prev parent reply other threads:[~2020-05-08 16:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 16:32 [RFC v2 0/9] vDPA support in qemu Cindy Lu
2020-05-08 16:32 ` [RFC v2 1/9] net: introduce qemu_get_peer Cindy Lu
2020-05-08 16:32 ` [RFC v2 2/9] net: use the function qemu_get_peer Cindy Lu
2020-05-09 2:19 ` Jason Wang
2020-05-09 6:49 ` Cindy Lu
2020-05-08 16:32 ` Cindy Lu [this message]
2020-05-09 2:25 ` [RFC v2 3/9] virtio_net: introduce vhost_set_state Jason Wang
2020-05-09 7:08 ` Cindy Lu
2020-05-08 16:32 ` [RFC v2 4/9] vhost-vdpa: introduce vhost-vdpa net client Cindy Lu
2020-05-08 16:41 ` Eric Blake
2020-05-09 7:17 ` Cindy Lu
2020-05-09 2:40 ` Jason Wang
2020-05-09 7:31 ` Cindy Lu
2020-05-08 16:32 ` [RFC v2 5/9] vhost-vdpa: implement vhost-vdpa backend Cindy Lu
2020-05-09 3:00 ` Jason Wang
2020-05-09 3:07 ` Jason Wang
2020-05-09 8:14 ` Cindy Lu
2020-05-21 12:40 ` Stefan Hajnoczi
2020-05-25 15:33 ` Cindy Lu
2020-05-25 16:15 ` Stefan Hajnoczi
2020-05-08 16:32 ` [RFC v2 6/9] virtio-bus: introduce queue_enabled method Cindy Lu
2020-05-09 3:01 ` Jason Wang
2020-05-09 6:50 ` Cindy Lu
2020-05-08 16:32 ` [RFC v2 7/9] virito-pci: implement " Cindy Lu
2020-05-09 3:02 ` Jason Wang
2020-05-09 12:01 ` Philippe Mathieu-Daudé
2020-05-11 5:08 ` Cindy Lu
2020-05-08 16:32 ` [RFC v2 8/9] vhost_net: set vq ready during start if necessary Cindy Lu
2020-05-09 3:03 ` Jason Wang
2020-05-09 6:51 ` Cindy Lu
2020-05-08 16:32 ` [RFC v2 9/9] vhost: introduce vhost_set_vring_ready method Cindy Lu
2020-05-09 3:05 ` Jason Wang
2020-05-09 3:10 ` [RFC v2 0/9] vDPA support in qemu Jason Wang
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=20200508163218.22592-4-lulu@redhat.com \
--to=lulu@redhat.com \
--cc=aadam@redhat.com \
--cc=armbru@redhat.com \
--cc=cohuck@redhat.com \
--cc=cunming.liang@intel.com \
--cc=eblake@redhat.com \
--cc=eperezma@redhat.com \
--cc=gdawar@xilinx.com \
--cc=hanand@xilinx.com \
--cc=hch@infradead.org \
--cc=jasowang@redhat.com \
--cc=jgg@mellanox.com \
--cc=jiri@mellanox.com \
--cc=kevin.tian@intel.com \
--cc=lingshan.zhu@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=mhabets@solarflare.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=rdunlap@infradead.org \
--cc=rob.miller@broadcom.com \
--cc=saugatm@xilinx.com \
--cc=shahafs@mellanox.com \
--cc=stefanha@redhat.com \
--cc=vmireyno@marvell.com \
--cc=xiao.w.wang@intel.com \
--cc=zhihong.wang@intel.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).