X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=ab993f6bc36d1744e73db2d345e822771ffafbf4;hb=1d87357a1322c2faa290452c08c7f794c0be848b;hp=e545cda0518a0aaae3b46bd3f8bc766a79da296c;hpb=e86c8696eb0bc62f4a4ae45df5715cee73533408;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index e545cda0..ab993f6b 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
@@ -184,6 +172,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;
@@ -218,28 +216,35 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 	dp = kzalloc(sizeof *dp, GFP_KERNEL);
 	if (dp == NULL)
 		goto err_put_module;
-
+	INIT_LIST_HEAD(&dp->port_list);
 	mutex_init(&dp->mutex);
 	dp->dp_idx = dp_idx;
 	for (i = 0; i < DP_N_QUEUES; i++)
 		skb_queue_head_init(&dp->queues[i]);
 	init_waitqueue_head(&dp->waitqueue);
 
-	/* Setup our datapath device */
-	dp_dev = dp_dev_create(dp, devname, ODPP_LOCAL);
-	err = PTR_ERR(dp_dev);
-	if (IS_ERR(dp_dev))
-		goto err_free_dp;
+	/* Initialize kobject for bridge.  This will be added as
+	 * /sys/class/net/<devname>/brif later, if sysfs is enabled. */
+	dp->ifobj.kset = NULL;
+	kobject_init(&dp->ifobj, &dp_ktype);
 
+	/* Allocate table. */
 	err = -ENOMEM;
 	rcu_assign_pointer(dp->table, dp_table_create(DP_L1_SIZE));
 	if (!dp->table)
-		goto err_destroy_dp_dev;
-	INIT_LIST_HEAD(&dp->port_list);
+		goto err_free_dp;
+
+	/* Setup our datapath device */
+	dp_dev = dp_dev_create(dp, devname, ODPP_LOCAL);
+	err = PTR_ERR(dp_dev);
+	if (IS_ERR(dp_dev))
+		goto err_destroy_table;
 
 	err = new_nbp(dp, dp_dev, ODPP_LOCAL);
-	if (err)
+	if (err) {
+		dp_dev_destroy(dp_dev);
 		goto err_destroy_table;
+	}
 
 	dp->drop_frags = 0;
 	dp->stats_percpu = alloc_percpu(struct dp_stats_percpu);
@@ -250,17 +255,14 @@ 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);
+	dp_sysfs_add_dp(dp);
 
 	return 0;
 
 err_destroy_local_port:
-	dp_del_port(dp->ports[ODPP_LOCAL], NULL);
+	dp_del_port(dp->ports[ODPP_LOCAL]);
 err_destroy_table:
 	dp_table_destroy(dp->table, 0);
-err_destroy_dp_dev:
-	dp_dev_destroy(dp_dev);
 err_free_dp:
 	kfree(dp);
 err_put_module:
@@ -272,21 +274,20 @@ err:
 	return err;
 }
 
-static void do_destroy_dp(struct datapath *dp, struct list_head *dp_devs)
+static void do_destroy_dp(struct datapath *dp)
 {
 	struct net_bridge_port *p, *n;
 	int i;
 
 	list_for_each_entry_safe (p, n, &dp->port_list, node)
 		if (p->port_no != ODPP_LOCAL)
-			dp_del_port(p, dp_devs);
+			dp_del_port(p);
 
-	if (dp_del_dp_hook)
-		dp_del_dp_hook(dp);
+	dp_sysfs_del_dp(dp);
 
 	rcu_assign_pointer(dps[dp->dp_idx], NULL);
 
-	dp_del_port(dp->ports[ODPP_LOCAL], dp_devs);
+	dp_del_port(dp->ports[ODPP_LOCAL]);
 
 	dp_table_destroy(dp->table, 1);
 
@@ -295,15 +296,13 @@ static void do_destroy_dp(struct datapath *dp, struct list_head *dp_devs)
 	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);
 }
 
 static int destroy_dp(int dp_idx)
 {
-	struct dp_dev *dp_dev, *next;
 	struct datapath *dp;
-	LIST_HEAD(dp_devs);
 	int err;
 
 	rtnl_lock();
@@ -313,17 +312,28 @@ static int destroy_dp(int dp_idx)
 	if (!dp)
 		goto err_unlock;
 
-	do_destroy_dp(dp, &dp_devs);
+	do_destroy_dp(dp);
 	err = 0;
 
 err_unlock:
 	mutex_unlock(&dp_mutex);
 	rtnl_unlock();
-	list_for_each_entry_safe (dp_dev, next, &dp_devs, list)
-		free_netdev(dp_dev->dev);
 	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 CONFIG_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)
 {
@@ -353,6 +363,11 @@ 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. */
+	p->kobj.kset = NULL;
+	kobject_init(&p->kobj, &brport_ktype);
+
 	dp_ifinfo_notify(RTM_NEWLINK, p);
 
 	return 0;
@@ -406,8 +421,7 @@ got_port_no:
 	if (err)
 		goto out_put;
 
-	if (dp_add_if_hook)
-		dp_add_if_hook(dp->ports[port_no]);
+	dp_sysfs_add_if(dp->ports[port_no]);
 
 	err = __put_user(port_no, &port.port);
 
@@ -421,17 +435,12 @@ out:
 	return err;
 }
 
