External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: set macvtap physdevs online when macvtap is set online

Browse Source 
A further fix for:

  https://bugzilla.redhat.com/show_bug.cgi?id=1113474

Since there is no possibility that any type of macvtap will work if
the parent physdev it's attached to is offline, we should bring the
physdev online at the same time as the macvtap. When taking the
macvtap offline, it's also necessary to take the physdev offline for
macvtap passthrough mode (because the physdev has the same MAC address
as the macvtap device, so could potentially cause problems with
misdirected packets during migration, as outlined in commits 829770
and 879c13). We can't set the physdev offline for other macvtap modes
1) because there may be other macvtap devices attached to the same
physdev (and/or the host itself may be using the device) in the other
modes whereas passthrough mode is exclusive to one macvtap at a time,
and 2) there's no practical reason to do so anyway.
This commit is contained in:
Laine Stump 2015-04-13 13:26:54 -04:00
parent cb3fe38c74
commit 38172ed894
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_hotplug.c
View File

@ -3936,11 +3936,9 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
VIR_WARN("cannot clear bandwidth setting for device : %s", VIR_WARN("cannot clear bandwidth setting for device : %s",
detach->ifname); detach->ifname);
/* deactivate the tap/macvtap device on the host (currently this /* deactivate the tap/macvtap device on the host, which could also
* isn't necessary, as everything done in * affect the parent device (e.g. macvtap passthrough mode sets
* qemuInterfaceStopDevice() is made meaningless when the device * the parent device offline)
* is deleted anyway, but in the future it may be important, and
* doesn't hurt anything for now)
*/ */
ignore_value(qemuInterfaceStopDevice(detach)); ignore_value(qemuInterfaceStopDevice(detach));

29
src/qemu/qemu_interface.c
View File

@ -63,7 +63,20 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net)
goto cleanup; goto cleanup;
} }
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT:
case VIR_DOMAIN_NET_TYPE_DIRECT: {
const char *physdev = virDomainNetGetActualDirectDev(net);
bool isOnline = true;
/* set the physdev online if necessary. It may already be up,
* in which case we shouldn't re-up it just in case that causes
* some sort of "blip" in the physdev's status.
*/
if (physdev && virNetDevGetOnline(physdev, &isOnline) < 0)
goto cleanup;
if (!isOnline && virNetDevSetOnline(physdev, true) < 0)
goto cleanup;
/* macvtap devices share their MAC address with the guest /* macvtap devices share their MAC address with the guest
* domain, and if they are set online prior to the domain CPUs * domain, and if they are set online prior to the domain CPUs
* being started, the host may send out traffic from this * being started, the host may send out traffic from this
@ -79,6 +92,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net)
if (virNetDevSetOnline(net->ifname, true) < 0) if (virNetDevSetOnline(net->ifname, true) < 0)
goto cleanup; goto cleanup;
break; break;
}
case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_USER:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET:
@ -146,7 +160,9 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net)
} }
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT: {
const char *physdev = virDomainNetGetActualDirectDev(net);
/* macvtap interfaces need to be marked !IFF_UP (ie "down") to /* macvtap interfaces need to be marked !IFF_UP (ie "down") to
* prevent any host-generated traffic sent from this interface * prevent any host-generated traffic sent from this interface
* from putting bad info into the arp caches of other machines * from putting bad info into the arp caches of other machines
@ -154,7 +170,16 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net)
*/ */
if (virNetDevSetOnline(net->ifname, false) < 0) if (virNetDevSetOnline(net->ifname, false) < 0)
goto cleanup; goto cleanup;
/* also mark the physdev down for passthrough macvtap, as the
* physdev has the same MAC address as the macvtap device.
*/
if (virDomainNetGetActualDirectMode(net) ==
VIR_NETDEV_MACVLAN_MODE_PASSTHRU &&
physdev && virNetDevSetOnline(physdev, false) < 0)
goto cleanup;
break; break;
}
case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_USER:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET: