From: Ian Jackson Date: Thu, 8 Jan 2009 19:07:45 +0000 (+0000) Subject: send arp like packets for hvm live migration X-Git-Tag: t.master-before-merge~34^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=73b0037b2278812fcadadec9d8eac656f1716074;p=qemu-xen-4.3-testing.git send arp like packets for hvm live migration When two servers connect different switch/hub and do live migration between them, network connect will no reponse about 30 seconds, it caused by migration finished, target server do not broadcast guest os's network info. In pvm, when backend changed, netfront driver will send fake arp to network, so, hvm also need this. Uri Lublin [wrote] the patch for it: http://www.mail-archive.com/qemu-devel@nongnu.org/msg09306.html I [Joe] add send arp like packets at tap_receive(), and it looked like work fine. Signed-off-by: Joe Jin Tested-by: Deepak Patel CC: Keir Fraser CC: Kurt C. Hackel --- diff --git a/vl.c b/vl.c index 393459847..be6d9a285 100644 --- a/vl.c +++ b/vl.c @@ -102,6 +102,9 @@ #include #endif #endif +#if defined(__linux__) +#include +#endif #endif #include "qemu_socket.h" @@ -4292,10 +4295,22 @@ typedef struct TAPState { char down_script[1024]; } TAPState; +static void qemu_tap_announce_self(void); + static void tap_receive(void *opaque, const uint8_t *buf, int size) { + static int arp_state = 0; TAPState *s = opaque; int ret; + + if (!arp_state ) { + arp_state = 1; + /* send arp like package to vlan when enter is the first. + for xen migration. + */ + qemu_tap_announce_self(); + } + for(;;) { ret = write(s->fd, buf, size); /* No error handling ?! */ if (ret < 0 && (errno == EINTR || errno == EAGAIN)) { @@ -4561,6 +4576,56 @@ static int launch_script(const char *setup_script, const char *ifname, int fd) return 0; } +#if defined(__linux__) +#define SELF_ANNOUNCE_ROUNDS 5 +#define ETH_P_EXPERIMENTAL 0x01F1 /* just a number in experimental range */ +#define EXPERIMENTAL_MAGIC 0xf1f23f4f +static int announce_self_create(unsigned char *buf, + unsigned char mac_addr[ETH_ALEN]) +{ + struct ethhdr *eh = (struct ethhdr*)buf; + uint32_t *magic = (uint32_t*)(eh+1); + unsigned char *p = (unsigned char*)(magic + 1); + + /* ethernet header */ + memset(eh->h_dest, 0xff, ETH_ALEN); + memcpy(eh->h_source, mac_addr, ETH_ALEN); + eh->h_proto = htons(ETH_P_EXPERIMENTAL); + + /* magic data */ + *magic = EXPERIMENTAL_MAGIC; + + return p - buf; /* sizeof(*eh) + sizeof(*magic) */ +} + +static void qemu_tap_announce_self(void) +{ + int i, j, len; + VLANState *vlan; + VLANClientState *vc; + uint8_t buf[256]; + + for (i=0; ifirst_client; vc != NULL; vc = vc->next) { + if (vc->fd_read == tap_receive) { /* send only if tap */ + for (j=0; jfd_read(vc->opaque, buf, len); + } + } + } /* for vc -- look for tap_receive */ + } /* for i -- all nics */ +} +#else +static void qemu_tap_announce_self(void) {} +#endif + static int net_tap_init(VLANState *vlan, const char *ifname1, const char *setup_script, const char *down_script) {