hv_netvsc: propogate Hyper-V friendly name into interface alias

This patch implement the 'Device Naming' feature of the Hyper-V
network device API. In Hyper-V on the host through the GUI or PowerShell
it is possible to enable the device naming feature which causes
the host to make available to the guest the name of the device.
This shows up in the RNDIS protocol as the friendly name.

The name has no particular meaning and is limited to 256 characters.
The value can only be set via PowerShell on the host, but could
be scripted for mass deployments. The default value is the
string 'Network Adapter' and since that is the same for all devices
and useless, the driver ignores it.

In Windows, the value goes into a registry key for use in SNMP
ifAlias. For Linux, this patch puts the value in the network
device alias property; where it is visible in ip tools and SNMP.

The host provided ifAlias is just a suggestion, and can be
overridden by later ip commands.

Also requires exporting dev_set_alias in netdev core.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 6b127be781d9c4f88719ab6cf033e4b70dc3a7c6..3b6dbacaf77d1fac3bc5dd2ef4358e0da1bddf6d 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -29,6 +29,7 @@
 #include <linux/nls.h>
 #include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
+#include <linux/ucs2_string.h>
 
 #include "hyperv_net.h"
 #include "netvsc_trace.h"
@@ -1223,6 +1224,29 @@ static int rndis_netdev_set_hwcaps(struct rndis_device *rndis_device,
        return ret;
 }
 
+static void rndis_get_friendly_name(struct net_device *net,
+                                   struct rndis_device *rndis_device,
+                                   struct netvsc_device *net_device)
+{
+       ucs2_char_t wname[256];
+       unsigned long len;
+       u8 ifalias[256];
+       u32 size;
+
+       size = sizeof(wname);
+       if (rndis_filter_query_device(rndis_device, net_device,
+                                     RNDIS_OID_GEN_FRIENDLY_NAME,
+                                     wname, &size) != 0)
+               return;
+
+       /* Convert Windows Unicode string to UTF-8 */
+       len = ucs2_as_utf8(ifalias, wname, sizeof(ifalias));
+
+       /* ignore the default value from host */
+       if (strcmp(ifalias, "Network Adapter") != 0)
+               dev_set_alias(net, ifalias, len);
+}
+
 struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
                                      struct netvsc_device_info *device_info)
 {
@@ -1276,6 +1300,10 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
 
        memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN);
 
+       /* Get friendly name as ifalias*/
+       if (!net->ifalias)
+               rndis_get_friendly_name(net, rndis_device, net_device);
+
        /* Query and set hardware capabilities */
        ret = rndis_netdev_set_hwcaps(rndis_device, net_device);
        if (ret != 0)

diff --git a/net/core/dev.c b/net/core/dev.c
index 969462ebb296250fe5f3b7c4621e9ba9720a2dbe..a490ef6435861d9b35e42c64ad4880ee2cdcb06b 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1285,6 +1285,7 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)
 
        return len;
 }
+EXPORT_SYMBOL(dev_set_alias);
 
 /**
  *     dev_get_alias - get ifalias of a device