From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkIZS-00060l-Jj for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:17:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkIZR-0007JK-3m for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:17:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkIZQ-0007JE-QA for qemu-devel@nongnu.org; Thu, 08 Oct 2015 17:17:49 -0400 Date: Fri, 9 Oct 2015 00:17:42 +0300 From: "Michael S. Tsirkin" Message-ID: <1444338957-15293-17-git-send-email-mst@redhat.com> References: <1444338957-15293-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1444338957-15293-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/25] vhost user: add rarp sending after live migration for legacy guest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= , Thibaut Collet From: Thibaut Collet A new vhost user message is added to allow QEMU to ask to vhost user back= end to broadcast a fake RARP after live migration for guest without GUEST_ANNOUN= CE capability. This new message is sent only if the backend supports the new VHOST_USER_PROTOCOL_F_RARP protocol feature. The payload of this new message is the MAC address of the guest (not know= n by the backend). The MAC address is copied in the first 6 bytes of a u64 to = avoid to create a new payload message type. This new message has no equivalent ioctl so a new callback is added in th= e userOps structure to send the request. Upon recept of this new message the vhost user backend must generate and broadcast a fake RARP request to notify the migration is terminated. MST: fix up stub for qemu-img, commit log Signed-off-by: Thibaut Collet [Rebased and fixed checkpatch errors - Marc-Andr=E9] Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost-backend.h | 3 +++ include/net/vhost_net.h | 1 + hw/net/vhost_net.c | 17 +++++++++++++++++ hw/virtio/vhost-user.c | 32 +++++++++++++++++++++++++++++++- net/vhost-user.c | 24 ++++++++++++++++++++++-- docs/specs/vhost-user.txt | 15 +++++++++++++++ 6 files changed, 89 insertions(+), 3 deletions(-) diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-= backend.h index e07118c..5918c01 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -67,6 +67,8 @@ typedef int (*vhost_get_vq_index_op)(struct vhost_dev *= dev, int idx); typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev, int enable); typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev); +typedef int (*vhost_migration_done_op)(struct vhost_dev *dev, + char *mac_addr); =20 typedef struct VhostOps { VhostBackendType backend_type; @@ -94,6 +96,7 @@ typedef struct VhostOps { vhost_get_vq_index_op vhost_get_vq_index; vhost_set_vring_enable_op vhost_set_vring_enable; vhost_requires_shm_log_op vhost_requires_shm_log; + vhost_migration_done_op vhost_migration_done; } VhostOps; =20 extern const VhostOps user_ops; diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index 0188c4d..3389b41 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -27,6 +27,7 @@ void vhost_net_ack_features(VHostNetState *net, uint64_= t features); bool vhost_net_virtqueue_pending(VHostNetState *net, int n); void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev, int idx, bool mask); +int vhost_net_notify_migration_done(VHostNetState *net, char* mac_addr); VHostNetState *get_vhost_net(NetClientState *nc); =20 int vhost_set_vring_enable(NetClientState * nc, int enable); diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 840f443..a518c26 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -388,6 +388,18 @@ void vhost_net_cleanup(struct vhost_net *net) g_free(net); } =20 +int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_add= r) +{ + const VhostOps *vhost_ops =3D net->dev.vhost_ops; + int r =3D -1; + + if (vhost_ops->vhost_migration_done) { + r =3D vhost_ops->vhost_migration_done(&net->dev, mac_addr); + } + + return r; +} + bool vhost_net_virtqueue_pending(VHostNetState *net, int idx) { return vhost_virtqueue_pending(&net->dev, idx); @@ -479,6 +491,11 @@ void vhost_net_virtqueue_mask(VHostNetState *net, Vi= rtIODevice *dev, { } =20 +int vhost_net_notify_migration_done(struct vhost_net *net, char *mac_add= r) +{ + return -1; +} + VHostNetState *get_vhost_net(NetClientState *nc) { return 0; diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index cd84f0c..5ab888d 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -10,6 +10,7 @@ =20 #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" +#include "hw/virtio/virtio-net.h" #include "sysemu/char.h" #include "sysemu/kvm.h" #include "qemu/error-report.h" @@ -27,9 +28,10 @@ #define VHOST_MEMORY_MAX_NREGIONS 8 #define VHOST_USER_F_PROTOCOL_FEATURES 30 =20 -#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x3ULL +#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x7ULL #define VHOST_USER_PROTOCOL_F_MQ 0 #define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1 +#define VHOST_USER_PROTOCOL_F_RARP 2 =20 typedef enum VhostUserRequest { VHOST_USER_NONE =3D 0, @@ -51,6 +53,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_PROTOCOL_FEATURES =3D 16, VHOST_USER_GET_QUEUE_NUM =3D 17, VHOST_USER_SET_VRING_ENABLE =3D 18, + VHOST_USER_SEND_RARP =3D 19, VHOST_USER_MAX } VhostUserRequest; =20 @@ -557,6 +560,32 @@ static bool vhost_user_requires_shm_log(struct vhost= _dev *dev) VHOST_USER_PROTOCOL_F_LOG_SHMFD); } =20 +static int vhost_user_migration_done(struct vhost_dev *dev, char* mac_ad= dr) +{ + VhostUserMsg msg =3D { 0 }; + int err; + + assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); + + /* If guest supports GUEST_ANNOUNCE do nothing */ + if (virtio_has_feature(dev->acked_features, VIRTIO_NET_F_GUEST_ANNOU= NCE)) { + return 0; + } + + /* if backend supports VHOST_USER_PROTOCOL_F_RARP ask it to send the= RARP */ + if (virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_RARP)) { + msg.request =3D VHOST_USER_SEND_RARP; + msg.flags =3D VHOST_USER_VERSION; + memcpy((char *)&msg.u64, mac_addr, 6); + msg.size =3D sizeof(m.u64); + + err =3D vhost_user_write(dev, &msg, NULL, 0); + return err; + } + return -1; +} + const VhostOps user_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_USER, .vhost_backend_init =3D vhost_user_init, @@ -578,4 +607,5 @@ const VhostOps user_ops =3D { .vhost_get_vq_index =3D vhost_user_get_vq_index, .vhost_set_vring_enable =3D vhost_user_set_vring_enable, .vhost_requires_shm_log =3D vhost_user_requires_shm_log, + .vhost_migration_done =3D vhost_user_migration_done, }; diff --git a/net/vhost-user.c b/net/vhost-user.c index 87917a5..cfe11b8 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -106,9 +106,29 @@ err: static ssize_t vhost_user_receive(NetClientState *nc, const uint8_t *buf= , size_t size) { - /* Discard the request that is received and managed by backend - * by an other way. + /* In case of RARP (message size is 60) notify backup to send a fake= RARP. + This fake RARP will be sent by backend only for guest + without GUEST_ANNOUNCE capability. */ + if (size =3D=3D 60) { + VhostUserState *s =3D DO_UPCAST(VhostUserState, nc, nc); + int r; + static int display_rarp_failure =3D 1; + char mac_addr[6]; + + /* extract guest mac address from the RARP message */ + memcpy(mac_addr, &buf[6], 6); + + r =3D vhost_net_notify_migration_done(s->vhost_net, mac_addr); + + if ((r !=3D 0) && (display_rarp_failure)) { + fprintf(stderr, + "Vhost user backend fails to broadcast fake RARP\n")= ; + fflush(stderr); + display_rarp_failure =3D 0; + } + } + return size; } =20 diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt index e0292a0..e0d71e2 100644 --- a/docs/specs/vhost-user.txt +++ b/docs/specs/vhost-user.txt @@ -194,6 +194,7 @@ Protocol features =20 #define VHOST_USER_PROTOCOL_F_MQ 0 #define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1 +#define VHOST_USER_PROTOCOL_F_RARP 2 =20 Message types ------------- @@ -381,3 +382,17 @@ Message types Master payload: vring state description =20 Signal slave to enable or disable corresponding vring. + + * VHOST_USER_SEND_RARP + + Id: 19 + Equivalent ioctl: N/A + Master payload: u64 + + Ask vhost user backend to broadcast a fake RARP to notify the migr= ation + is terminated for guest that does not support GUEST_ANNOUNCE. + Only legal if feature bit VHOST_USER_F_PROTOCOL_FEATURES is presen= t in + VHOST_USER_GET_FEATURES and protocol feature bit VHOST_USER_PROTOC= OL_F_RARP + is present in VHOST_USER_GET_PROTOCOL_FEATURES. + The first 6 bytes of the payload contain the mac address of the gu= est to + allow the vhost user backend to construct and broadcast the fake R= ARP. --=20 MST