datapath: Add missing rtnl_dereference() calls.

[sliver-openvswitch.git] / datapath / vport-patch.c

diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c
index d27509a..ef9778f 100644 (file)
--- a/datapath/vport-patch.c
+++ b/datapath/vport-patch.c
@@ -9,6 +9,7 @@
 #include <linux/dcache.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/rtnetlink.h>
 
 #include "datapath.h"
 #include "vport.h"
@@ -17,6 +18,7 @@
 struct device_config {
        struct rcu_head rcu;
 
+       char peer_name[IFNAMSIZ];
        unsigned char eth_addr[ETH_ALEN];
        unsigned int mtu;
 };
@@ -27,14 +29,10 @@ struct patch_vport {
        char name[IFNAMSIZ];
 
        /* Protected by RTNL lock. */
-       char peer_name[IFNAMSIZ];
        struct hlist_node hash_node;
 
-       /* Protected by RCU. */
-       struct vport *peer;
-
-       /* Protected by RCU. */
-       struct device_config *devconf;
+       struct vport __rcu *peer;
+       struct device_config __rcu *devconf;
 };
 
 /* Protected by RTNL lock. */
@@ -61,7 +59,7 @@ static void assign_config_rcu(struct vport *vport,
        struct patch_vport *patch_vport = patch_vport_priv(vport);
        struct device_config *old_config;
 
-       old_config = rcu_dereference(patch_vport->devconf);
+       old_config = rtnl_dereference(patch_vport->devconf);
        rcu_assign_pointer(patch_vport->devconf, new_config);
        call_rcu(&old_config->rcu, free_config);
 }
@@ -87,7 +85,8 @@ static void patch_exit(void)
        kfree(peer_table);
 }
 
-static int set_config(struct vport *vport, const void *config)
+static int set_config(struct vport *vport, const void *config, 
+                       struct device_config *devconf)
 {
        struct patch_vport *patch_vport = patch_vport_priv(vport);
        char peer_name[IFNAMSIZ];
@@ -97,7 +96,7 @@ static int set_config(struct vport *vport, const void *config)
        if (!strcmp(patch_vport->name, peer_name))
                return -EINVAL;
 
-       strcpy(patch_vport->peer_name, peer_name);
+       strcpy(devconf->peer_name, peer_name);
 
        return 0;
 }
@@ -106,6 +105,7 @@ static struct vport *patch_create(const struct vport_parms *parms)
 {
        struct vport *vport;
        struct patch_vport *patch_vport;
+       const char *peer_name;
        int err;
 
        vport = vport_alloc(sizeof(struct patch_vport), &patch_vport_ops, parms);
@@ -118,29 +118,32 @@ static struct vport *patch_create(const struct vport_parms *parms)
 
        strcpy(patch_vport->name, parms->name);
 
-       err = set_config(vport, parms->config);
-       if (err)
-               goto error_free_vport;
-
        patch_vport->devconf = kmalloc(sizeof(struct device_config), GFP_KERNEL);
        if (!patch_vport->devconf) {
                err = -ENOMEM;
                goto error_free_vport;
        }
 
+       err = set_config(vport, parms->config, patch_vport->devconf);
+       if (err)
+               goto error_free_devconf;
+
        vport_gen_rand_ether_addr(patch_vport->devconf->eth_addr);
 
        /* Make the default MTU fairly large so that it doesn't become the
         * bottleneck on systems using jumbo frames. */
        patch_vport->devconf->mtu = 65535;
 
-       hlist_add_head(&patch_vport->hash_node, hash_bucket(patch_vport->peer_name));
+       peer_name = patch_vport->devconf->peer_name;
+       hlist_add_head(&patch_vport->hash_node, hash_bucket(peer_name));
 
-       rcu_assign_pointer(patch_vport->peer, vport_locate(patch_vport->peer_name));
+       rcu_assign_pointer(patch_vport->peer, vport_locate(peer_name));
        update_peers(patch_vport->name, vport);
 
        return vport;
 
+error_free_devconf:
+       kfree(patch_vport->devconf);
 error_free_vport:
        vport_free(vport);
 error:
@@ -149,14 +152,33 @@ error:
 
 static int patch_modify(struct vport *vport, struct odp_port *port)
 {
-       int err = set_config(vport, port->config);
-       if (!err) {
-               struct patch_vport *patch_vport = patch_vport_priv(vport);
+       struct patch_vport *patch_vport = patch_vport_priv(vport);
+       struct device_config *devconf;
+       int err;
 
-               hlist_del(&patch_vport->hash_node);
-               rcu_assign_pointer(patch_vport->peer, vport_locate(patch_vport->peer_name));
-               hlist_add_head(&patch_vport->hash_node, hash_bucket(patch_vport->peer_name));
+       devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+                         sizeof(struct device_config), GFP_KERNEL);
+       if (!devconf) {
+               err = -ENOMEM;
+               goto error;
        }
+
+       err = set_config(vport, port->config, devconf);
+       if (err)
+               goto error_free;
+
+       assign_config_rcu(vport, devconf);
+       
+       hlist_del(&patch_vport->hash_node);
+
+       rcu_assign_pointer(patch_vport->peer, vport_locate(devconf->peer_name));
+       hlist_add_head(&patch_vport->hash_node, hash_bucket(devconf->peer_name));
+
+       return 0;
+
+error_free:
+       kfree(devconf);
+error:
        return err;
 }
 
@@ -186,9 +208,13 @@ static void update_peers(const char *name, struct vport *vport)
        struct patch_vport *peer_vport;
        struct hlist_node *node;
 
-       hlist_for_each_entry(peer_vport, node, bucket, hash_node)
-               if (!strcmp(peer_vport->peer_name, name))
+       hlist_for_each_entry(peer_vport, node, bucket, hash_node) {
+               const char *peer_name;
+
+               peer_name = rtnl_dereference(peer_vport->devconf)->peer_name;
+               if (!strcmp(peer_name, name))
                        rcu_assign_pointer(peer_vport->peer, vport);
+       }
 }
 
 static int patch_set_mtu(struct vport *vport, int mtu)
