superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipv6: sr: select DST_CACHE by default 

When CONFIG_IPV6_SEG6_LWTUNNEL is selected, automatically select DST_CACHE.
This allows to remove multiple ifdefs.

Signed-off-by: David Lebrun <david.lebrun@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
pull/407/merge
David Lebrun 2017-03-27 11:43:59 +02:00 committed by David S. Miller
parent 656455bf19
commit 402a5bc462
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv6/Kconfig
View File

@ -307,6 +307,7 @@ config IPV6_SEG6_LWTUNNEL
bool "IPv6: Segment Routing Header encapsulation support" bool "IPv6: Segment Routing Header encapsulation support"
depends on IPV6 depends on IPV6
select LWTUNNEL select LWTUNNEL
select DST_CACHE
---help--- ---help---
Support for encapsulation of packets within an outer IPv6 Support for encapsulation of packets within an outer IPv6
header and a Segment Routing Header using the lightweight header and a Segment Routing Header using the lightweight

18
net/ipv6/seg6_iptunnel.c
View File

@ -26,17 +26,13 @@
#include <linux/seg6_iptunnel.h> #include <linux/seg6_iptunnel.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include <net/ip6_route.h> #include <net/ip6_route.h>
#ifdef CONFIG_DST_CACHE
#include <net/dst_cache.h> #include <net/dst_cache.h>
#endif
#ifdef CONFIG_IPV6_SEG6_HMAC #ifdef CONFIG_IPV6_SEG6_HMAC
#include <net/seg6_hmac.h> #include <net/seg6_hmac.h>
#endif #endif
struct seg6_lwt { struct seg6_lwt {
#ifdef CONFIG_DST_CACHE
struct dst_cache cache; struct dst_cache cache;
#endif
struct seg6_iptunnel_encap tuninfo[0]; struct seg6_iptunnel_encap tuninfo[0];
}; };
@ -250,17 +246,14 @@ static int seg6_input(struct sk_buff *skb)
slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate); slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);
#ifdef CONFIG_DST_CACHE
preempt_disable(); preempt_disable();
dst = dst_cache_get(&slwt->cache); dst = dst_cache_get(&slwt->cache);
preempt_enable(); preempt_enable();
#endif
skb_dst_drop(skb); skb_dst_drop(skb);
if (!dst) { if (!dst) {
ip6_route_input(skb); ip6_route_input(skb);
#ifdef CONFIG_DST_CACHE
dst = skb_dst(skb); dst = skb_dst(skb);
if (!dst->error) { if (!dst->error) {
preempt_disable(); preempt_disable();
@ -268,7 +261,6 @@ static int seg6_input(struct sk_buff *skb)
&ipv6_hdr(skb)->saddr); &ipv6_hdr(skb)->saddr);
preempt_enable(); preempt_enable();
} }
#endif
} else { } else {
skb_dst_set(skb, dst); skb_dst_set(skb, dst);
} }
@ -289,11 +281,9 @@ static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate); slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);
#ifdef CONFIG_DST_CACHE
preempt_disable(); preempt_disable();
dst = dst_cache_get(&slwt->cache); dst = dst_cache_get(&slwt->cache);
preempt_enable(); preempt_enable();
#endif
if (unlikely(!dst)) { if (unlikely(!dst)) {
struct ipv6hdr *hdr = ipv6_hdr(skb); struct ipv6hdr *hdr = ipv6_hdr(skb);
@ -312,11 +302,9 @@ static int seg6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
goto drop; goto drop;
} }
#ifdef CONFIG_DST_CACHE
preempt_disable(); preempt_disable();
dst_cache_set_ip6(&slwt->cache, dst, &fl6.saddr); dst_cache_set_ip6(&slwt->cache, dst, &fl6.saddr);
preempt_enable(); preempt_enable();
#endif
} }
skb_dst_drop(skb); skb_dst_drop(skb);
@ -380,13 +368,11 @@ static int seg6_build_state(struct nlattr *nla,
slwt = seg6_lwt_lwtunnel(newts); slwt = seg6_lwt_lwtunnel(newts);
#ifdef CONFIG_DST_CACHE
err = dst_cache_init(&slwt->cache, GFP_KERNEL); err = dst_cache_init(&slwt->cache, GFP_KERNEL);
if (err) { if (err) {
kfree(newts); kfree(newts);
return err; return err;
} }
#endif
memcpy(&slwt->tuninfo, tuninfo, tuninfo_len); memcpy(&slwt->tuninfo, tuninfo, tuninfo_len);
@ -400,12 +386,10 @@ static int seg6_build_state(struct nlattr *nla,
return 0; return 0;
} }
#ifdef CONFIG_DST_CACHE
static void seg6_destroy_state(struct lwtunnel_state *lwt) static void seg6_destroy_state(struct lwtunnel_state *lwt)
{ {
dst_cache_destroy(&seg6_lwt_lwtunnel(lwt)->cache); dst_cache_destroy(&seg6_lwt_lwtunnel(lwt)->cache);
} }
#endif
static int seg6_fill_encap_info(struct sk_buff *skb, static int seg6_fill_encap_info(struct sk_buff *skb,
struct lwtunnel_state *lwtstate) struct lwtunnel_state *lwtstate)
@ -439,9 +423,7 @@ static int seg6_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)
static const struct lwtunnel_encap_ops seg6_iptun_ops = { static const struct lwtunnel_encap_ops seg6_iptun_ops = {
.build_state = seg6_build_state, .build_state = seg6_build_state,
#ifdef CONFIG_DST_CACHE
.destroy_state = seg6_destroy_state, .destroy_state = seg6_destroy_state,
#endif
.output = seg6_output, .output = seg6_output,
.input = seg6_input, .input = seg6_input,
.fill_encap = seg6_fill_encap_info, .fill_encap = seg6_fill_encap_info,