X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_sysfs_dp.c;h=91dd56f8fa972e0d17a403cc5193e64e57f0d2aa;hb=58bc1a52cb0b88f8f44b175f13f602e650bc9d06;hp=9699a0760e4441ecd35f0e4da41ed5e4ef449215;hpb=58c342f617051e9e2ffb09710b4ef2b22c34e79a;p=openvswitch

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index 9699a076..91dd56f8 100644
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -26,28 +26,37 @@
 
 #include "dp_sysfs.h"
 #include "datapath.h"
-#include "dp_dev.h"
+#include "vport-internal_dev.h"
 
-#ifdef SUPPORT_SYSFS
+#ifdef CONFIG_SYSFS
 #define to_dev(obj)	container_of(obj, struct device, kobj)
 
 /* Hack to attempt to build on more platforms. */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
-#define to_kobj(d) &(d)->class_dev.kobj
-#define DP_DEVICE_ATTR CLASS_DEVICE_ATTR
+#define INTERNAL_DEVICE_ATTR CLASS_DEVICE_ATTR
+#define DEVICE_PARAMS struct class_device *d
+#define DEVICE_ARGS d
+#define DEV_ATTR(NAME) class_device_attr_##NAME
 #else
-#define to_kobj(d) &(d)->dev.kobj
-#define DP_DEVICE_ATTR DEVICE_ATTR
+#define INTERNAL_DEVICE_ATTR DEVICE_ATTR
+#define DEVICE_PARAMS struct device *d, struct device_attribute *attr
+#define DEVICE_ARGS d, attr
+#define DEV_ATTR(NAME) dev_attr_##NAME
 #endif
 
+struct datapath *sysfs_get_dp(struct net_device *netdev)
+{
+	return vport_get_dp_port(internal_dev_get_vport(netdev))->dp;
+}
+
 /*
  * Common code for storing bridge parameters.
  */
-static ssize_t store_bridge_parm(struct class_device *d,
+static ssize_t store_bridge_parm(DEVICE_PARAMS,
 				 const char *buf, size_t len,
 				 void (*set)(struct datapath *, unsigned long))
 {
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	char *endp;
 	unsigned long val;
 
@@ -76,11 +85,10 @@ static ssize_t store_bridge_parm(struct class_device *d,
 }
 
 
-static ssize_t show_forward_delay(struct class_device *d,
-				  char *buf)
+static ssize_t show_forward_delay(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay));
 #else
 	return sprintf(buf, "%d\n", 0);
@@ -99,15 +107,15 @@ static void set_forward_delay(struct datapath *dp, unsigned long val)
 #endif
 }
 
-static ssize_t store_forward_delay(struct class_device *d,
+static ssize_t store_forward_delay(DEVICE_PARAMS,
 				   const char *buf, size_t len)
 {
-	return store_bridge_parm(d, buf, len, set_forward_delay);
+	return store_bridge_parm(DEVICE_ARGS, buf, len, set_forward_delay);
 }
-static DP_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR,
+static INTERNAL_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR,
 		   show_forward_delay, store_forward_delay);
 
-static ssize_t show_hello_time(struct class_device *d, char *buf)
+static ssize_t show_hello_time(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return sprintf(buf, "%lu\n",
@@ -129,17 +137,16 @@ static void set_hello_time(struct datapath *dp, unsigned long val)
 #endif
 }
 
-static ssize_t store_hello_time(struct class_device *d,
+static ssize_t store_hello_time(DEVICE_PARAMS,
 				const char *buf,
 				size_t len)
 {
-	return store_bridge_parm(d, buf, len, set_hello_time);
+	return store_bridge_parm(DEVICE_ARGS, buf, len, set_hello_time);
 }
-static DP_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time,
+static INTERNAL_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time,
 		   store_hello_time);
 
-static ssize_t show_max_age(struct class_device *d, 
-			    char *buf)
+static ssize_t show_max_age(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return sprintf(buf, "%lu\n",
@@ -161,18 +168,17 @@ static void set_max_age(struct datapath *dp, unsigned long val)
 #endif
 }
 
-static ssize_t store_max_age(struct class_device *d, 
+static ssize_t store_max_age(DEVICE_PARAMS,
 			     const char *buf, size_t len)
 {
-	return store_bridge_parm(d, buf, len, set_max_age);
+	return store_bridge_parm(DEVICE_ARGS, buf, len, set_max_age);
 }
-static DP_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age);
+static INTERNAL_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age);
 
-static ssize_t show_ageing_time(struct class_device *d,
-				char *buf)
+static ssize_t show_ageing_time(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time));
 #else
 	return sprintf(buf, "%d\n", 0);
@@ -188,19 +194,18 @@ static void set_ageing_time(struct datapath *dp, unsigned long val)
 #endif
 }
 
-static ssize_t store_ageing_time(struct class_device *d,
+static ssize_t store_ageing_time(DEVICE_PARAMS,
 				 const char *buf, size_t len)
 {
-	return store_bridge_parm(d, buf, len, set_ageing_time);
+	return store_bridge_parm(DEVICE_ARGS, buf, len, set_ageing_time);
 }
-static DP_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time,
+static INTERNAL_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time,
 		   store_ageing_time);
 
