X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-patch.c;h=ba10903b9cab7ac452a8c4f83ecbea9beca43dd7;hb=6455100f38e9312346f4d58511595f695d813537;hp=74d10f6dde889eb90a7d4e6e0063c0f8aada00eb;hpb=574f1fb57a75affcd3953dab6119b061d1eff67f;p=sliver-openvswitch.git diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c index 74d10f6dd..ba10903b9 100644 --- a/datapath/vport-patch.c +++ b/datapath/vport-patch.c @@ -11,6 +11,7 @@ #include #include +#include "compat.h" #include "datapath.h" #include "vport.h" #include "vport-generic.h" @@ -20,7 +21,6 @@ struct patch_config { char peer_name[IFNAMSIZ]; unsigned char eth_addr[ETH_ALEN]; - unsigned int mtu; }; struct patch_vport { @@ -41,7 +41,7 @@ static struct hlist_head *peer_table; static void update_peers(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); } @@ -85,14 +85,32 @@ static void patch_exit(void) kfree(peer_table); } -static int patch_set_config(struct vport *vport, const void *config, +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; @@ -109,7 +127,8 @@ static struct vport *patch_create(const struct vport_parms *parms) struct patch_config *patchconf; int err; - vport = vport_alloc(sizeof(struct patch_vport), &patch_vport_ops, parms); + vport = vport_alloc(sizeof(struct patch_vport), + &patch_vport_ops, parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto error; @@ -125,16 +144,12 @@ static struct vport *patch_create(const struct vport_parms *parms) goto error_free_vport; } - err = patch_set_config(vport, parms->config, patchconf); + err = patch_set_config(vport, parms->options, patchconf); if (err) goto error_free_patchconf; vport_gen_rand_ether_addr(patchconf->eth_addr); - /* Make the default MTU fairly large so that it doesn't become the - * bottleneck on systems using jumbo frames. */ - patchconf->mtu = 65535; - rcu_assign_pointer(patch_vport->patchconf, patchconf); peer_name = patchconf->peer_name; @@ -152,7 +167,25 @@ 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); + vport_free(vport_from_priv(patch_vport)); +} + +static void 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); +} + +static int patch_set_options(struct vport *vport, struct nlattr *options) { struct patch_vport *patch_vport = patch_vport_priv(vport); struct patch_config *patchconf; @@ -165,12 +198,12 @@ static int patch_modify(struct vport *vport, struct odp_port *port) goto error; } - err = patch_set_config(vport, port->config, patchconf); + err = patch_set_config(vport, options, patchconf); if (err) goto error_free; assign_config_rcu(vport, patchconf); - + hlist_del(&patch_vport->hash_node); rcu_assign_pointer(patch_vport->peer, vport_locate(patchconf->peer_name)); @@ -184,26 +217,6 @@ 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 patch_config __force *)patch_vport->patchconf); - 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) { struct hlist_head *bucket = hash_bucket(name); @@ -219,22 +232,6 @@ static void update_peers(const char *name, struct vport *vport) } } -static int patch_set_mtu(struct vport *vport, int mtu) -{ - struct patch_vport *patch_vport = patch_vport_priv(vport); - struct patch_config *patchconf; - - patchconf = kmemdup(rtnl_dereference(patch_vport->patchconf), - sizeof(struct patch_config), GFP_KERNEL); - if (!patchconf) - return -ENOMEM; - - patchconf->mtu = mtu; - assign_config_rcu(vport, patchconf); - - return 0; -} - static int patch_set_addr(struct vport *vport, const unsigned char *addr) { struct patch_vport *patch_vport = patch_vport_priv(vport); @@ -264,19 +261,12 @@ static const unsigned char *patch_get_addr(const struct vport *vport) 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->patchconf)->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->patchconf)->mtu; + return nla_put_string(skb, OVS_PATCH_ATTR_PEER, patchconf->peer_name); } static int patch_send(struct vport *vport, struct sk_buff *skb) @@ -297,21 +287,18 @@ static int patch_send(struct vport *vport, struct sk_buff *skb) } const struct vport_ops patch_vport_ops = { - .type = "patch", - .flags = VPORT_F_GEN_STATS, + .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_options = patch_get_options, + .set_options = patch_set_options, .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, .send = patch_send, };