X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=bf8043b6054fffa428fb827321325f16cdfa6f87;hb=f35409904bc4a0a695a4aecb2435933d8a8187fe;hp=43d96fbdecb58eb85f85092cb68c015cf3f31594;hpb=1dcf111b1cb66fe1f3ed2e45f66ab6f5659a6527;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 43d96fbd..bf8043b6 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -55,18 +55,6 @@
 int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 EXPORT_SYMBOL(dp_ioctl_hook);
 
-int (*dp_add_dp_hook)(struct datapath *dp);
-EXPORT_SYMBOL(dp_add_dp_hook);
-
-int (*dp_del_dp_hook)(struct datapath *dp);
-EXPORT_SYMBOL(dp_del_dp_hook);
-
-int (*dp_add_if_hook)(struct net_bridge_port *p);
-EXPORT_SYMBOL(dp_add_if_hook);
-
-int (*dp_del_if_hook)(struct net_bridge_port *p);
-EXPORT_SYMBOL(dp_del_if_hook);
-
 /* Datapaths.  Protected on the read side by rcu_read_lock, on the write side
  * by dp_mutex.  dp_mutex is almost completely redundant with genl_mutex
  * maintained by the Generic Netlink code, but the timeout path needs mutual
@@ -183,6 +171,16 @@ errout:
 		rtnl_set_sk_err(net, RTNLGRP_LINK, err);
 }
 
+static void release_dp(struct kobject *kobj)
+{
+	struct datapath *dp = container_of(kobj, struct datapath, ifobj);
+	kfree(dp);
+}
+
+struct kobj_type dp_ktype = {
+	.release = release_dp
+};
+
 static int create_dp(int dp_idx, const char __user *devnamep)
 {
 	struct net_device *dp_dev;
@@ -224,6 +222,13 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 		skb_queue_head_init(&dp->queues[i]);
 	init_waitqueue_head(&dp->waitqueue);
 
+	/* Initialize kobject for bridge.  This will be added as
+	 * /sys/class/net/<devname>/bridge later, if sysfs is enabled. */
+	kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "bridge" */
+	dp->ifobj.kset = NULL;
+	dp->ifobj.parent = NULL;
+	kobject_init(&dp->ifobj, &dp_ktype);
+
 	/* Allocate table. */
 	err = -ENOMEM;
 	rcu_assign_pointer(dp->table, dp_table_create(DP_L1_SIZE));
@@ -251,8 +256,9 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 	mutex_unlock(&dp_mutex);
 	rtnl_unlock();
 
-	if (dp_add_dp_hook)
-		dp_add_dp_hook(dp);
+#ifdef SUPPORT_SYSFS
+	dp_sysfs_add_dp(dp);
+#endif
 
 	return 0;
 
@@ -280,8 +286,9 @@ static void do_destroy_dp(struct datapath *dp)
 		if (p->port_no != ODPP_LOCAL)
 			dp_del_port(p);
 
-	if (dp_del_dp_hook)
-		dp_del_dp_hook(dp);
+#ifdef SUPPORT_SYSFS
+	dp_sysfs_del_dp(dp);
+#endif
 
 	rcu_assign_pointer(dps[dp->dp_idx], NULL);
 
@@ -294,7 +301,7 @@ static void do_destroy_dp(struct datapath *dp)
 	for (i = 0; i < DP_MAX_GROUPS; i++)
 		kfree(dp->groups[i]);
 	free_percpu(dp->stats_percpu);
-	kfree(dp);
+	kobject_put(&dp->ifobj);
 	module_put(THIS_MODULE);
 }
 
@@ -319,6 +326,19 @@ err_unlock:
 	return err;
 }
 
+static void release_nbp(struct kobject *kobj)
+{
+	struct net_bridge_port *p = container_of(kobj, struct net_bridge_port, kobj);
+	kfree(p);
+}
+
+struct kobj_type brport_ktype = {
+#ifdef SUPPORT_SYSFS
+	.sysfs_ops = &brport_sysfs_ops,
+#endif
+	.release = release_nbp
+};
+
 /* Called with RTNL lock and dp_mutex. */
 static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
 {
@@ -348,6 +368,13 @@ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
 	list_add_rcu(&p->node, &dp->port_list);
 	dp->n_ports++;
 
+	/* Initialize kobject for bridge.  This will be added as
+	 * /sys/class/net/<devname>/brport later, if sysfs is enabled. */
+	kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */
+	p->kobj.kset = NULL;
+	p->kobj.parent = &p->dev->NETDEV_DEV_MEMBER.kobj;
+	kobject_init(&p->kobj, &brport_ktype);
+
 	dp_ifinfo_notify(RTM_NEWLINK, p);
 
 	return 0;
@@ -403,8 +430,9 @@ static int add_port(int dp_idx, struct odp_port __user *portp)
 	if (err)
 		goto out_put;
 
-	if (dp_add_if_hook)
-		dp_add_if_hook(dp->ports[port_no]);
+#ifdef SUPPORT_SYSFS
+	dp_sysfs_add_if(dp->ports[port_no]);
+#endif
 
 out_put:
 	dev_put(dev);
@@ -421,8 +449,8 @@ int dp_del_port(struct net_bridge_port *p)
 	ASSERT_RTNL();
 
 #ifdef SUPPORT_SYSFS
-	if (p->port_no != ODPP_LOCAL && dp_del_if_hook)
-		sysfs_remove_link(&p->dp->ifobj, p->dev->name);
+	if (p->port_no != ODPP_LOCAL)
+		dp_sysfs_del_if(p);
 #endif
 	dp_ifinfo_notify(RTM_DELLINK, p);
 
@@ -444,15 +472,10 @@ int dp_del_port(struct net_bridge_port *p)
 	/* Then wait until no one is still using it, and destroy it. */
 	synchronize_rcu();
 
-	if (is_dp_dev(p->dev)) {
+	if (is_dp_dev(p->dev))
 		dp_dev_destroy(p->dev);
-	}
-	if (p->port_no != ODPP_LOCAL && dp_del_if_hook) {
-		dp_del_if_hook(p);
-	} else {
-		dev_put(p->dev);
-		kfree(p);
-	}
+	dev_put(p->dev);
+	kobject_put(&p->kobj);
 
 	return 0;
 }