-static ssize_t show_stp_state(struct class_device *d,
-			      char *buf)
+static ssize_t show_stp_state(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%d\n", br->stp_enabled);
 #else
 	return sprintf(buf, "%d\n", 0);
@@ -208,11 +213,11 @@ static ssize_t show_stp_state(struct class_device *d,
 }
 
 
-static ssize_t store_stp_state(struct class_device *d,
+static ssize_t store_stp_state(DEVICE_PARAMS,
 			       const char *buf,
 			       size_t len)
 {
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 #if 0
 	char *endp;
 	unsigned long val;
@@ -233,14 +238,13 @@ static ssize_t store_stp_state(struct class_device *d,
 
 	return len;
 }
-static DP_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state,
+static INTERNAL_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state,
 		   store_stp_state);
 
-static ssize_t show_priority(struct class_device *d, 
-			     char *buf)
+static ssize_t show_priority(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%d\n",
 		       (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]);
 #else
@@ -257,15 +261,14 @@ static void set_priority(struct datapath *dp, unsigned long val)
 #endif
 }
 
-static ssize_t store_priority(struct class_device *d, 
+static ssize_t store_priority(DEVICE_PARAMS,
 			       const char *buf, size_t len)
 {
-	return store_bridge_parm(d, buf, len, set_priority);
+	return store_bridge_parm(DEVICE_ARGS, buf, len, set_priority);
 }
-static DP_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority);
+static INTERNAL_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority);
 
-static ssize_t show_root_id(struct class_device *d, 
-			    char *buf)
+static ssize_t show_root_id(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return br_show_bridge_id(buf, &to_bridge(d)->designated_root);
@@ -273,22 +276,20 @@ static ssize_t show_root_id(struct class_device *d,
 	return sprintf(buf, "0000.010203040506\n");
 #endif
 }
-static DP_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL);
+static INTERNAL_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL);
 
