diff options
| author | Ansis Atteka <aatteka@nicira.com> | 2013-02-13 16:43:24 -0800 |
|---|---|---|
| committer | Ansis Atteka <aatteka@nicira.com> | 2013-02-20 11:31:28 -0800 |
| commit | 4b5fbf854d876e2f06a5cefb6fa869931169d7d0 (patch) | |
| tree | bfce784d9b4431c907c1522dccd363a102392217 /datapath | |
| parent | 009e734c5825b7edadcd1cf84be6d454f42ddca6 (diff) | |
| download | openvswitch-4b5fbf854d876e2f06a5cefb6fa869931169d7d0.tar.gz | |
datapath: use skb_mark for route lookups
If IPsec policy uses skb mark, then we have to do route look up
with skb mark as well.
Issue: 14870
Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/tunnel.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/datapath/tunnel.c b/datapath/tunnel.c index a81f4c482..3964208a4 100644 --- a/datapath/tunnel.c +++ b/datapath/tunnel.c @@ -45,6 +45,7 @@ #include <net/xfrm.h> #include "checksum.h" +#include "compat.h" #include "datapath.h" #include "tunnel.h" #include "vlan.h" @@ -360,7 +361,7 @@ void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb) static struct rtable *find_route(struct net *net, __be32 *saddr, __be32 daddr, u8 ipproto, - u8 tos) + u8 tos, u32 skb_mark) { struct rtable *rt; /* Tunnel configuration keeps DSCP part of TOS bits, But Linux @@ -370,7 +371,13 @@ static struct rtable *find_route(struct net *net, struct flowi fl = { .nl_u = { .ip4_u = { .daddr = daddr, .saddr = *saddr, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) + .fwmark = skb_mark, +#endif .tos = RT_TOS(tos) } }, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + .mark = skb_mark, +#endif .proto = ipproto }; if (unlikely(ip_route_output_key(net, &rt, &fl))) @@ -381,6 +388,7 @@ static struct rtable *find_route(struct net *net, struct flowi4 fl = { .daddr = daddr, .saddr = *saddr, .flowi4_tos = RT_TOS(tos), + .flowi4_mark = skb_mark, .flowi4_proto = ipproto }; rt = ip_route_output_key(net, &fl); @@ -516,6 +524,7 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb) __be16 frag_off; __be32 daddr; __be32 saddr; + u32 skb_mark; u8 ttl; u8 tos; @@ -608,8 +617,9 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb) } /* Route lookup */ + skb_mark = skb_get_mark(skb); rt = find_route(port_key_get_net(&mutable->key), &saddr, daddr, - tnl_vport->tnl_ops->ipproto, tos); + tnl_vport->tnl_ops->ipproto, tos, skb_mark); if (IS_ERR(rt)) goto error_free; @@ -773,7 +783,7 @@ static int tnl_set_config(struct net *net, struct nlattr *options, rt = find_route(port_key_get_net(&mutable->key), &saddr, mutable->key.daddr, - tnl_ops->ipproto, mutable->tos); + tnl_ops->ipproto, mutable->tos, 0); if (IS_ERR(rt)) return -EADDRNOTAVAIL; dev = rt_dst(rt).dev; |