leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Use VRF device index for lookups on RX

Browse Source 
On ingress use index of VRF master device for route lookups if real device
is enslaved. Rules are expected to be installed for the VRF device to
direct lookups to a specific table.

Signed-off-by: Shrijeet Mukherjee <shm@cumulusnetworks.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2015-08-13 14:59:01 -06:00 committed by David S. Miller
parent 4e3c89920c
commit cd2fbe1b6b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/fib_frontend.c
View File

@ -45,6 +45,7 @@
#include <net/ip_fib.h> #include <net/ip_fib.h>
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/vrf.h>
#ifndef CONFIG_IP_MULTIPLE_TABLES #ifndef CONFIG_IP_MULTIPLE_TABLES
@ -309,7 +310,9 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
bool dev_match; bool dev_match;
fl4.flowi4_oif = 0; fl4.flowi4_oif = 0;
fl4.flowi4_iif = oif ? : LOOPBACK_IFINDEX; fl4.flowi4_iif = vrf_master_ifindex_rcu(dev);
if (!fl4.flowi4_iif)
fl4.flowi4_iif = oif ? : LOOPBACK_IFINDEX;
fl4.daddr = src; fl4.daddr = src;
fl4.saddr = dst; fl4.saddr = dst;
fl4.flowi4_tos = tos; fl4.flowi4_tos = tos;
@ -339,6 +342,9 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
if (nh->nh_dev == dev) { if (nh->nh_dev == dev) {
dev_match = true; dev_match = true;
break; break;
} else if (vrf_master_ifindex_rcu(nh->nh_dev) == dev->ifindex) {
dev_match = true;
break;
} }
} }
#else #else

3
net/ipv4/route.c
View File

@ -112,6 +112,7 @@
#endif #endif
#include <net/secure_seq.h> #include <net/secure_seq.h>
#include <net/ip_tunnels.h> #include <net/ip_tunnels.h>
#include <net/vrf.h>
#define RT_FL_TOS(oldflp4) \ #define RT_FL_TOS(oldflp4) \
((oldflp4)->flowi4_tos & (IPTOS_RT_MASK | RTO_ONLINK)) ((oldflp4)->flowi4_tos & (IPTOS_RT_MASK | RTO_ONLINK))
@ -1726,7 +1727,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
* Now we are ready to route packet. * Now we are ready to route packet.
*/ */
fl4.flowi4_oif = 0; fl4.flowi4_oif = 0;
fl4.flowi4_iif = dev->ifindex; fl4.flowi4_iif = vrf_master_ifindex_rcu(dev) ? : dev->ifindex;
fl4.flowi4_mark = skb->mark; fl4.flowi4_mark = skb->mark;
fl4.flowi4_tos = tos; fl4.flowi4_tos = tos;
fl4.flowi4_scope = RT_SCOPE_UNIVERSE; fl4.flowi4_scope = RT_SCOPE_UNIVERSE;