-static ssize_t show_bridge_id(struct class_device *d, 
-			      char *buf)
+static ssize_t show_bridge_id(DEVICE_PARAMS, char *buf)
 {
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
-	const unsigned char *addr = dp->ports[ODPP_LOCAL]->dev->dev_addr;
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
+	const unsigned char *addr = vport_get_addr(dp->ports[ODPP_LOCAL]->vport);
 
 	/* 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]);
 }
-static DP_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL);
+static INTERNAL_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL);
 
-static ssize_t show_root_port(struct class_device *d, 
-			      char *buf)
+static ssize_t show_root_port(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return sprintf(buf, "%d\n", to_bridge(d)->root_port);
@@ -296,10 +297,9 @@ static ssize_t show_root_port(struct class_device *d,
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL);
+static INTERNAL_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL);
 
-static ssize_t show_root_path_cost(struct class_device *d,
-				   char *buf)
+static ssize_t show_root_path_cost(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return sprintf(buf, "%d\n", to_bridge(d)->root_path_cost);
@@ -307,10 +307,9 @@ static ssize_t show_root_path_cost(struct class_device *d,
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL);
+static INTERNAL_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL);
 
-static ssize_t show_topology_change(struct class_device *d,
-				    char *buf)
+static ssize_t show_topology_change(DEVICE_PARAMS, char *buf)
 {
 #if 0
 	return sprintf(buf, "%d\n", to_bridge(d)->topology_change);
@@ -318,75 +317,69 @@ static ssize_t show_topology_change(struct class_device *d,
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL);
+static INTERNAL_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL);
 
-static ssize_t show_topology_change_detected(struct class_device *d,
-					     char *buf)
+static ssize_t show_topology_change_detected(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%d\n", br->topology_change_detected);
 #else
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(topology_change_detected, S_IRUGO,
+static INTERNAL_DEVICE_ATTR(topology_change_detected, S_IRUGO,
 		   show_topology_change_detected, NULL);
 
-static ssize_t show_hello_timer(struct class_device *d,
-				char *buf)
+static ssize_t show_hello_timer(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%ld\n", br_timer_value(&br->hello_timer));
 #else
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL);
+static INTERNAL_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL);
 
-static ssize_t show_tcn_timer(struct class_device *d, 
-			      char *buf)
+static ssize_t show_tcn_timer(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%ld\n", br_timer_value(&br->tcn_timer));
 #else
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL);
+static INTERNAL_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL);
 
-static ssize_t show_topology_change_timer(struct class_device *d,
-					  char *buf)
+static ssize_t show_topology_change_timer(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%ld\n", br_timer_value(&br->topology_change_timer));
 #else
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer,
+static INTERNAL_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer,
 		   NULL);
 
-static ssize_t show_gc_timer(struct class_device *d, 
-			     char *buf)
+static ssize_t show_gc_timer(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%ld\n", br_timer_value(&br->gc_timer));
 #else
 	return sprintf(buf, "%d\n", 0);
 #endif
 }
-static DP_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL);
+static INTERNAL_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL);
 
-static ssize_t show_group_addr(struct class_device *d,
-			       char *buf)
+static ssize_t show_group_addr(DEVICE_PARAMS, char *buf)
 {
 #if 0
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 	return sprintf(buf, "%x:%x:%x:%x:%x:%x\n",
 		       br->group_addr[0], br->group_addr[1],
 		       br->group_addr[2], br->group_addr[3],
@@ -396,10 +389,10 @@ static ssize_t show_group_addr(struct class_device *d,
 #endif
 }
 
-static ssize_t store_group_addr(struct class_device *d,
+static ssize_t store_group_addr(DEVICE_PARAMS,
 				const char *buf, size_t len)
 {
-	struct datapath *dp = dp_dev_get_dp(to_net_dev(d));
+	struct datapath *dp = sysfs_get_dp(to_net_dev(d));
 #if 0
 	unsigned new_addr[6];
 	int i;
@@ -435,32 +428,32 @@ static ssize_t store_group_addr(struct class_device *d,
 	return len;
 }
 
-static DP_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR,
+static INTERNAL_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR,
 		   show_group_addr, store_group_addr);
 
 static struct attribute *bridge_attrs[] = {
-	&class_device_attr_forward_delay.attr,
-	&class_device_attr_hello_time.attr,
-	&class_device_attr_max_age.attr,
-	&class_device_attr_ageing_time.attr,
-	&class_device_attr_stp_state.attr,
-	&class_device_attr_priority.attr,
-	&class_device_attr_bridge_id.attr,
-	&class_device_attr_root_id.attr,
-	&class_device_attr_root_path_cost.attr,
-	&class_device_attr_root_port.attr,
-	&class_device_attr_topology_change.attr,
-	&class_device_attr_topology_change_detected.attr,
-	&class_device_attr_hello_timer.attr,
-	&class_device_attr_tcn_timer.attr,
-	&class_device_attr_topology_change_timer.attr,
-	&class_device_attr_gc_timer.attr,
-	&class_device_attr_group_addr.attr,
+	&DEV_ATTR(forward_delay).attr,
+	&DEV_ATTR(hello_time).attr,
+	&DEV_ATTR(max_age).attr,
+	&DEV_ATTR(ageing_time).attr,
+	&DEV_ATTR(stp_state).attr,
+	&DEV_ATTR(priority).attr,
+	&DEV_ATTR(bridge_id).attr,
+	&DEV_ATTR(root_id).attr,
+	&DEV_ATTR(root_path_cost).attr,
+	&DEV_ATTR(root_port).attr,
+	&DEV_ATTR(topology_change).attr,
+	&DEV_ATTR(topology_change_detected).attr,
+	&DEV_ATTR(hello_timer).attr,
+	&DEV_ATTR(tcn_timer).attr,
+	&DEV_ATTR(topology_change_timer).attr,
+	&DEV_ATTR(gc_timer).attr,
+	&DEV_ATTR(group_addr).attr,
 	NULL
 };
 
 static struct attribute_group bridge_group = {
-	.name = SYSFS_BRIDGE_ATTR,
+	.name = SYSFS_BRIDGE_ATTR, /* "bridge" */
 	.attrs = bridge_attrs,
 };
 
@@ -476,9 +469,10 @@ static struct attribute_group bridge_group = {
  */
 int dp_sysfs_add_dp(struct datapath *dp)
 {
-	struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev);
+	struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]->vport);
 	int err;
 
+	/* 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",
@@ -486,12 +480,11 @@ int dp_sysfs_add_dp(struct datapath *dp)
 		goto out1;
 	}
 
-	/* Create /sys/class/net/<devname>/bridge directory. */
-	dp->ifobj.parent = kobj;
-	err = kobject_add(&dp->ifobj);
+	/* Create /sys/class/net/<devname>/brif directory. */
+	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), dp->ifobj.name);
+			__FUNCTION__, dp_name(dp), kobject_name(&dp->ifobj));
 		goto out2;
 	}
 	kobject_uevent(&dp->ifobj, KOBJ_ADD);
@@ -505,21 +498,16 @@ int dp_sysfs_add_dp(struct datapath *dp)
 
 int dp_sysfs_del_dp(struct datapath *dp)
 {
-	struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev);
+	struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]->vport);
 
 	kobject_del(&dp->ifobj);
 	sysfs_remove_group(kobj, &bridge_group);
 
 	return 0;
 }
-#else /* !SUPPORT_SYSFS */
+#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 net_bridge_port *p) { return 0; }
-int dp_sysfs_del_if(struct net_bridge_port *p)
-{
-	dev_put(p->dev);
-	kfree(p);
-	return 0;
-}
-#endif /* !SUPPORT_SYSFS */
+int dp_sysfs_add_if(struct dp_port *p) { return 0; }
+int dp_sysfs_del_if(struct dp_port *p) { return 0; }
+#endif /* !CONFIG_SYSFS */