X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-capwap.c;h=05a099d639076a7b6c250377cf5c289a104685ac;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=3fb4ffb36f750296824b9051ceb048def858c6d4;hpb=085a41cb35dc1d396cf2d5fd833696072d84c040;p=sliver-openvswitch.git diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c index 3fb4ffb36..05a099d63 100644 --- a/datapath/vport-capwap.c +++ b/datapath/vport-capwap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. + * Copyright (c) 2007-2012 Nicira, Inc. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -23,6 +24,7 @@ #include #include +#include "datapath.h" #include "tunnel.h" #include "vport.h" #include "vport-generic.h" @@ -32,7 +34,7 @@ #define CAPWAP_FRAG_TIMEOUT (30 * HZ) #define CAPWAP_FRAG_MAX_MEM (256 * 1024) -#define CAPWAP_FRAG_PRUNE_MEM (192 *1024) +#define CAPWAP_FRAG_PRUNE_MEM (192 * 1024) #define CAPWAP_FRAG_SECRET_INTERVAL (10 * 60 * HZ) /* @@ -100,7 +102,7 @@ struct capwaphdr_wsi_key { /* Flag indicating a 64bit key is stored in WSI data field */ #define CAPWAP_WSI_F_KEY64 0x80 -static inline struct capwaphdr *capwap_hdr(const struct sk_buff *skb) +static struct capwaphdr *capwap_hdr(const struct sk_buff *skb) { return (struct capwaphdr *)(udp_hdr(skb) + 1); } @@ -137,8 +139,6 @@ struct frag_skb_cb { static struct sk_buff *fragment(struct sk_buff *, const struct vport *, struct dst_entry *dst, unsigned int hlen); -static void defrag_init(void); -static void defrag_exit(void); static struct sk_buff *defrag(struct sk_buff *, bool frag_last); static void capwap_frag_init(struct inet_frag_queue *, void *match); @@ -154,13 +154,6 @@ static struct inet_frags frag_state = { .frag_expire = capwap_frag_expire, .secret_interval = CAPWAP_FRAG_SECRET_INTERVAL, }; -static struct netns_frags frag_netns_state = { - .timeout = CAPWAP_FRAG_TIMEOUT, - .high_thresh = CAPWAP_FRAG_MAX_MEM, - .low_thresh = CAPWAP_FRAG_PRUNE_MEM, -}; - -static struct socket *capwap_rcv_socket; static int capwap_hdr_len(const struct tnl_mutable_config *mutable) { @@ -170,7 +163,7 @@ static int capwap_hdr_len(const struct tnl_mutable_config *mutable) if (mutable->flags & TNL_F_CSUM) return -EINVAL; - /* if keys are specified, then add WSI field */ + /* if keys are specified, then add WSI field */ if (mutable->out_key || (mutable->flags & TNL_F_OUT_KEY_ACTION)) { size += sizeof(struct capwaphdr_wsi) + sizeof(struct capwaphdr_wsi_key); @@ -282,8 +275,7 @@ static int process_capwap_wsi(struct sk_buff *skb, __be64 *key) return 0; } -static inline struct sk_buff *process_capwap_proto(struct sk_buff *skb, - __be64 *key) +static struct sk_buff *process_capwap_proto(struct sk_buff *skb, __be64 *key) { struct capwaphdr *cwh = capwap_hdr(skb); int hdr_len = sizeof(struct udphdr); @@ -334,8 +326,8 @@ static int capwap_rcv(struct sock *sk, struct sk_buff *skb) goto out; iph = ip_hdr(skb); - vport = tnl_find_port(iph->daddr, iph->saddr, key, TNL_T_PROTO_CAPWAP, - &mutable); + vport = ovs_tnl_find_port(sock_net(sk), iph->daddr, iph->saddr, key, + TNL_T_PROTO_CAPWAP, &mutable); if (unlikely(!vport)) { icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); goto error; @@ -346,7 +338,7 @@ static int capwap_rcv(struct sock *sk, struct sk_buff *skb) else OVS_CB(skb)->tun_id = 0; - tnl_rcv(vport, skb, iph->tos); + ovs_tnl_rcv(vport, skb, iph->tos); goto out; error: @@ -363,49 +355,105 @@ static const struct tnl_ops capwap_tnl_ops = { .update_header = capwap_update_header, }; -static struct vport *capwap_create(const struct vport_parms *parms) +static inline struct capwap_net *ovs_get_capwap_net(struct net *net) { - return tnl_create(parms, &capwap_vport_ops, &capwap_tnl_ops); + struct ovs_net *ovs_net = net_generic(net, ovs_net_id); + return &ovs_net->vport_net.capwap; } -/* Random value. Irrelevant as long as it's not 0 since we set the handler. */ +/* Arbitrary value. Irrelevant as long as it's not 0 since we set the handler. */ #define UDP_ENCAP_CAPWAP 10 -static int capwap_init(void) +static int init_socket(struct net *net) { int err; + struct capwap_net *capwap_net = ovs_get_capwap_net(net); struct sockaddr_in sin; - err = sock_create(AF_INET, SOCK_DGRAM, 0, &capwap_rcv_socket); + if (capwap_net->n_tunnels) { + capwap_net->n_tunnels++; + return 0; + } + + err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, + &capwap_net->capwap_rcv_socket); if (err) goto error; + /* release net ref. */ + sk_change_net(capwap_net->capwap_rcv_socket->sk, net); + sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl(INADDR_ANY); sin.sin_port = htons(CAPWAP_DST_PORT); - err = kernel_bind(capwap_rcv_socket, (struct sockaddr *)&sin, + err = kernel_bind(capwap_net->capwap_rcv_socket, + (struct sockaddr *)&sin, sizeof(struct sockaddr_in)); if (err) goto error_sock; - udp_sk(capwap_rcv_socket->sk)->encap_type = UDP_ENCAP_CAPWAP; - udp_sk(capwap_rcv_socket->sk)->encap_rcv = capwap_rcv; + udp_sk(capwap_net->capwap_rcv_socket->sk)->encap_type = UDP_ENCAP_CAPWAP; + udp_sk(capwap_net->capwap_rcv_socket->sk)->encap_rcv = capwap_rcv; + + capwap_net->frag_state.timeout = CAPWAP_FRAG_TIMEOUT; + capwap_net->frag_state.high_thresh = CAPWAP_FRAG_MAX_MEM; + capwap_net->frag_state.low_thresh = CAPWAP_FRAG_PRUNE_MEM; - defrag_init(); + inet_frags_init_net(&capwap_net->frag_state); + capwap_net->n_tunnels++; return 0; error_sock: - sock_release(capwap_rcv_socket); + sk_release_kernel(capwap_net->capwap_rcv_socket->sk); error: - pr_warn("cannot register capwap protocol handler\n"); + pr_warn("cannot register capwap protocol handler : %d\n", err); return err; } +static void release_socket(struct net *net) +{ + struct capwap_net *capwap_net = ovs_get_capwap_net(net); + + capwap_net->n_tunnels--; + if (capwap_net->n_tunnels) + return; + + inet_frags_exit_net(&capwap_net->frag_state, &frag_state); + sk_release_kernel(capwap_net->capwap_rcv_socket->sk); +} + +static struct vport *capwap_create(const struct vport_parms *parms) +{ + struct vport *vport; + int err; + + err = init_socket(ovs_dp_get_net(parms->dp)); + if (err) + return ERR_PTR(err); + + vport = ovs_tnl_create(parms, &ovs_capwap_vport_ops, &capwap_tnl_ops); + if (IS_ERR(vport)) + release_socket(ovs_dp_get_net(parms->dp)); + + return vport; +} + +static void capwap_destroy(struct vport *vport) +{ + ovs_tnl_destroy(vport); + release_socket(ovs_dp_get_net(vport->dp)); +} + +static int capwap_init(void) +{ + inet_frags_init(&frag_state); + return 0; +} + static void capwap_exit(void) { - defrag_exit(); - sock_release(capwap_rcv_socket); + inet_frags_fini(&frag_state); } static void copy_skb_metadata(struct sk_buff *from, struct sk_buff *to) @@ -507,18 +555,18 @@ static struct sk_buff *fragment(struct sk_buff *skb, const struct vport *vport, remaining -= frag_size; } - goto out; + consume_skb(skb); + return result; error: - tnl_free_linked_skbs(result); -out: + ovs_tnl_free_linked_skbs(result); kfree_skb(skb); - return result; + return NULL; } /* All of the following functions relate to fragmentation reassembly. */ -static inline struct frag_queue *ifq_cast(struct inet_frag_queue *ifq) +static struct frag_queue *ifq_cast(struct inet_frag_queue *ifq) { return container_of(ifq, struct frag_queue, ifq); } @@ -530,13 +578,14 @@ static u32 frag_hash(struct frag_match *match) frag_state.rnd) & (INETFRAGS_HASHSZ - 1); } -static struct frag_queue *queue_find(struct frag_match *match) +static struct frag_queue *queue_find(struct netns_frags *ns_frag_state, + struct frag_match *match) { struct inet_frag_queue *ifq; read_lock(&frag_state.lock); - ifq = inet_frag_find(&frag_netns_state, &frag_state, match, frag_hash(match)); + ifq = inet_frag_find(ns_frag_state, &frag_state, match, frag_hash(match)); if (!ifq) return NULL; @@ -711,19 +760,21 @@ static struct sk_buff *defrag(struct sk_buff *skb, bool frag_last) { struct iphdr *iph = ip_hdr(skb); struct capwaphdr *cwh = capwap_hdr(skb); + struct capwap_net *capwap_net = ovs_get_capwap_net(dev_net(skb->dev)); + struct netns_frags *ns_frag_state = &capwap_net->frag_state; struct frag_match match; u16 frag_off; struct frag_queue *fq; - if (atomic_read(&frag_netns_state.mem) > frag_netns_state.high_thresh) - inet_frag_evictor(&frag_netns_state, &frag_state); + if (atomic_read(&ns_frag_state->mem) > ns_frag_state->high_thresh) + inet_frag_evictor(ns_frag_state, &frag_state); match.daddr = iph->daddr; match.saddr = iph->saddr; match.id = cwh->frag_id; frag_off = ntohs(cwh->frag_off) & FRAG_OFF_MASK; - fq = queue_find(&match); + fq = queue_find(ns_frag_state, &match); if (fq) { spin_lock(&fq->ifq.lock); skb = frag_queue(fq, skb, frag_off, frag_last); @@ -738,18 +789,6 @@ static struct sk_buff *defrag(struct sk_buff *skb, bool frag_last) return NULL; } -static void defrag_init(void) -{ - inet_frags_init(&frag_state); - inet_frags_init_net(&frag_netns_state); -} - -static void defrag_exit(void) -{ - inet_frags_exit_net(&frag_netns_state, &frag_state); - inet_frags_fini(&frag_state); -} - static void capwap_frag_init(struct inet_frag_queue *ifq, void *match_) { struct frag_match *match = match_; @@ -786,22 +825,22 @@ static void capwap_frag_expire(unsigned long ifq) inet_frag_put(&fq->ifq, &frag_state); } -const struct vport_ops capwap_vport_ops = { +const struct vport_ops ovs_capwap_vport_ops = { .type = OVS_VPORT_TYPE_CAPWAP, .flags = VPORT_F_TUN_ID, .init = capwap_init, .exit = capwap_exit, .create = capwap_create, - .destroy = tnl_destroy, - .set_addr = tnl_set_addr, - .get_name = tnl_get_name, - .get_addr = tnl_get_addr, - .get_options = tnl_get_options, - .set_options = tnl_set_options, - .get_dev_flags = vport_gen_get_dev_flags, - .is_running = vport_gen_is_running, - .get_operstate = vport_gen_get_operstate, - .send = tnl_send, + .destroy = capwap_destroy, + .set_addr = ovs_tnl_set_addr, + .get_name = ovs_tnl_get_name, + .get_addr = ovs_tnl_get_addr, + .get_options = ovs_tnl_get_options, + .set_options = ovs_tnl_set_options, + .get_dev_flags = ovs_vport_gen_get_dev_flags, + .is_running = ovs_vport_gen_is_running, + .get_operstate = ovs_vport_gen_get_operstate, + .send = ovs_tnl_send, }; #else #warning CAPWAP tunneling will not be available on kernels before 2.6.26