From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gautam Dawar <gdawar@xilinx.com>,
Jason Wang <jasowang@redhat.com>,
Zhu Lingshan <lingshan.zhu@intel.com>,
yin31149@gmail.com, Shannon Nelson <shannon.nelson@amd.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Dragos Tatulea <dtatulea@nvidia.com>,
Yajun Wu <yajunw@nvidia.com>, Juan Quintela <quintela@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Parav Pandit <parav@mellanox.com>, Lei Yang <leiyang@redhat.com>,
si-wei.liu@oracle.com
Subject: [RFC PATCH v2 09/10] vdpa: add vhost_vdpa_net_load_setup NetClient callback
Date: Tue, 28 Nov 2023 11:43:02 +0100 [thread overview]
Message-ID: <20231128104303.3314000-10-eperezma@redhat.com> (raw)
In-Reply-To: <20231128104303.3314000-1-eperezma@redhat.com>
So the vDPA backend knows when a migration incoming starts. NicState
argument is needed so we can get the dma address space.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
RFC v2:
* Solve git conflict with .set_steering_ebpf
* Fix x-svq=on use case which did not allocated iova_tree.
---
include/net/net.h | 6 ++++++
net/vhost-vdpa.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/include/net/net.h b/include/net/net.h
index ffbd2c8d56..68282dde31 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -42,6 +42,7 @@ typedef struct NICConf {
/* Net clients */
+struct NICState;
typedef void (NetPoll)(NetClientState *, bool enable);
typedef bool (NetCanReceive)(NetClientState *);
typedef int (NetStart)(NetClientState *);
@@ -69,6 +70,9 @@ typedef void (SocketReadStateFinalize)(SocketReadState *rs);
typedef void (NetAnnounce)(NetClientState *);
typedef bool (SetSteeringEBPF)(NetClientState *, int);
typedef bool (NetCheckPeerType)(NetClientState *, ObjectClass *, Error **);
+/* This can be called before start & pair, so get also the peer */
+typedef int (NetMigrationLoadSetup)(NetClientState *, struct NICState *);
+typedef int (NetMigrationLoadCleanup)(NetClientState *, struct NICState *);
typedef struct NetClientInfo {
NetClientDriver type;
@@ -98,6 +102,8 @@ typedef struct NetClientInfo {
NetAnnounce *announce;
SetSteeringEBPF *set_steering_ebpf;
NetCheckPeerType *check_peer_type;
+ NetMigrationLoadSetup *load_setup;
+ NetMigrationLoadCleanup *load_cleanup;
} NetClientInfo;
struct NetClientState {
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index a37de7860e..90f41280d2 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -407,6 +407,37 @@ static void vhost_vdpa_net_client_stop(NetClientState *nc)
}
}
+static int vhost_vdpa_net_load_setup(NetClientState *nc, NICState *nic)
+{
+ VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
+ VirtIONet *n = qemu_get_nic_opaque(&nic->ncs[0]);
+ VhostVDPAShared *shared = s->vhost_vdpa.shared;
+ int r;
+
+ if (s->always_svq) {
+ /* iova tree is needed because of SVQ */
+ shared->iova_tree = vhost_iova_tree_new(shared->iova_range.first,
+ shared->iova_range.last);
+ }
+
+ r = vhost_vdpa_load_setup(shared, n->parent_obj.dma_as);
+ if (unlikely(r < 0)) {
+ g_clear_pointer(&s->vhost_vdpa.shared->iova_tree,
+ vhost_iova_tree_delete);
+ }
+
+ return r;
+}
+
+static int vhost_vdpa_net_load_cleanup(NetClientState *nc, NICState *nic)
+{
+ VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
+ VirtIONet *n = qemu_get_nic_opaque(&nic->ncs[0]);
+
+ return vhost_vdpa_load_cleanup(s->vhost_vdpa.shared,
+ n->parent_obj.status & VIRTIO_CONFIG_S_DRIVER_OK);
+}
+
static NetClientInfo net_vhost_vdpa_info = {
.type = NET_CLIENT_DRIVER_VHOST_VDPA,
.size = sizeof(VhostVDPAState),
@@ -419,6 +450,8 @@ static NetClientInfo net_vhost_vdpa_info = {
.has_ufo = vhost_vdpa_has_ufo,
.check_peer_type = vhost_vdpa_check_peer_type,
.set_steering_ebpf = vhost_vdpa_set_steering_ebpf,
+ .load_setup = vhost_vdpa_net_load_setup,
+ .load_cleanup = vhost_vdpa_net_load_cleanup,
};
static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index,
--
2.39.3
next prev parent reply other threads:[~2023-11-28 10:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 10:42 [RFC PATCH v2 00/10] Map memory at destination .load_setup in vDPA-net migration Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 01/10] vdpa: do not set virtio status bits if unneeded Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 02/10] vdpa: make batch_begin_once early return Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 03/10] vdpa: merge _begin_batch into _batch_begin_once Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 04/10] vdpa: extract out _dma_end_batch from _listener_commit Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 05/10] vdpa: factor out stop path of vhost_vdpa_dev_start Eugenio Pérez
2023-11-28 10:42 ` [RFC PATCH v2 06/10] vdpa: check for iova tree initialized at net_client_start Eugenio Pérez
2023-11-28 10:43 ` [RFC PATCH v2 07/10] vdpa: set backend capabilities at vhost_vdpa_init Eugenio Pérez
2023-11-28 10:43 ` [RFC PATCH v2 08/10] vdpa: add vhost_vdpa_load_setup Eugenio Pérez
2023-11-28 10:43 ` Eugenio Pérez [this message]
2023-11-28 10:43 ` [RFC PATCH v2 10/10] virtio_net: register incremental migration handlers 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=20231128104303.3314000-10-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=dtatulea@nvidia.com \
--cc=gdawar@xilinx.com \
--cc=jasowang@redhat.com \
--cc=leiyang@redhat.com \
--cc=lingshan.zhu@intel.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=sgarzare@redhat.com \
--cc=shannon.nelson@amd.com \
--cc=si-wei.liu@oracle.com \
--cc=yajunw@nvidia.com \
--cc=yin31149@gmail.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).