X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_dp.c;h=3ecacd779a869489007260518b0dc525eac034e7;hb=a8643e447601201aabd1159966bd716e48378f97;hp=8214c604e39d5956d7f7002e60dba6e73010f1dd;hpb=b4a7d61582ef3a09a666106a926c8912201dfe72;p=sliver-openvswitch.git

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index 8214c604e..3ecacd779 100644
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -1,11 +1,23 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/version.h>
 
 /*
@@ -41,11 +53,11 @@
 #define DEV_ATTR(NAME) dev_attr_##NAME
 #endif
 
-struct datapath *sysfs_get_dp(struct net_device *netdev)
+static struct datapath *sysfs_get_dp(struct net_device *netdev)
 {
-	return vport_get_dp_port(internal_dev_get_vport(netdev))->dp;
+	struct vport *vport = ovs_internal_dev_get_vport(netdev);
+	return vport ? vport->dp : NULL;
 }
-
 /*
  * Common code for storing bridge parameters.
  */
@@ -53,9 +65,9 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS,
 				 const char *buf, size_t len,
 				 void (*set)(struct datapath *, unsigned long))
 {
-	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	char *endp;
 	unsigned long val;
+	ssize_t result = len;
 
 	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
@@ -66,14 +78,24 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS,
 
 	/* xxx We use a default value of 0 for all fields.  If the caller is
 	 * xxx attempting to set the value to our default, just silently
-	 * xxx ignore the request. 
+	 * xxx ignore the request.
 	 */
 	if (val != 0) {
-		printk("%s: xxx writing dp parms not supported yet!\n", 
-		       dp_name(dp));
+		struct datapath *dp;
+
+		rcu_read_lock();
+
+		dp = sysfs_get_dp(to_net_dev(d));
+		if (dp)
+			pr_warning("%s: xxx writing dp parms not supported yet!\n",
+			       ovs_dp_name(dp));
+		else
+			result = -ENODEV;
+
+		rcu_read_unlock();
 	}
 
-	return len;
+	return result;
 }
 
 
