/*
- * Copyright (c) 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
*/
-#include <linux/dcache.h>
#include <linux/kernel.h>
+#include <linux/jhash.h>
#include <linux/list.h>
#include <linux/rtnetlink.h>
+#include <net/net_namespace.h>
+#include "compat.h"
#include "datapath.h"
#include "vport.h"
-#include "vport-generic.h"
-struct device_config {
+struct patch_config {
struct rcu_head rcu;
char peer_name[IFNAMSIZ];
unsigned char eth_addr[ETH_ALEN];
- unsigned int mtu;
};
struct patch_vport {
struct hlist_node hash_node;
struct vport __rcu *peer;
- struct device_config __rcu *devconf;
+ struct patch_config __rcu *patchconf;
};
/* Protected by RTNL lock. */
static struct hlist_head *peer_table;
#define PEER_HASH_BUCKETS 256
-static void update_peers(const char *name, struct vport *);
+static void update_peers(struct net *, const char *name, struct vport *);
-static inline struct patch_vport *patch_vport_priv(const struct vport *vport)
+static struct patch_vport *patch_vport_priv(const struct vport *vport)
{
return vport_priv(vport);
}
/* RCU callback. */
static void free_config(struct rcu_head *rcu)
{
- struct device_config *c = container_of(rcu, struct device_config, rcu);
+ struct patch_config *c = container_of(rcu, struct patch_config, rcu);
kfree(c);
}
static void assign_config_rcu(struct vport *vport,
- struct device_config *new_config)
+ struct patch_config *new_config)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
- struct device_config *old_config;
+ struct patch_config *old_config;
- old_config = rtnl_dereference(patch_vport->devconf);
- rcu_assign_pointer(patch_vport->devconf, new_config);
+ old_config = rtnl_dereference(patch_vport->patchconf);
+ rcu_assign_pointer(patch_vport->patchconf, new_config);
call_rcu(&old_config->rcu, free_config);
}
-static struct hlist_head *hash_bucket(const char *name)
+static struct hlist_head *hash_bucket(struct net *net, const char *name)
{
- unsigned int hash = full_name_hash(name, strlen(name));
+ unsigned int hash = jhash(name, strlen(name), (unsigned long) net);
return &peer_table[hash & (PEER_HASH_BUCKETS - 1)];
}
kfree(peer_table);
}
-static int set_config(struct vport *vport, const void *config,
- struct device_config *devconf)
+static const struct nla_policy patch_policy[OVS_PATCH_ATTR_MAX + 1] = {
+#ifdef HAVE_NLA_NUL_STRING
+ [OVS_PATCH_ATTR_PEER] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
+#endif
+};
+
+static int patch_set_config(struct vport *vport, const struct nlattr *options,
+ struct patch_config *patchconf)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
- char peer_name[IFNAMSIZ];
+ struct nlattr *a[OVS_PATCH_ATTR_MAX + 1];
+ const char *peer_name;
+ int err;
+
+ if (!options)
+ return -EINVAL;
+
+ err = nla_parse_nested(a, OVS_PATCH_ATTR_MAX, options, patch_policy);
+ if (err)
+ return err;
- strlcpy(peer_name, config, IFNAMSIZ);
+ if (!a[OVS_PATCH_ATTR_PEER] ||
+ CHECK_NUL_STRING(a[OVS_PATCH_ATTR_PEER], IFNAMSIZ - 1))
+ return -EINVAL;
+ peer_name = nla_data(a[OVS_PATCH_ATTR_PEER]);
if (!strcmp(patch_vport->name, peer_name))
return -EINVAL;
- strcpy(devconf->peer_name, peer_name);
+ strcpy(patchconf->peer_name, peer_name);
return 0;
}
struct vport *vport;
struct patch_vport *patch_vport;
const char *peer_name;
- struct device_config *devconf;
+ struct patch_config *patchconf;
+ struct net *net = ovs_dp_get_net(parms->dp);
int err;
- vport = vport_alloc(sizeof(struct patch_vport), &patch_vport_ops, parms);
+ vport = ovs_vport_alloc(sizeof(struct patch_vport),
+ &ovs_patch_vport_ops, parms);
if (IS_ERR(vport)) {
err = PTR_ERR(vport);
goto error;
strcpy(patch_vport->name, parms->name);
- devconf = kmalloc(sizeof(struct device_config), GFP_KERNEL);
- if (!devconf) {
+ patchconf = kmalloc(sizeof(struct patch_config), GFP_KERNEL);
+ if (!patchconf) {
err = -ENOMEM;
goto error_free_vport;
}
- err = set_config(vport, parms->config, devconf);
+ err = patch_set_config(vport, parms->options, patchconf);
if (err)
- goto error_free_devconf;
+ goto error_free_patchconf;
- vport_gen_rand_ether_addr(devconf->eth_addr);
+ random_ether_addr(patchconf->eth_addr);
- /* Make the default MTU fairly large so that it doesn't become the
- * bottleneck on systems using jumbo frames. */
- devconf->mtu = 65535;
+ rcu_assign_pointer(patch_vport->patchconf, patchconf);
- rcu_assign_pointer(patch_vport->devconf, devconf);
-
- peer_name = devconf->peer_name;
- hlist_add_head(&patch_vport->hash_node, hash_bucket(peer_name));
- rcu_assign_pointer(patch_vport->peer, vport_locate(peer_name));
- update_peers(patch_vport->name, vport);
+ peer_name = patchconf->peer_name;
+ hlist_add_head(&patch_vport->hash_node, hash_bucket(net, peer_name));
+ rcu_assign_pointer(patch_vport->peer, ovs_vport_locate(net, peer_name));
+ update_peers(net, patch_vport->name, vport);
return vport;
-error_free_devconf:
- kfree(devconf);
+error_free_patchconf:
+ kfree(patchconf);
error_free_vport:
- vport_free(vport);
+ ovs_vport_free(vport);
error:
return ERR_PTR(err);
}
-static int patch_modify(struct vport *vport, struct odp_port *port)
+static void free_port_rcu(struct rcu_head *rcu)
+{
+ struct patch_vport *patch_vport = container_of(rcu,
+ struct patch_vport, rcu);
+
+ kfree((struct patch_config __force *)patch_vport->patchconf);
+ ovs_vport_free(vport_from_priv(patch_vport));
+}
+
+static void patch_destroy(struct vport *vport)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
- struct device_config *devconf;
+
+ update_peers(ovs_dp_get_net(vport->dp), patch_vport->name, NULL);
+ hlist_del(&patch_vport->hash_node);
+ call_rcu(&patch_vport->rcu, free_port_rcu);
+}
+
+static int patch_set_options(struct vport *vport, struct nlattr *options)
+{
+ struct patch_vport *patch_vport = patch_vport_priv(vport);
+ struct patch_config *patchconf;
int err;
- devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
- sizeof(struct device_config), GFP_KERNEL);
- if (!devconf) {
+ patchconf = kmemdup(rtnl_dereference(patch_vport->patchconf),
+ sizeof(struct patch_config), GFP_KERNEL);
+ if (!patchconf) {
err = -ENOMEM;
goto error;
}
- err = set_config(vport, port->config, devconf);
+ err = patch_set_config(vport, options, patchconf);
if (err)
goto error_free;
- assign_config_rcu(vport, devconf);
-
+ assign_config_rcu(vport, patchconf);
+
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));
+ rcu_assign_pointer(patch_vport->peer,
+ ovs_vport_locate(ovs_dp_get_net(vport->dp), patchconf->peer_name));
- return 0;
+ hlist_add_head(&patch_vport->hash_node,
+ hash_bucket(ovs_dp_get_net(vport->dp), patchconf->peer_name));
+ return 0;
error_free:
- kfree(devconf);
+ kfree(patchconf);
error:
return err;
}
-static void free_port_rcu(struct rcu_head *rcu)
-{
- struct patch_vport *patch_vport = container_of(rcu,
- struct patch_vport, rcu);
-
- kfree((struct device_config __force *)patch_vport->devconf);
- vport_free(vport_from_priv(patch_vport));
-}
-
-static int patch_destroy(struct vport *vport)
-{
- struct patch_vport *patch_vport = patch_vport_priv(vport);
-
- update_peers(patch_vport->name, NULL);
- hlist_del(&patch_vport->hash_node);
- call_rcu(&patch_vport->rcu, free_port_rcu);
-
- return 0;
-}
-
-static void update_peers(const char *name, struct vport *vport)
+static void update_peers(struct net *net, const char *name, struct vport *vport)
{
- struct hlist_head *bucket = hash_bucket(name);
+ struct hlist_head *bucket = hash_bucket(net, name);
struct patch_vport *peer_vport;
struct hlist_node *node;
hlist_for_each_entry(peer_vport, node, bucket, hash_node) {
+ struct vport *curr_vport = vport_from_priv(peer_vport);
const char *peer_name;
- peer_name = rtnl_dereference(peer_vport->devconf)->peer_name;
- if (!strcmp(peer_name, name))
+ peer_name = rtnl_dereference(peer_vport->patchconf)->peer_name;
+ if (!strcmp(peer_name, name) && net_eq(ovs_dp_get_net(curr_vport->dp), net))
rcu_assign_pointer(peer_vport->peer, vport);
}
}
-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(rtnl_dereference(patch_vport->devconf),
- sizeof(struct device_config), GFP_KERNEL);
- if (!devconf)
- return -ENOMEM;
-
- devconf->mtu = mtu;
- assign_config_rcu(vport, devconf);
-
- return 0;
-}
-
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;
+ struct patch_config *patchconf;
- devconf = kmemdup(rtnl_dereference(patch_vport->devconf),
- sizeof(struct device_config), GFP_KERNEL);
- if (!devconf)
+ patchconf = kmemdup(rtnl_dereference(patch_vport->patchconf),
+ sizeof(struct patch_config), GFP_KERNEL);
+ if (!patchconf)
return -ENOMEM;
- memcpy(devconf->eth_addr, addr, ETH_ALEN);
- assign_config_rcu(vport, devconf);
+ memcpy(patchconf->eth_addr, addr, ETH_ALEN);
+ assign_config_rcu(vport, patchconf);
return 0;
}
static const unsigned char *patch_get_addr(const struct vport *vport)
{
const struct patch_vport *patch_vport = patch_vport_priv(vport);
- return rcu_dereference_rtnl(patch_vport->devconf)->eth_addr;
+ return rcu_dereference_rtnl(patch_vport->patchconf)->eth_addr;
}
-static void patch_get_config(const struct vport *vport, void *config)
+static int patch_get_options(const struct vport *vport, struct sk_buff *skb)
{
- 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);
-}
+ struct patch_vport *patch_vport = patch_vport_priv(vport);
+ struct patch_config *patchconf = rcu_dereference_rtnl(patch_vport->patchconf);
-static int patch_get_mtu(const struct vport *vport)
-{
- const struct patch_vport *patch_vport = patch_vport_priv(vport);
- return rcu_dereference_rtnl(patch_vport->devconf)->mtu;
+ return nla_put_string(skb, OVS_PATCH_ATTR_PEER, patchconf->peer_name);
}
static int patch_send(struct vport *vport, struct sk_buff *skb)
if (!peer) {
kfree_skb(skb);
- vport_record_error(vport, VPORT_E_TX_DROPPED);
+ ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
return 0;
}
- vport_receive(peer, skb);
+ ovs_vport_receive(peer, skb);
return skb_len;
}
-const struct vport_ops patch_vport_ops = {
- .type = "patch",
- .flags = VPORT_F_GEN_STATS,
+const struct vport_ops ovs_patch_vport_ops = {
+ .type = OVS_VPORT_TYPE_PATCH,
.init = patch_init,
.exit = patch_exit,
.create = patch_create,
- .modify = patch_modify,
.destroy = patch_destroy,
- .set_mtu = patch_set_mtu,
.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,
- .get_mtu = patch_get_mtu,
+ .get_options = patch_get_options,
+ .set_options = patch_set_options,
.send = patch_send,
};
git://git.onelab.eu / sliver-openvswitch.git / blobdiff