upstream/oracle/userland-gate: comparison components/openvswitch/files/lib/netdev-solaris.c

equal deleted inserted replaced

-:ad3057df09ab
+:cca4aa297e68
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 */
 /*
 * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
 *
 #include "unaligned.h"
 #include "vlog.h"
 #include "netdev-solaris.h"
 #include "util-solaris.h"
+#include "dpif-solaris.h"
 /*
 * Enable vlog() for this module
 */
 VLOG_DEFINE_THIS_MODULE(netdev_solaris);
 	VALID_LINKCLASS		= 1 << 5,
 	VALID_FEATURES		= 1 << 6
 };
 /*
-* When network devices are constructed, the internal devices (i.e., bridges)
-* are initially created over this etherstub and are moved when uplink ports
-* are added to the bridge.
-*/
-#define	NETDEV_IMPL_ETHERSTUB	"ovs.etherstub0"
-/*
 * Used to track state of IP plumbing on network devices.
 */
 #define	SOLARIS_IPV4 0x01
 #define	SOLARIS_IPV6 0x02
 static boolean_t	kstat2_handle_initialized = B_FALSE;
 static struct ovs_mutex	kstat_mutex = OVS_MUTEX_INITIALIZER;
 static int netdev_solaris_init(void);
 static struct netdev_solaris *netdev_solaris_cast(const struct netdev *);
