X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=11221333a6579eab60d88520888d049ebc571261;hb=c6ebb8fb918f819a3c9b7161731ea0453a79137a;hp=c4937ed3d81ba49b7bb396be38dbdd3ce51b7287;hpb=4ea115b63fad4c6bd46c304fa00403a32a032d31;p=openvswitch

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index c4937ed3..11221333 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -19,7 +19,7 @@
 #include "vport-netdev.h"
 
 struct internal_dev {
-	struct vport *vport;
+	struct vport *attached_vport, *vport;
 	struct net_device_stats stats;
 };
 
@@ -70,17 +70,19 @@ static int internal_dev_mac_addr(struct net_device *dev, void *p)
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
-	struct vport *vport = internal_dev_get_vport(netdev);
+	struct internal_dev *internal_dev = internal_dev_priv(netdev);
+	struct vport *vport = rcu_dereference(internal_dev->vport);
 
 	/* We need our own clone. */
 	skb = skb_share_check(skb, GFP_ATOMIC);
-	if (!skb) {
+	if (unlikely(!skb)) {
 		vport_record_error(vport, VPORT_E_RX_DROPPED);
 		return 0;
 	}
 
 	skb_reset_mac_header(skb);
 	compute_ip_summed(skb, true);
+	OVS_CB(skb)->flow = NULL;
 
 	vport_receive(vport, skb);
 
@@ -102,9 +104,15 @@ static int internal_dev_stop(struct net_device *netdev)
 static void internal_dev_getinfo(struct net_device *netdev,
 				 struct ethtool_drvinfo *info)
 {
-	struct dp_port *dp_port = vport_get_dp_port(internal_dev_get_vport(netdev));
+	struct vport *vport = internal_dev_get_vport(netdev);
+	struct dp_port *dp_port;
 
 	strcpy(info->driver, "openvswitch");
+
+	if (!vport)
+		return;
+
+	dp_port = vport_get_dp_port(vport);
 	if (dp_port)
 		sprintf(info->bus_info, "%d.%d", dp_port->dp->dp_idx, dp_port->port_no);
 }
@@ -122,25 +130,24 @@ static struct ethtool_ops internal_dev_ethtool_ops = {
 
 static int internal_dev_change_mtu(struct net_device *netdev, int new_mtu)
 {
-	struct dp_port *dp_port = vport_get_dp_port(internal_dev_get_vport(netdev));
+	struct vport *vport = internal_dev_get_vport(netdev);
 
 	if (new_mtu < 68)
 		return -EINVAL;
 
-	if (dp_port) {
-		if (new_mtu > dp_min_mtu(dp_port->dp))
-			return -EINVAL;
+	if (vport) {
+		struct dp_port *dp_port = vport_get_dp_port(vport);
+
+		if (dp_port) {
+			if (new_mtu > dp_min_mtu(dp_port->dp))
+				return -EINVAL;
+		}
 	}
 
 	netdev->mtu = new_mtu;
 	return 0;
 }
 
-static void internal_dev_free(struct net_device *netdev)
-{
-	free_netdev(netdev);
-}
-
 static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	if (dp_ioctl_hook)
@@ -161,8 +168,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
 };
 #endif
 
-static void
-do_setup(struct net_device *netdev)
+static void do_setup(struct net_device *netdev)
 {
 	ether_setup(netdev);
 
@@ -178,7 +184,7 @@ do_setup(struct net_device *netdev)
 	netdev->change_mtu = internal_dev_change_mtu;
 #endif
 
-	netdev->destructor = internal_dev_free;
+	netdev->destructor = free_netdev;
 	SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
 	netdev->tx_queue_len = 0;
 
@@ -189,8 +195,8 @@ do_setup(struct net_device *netdev)
 	vport_gen_rand_ether_addr(netdev->dev_addr);
 }
 
-static struct vport *
-internal_dev_create(const char *name, const void __user *config)
+static struct vport *internal_dev_create(const char *name,
+					 const void __user *config)
 {
 	struct vport *vport;
 	struct netdev_vport *netdev_vport;
@@ -212,7 +218,7 @@ internal_dev_create(const char *name, const void __user *config)
 	}
 
 	internal_dev = internal_dev_priv(netdev_vport->dev);
-	internal_dev->vport = vport;
+	rcu_assign_pointer(internal_dev->vport, vport);
 
 	err = register_netdevice(netdev_vport->dev);
 	if (err)
@@ -228,8 +234,7 @@ error:
 	return ERR_PTR(err);
 }
 
-static int
-internal_dev_destroy(struct vport *vport)
+static int internal_dev_destroy(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
@@ -239,38 +244,31 @@ internal_dev_destroy(struct vport *vport)
 	return 0;
 }
 
-static int
-internal_dev_attach(struct vport *vport)
+static int internal_dev_attach(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
+	struct internal_dev *internal_dev = internal_dev_priv(netdev_vport->dev);
 
+	rcu_assign_pointer(internal_dev->attached_vport, internal_dev->vport);
 	dev_set_promiscuity(netdev_vport->dev, 1);
-
-	/* It would make sense to assign dev->br_port here too, but
-	 * that causes packets received on internal ports to get caught
-	 * in netdev_frame_hook().  In turn netdev_frame_hook() can reject them
-	 * back to the network stack, but that's a waste of time. */
+	netif_start_queue(netdev_vport->dev);
 
 	return 0;
 }
 
-static int
-internal_dev_detach(struct vport *vport)
+static int internal_dev_detach(struct vport *vport)
 {
 	struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
+	struct internal_dev *internal_dev = internal_dev_priv(netdev_vport->dev);
 
+	netif_stop_queue(netdev_vport->dev);
 	dev_set_promiscuity(netdev_vport->dev, -1);
-
-	/* Make sure that no packets arrive from now on, since
-	 * internal_dev_xmit() will try to find itself through
-	 * p->dp->ports[], and we're about to set that to null. */
-	netif_tx_disable(netdev_vport->dev);
+	rcu_assign_pointer(internal_dev->attached_vport, NULL);
 
 	return 0;
 }
 
-static int
-internal_dev_recv(struct vport *vport, struct sk_buff *skb)
+static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 {
 	struct net_device *netdev = netdev_vport_priv(vport)->dev;
 	int len;
@@ -291,7 +289,7 @@ internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 
 struct vport_ops internal_vport_ops = {
 	.type		= "internal",
-	.flags		= VPORT_F_REQUIRED | VPORT_F_GEN_STATS,
+	.flags		= VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW,
 	.create		= internal_dev_create,
 	.destroy	= internal_dev_destroy,
 	.attach		= internal_dev_attach,
@@ -319,15 +317,18 @@ int is_internal_dev(const struct net_device *netdev)
 #endif
 }
 
-int
-is_internal_vport(const struct vport *vport)
+int is_internal_vport(const struct vport *vport)
 {
 	return vport->ops == &internal_vport_ops;
 }
 
-struct vport *
-internal_dev_get_vport(struct net_device *netdev)
+struct vport *internal_dev_get_vport(struct net_device *netdev)
 {
-	struct internal_dev *internal_dev = internal_dev_priv(netdev);
-	return rcu_dereference(internal_dev->vport);
+	struct internal_dev *internal_dev;
+
+	if (!is_internal_dev(netdev))
+		return NULL;
+	
+	internal_dev = internal_dev_priv(netdev);
+	return rcu_dereference(internal_dev->attached_vport);
 }