From: Laine Stump <laine@redhat.com> Commit f4ef3a71 made a variation of virNetDevSetMAC that would return without logging an error message if errno was set to EADDRNOTAVAIL. This errno is set by some SRIOV VF drivers (in particular igbvf) when they fail to set the device's MAC address due to the PF driver refusing the request. This is useful if we want to try a different method of setting the VF MAC address before giving up (Commit 86556e16 actually does this, setting the desired MAC address to the "admin MAC in the PF, then detaching and reattaching the VF netdev driver to force a reinit of the MAC address). During testing of Bug 1442040 t was discovered that the ixgbe driver returns EPERM in this situation, so this patch changes the exception case for silent+non-terminal failure to account for this difference. Completes resolution to: https://bugzilla.redhat.com/1415609 (RHEL 7.4) https://bugzilla.redhat.com/1442040 (RHEL 7.3.z) --- NB: I could also change it to be silent on *any* error, but this could lead to situations where the actual cause of a failure to set the MAC address is obscured to the point of being unable to figure out the problem (because the error would instead show up when the kernel is trying to initialize the MAC address as it reattached the VF net driver, for example). Limiting the errno's that warrant the silent treatment allows us to give more useful error reporting in these other cases. src/util/virnetdev.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 170e348..9aa9c9f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -226,7 +226,8 @@ int virNetDevExists(const char *ifname) * virNetDevSetMACInternal: * @ifname: interface name to set MTU for * @macaddr: MAC address - * @quiet: true if a failure to set MAC address with errno == EADDRNOTAVAIL + * @quiet: true if a failure to set MAC address with + * errno == EADDRNOTAVAIL || errno == EPERM * should be silent (still returns error, but without log) * * This function sets the @macaddr for a given interface @ifname. @@ -258,7 +259,8 @@ virNetDevSetMACInternal(const char *ifname, if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -305,7 +307,8 @@ virNetDevSetMACInternal(const char *ifname, ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN; if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -2229,11 +2232,12 @@ virNetDevSetNetConfig(const char *linkdev, int vf, int retries = 100; /* if pfDevOrig == NULL, this isn't a VF, so we've failed */ - if (!pfDevOrig || errno != EADDRNOTAVAIL) + if (!pfDevOrig || + (errno != EADDRNOTAVAIL && errno != EPERM)) goto cleanup; /* Otherwise this is a VF, and virNetDevSetMAC failed with - * EADDRNOTAVAIL, which could be due to the + * EADDRNOTAVAIL/EPERM, which could be due to the * "administratively set" flag being set in the PF for * this VF. When this happens, we can attempt to use an * alternate method to set the VF MAC: first set it into -- 2.9.3