X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-gre.c;h=4000c749b296c87e9505c6de58d1deb36fa92d7d;hb=685c931cff7c2f212dd82118ad1d97ccfc3a708d;hp=6e965cd83a651352ab6a4c449b549b92836ff9db;hpb=a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5;p=openvswitch diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c index 6e965cd8..4000c749 100644 --- a/datapath/vport-gre.c +++ b/datapath/vport-gre.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Nicira Networks. + * Copyright (c) 2007-2012 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -29,6 +29,7 @@ #include #include +#include "datapath.h" #include "tunnel.h" #include "vport.h" #include "vport-generic.h" @@ -53,12 +54,15 @@ static int gre_hdr_len(const struct tnl_mutable_config *mutable) if (mutable->flags & TNL_F_CSUM) len += GRE_HEADER_SECTION; - if (mutable->out_key || mutable->flags & TNL_F_OUT_KEY_ACTION) + if (mutable->out_key || mutable->flags & TNL_F_OUT_KEY_ACTION) { len += GRE_HEADER_SECTION; - + if (mutable->key.tunnel_type & TNL_T_PROTO_GRE64) + len += GRE_HEADER_SECTION; + } return len; } + /* Returns the least-significant 32 bits of a __be64. */ static __be32 be64_get_low32(__be64 x) { @@ -69,6 +73,15 @@ static __be32 be64_get_low32(__be64 x) #endif } +static __be32 be64_get_high32(__be64 x) +{ +#ifdef __BIG_ENDIAN + return (__force __be32)((__force u64)x >> 32); +#else + return (__force __be32)x; +#endif +} + static void gre_build_header(const struct vport *vport, const struct tnl_mutable_config *mutable, void *header) @@ -85,11 +98,20 @@ static void gre_build_header(const struct vport *vport, options++; } - if (mutable->out_key || mutable->flags & TNL_F_OUT_KEY_ACTION) + if (mutable->flags & TNL_F_OUT_KEY_ACTION) { greh->flags |= GRE_KEY; + if (mutable->key.tunnel_type & TNL_T_PROTO_GRE64) + greh->flags |= GRE_SEQ; - if (mutable->out_key) + } else if (mutable->out_key) { + greh->flags |= GRE_KEY; *options = be64_get_low32(mutable->out_key); + if (mutable->key.tunnel_type & TNL_T_PROTO_GRE64) { + options++; + *options = be64_get_high32(mutable->out_key); + greh->flags |= GRE_SEQ; + } + } } static struct sk_buff *gre_update_header(const struct vport *vport, @@ -102,8 +124,17 @@ static struct sk_buff *gre_update_header(const struct vport *vport, /* Work backwards over the options so the checksum is last. */ if (mutable->flags & TNL_F_OUT_KEY_ACTION) { + if (mutable->key.tunnel_type & TNL_T_PROTO_GRE64) { + /* Set higher 32 bits to seq. */ + *options = be64_get_high32(OVS_CB(skb)->tun_id); + options--; + } *options = be64_get_low32(OVS_CB(skb)->tun_id); options--; + } else if (mutable->out_key) { + options--; + if (mutable->key.tunnel_type & TNL_T_PROTO_GRE64) + options--; } if (mutable->flags & TNL_F_CSUM) @@ -123,17 +154,17 @@ static struct sk_buff *gre_update_header(const struct vport *vport, return skb; } -/* Zero-extends a __be32 into the least-significant 32 bits of a __be64. */ -static __be64 be32_extend_to_be64(__be32 x) +static __be64 key_to_tunnel_id(__be32 key, __be32 seq) { #ifdef __BIG_ENDIAN - return (__force __be64)x; + return (__force __be64)((__force u64)seq << 32 | (__force u32)key); #else - return (__force __be64)((__force u64)x << 32); + return (__force __be64)((__force u64)key << 32 | (__force u32)seq); #endif } -static int parse_header(struct iphdr *iph, __be16 *flags, __be64 *key) +static int parse_header(struct iphdr *iph, __be16 *flags, __be64 *tun_id, + u32 *tunnel_type) { /* IP and ICMP protocol handlers check that the IHL is valid. */ struct gre_base_hdr *greh = (struct gre_base_hdr *)((u8 *)iph + (iph->ihl << 2)); @@ -156,14 +187,28 @@ static int parse_header(struct iphdr *iph, __be16 *flags, __be64 *key) } if (greh->flags & GRE_KEY) { - hdr_len += GRE_HEADER_SECTION; + __be32 seq; + __be32 gre_key; - *key = be32_extend_to_be64(*options); + gre_key = *options; + hdr_len += GRE_HEADER_SECTION; options++; - } else - *key = 0; - if (unlikely(greh->flags & GRE_SEQ)) + if (greh->flags & GRE_SEQ) { + seq = *options; + *tunnel_type = TNL_T_PROTO_GRE64; + } else { + seq = 0; + *tunnel_type = TNL_T_PROTO_GRE; + } + *tun_id = key_to_tunnel_id(gre_key, seq); + } else { + *tun_id = 0; + /* Ignore GRE seq if there is no key present. */ + *tunnel_type = TNL_T_PROTO_GRE; + } + + if (greh->flags & GRE_SEQ) hdr_len += GRE_HEADER_SECTION; return hdr_len; @@ -177,6 +222,7 @@ static void gre_err(struct sk_buff *skb, u32 info) const int type = icmp_hdr(skb)->type; const int code = icmp_hdr(skb)->code; int mtu = ntohs(icmp_hdr(skb)->un.frag.mtu); + u32 tunnel_type; struct iphdr *iph; __be16 flags; @@ -201,12 +247,12 @@ static void gre_err(struct sk_buff *skb, u32 info) if (ipv4_is_multicast(iph->daddr)) return; - tunnel_hdr_len = parse_header(iph, &flags, &key); + tunnel_hdr_len = parse_header(iph, &flags, &key, &tunnel_type); if (tunnel_hdr_len < 0) return; - vport = tnl_find_port(iph->saddr, iph->daddr, key, TNL_T_PROTO_GRE, - &mutable); + vport = ovs_tnl_find_port(dev_net(skb->dev), iph->saddr, iph->daddr, key, + tunnel_type, &mutable); if (!vport) return; @@ -283,7 +329,7 @@ static void gre_err(struct sk_buff *skb, u32 info) #endif __skb_pull(skb, tunnel_hdr_len); - tnl_frag_needed(vport, mutable, skb, mtu, key); + ovs_tnl_frag_needed(vport, mutable, skb, mtu, key); __skb_push(skb, tunnel_hdr_len); out: @@ -327,14 +373,14 @@ static int gre_rcv(struct sk_buff *skb) struct iphdr *iph; __be16 flags; __be64 key; + u32 tunnel_type; if (unlikely(!pskb_may_pull(skb, sizeof(struct gre_base_hdr) + ETH_HLEN))) goto error; - if (unlikely(!check_checksum(skb))) goto error; - hdr_len = parse_header(ip_hdr(skb), &flags, &key); + hdr_len = parse_header(ip_hdr(skb), &flags, &key, &tunnel_type); if (unlikely(hdr_len < 0)) goto error; @@ -342,8 +388,8 @@ static int gre_rcv(struct sk_buff *skb) goto error; iph = ip_hdr(skb); - vport = tnl_find_port(iph->daddr, iph->saddr, key, TNL_T_PROTO_GRE, - &mutable); + vport = ovs_tnl_find_port(dev_net(skb->dev), iph->daddr, iph->saddr, key, + tunnel_type, &mutable); if (unlikely(!vport)) { icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); goto error; @@ -357,7 +403,7 @@ static int gre_rcv(struct sk_buff *skb) __skb_pull(skb, hdr_len); skb_postpull_rcsum(skb, skb_transport_header(skb), hdr_len + ETH_HLEN); - tnl_rcv(vport, skb, iph->tos); + ovs_tnl_rcv(vport, skb, iph->tos); return 0; error: @@ -375,18 +421,40 @@ static const struct tnl_ops gre_tnl_ops = { static struct vport *gre_create(const struct vport_parms *parms) { - return tnl_create(parms, &gre_vport_ops, &gre_tnl_ops); + return ovs_tnl_create(parms, &ovs_gre_vport_ops, &gre_tnl_ops); +} + +static const struct tnl_ops gre64_tnl_ops = { + .tunnel_type = TNL_T_PROTO_GRE64, + .ipproto = IPPROTO_GRE, + .hdr_len = gre_hdr_len, + .build_header = gre_build_header, + .update_header = gre_update_header, +}; + +static struct vport *gre_create64(const struct vport_parms *parms) +{ + return ovs_tnl_create(parms, &ovs_gre64_vport_ops, &gre64_tnl_ops); } static const struct net_protocol gre_protocol_handlers = { .handler = gre_rcv, .err_handler = gre_err, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) + .netns_ok = 1, +#endif }; +static bool inited; + static int gre_init(void) { int err; + if (inited) + return 0; + + inited = true; err = inet_add_protocol(&gre_protocol_handlers, IPPROTO_GRE); if (err) pr_warn("cannot register gre protocol handler\n"); @@ -396,23 +464,46 @@ static int gre_init(void) static void gre_exit(void) { + if (!inited) + return; + + inited = false; + inet_del_protocol(&gre_protocol_handlers, IPPROTO_GRE); } -const struct vport_ops gre_vport_ops = { +const struct vport_ops ovs_gre_vport_ops = { .type = OVS_VPORT_TYPE_GRE, .flags = VPORT_F_TUN_ID, .init = gre_init, .exit = gre_exit, .create = gre_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 = ovs_tnl_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, +}; + +const struct vport_ops ovs_gre64_vport_ops = { + .type = OVS_VPORT_TYPE_GRE64, + .flags = VPORT_F_TUN_ID, + .init = gre_init, + .exit = gre_exit, + .create = gre_create64, + .destroy = ovs_tnl_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, };