-int dp_del_port(struct net_bridge_port *p, struct list_head *dp_devs)
+int dp_del_port(struct net_bridge_port *p)
 {
 	ASSERT_RTNL();
 
-	if (p->port_no != ODPP_LOCAL && dp_del_if_hook) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-		sysfs_remove_link(&p->dp->ifobj, p->dev->name);
-#else
-		sysfs_remove_link(p->dp->ifobj, p->dev->name);
-#endif
-	}
+	if (p->port_no != ODPP_LOCAL)
+		dp_sysfs_del_if(p);
 	dp_ifinfo_notify(RTM_DELLINK, p);
 
 	p->dp->n_ports--;
@@ -452,26 +461,16 @@ int dp_del_port(struct net_bridge_port *p, struct list_head *dp_devs)
 	/* 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 (dp_devs) {
-			struct dp_dev *dp_dev = dp_dev_priv(p->dev);
-			list_add(&dp_dev->list, dp_devs);
-		}
-	}
-	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;
 }
 
 static int del_port(int dp_idx, int port_no)
 {
-	struct dp_dev *dp_dev, *next;
 	struct net_bridge_port *p;
 	struct datapath *dp;
 	LIST_HEAD(dp_devs);
@@ -492,15 +491,13 @@ static int del_port(int dp_idx, int port_no)
 	if (!p)
 		goto out_unlock_dp;
 
-	err = dp_del_port(p, &dp_devs);
+	err = dp_del_port(p);
 
 out_unlock_dp:
 	mutex_unlock(&dp->mutex);
 out_unlock_rtnl:
 	rtnl_unlock();
 out:
-	list_for_each_entry_safe (dp_dev, next, &dp_devs, list)
-		free_netdev(dp_dev->dev);
 	return err;
 }
 
@@ -531,7 +528,6 @@ void dp_process_received_packet(struct sk_buff *skb, struct net_bridge_port *p)
 	struct sw_flow *flow;
 
 	WARN_ON_ONCE(skb_shared(skb));
-	WARN_ON_ONCE(skb->destructor);
 
 	/* BHs are off so we don't have to use get_cpu()/put_cpu() here. */
 	stats = percpu_ptr(dp->stats_percpu, smp_processor_id());
@@ -580,8 +576,7 @@ static int dp_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
 #error
 #endif
 
-#ifdef CONFIG_XEN
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18)
+#if defined(CONFIG_XEN) && LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18)
 /* This code is copied verbatim from net/dev/core.c in Xen's
  * linux-2.6.18-92.1.10.el5.xs5.0.0.394.644.  We can't call those functions
  * directly because they aren't exported. */
@@ -597,7 +592,7 @@ static int skb_pull_up_to(struct sk_buff *skb, void *ptr)
 	}
 }
 
-int skb_checksum_setup(struct sk_buff *skb)
+int vswitch_skb_checksum_setup(struct sk_buff *skb)
 {
 	if (skb->proto_csum_blank) {
 		if (skb->protocol != htons(ETH_P_IP))
@@ -628,8 +623,9 @@ int skb_checksum_setup(struct sk_buff *skb)
 out:
 	return -EPROTO;
 }
-#endif /* linux == 2.6.18 */
-#endif /* CONFIG_XEN */
+#else
+int vswitch_skb_checksum_setup(struct sk_buff *skb) { return 0; }
+#endif /* CONFIG_XEN && linux == 2.6.18 */
 
 int
 dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
@@ -655,7 +651,7 @@ dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
 	 * the non-Xen case, but it is difficult to trigger or test this case
 	 * there, hence the WARN_ON_ONCE().
  	 */
-	err = skb_checksum_setup(skb);
+	err = vswitch_skb_checksum_setup(skb);
  	if (err)
 		goto err_kfree_skb;
 #ifndef CHECKSUM_HW
@@ -1193,6 +1189,29 @@ static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp)
 	return copy_to_user(statsp, &stats, sizeof stats) ? -EFAULT : 0;
 }
 
+/* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports */
+int dp_min_mtu(const struct datapath *dp)
+{
+	struct net_bridge_port *p;
+	int mtu = 0;
+
+	ASSERT_RTNL();
+
+	list_for_each_entry_rcu (p, &dp->port_list, node) {
+		struct net_device *dev = p->dev;
+
+		/* Skip any internal ports, since that's what we're trying to
+		 * set. */
+		if (is_dp_dev(dev))
+			continue;
+
+		if (!mtu || dev->mtu < mtu)
+			mtu = dev->mtu;
+	}
+
+	return mtu ? mtu : ETH_DATA_LEN;
+}
+
 static int
 put_port(const struct net_bridge_port *p, struct odp_port __user *uop)
 {
@@ -1260,7 +1279,7 @@ list_ports(struct datapath *dp, struct odp_portvec __user *pvp)
 				break;
 		}
 	}
-	return put_user(idx, &pvp->n_ports);
+	return put_user(dp->n_ports, &pvp->n_ports);
 }
 
 /* RCU callback for freeing a dp_port_group */