+/* Maintaining a mapping of every netdev->name to its bridge name. */
+struct shash port_to_bridge_map = SHASH_INITIALIZER(&port_to_bridge_map);
 /*
 * An instance of a traffic control class.
 *
 * Always associated with a particular network device.
 	ovs_assert(is_netdev_solaris_class(netdev_get_class(netdev)));
 	return (CONTAINER_OF(netdev, struct netdev_solaris, up));
 }
+char *
+netdev_solaris_get_class(struct netdev *netdev)
+{
+	return ((netdev_solaris_cast(netdev))->class);
+}
 static int
 netdev_solaris_plumb(const struct netdev *netdev_, sa_family_t af)
 {
 	struct netdev_solaris	*netdev = netdev_solaris_cast(netdev_);
 	const char		*netdev_name = netdev_get_name(netdev_);
 		sock = sock6;
 		astring = "IPv6";
 		proto = SOLARIS_IPV6;
 	}
-	if ((netdev->implicitly_plumbed & proto) == 0)
+	if ((netdev->implicitly_plumbed & proto) == 0 &&
+	    (netdev->up.netdev_class != &netdev_internal_class)) {
 		return (0);
+	}
 	error = solaris_unplumb_if(sock, netdev_name, af);
 	if (error != 0) {
-		VLOG_ERR("%s device could not be unplumbed", netdev_name);
+		if (error == ENXIO &&
-		return (error);
+		    netdev->up.netdev_class == &netdev_internal_class) {
+			return (0);
+		}
+		VLOG_ERR("%s device could not be unplumbed %d", netdev_name,
+		    error);
 	}
 	VLOG_ERR("%s device unplumbed for %s", netdev_name, astring);
 	netdev->implicitly_plumbed &= ~proto;
 	netdev->plumbed &= ~proto;
 	struct netdev_solaris *netdev = xzalloc(sizeof (*netdev));
 	return (&netdev->up);
 }
+static void
+netdev_solaris_add_port_to_bridge_mapping(const struct netdev
+		*netdev, const char *brname)
+{
+	VLOG_DBG("netdev_solaris_add_port_to_bridge_mapping: adding a mapping "
+	    "<%s,%s> to port_to_bridge_map", netdev->name, brname);
+	shash_add_nocopy(&port_to_bridge_map, netdev->name, brname);
+}
 static int
 netdev_solaris_unconfigure_uplink(const struct netdev *netdev_)
 {
 	struct netdev_solaris	*netdev = netdev_solaris_cast(netdev_);
 	const char		*netdev_name = netdev_get_name(netdev_);
 	int			error;
+	char			curr_lower[DLADM_PROP_VAL_MAX];
+	struct netdev		*netdev_to_migrate = NULL;
+	char			*new_lower = NULL;
+	bool			b_error = false;
 	VLOG_DBG("netdev_solaris_unconfigure_uplink device %s", netdev_name);
-	error = solaris_modify_vnic(NETDEV_IMPL_ETHERSTUB, netdev->brname);
+	error = solaris_get_dlprop(netdev->brname, "lower-link", "current",
-	if (error != 0 && error != ENODEV) {
+	    curr_lower, sizeof (curr_lower));
-		VLOG_ERR("failed to unconfigure %s as uplink for %s: "
+	if (error) {
-		    "%s", netdev_name, netdev->brname,
+		VLOG_ERR("netdev_solaris_unconfigure_uplink couldn't obtain "
-		    ovs_strerror(error));
+		    "bridge(%s) lowerlink", netdev->brname);
+		return (0);
+	}
+	if (strcmp(netdev_name, curr_lower) == 0) {
+		/*
+		 * The uplink which we are trying to remove has bridge vnic on
+		 * top of it. We need to migrate bridge vnic to a different
+		 * uplink or to ovs.etherstub0 if uplink_port_list is empty.
+		 */
+		VLOG_DBG("netdev_solaris_unconfigure_uplink: unconfiguring the "
+		    "uplink (%s) which is the bridge %s's lowerlink (%s)",
+		    netdev_name, netdev->brname, curr_lower);
+		netdev_to_migrate = dpif_solaris_obtain_netdev_to_migrate(
+		    netdev->brname, &b_error);
+		if (b_error) {
+			VLOG_ERR("netdev_solaris_unconfigure_uplink: couldn't "
+			    "obtain netdev_to_migrate for bridge vnic %s",
+			    netdev->brname);
+			return (0);
+		}
+		if (netdev_to_migrate == NULL)
+			new_lower = NETDEV_IMPL_ETHERSTUB;
+		else
+			new_lower = netdev_to_migrate->name;
+		VLOG_DBG("netdev_solaris_unconfigure_uplink migrating bridge "
+		    "vnic to %s", new_lower);
+		error = solaris_modify_vnic(new_lower, netdev->brname);
+		if (error != 0) {
+			VLOG_ERR("failed to unconfigure %s as uplink for %s: "
+			    "%s", netdev_name, netdev->brname,
+			    ovs_strerror(error));
+			return (0);
+		}
+		/*
+		 * reset internal port's physname and refresh its port channel.
+		 */
+		dpif_solaris_migrate_internal_port(netdev->brname, new_lower);
 	}
 	return (0);
 }
 static int
 netdev_solaris_configure_uplink(const struct netdev *netdev_,
 const char *brname)
 {
 	struct netdev_solaris	*netdev = netdev_solaris_cast(netdev_);
-	const char		*netdev_name = netdev_get_name(netdev_);
+	const char		*new_uplink = netdev_get_name(netdev_);
-	char			buffer[DLADM_PROP_VAL_MAX];
+	char			curr_lower[DLADM_PROP_VAL_MAX];
 	int			error;
+	const char		*netdev_existing_class;
-	VLOG_DBG("netdev_solaris_configure_uplink device %s", netdev_name);
+	struct netdev		*i_netdev;
+	boolean_t		migrated = B_FALSE;
+	VLOG_DBG("netdev_solaris_configure_uplink device %s", new_uplink);
 	/*
 	 * Normally, we would expect to see that the bridge VNIC has already
 	 * been created by a call to netdev_solaris_construct() to create the
 	 * bridge netdev. However, on a service restart ovs-vswitchd sometimes
 	 * adds the lower-link port prior to adding the bridge's internal port.
 	 * As a result, we need to create the bridge VNIC here if it does not
 	 * already exist.
 	 */
 	error = solaris_get_dlprop(brname, "lower-link", "current",
-	    buffer, sizeof (buffer));
+	    curr_lower, sizeof (curr_lower));
+	VLOG_DBG("netdev_solaris_configure_uplink lower-link:%s", curr_lower);
 	if (error == ENODEV) {
-		VLOG_DBG("%s vnic being created on %s",
+		/*
-		    brname, netdev_name);
+		 * No implicit VNIC being created yet, create it now
-		error = solaris_create_vnic(netdev_name, brname);
+		 */
-		if (error != 0) {
+		VLOG_DBG("%s vnic being created on %s", brname, new_uplink);
+		error = solaris_create_vnic(new_uplink, brname);
+		if (error == 0) {
+			(void) strlcpy(netdev->brname, brname,
+			    sizeof (netdev->brname));
+		} else {
 			VLOG_ERR("Failed to create vnic for %s: %s",
 			    brname, ovs_strerror(error));
 		}
 		goto exit;
 	} else if (error != 0) {
 	/*
 	 * If the lower-link is already set correctly, then return with
 	 * success.
 	 */
-	if (strcmp(buffer, netdev_name) == 0) {
+	if (strcmp(curr_lower, new_uplink) == 0) {
+		VLOG_DBG("netdev_solaris_configure_uplink lower-link(%s) is "
+		    "already correctly set. (%s)", curr_lower, new_uplink);
 		error = 0;
 		goto exit;
 	}
-	/*
+	if (strcmp(curr_lower, NETDEV_IMPL_ETHERSTUB) == 0) {
-	 * If the lower-link is already set to something other than the
+		/*
-	 * etherstub, something is wrong.
+		 * Bridge vnic is on ovs.etherstub0. We have to migrate the
-	 */
+		 * bridge vnic to the uplink
-	if (strcmp(buffer, NETDEV_IMPL_ETHERSTUB) != 0) {
+		 */
-		VLOG_ERR("Bridge already has uplink %s", buffer);
+		VLOG_DBG("bridge vnic %s is on %s, migrating it to %s",
-		error = EEXIST;
+		    brname, curr_lower, new_uplink);
-		goto exit;
-	}
+		error = solaris_modify_vnic(new_uplink, brname);
+		if (error != 0) {
-	/*
+			VLOG_ERR("failed to configure %s as uplink: %s",
-	 * This is the "normal" case, where the bridge VNIC existed and had
+			    new_uplink, ovs_strerror(error));
-	 * the etherstub as its lower-link. Move the VNIC to its uplink.
+			goto exit;
-	 */
+		}
-	error = solaris_modify_vnic(netdev_name, brname);
+		migrated = B_TRUE;
-	if (error != 0) {
+	} else {
-		VLOG_ERR("failed to configure %s as uplink: %s",
+		/*
-		    netdev_name, ovs_strerror(error));
+		 * Bridge vnic is already on an uplink. Now we see if the
-		goto exit;
+		 * uplink to be added is other than etherstub or not.
+		 * If the bridge vnic is currently residing on an etherstub
+		 * and the one to be configured is not etherstub,
+		 * then we migrate the bridge vnic.
+		 */
+		i_netdev = netdev_from_name(curr_lower);
+		if (!i_netdev) {
+			VLOG_ERR("netdev_solaris_configure_uplink error "
+			    "in fetching lower-link netdev for %s", curr_lower);
+			goto exit;
+		}
+		/* i_netdev->ref_cnt--; */
+		netdev_close(i_netdev);
+		netdev_existing_class = netdev_solaris_get_class(i_netdev);
+		if ((strcmp(netdev_existing_class, "etherstub") == 0) &&
+		    (strcmp(netdev->class, "etherstub") != 0)) {
+			error = solaris_modify_vnic(new_uplink, brname);
+			if (error != 0) {
+				VLOG_ERR("failed to configure %s as uplink: %s",
+				    new_uplink, ovs_strerror(error));
+				goto exit;
+			}
+			migrated = B_TRUE;
+		}
 	}
 	(void) strlcpy(netdev->brname, brname, sizeof (netdev->brname));
 exit:
+	/*
+	 * reset internal port's physname and refresh its port channel.
+	 */
+	if (migrated)
+		dpif_solaris_migrate_internal_port(brname, new_uplink);
 	return (error);
 }
 static boolean_t
 solaris_is_if_plumbed(struct netdev *netdev_, sa_family_t af, uint64_t *flags)
 	GET_STATUS,							\
 	netdev_solaris_arp_lookup,					\
 	netdev_solaris_update_flags,					\
 	netdev_solaris_configure_uplink,				\
 	netdev_solaris_is_uplink,					\
+	netdev_solaris_add_port_to_bridge_mapping,			\
 	NULL,								\
 	NULL,								\
 	NULL,								\
 	NULL,								\
 	NULL,								\

changeset 5730	cca4aa297e68
parent 5090	5f131162e136
child 6018	b5072b523988