@@ -196,7 +222,8 @@ static int patch_set_mtu(struct vport *vport, int mtu)
        struct patch_vport *patch_vport = patch_vport_priv(vport);
        struct device_config *devconf;
 
-       devconf = kmemdup(patch_vport->devconf, sizeof(struct device_config), GFP_KERNEL);
+       devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+                         sizeof(struct device_config), GFP_KERNEL);
        if (!devconf)
                return -ENOMEM;
 
@@ -211,7 +238,8 @@ static int patch_set_addr(struct vport *vport, const unsigned char *addr)
        struct patch_vport *patch_vport = patch_vport_priv(vport);
        struct device_config *devconf;
 
-       devconf = kmemdup(patch_vport->devconf, sizeof(struct device_config), GFP_KERNEL);
+       devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
+                         sizeof(struct device_config), GFP_KERNEL);
        if (!devconf)
                return -ENOMEM;
 
@@ -231,13 +259,22 @@ static const char *patch_get_name(const struct vport *vport)
 static const unsigned char *patch_get_addr(const struct vport *vport)
 {
        const struct patch_vport *patch_vport = patch_vport_priv(vport);
-       return rcu_dereference(patch_vport->devconf)->eth_addr;
+       return rcu_dereference_rtnl(patch_vport->devconf)->eth_addr;
+}
+
+static void patch_get_config(const struct vport *vport, void *config)
+{
+       const struct patch_vport *patch_vport = patch_vport_priv(vport);
+       const char *peer_name;
+
+       peer_name = rcu_dereference_rtnl(patch_vport->devconf)->peer_name;
+       strlcpy(config, peer_name, VPORT_CONFIG_SIZE);
 }
 
 static int patch_get_mtu(const struct vport *vport)
 {
        const struct patch_vport *patch_vport = patch_vport_priv(vport);
-       return rcu_dereference(patch_vport->devconf)->mtu;
+       return rcu_dereference_rtnl(patch_vport->devconf)->mtu;
 }
 
 static int patch_send(struct vport *vport, struct sk_buff *skb)
@@ -269,6 +306,7 @@ const struct vport_ops patch_vport_ops = {
        .set_addr       = patch_set_addr,
        .get_name       = patch_get_name,
        .get_addr       = patch_get_addr,
+       .get_config     = patch_get_config,
        .get_dev_flags  = vport_gen_get_dev_flags,
        .is_running     = vport_gen_is_running,
        .get_operstate  = vport_gen_get_operstate,