@@ -84,7 +106,7 @@ static ssize_t show_forward_delay(DEVICE_PARAMS, char *buf)
 
 static void set_forward_delay(struct datapath *dp, unsigned long val)
 {
-	printk("%s: xxx attempt to set_forward_delay()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_forward_delay()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_forward_delay(DEVICE_PARAMS,
@@ -102,7 +124,7 @@ static ssize_t show_hello_time(DEVICE_PARAMS, char *buf)
 
 static void set_hello_time(struct datapath *dp, unsigned long val)
 {
-	printk("%s: xxx attempt to set_hello_time()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_hello_time()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_hello_time(DEVICE_PARAMS,
@@ -121,7 +143,7 @@ static ssize_t show_max_age(DEVICE_PARAMS, char *buf)
 
 static void set_max_age(struct datapath *dp, unsigned long val)
 {
-	printk("%s: xxx attempt to set_max_age()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_max_age()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_max_age(DEVICE_PARAMS,
@@ -138,7 +160,7 @@ static ssize_t show_ageing_time(DEVICE_PARAMS, char *buf)
 
 static void set_ageing_time(struct datapath *dp, unsigned long val)
 {
-	printk("%s: xxx attempt to set_ageing_time()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_ageing_time()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_ageing_time(DEVICE_PARAMS,
@@ -159,11 +181,20 @@ static ssize_t store_stp_state(DEVICE_PARAMS,
 			       const char *buf,
 			       size_t len)
 {
-	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
+	struct datapath *dp;
+	ssize_t result = len;
+
+	rcu_read_lock();
 
-	printk("%s: xxx attempt to set_stp_state()\n", dp_name(dp));
+	dp = sysfs_get_dp(to_net_dev(d));
+	if (dp)
+		pr_info("%s: xxx attempt to set_stp_state()\n", ovs_dp_name(dp));
+	else
+		result = -ENODEV;
 
-	return len;
+	rcu_read_unlock();
+
+	return result;
 }
 static INTERNAL_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state,
 		   store_stp_state);
@@ -175,7 +206,7 @@ static ssize_t show_priority(DEVICE_PARAMS, char *buf)
 
 static void set_priority(struct datapath *dp, unsigned long val)
 {
-	printk("%s: xxx attempt to set_priority()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_priority()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_priority(DEVICE_PARAMS,
@@ -193,12 +224,25 @@ static INTERNAL_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL);
 
 static ssize_t show_bridge_id(DEVICE_PARAMS, char *buf)
 {
-	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
-	const unsigned char *addr = vport_get_addr(dp->ports[ODPP_LOCAL]->vport);
+	struct vport *vport;
+	ssize_t result;
+
+	rcu_read_lock();
 
-	/* xxx Do we need a lock of some sort? */
-	return sprintf(buf, "%.2x%.2x.%.2x%.2x%.2x%.2x%.2x%.2x\n",
-			0, 0, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+	vport = ovs_internal_dev_get_vport(to_net_dev(d));
+	if (vport) {
+		const unsigned char *addr;
+
+		addr = vport->ops->get_addr(vport);
+		result = sprintf(buf, "%.2x%.2x.%.2x%.2x%.2x%.2x%.2x%.2x\n",
+				 0, 0, addr[0], addr[1], addr[2], addr[3],
+				 addr[4], addr[5]);
+	} else
+		result = -ENODEV;
+
+	rcu_read_unlock();
+
+	return result;
 }
 static INTERNAL_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL);
 
@@ -260,10 +304,21 @@ static ssize_t show_group_addr(DEVICE_PARAMS, char *buf)
 static ssize_t store_group_addr(DEVICE_PARAMS,
 				const char *buf, size_t len)
 {
-	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
+	struct datapath *dp;
+	ssize_t result = len;
+
+	rcu_read_lock();
+
+	dp = sysfs_get_dp(to_net_dev(d));
+	if (dp)
+		pr_info("%s: xxx attempt to store_group_addr()\n",
+		       ovs_dp_name(dp));
+	else
+		result = -ENODEV;
 
-	printk("%s: xxx attempt to store_group_addr()\n", dp_name(dp));
-	return len;
+	rcu_read_unlock();
+
+	return result;
 }
 
 static INTERNAL_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR,
@@ -305,16 +360,23 @@ static struct attribute_group bridge_group = {
  *   to hold links.  The ifobj exists in the same data structure
  *   as its parent the bridge so reference counting works.
  */
-int dp_sysfs_add_dp(struct datapath *dp)
+int ovs_dp_sysfs_add_dp(struct datapath *dp)
 {
-	struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]->vport);
+	struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL);
+	struct kobject *kobj = vport->ops->get_kobj(vport);
 	int err;
 
+#ifdef CONFIG_NET_NS
+	/* Due to bug in 2.6.32 kernel, sysfs_create_group() could panic
+	 * in other namespace than init_net. Following check is to avoid it. */
+	if (!kobj->sd)
+		return -ENOENT;
+#endif
 	/* Create /sys/class/net/<devname>/bridge directory. */
 	err = sysfs_create_group(kobj, &bridge_group);
 	if (err) {
 		pr_info("%s: can't create group %s/%s\n",
-			__func__, dp_name(dp), bridge_group.name);
+			__func__, ovs_dp_name(dp), bridge_group.name);
 		goto out1;
 	}
 
@@ -322,7 +384,7 @@ int dp_sysfs_add_dp(struct datapath *dp)
 	err = kobject_add(&dp->ifobj, kobj, SYSFS_BRIDGE_PORT_SUBDIR);
 	if (err) {
 		pr_info("%s: can't add kobject (directory) %s/%s\n",
-			__FUNCTION__, dp_name(dp), kobject_name(&dp->ifobj));
+			__func__, ovs_dp_name(dp), kobject_name(&dp->ifobj));
 		goto out2;
 	}
 	kobject_uevent(&dp->ifobj, KOBJ_ADD);
@@ -334,9 +396,15 @@ int dp_sysfs_add_dp(struct datapath *dp)
 	return err;
 }
 
-int dp_sysfs_del_dp(struct datapath *dp)
+int ovs_dp_sysfs_del_dp(struct datapath *dp)
 {
-	struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]->vport);
+	struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL);
+	struct kobject *kobj = vport->ops->get_kobj(vport);
+
+#ifdef CONFIG_NET_NS
+	if (!kobj->sd)
+		return 0;
+#endif
 
 	kobject_del(&dp->ifobj);
 	sysfs_remove_group(kobj, &bridge_group);
@@ -344,8 +412,8 @@ int dp_sysfs_del_dp(struct datapath *dp)
 	return 0;
 }
 #else /* !CONFIG_SYSFS */
-int dp_sysfs_add_dp(struct datapath *dp) { return 0; }
-int dp_sysfs_del_dp(struct datapath *dp) { return 0; }
-int dp_sysfs_add_if(struct dp_port *p) { return 0; }
-int dp_sysfs_del_if(struct dp_port *p) { return 0; }
+int ovs_dp_sysfs_add_dp(struct datapath *dp) { return 0; }
+int ovs_dp_sysfs_del_dp(struct datapath *dp) { return 0; }
+int dp_sysfs_add_if(struct vport *p) { return 0; }
+int dp_sysfs_del_if(struct vport *p) { return 0; }
 #endif /* !CONFIG_SYSFS */