pull request (net-next): ipsec-next 2019-07-05
Subsystems (4)
Steffen Klassert
maintainer1) A lot of work to remove indirections from the xfrm code. From Florian Westphal.
2) Fix a WARN_ON with ipv6 that triggered because of a forgotten break statement. From Florian Westphal.
3) Remove xfrmi_init_net, it is not needed.
From Li RongQing.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 2a99283cb7c1ef1bc61770a2a20ef88693687443:
Merge branch 'net-dsa-mv88e6xxx-support-for-mv88e6250' (2019-06-04 20:07:57 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
for you to fetch changes up to c7b37c769d2a5e711106a3c793140a4f46768e04:
xfrm: remove get_mtu indirection from xfrm_type (2019-07-01 06:16:40 +0200)
----------------------------------------------------------------
Florian Westphal (8):
xfrm: remove init_tempsel indirection from xfrm_state_afinfo
xfrm: remove init_temprop indirection from xfrm_state_afinfo
xfrm: remove init_flags indirection from xfrm_state_afinfo
xfrm: remove state and template sort indirections from xfrm_state_afinfo
xfrm: remove eth_proto value from xfrm_state_afinfo
xfrm: remove type and offload_type map from xfrm_state_afinfo
xfrm: fix bogus WARN_ON with ipv6
xfrm: remove get_mtu indirection from xfrm_type
Li RongQing (1):
xfrm: remove empty xfrmi_init_net
include/net/xfrm.h | 53 +++--- net/ipv4/ah4.c | 3 +- net/ipv4/esp4.c | 30 +--- net/ipv4/esp4_offload.c | 4 +- net/ipv4/ipcomp.c | 3 +- net/ipv4/xfrm4_state.c | 45 ----- net/ipv4/xfrm4_tunnel.c | 3 +- net/ipv6/ah6.c | 4 +- net/ipv6/esp6.c | 23 +-- net/ipv6/esp6_offload.c | 4 +- net/ipv6/ipcomp6.c | 3 +- net/ipv6/mip6.c | 6 +- net/ipv6/xfrm6_state.c | 137 --------------- net/xfrm/xfrm_device.c | 5 +- net/xfrm/xfrm_input.c | 25 +-- net/xfrm/xfrm_interface.c | 6 - net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 437 ++++++++++++++++++++++++++++++++++------------ 18 files changed, 381 insertions(+), 412 deletions(-)
Steffen Klassert
maintainerPATCH 1/9 xfrm: remove init_tempsel indirection from xfrm_state_afinfo
From: Florian Westphal <[email protected]>
Simple initialization, handle it in the caller.
--- include/net/xfrm.h | 2 -- net/ipv4/xfrm4_state.c | 19 -------------- net/ipv6/xfrm6_state.c | 21 ---------------- net/xfrm/xfrm_state.c | 56 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 49 insertions(+), 49 deletions(-)
include/net/xfrm.h +0 -2
@@ -354,8 +354,6 @@ struct xfrm_state_afinfo {const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ];int (*init_flags)(struct xfrm_state *x); -void (*init_tempsel)(struct xfrm_selector *sel, -const struct flowi *fl); void (*init_temprop)(struct xfrm_state *x, const struct xfrm_tmpl *tmpl, const xfrm_address_t *daddr,
net/ipv4/xfrm4_state.c +0 -19
@@ -22,24 +22,6 @@ static int xfrm4_init_flags(struct xfrm_state *x)return 0 ; } -static void -__xfrm4_init_tempsel (struct xfrm_selector *sel,const struct flowi *fl) -{ -const struct flowi4 *fl4 = &fl->u.ip4; - - sel->daddr.a4 = fl4->daddr; - sel->saddr.a4 = fl4->saddr; - sel->dport =xfrm_flowi_dport (fl, &fl4->uli); - sel->dport_mask =htons (0xffff ); - sel->sport =xfrm_flowi_sport (fl, &fl4->uli); - sel->sport_mask =htons (0xffff ); - sel->family =AF_INET ; - sel->prefixlen_d =32 ; - sel->prefixlen_s =32 ; - sel->proto = fl4->flowi4_proto; - sel->ifindex = fl4->flowi4_oif; -} -static void xfrm4_init_temprop (struct xfrm_state *x,const struct xfrm_tmpl *tmpl,const xfrm_address_t *daddr,const xfrm_address_t *saddr)
@@ -77,7 +59,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .eth_proto = htons(ETH_P_IP), .owner = THIS_MODULE, .init_flags = xfrm4_init_flags, - .init_tempsel = __xfrm4_init_tempsel, .init_temprop = xfrm4_init_temprop, .output = xfrm4_output, .output_finish = xfrm4_output_finish,
net/ipv6/xfrm6_state.c +0 -21
@@ -21,26 +21,6 @@#include <net/ipv6.h> #include <net/addrconf.h> -static void -__xfrm6_init_tempsel (struct xfrm_selector *sel,const struct flowi *fl) -{ -const struct flowi6 *fl6 = &fl->u.ip6; - -/* Initialize temporary selector matching only -* to current session. */ - *(struct in6_addr *)&sel->daddr = fl6->daddr; - *(struct in6_addr *)&sel->saddr = fl6->saddr; - sel->dport =xfrm_flowi_dport (fl, &fl6->uli); - sel->dport_mask =htons (0xffff ); - sel->sport =xfrm_flowi_sport (fl, &fl6->uli); - sel->sport_mask =htons (0xffff ); - sel->family =AF_INET6 ; - sel->prefixlen_d =128 ; - sel->prefixlen_s =128 ; - sel->proto = fl6->flowi6_proto; - sel->ifindex = fl6->flowi6_oif; -} -static void xfrm6_init_temprop (struct xfrm_state *x,const struct xfrm_tmpl *tmpl,const xfrm_address_t *daddr,const xfrm_address_t *saddr)
@@ -173,7 +153,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .proto = IPPROTO_IPV6, .eth_proto = htons(ETH_P_IPV6), .owner = THIS_MODULE, - .init_tempsel = __xfrm6_init_tempsel, .init_temprop = xfrm6_init_temprop, .tmpl_sort = __xfrm6_tmpl_sort, .state_sort = __xfrm6_state_sort,
net/xfrm/xfrm_state.c +49 -7
71 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 2/9 xfrm: remove init_temprop indirection from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
same as previous patch: just place this in the caller, no need to have an indirection for a structure initialization.
--- include/net/xfrm.h | 4 ---- net/ipv4/xfrm4_state.c | 16 ---------------- net/ipv6/xfrm6_state.c | 16 ---------------- net/xfrm/xfrm_state.c | 27 ++++++++++++++++++++------- 4 files changed, 20 insertions(+), 43 deletions(-)
include/net/xfrm.h +0 -4
@@ -354,10 +354,6 @@ struct xfrm_state_afinfo {const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ];int (*init_flags)(struct xfrm_state *x); -void (*init_temprop)(struct xfrm_state *x, -const struct xfrm_tmpl *tmpl, -const xfrm_address_t *daddr, -const xfrm_address_t *saddr);int (*tmpl_sort)(struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n);int (*state_sort)(struct xfrm_state **dst,struct xfrm_state **src,int n);int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);
net/ipv4/xfrm4_state.c +0 -16
@@ -22,21 +22,6 @@ static int xfrm4_init_flags(struct xfrm_state *x)return 0 ; } -static void -xfrm4_init_temprop (struct xfrm_state *x,const struct xfrm_tmpl *tmpl, -const xfrm_address_t *daddr,const xfrm_address_t *saddr) -{ - x->id = tmpl->id; -if (x->id.daddr.a4 ==0 ) - x->id.daddr.a4 = daddr->a4; - x->props.saddr = tmpl->saddr; -if (x->props.saddr.a4 ==0 ) - x->props.saddr.a4 = saddr->a4; - x->props.mode = tmpl->mode; - x->props.reqid = tmpl->reqid; - x->props.family =AF_INET ; -} -int xfrm4_extract_header (struct sk_buff *skb) {const struct iphdr *iph =ip_hdr (skb);
@@ -59,7 +44,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .eth_proto = htons(ETH_P_IP), .owner = THIS_MODULE, .init_flags = xfrm4_init_flags, - .init_temprop = xfrm4_init_temprop, .output = xfrm4_output, .output_finish = xfrm4_output_finish, .extract_input = xfrm4_extract_input,
net/ipv6/xfrm6_state.c +0 -16
@@ -21,21 +21,6 @@#include <net/ipv6.h> #include <net/addrconf.h> -static void -xfrm6_init_temprop (struct xfrm_state *x,const struct xfrm_tmpl *tmpl, -const xfrm_address_t *daddr,const xfrm_address_t *saddr) -{ - x->id = tmpl->id; -if (ipv6_addr_any ((struct in6_addr *)&x->id.daddr)) -memcpy (&x->id.daddr, daddr,sizeof (x->sel.daddr)); -memcpy (&x->props.saddr, &tmpl->saddr,sizeof (x->props.saddr)); -if (ipv6_addr_any ((struct in6_addr *)&x->props.saddr)) -memcpy (&x->props.saddr, saddr,sizeof (x->props.saddr)); - x->props.mode = tmpl->mode; - x->props.reqid = tmpl->reqid; - x->props.family =AF_INET6 ; -} -/* distribution counting sort function for xfrm_state and xfrm_tmpl */ static int __xfrm6_sort (void **dst,void **src,int n,int (*cmp)(void *p),int maxclass)
@@ -153,7 +138,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .proto = IPPROTO_IPV6, .eth_proto = htons(ETH_P_IPV6), .owner = THIS_MODULE, - .init_temprop = xfrm6_init_temprop, .tmpl_sort = __xfrm6_tmpl_sort, .state_sort = __xfrm6_state_sort, .output = xfrm6_output,
net/xfrm/xfrm_state.c +20 -7
@@ -812,8 +812,6 @@ xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl, const xfrm_address_t *daddr, const xfrm_address_t *saddr, unsigned short family) { - struct xfrm_state_afinfo *afinfo = xfrm_state_afinfo_get_rcu(family); - switch (family) { case AF_INET: __xfrm4_init_tempsel(&x->sel, fl);
@@ -823,13 +821,28 @@ xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl,break ; } -if (family != tmpl->encap_family) - afinfo =xfrm_state_afinfo_get_rcu (tmpl->encap_family); + x->id = tmpl->id; -if (!afinfo) -return ; +switch (tmpl->encap_family) { +case AF_INET : +if (x->id.daddr.a4 ==0 ) + x->id.daddr.a4 = daddr->a4; + x->props.saddr = tmpl->saddr; +if (x->props.saddr.a4 ==0 ) + x->props.saddr.a4 = saddr->a4; +break ; +case AF_INET6 : +if (ipv6_addr_any ((struct in6_addr *)&x->id.daddr)) +memcpy (&x->id.daddr, daddr,sizeof (x->sel.daddr)); +memcpy (&x->props.saddr, &tmpl->saddr,sizeof (x->props.saddr)); +if (ipv6_addr_any ((struct in6_addr *)&x->props.saddr)) +memcpy (&x->props.saddr, saddr,sizeof (x->props.saddr)); +break ; + } - afinfo->init_temprop (x, tmpl, daddr, saddr); + x->props.mode = tmpl->mode; + x->props.reqid = tmpl->reqid; + x->props.family = tmpl->encap_family; } static struct xfrm_state *__xfrm_state_lookup(struct net *net, u32 mark,
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 3/9 xfrm: remove init_flags indirection from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
There is only one implementation of this function; just call it directly.
--- include/net/xfrm.h | 1 - net/ipv4/xfrm4_state.c | 8 -------- net/xfrm/xfrm_state.c | 17 +++-------------- 3 files changed, 3 insertions(+), 23 deletions(-)
include/net/xfrm.h +0 -1
@@ -353,7 +353,6 @@ struct xfrm_state_afinfo {const struct xfrm_type *type_map[IPPROTO_MAX ];const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ]; -int (*init_flags)(struct xfrm_state *x);int (*tmpl_sort)(struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n);int (*state_sort)(struct xfrm_state **dst,struct xfrm_state **src,int n);int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);
net/ipv4/xfrm4_state.c +0 -8
@@ -15,13 +15,6 @@#include <linux/netfilter_ipv4.h> #include <linux/export.h> -static int xfrm4_init_flags (struct xfrm_state *x) -{ -if (xs_net (x)->ipv4.sysctl_ip_no_pmtu_disc) - x->props.flags |=XFRM_STATE_NOPMTUDISC ; -return 0 ; -} -int xfrm4_extract_header (struct sk_buff *skb) {const struct iphdr *iph =ip_hdr (skb);
@@ -43,7 +36,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .proto = IPPROTO_IPIP, .eth_proto = htons(ETH_P_IP), .owner = THIS_MODULE, - .init_flags = xfrm4_init_flags, .output = xfrm4_output, .output_finish = xfrm4_output_finish, .extract_input = xfrm4_extract_input,
net/xfrm/xfrm_state.c +3 -14
@@ -2263,25 +2263,14 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu)int __xfrm_init_state (struct xfrm_state *x,bool init_replay,bool offload) { -const struct xfrm_state_afinfo *afinfo;const struct xfrm_mode *inner_mode;const struct xfrm_mode *outer_mode;int family = x->props.family;int err; - err = -EAFNOSUPPORT ; - afinfo =xfrm_state_get_afinfo (family); -if (!afinfo) - goto error; - - err =0 ; -if (afinfo->init_flags) - err = afinfo->init_flags (x); - -rcu_read_unlock (); - -if (err) - goto error; +if (family ==AF_INET && +xs_net (x)->ipv4.sysctl_ip_no_pmtu_disc) + x->props.flags |=XFRM_STATE_NOPMTUDISC ; err = -EPROTONOSUPPORT ;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 4/9 xfrm: remove state and template sort indirections from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
No module dependency, placing this in xfrm_state.c avoids need for an indirection.
This also removes the state spinlock -- I don't see why we would need to hold it during sorting.
This in turn allows to remove the 'net' argument passed to xfrm_tmpl_sort. Last, remove the EXPORT_SYMBOL, there are no modular callers.
For the CONFIG_IPV6=m case, vmlinux size increase is about 300 byte.
--- include/net/xfrm.h | 18 +++--- net/ipv6/xfrm6_state.c | 98 ------------------------------ net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 132 ++++++++++++++++++++++++++++++++--------- 4 files changed, 113 insertions(+), 137 deletions(-)
include/net/xfrm.h +7 -11
@@ -353,8 +353,6 @@ struct xfrm_state_afinfo {const struct xfrm_type *type_map[IPPROTO_MAX ];const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ]; -int (*tmpl_sort)(struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n); -int (*state_sort)(struct xfrm_state **dst,struct xfrm_state **src,int n);int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);int (*output_finish)(struct sock *sk,struct sk_buff *skb); int (*extract_input)(struct xfrm_state *x,
@@ -1501,21 +1499,19 @@ struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, u32 mark,u8 proto, unsigned short family);#ifdef CONFIG_XFRM_SUB_POLICY -int xfrm_tmpl_sort (struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n, -unsigned short family,struct net *net); -int xfrm_state_sort (struct xfrm_state **dst,struct xfrm_state **src,int n, +void xfrm_tmpl_sort (struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n,unsigned short family); +void xfrm_state_sort (struct xfrm_state **dst,struct xfrm_state **src,int n, +unsigned short family);#else -static inline int xfrm_tmpl_sort (struct xfrm_tmpl **dst,struct xfrm_tmpl **src, -int n,unsigned short family,struct net *net) +static inline void xfrm_tmpl_sort (struct xfrm_tmpl **d,struct xfrm_tmpl **s, +int n,unsigned short family) { -return -ENOSYS ; } -static inline int xfrm_state_sort (struct xfrm_state **dst,struct xfrm_state **src, -int n,unsigned short family) +static inline void xfrm_state_sort (struct xfrm_state **d,struct xfrm_state **s, +int n,unsigned short family) { -return -ENOSYS ; }#endif
net/ipv6/xfrm6_state.c +0 -98
110 lines not on this page · raw message
net/xfrm/xfrm_policy.c +1 -1
@@ -3628,7 +3628,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, } xfrm_nr = ti;if (npols >1 ) { -xfrm_tmpl_sort (stp, tpp, xfrm_nr, family, net); +xfrm_tmpl_sort (stp, tpp, xfrm_nr, family); tpp = stp; }
net/xfrm/xfrm_state.c +105 -27
156 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 5/9 xfrm: remove eth_proto value from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
xfrm_prepare_input needs to lookup the state afinfo backend again to fetch the address family ethernet protocol value.
There are only two address families, so a switch statement is simpler. While at it, use u8 for family and proto and remove the owner member -- its not used anywhere.
--- include/net/xfrm.h | 6 ++---- net/ipv4/xfrm4_state.c | 2 -- net/ipv6/xfrm6_state.c | 2 -- net/xfrm/xfrm_input.c | 24 ++++++++++++------------ 4 files changed, 14 insertions(+), 20 deletions(-)
include/net/xfrm.h +2 -4
@@ -346,10 +346,8 @@ void km_state_expired(struct xfrm_state *x, int hard, u32 portid);int __xfrm_state_delete (struct xfrm_state *x);struct xfrm_state_afinfo { -unsigned int family; -unsigned int proto; -__be16 eth_proto; -struct module *owner; +u8 family; +u8 proto;const struct xfrm_type *type_map[IPPROTO_MAX ];const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ];
net/ipv4/xfrm4_state.c +0 -2
@@ -34,8 +34,6 @@ int xfrm4_extract_header(struct sk_buff *skb)static struct xfrm_state_afinfo xfrm4_state_afinfo = { .family =AF_INET , .proto =IPPROTO_IPIP , - .eth_proto =htons (ETH_P_IP ), - .owner =THIS_MODULE , .output = xfrm4_output, .output_finish = xfrm4_output_finish, .extract_input = xfrm4_extract_input,
net/ipv6/xfrm6_state.c +0 -2
@@ -40,8 +40,6 @@ int xfrm6_extract_header(struct sk_buff *skb)static struct xfrm_state_afinfo xfrm6_state_afinfo = { .family =AF_INET6 , .proto =IPPROTO_IPV6 , - .eth_proto =htons (ETH_P_IPV6 ), - .owner =THIS_MODULE , .output = xfrm6_output, .output_finish = xfrm6_output_finish, .extract_input = xfrm6_extract_input,
net/xfrm/xfrm_input.c +12 -12
@@ -359,28 +359,28 @@ static int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb) afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family);if (likely (afinfo)) err = afinfo->extract_input (x, skb); +rcu_read_unlock (); -if (err) { -rcu_read_unlock (); +if (err)return err; - }if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol); -if (!inner_mode) { -rcu_read_unlock (); +if (!inner_mode)return -EAFNOSUPPORT ; - } } - afinfo =xfrm_state_afinfo_get_rcu (inner_mode->family); -if (unlikely (!afinfo)) { -rcu_read_unlock (); -return -EAFNOSUPPORT ; +switch (inner_mode->family) { +case AF_INET : + skb->protocol =htons (ETH_P_IP ); +break ; +case AF_INET6 : + skb->protocol =htons (ETH_P_IPV6 ); +default : +WARN_ON_ONCE (1 ); +break ; } - skb->protocol = afinfo->eth_proto; -rcu_read_unlock ();return xfrm_inner_mode_encap_remove (x, inner_mode, skb); }
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 6/9 xfrm: remove type and offload_type map from xfrm_state_afinfo
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
Only a handful of xfrm_types exist, no need to have 512 pointers for them.
Reduces size of afinfo struct from 4k to 120 bytes on 64bit platforms.
Also, the unregister function doesn't need to return an error, no single caller does anything useful with it.
Just place a WARN_ON() where needed instead.
--- include/net/xfrm.h | 16 +++- net/ipv4/ah4.c | 3 +- net/ipv4/esp4.c | 3 +- net/ipv4/esp4_offload.c | 4 +- net/ipv4/ipcomp.c | 3 +- net/ipv4/xfrm4_tunnel.c | 3 +- net/ipv6/ah6.c | 4 +- net/ipv6/esp6.c | 3 +- net/ipv6/esp6_offload.c | 4 +- net/ipv6/ipcomp6.c | 3 +- net/ipv6/mip6.c | 6 +- net/xfrm/xfrm_state.c | 179 ++++++++++++++++++++++++++++------------ 12 files changed, 150 insertions(+), 81 deletions(-)
include/net/xfrm.h +12 -4
@@ -348,8 +348,16 @@ int __xfrm_state_delete(struct xfrm_state *x);struct xfrm_state_afinfo {u8 family;u8 proto; -const struct xfrm_type *type_map[IPPROTO_MAX ]; -const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ]; + +const struct xfrm_type_offload *type_offload_esp; + +const struct xfrm_type *type_esp; +const struct xfrm_type *type_ipip; +const struct xfrm_type *type_ipip6; +const struct xfrm_type *type_comp; +const struct xfrm_type *type_ah; +const struct xfrm_type *type_routing; +const struct xfrm_type *type_dstopts;int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);int (*output_finish)(struct sock *sk,struct sk_buff *skb);
@@ -401,7 +409,7 @@ struct xfrm_type { };int xfrm_register_type (const struct xfrm_type *type,unsigned short family); -int xfrm_unregister_type (const struct xfrm_type *type,unsigned short family); +void xfrm_unregister_type (const struct xfrm_type *type,unsigned short family);struct xfrm_type_offload {char *description;
@@ -413,7 +421,7 @@ struct xfrm_type_offload { };int xfrm_register_type_offload (const struct xfrm_type_offload *type,unsigned short family); -int xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family); +void xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family);static inline int xfrm_af2proto (unsigned int family) {
net/ipv4/ah4.c +1 -2
@@ -590,8 +590,7 @@ static void __exit ah4_fini(void) {if (xfrm4_protocol_deregister (&ah4_protocol,IPPROTO_AH ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&ah_type,AF_INET ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&ah_type,AF_INET ); }module_init (ah4_init);
net/ipv4/esp4.c +1 -2
@@ -1066,8 +1066,7 @@ static void __exit esp4_fini(void) {if (xfrm4_protocol_deregister (&esp4_protocol,IPPROTO_ESP ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&esp_type,AF_INET ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&esp_type,AF_INET ); }module_init (esp4_init);
net/ipv4/esp4_offload.c +1 -3
@@ -315,9 +315,7 @@ static int __init esp4_offload_init(void) static void __exit esp4_offload_exit(void) { -if (xfrm_unregister_type_offload (&esp_type_offload,AF_INET ) <0 ) -pr_info ("%s: can't remove xfrm type offload\n" , __func__); - +xfrm_unregister_type_offload (&esp_type_offload,AF_INET );inet_del_offload (&esp4_offload,IPPROTO_ESP ); }
net/ipv4/ipcomp.c +1 -2
@@ -190,8 +190,7 @@ static void __exit ipcomp4_fini(void) {if (xfrm4_protocol_deregister (&ipcomp4_protocol,IPPROTO_COMP ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&ipcomp_type,AF_INET ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&ipcomp_type,AF_INET ); }module_init (ipcomp4_init);
net/ipv4/xfrm4_tunnel.c +1 -2
@@ -108,8 +108,7 @@ static void __exit ipip_fini(void)if (xfrm4_tunnel_deregister (&xfrm_tunnel_handler,AF_INET ))pr_info ("%s: can't remove xfrm handler for AF_INET\n" , __func__); -if (xfrm_unregister_type (&ipip_type,AF_INET ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&ipip_type,AF_INET ); }module_init (ipip_init);
net/ipv6/ah6.c +1 -3
@@ -793,9 +793,7 @@ static void __exit ah6_fini(void)if (xfrm6_protocol_deregister (&ah6_protocol,IPPROTO_AH ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&ah6_type,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); - +xfrm_unregister_type (&ah6_type,AF_INET6 ); }module_init (ah6_init);
net/ipv6/esp6.c +1 -2
@@ -951,8 +951,7 @@ static void __exit esp6_fini(void) {if (xfrm6_protocol_deregister (&esp6_protocol,IPPROTO_ESP ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&esp6_type,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&esp6_type,AF_INET6 ); }module_init (esp6_init);
net/ipv6/esp6_offload.c +1 -3
@@ -339,9 +339,7 @@ static int __init esp6_offload_init(void) static void __exit esp6_offload_exit(void) { -if (xfrm_unregister_type_offload (&esp6_type_offload,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type offload\n" , __func__); - +xfrm_unregister_type_offload (&esp6_type_offload,AF_INET6 );inet6_del_offload (&esp6_offload,IPPROTO_ESP ); }
net/ipv6/ipcomp6.c +1 -2
@@ -206,8 +206,7 @@ static void __exit ipcomp6_fini(void) {if (xfrm6_protocol_deregister (&ipcomp6_protocol,IPPROTO_COMP ) <0 )pr_info ("%s: can't remove protocol\n" , __func__); -if (xfrm_unregister_type (&ipcomp6_type,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type\n" , __func__); +xfrm_unregister_type (&ipcomp6_type,AF_INET6 ); }module_init (ipcomp6_init);
net/ipv6/mip6.c +2 -4
@@ -499,10 +499,8 @@ static void __exit mip6_fini(void) {if (rawv6_mh_filter_unregister (mip6_mh_filter) <0 )pr_info ("%s: can't remove rawv6 mh filter\n" , __func__); -if (xfrm_unregister_type (&mip6_rthdr_type,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type(rthdr)\n" , __func__); -if (xfrm_unregister_type (&mip6_destopt_type,AF_INET6 ) <0 ) -pr_info ("%s: can't remove xfrm type(destopt)\n" , __func__); +xfrm_unregister_type (&mip6_rthdr_type,AF_INET6 ); +xfrm_unregister_type (&mip6_destopt_type,AF_INET6 ); }module_init (mip6_init);
net/xfrm/xfrm_state.c +127 -52
255 lines not on this page · raw message
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 7/9 xfrm: fix bogus WARN_ON with ipv6
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
net/xfrm/xfrm_input.c:378:17: warning: this statement may fall through [-Wimplicit-fallthrough=] skb->protocol = htons(ETH_P_IPV6);
... the fallthrough then causes a bogus WARN_ON().
--- net/xfrm/xfrm_input.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_input.c +1 -0
@@ -376,6 +376,7 @@ static int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb)break ;case AF_INET6 : skb->protocol =htons (ETH_P_IPV6 ); +break ;default :WARN_ON_ONCE (1 );break ;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 8/9 xfrm: remove empty xfrmi_init_net
In reply to Steffen KlassertFrom: Li RongQing <[email protected]>
Pointer members of an object with static storage duration, if not explicitly initialized, will be initialized to a NULL pointer. The net namespace API checks if this pointer is not NULL before using it, it are safe to remove the function.
--- net/xfrm/xfrm_interface.c | 6 ------ 1 file changed, 6 deletions(-)
net/xfrm/xfrm_interface.c +0 -6
@@ -793,11 +793,6 @@ static void __net_exit xfrmi_destroy_interfaces(struct xfrmi_net *xfrmn)unregister_netdevice_many (&list); } -static int __net_init xfrmi_init_net (struct net *net) -{ -return 0 ; -} - static void __net_exit xfrmi_exit_net(struct net *net) {struct xfrmi_net *xfrmn =net_generic (net, xfrmi_net_id);
@@ -808,7 +803,6 @@ static void __net_exit xfrmi_exit_net(struct net *net) }static struct pernet_operations xfrmi_net_ops = { - .init = xfrmi_init_net, .exit = xfrmi_exit_net, .id = &xfrmi_net_id, .size =sizeof (struct xfrmi_net ),
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 9/9 xfrm: remove get_mtu indirection from xfrm_type
In reply to Steffen KlassertFrom: Florian Westphal <[email protected]>
esp4_get_mtu and esp6_get_mtu are exactly the same, the only difference is a single sizeof() (ipv4 vs. ipv6 header).
Merge both into xfrm_state_mtu() and remove the indirection.
--- include/net/xfrm.h | 4 +--- net/ipv4/esp4.c | 27 +-------------------------- net/ipv6/esp6.c | 20 +------------------- net/xfrm/xfrm_device.c | 5 ++--- net/xfrm/xfrm_state.c | 34 +++++++++++++++++++++++++++++----- 5 files changed, 34 insertions(+), 56 deletions(-)
include/net/xfrm.h +1 -3
@@ -404,8 +404,6 @@ struct xfrm_type {int (*reject)(struct xfrm_state *,struct sk_buff *,const struct flowi *);int (*hdr_offset)(struct xfrm_state *,struct sk_buff *,u8 **); -/* Estimate maximal size of result of transformation of a dgram */ -u32 (*get_mtu)(struct xfrm_state *,int size); };int xfrm_register_type (const struct xfrm_type *type,unsigned short family);
@@ -1546,7 +1544,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si);void xfrm_spd_getinfo (struct net *net,struct xfrmk_spdinfo *si);u32 xfrm_replay_seqhi (struct xfrm_state *x,__be32 net_seq);int xfrm_init_replay (struct xfrm_state *x); -int xfrm_state_mtu (struct xfrm_state *x,int mtu); +u32 xfrm_state_mtu (struct xfrm_state *x,int mtu);int __xfrm_init_state (struct xfrm_state *x,bool init_replay,bool offload);int xfrm_init_state (struct xfrm_state *x);int xfrm_input (struct sk_buff *skb,int nexthdr,__be32 spi,int encap_type);
net/ipv4/esp4.c +1 -26
@@ -33,8 +33,6 @@ struct esp_output_extra {#define ESP_SKB_CB (__skb) ((struct esp_skb_cb *)&((__skb)->cb[0])) -static u32 esp4_get_mtu (struct xfrm_state *x,int mtu); -/* * Allocate an AEAD request structure with extra space for SG and IV. *
@@ -506,7 +504,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst (skb);u32 padto; - padto =min (x->tfcpad,esp4_get_mtu (x, dst->child_mtu_cached)); + padto =min (x->tfcpad,xfrm_state_mtu (x, dst->child_mtu_cached));if (skb->len < padto) esp.tfclen = padto - skb->len; }
@@ -788,28 +786,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)return err; } -static u32 esp4_get_mtu (struct xfrm_state *x,int mtu) -{ -struct crypto_aead *aead = x->data; -u32 blksize =ALIGN (crypto_aead_blocksize (aead),4 ); -unsigned int net_adj; - -switch (x->props.mode) { -case XFRM_MODE_TRANSPORT : -case XFRM_MODE_BEET : - net_adj =sizeof (struct iphdr ); -break ; -case XFRM_MODE_TUNNEL : - net_adj =0 ; -break ; -default : -BUG (); - } - -return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - - net_adj) & ~(blksize -1 )) + net_adj -2 ; -} -static int esp4_err (struct sk_buff *skb,u32 info) {struct net *net =dev_net (skb->dev);
@@ -1035,7 +1011,6 @@ static const struct xfrm_type esp_type = .flags = XFRM_TYPE_REPLAY_PROT, .init_state = esp_init_state, .destructor = esp_destroy, - .get_mtu = esp4_get_mtu, .input = esp_input, .output = esp_output, };
net/ipv6/esp6.c +1 -19
@@ -41,8 +41,6 @@ struct esp_skb_cb {#define ESP_SKB_CB (__skb) ((struct esp_skb_cb *)&((__skb)->cb[0])) -static u32 esp6_get_mtu (struct xfrm_state *x,int mtu); -/* * Allocate an AEAD request structure with extra space for SG and IV. *
@@ -447,7 +445,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst (skb);u32 padto; - padto =min (x->tfcpad,esp6_get_mtu (x, dst->child_mtu_cached)); + padto =min (x->tfcpad,xfrm_state_mtu (x, dst->child_mtu_cached));if (skb->len < padto) esp.tfclen = padto - skb->len; }
@@ -687,21 +685,6 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)return ret; } -static u32 esp6_get_mtu (struct xfrm_state *x,int mtu) -{ -struct crypto_aead *aead = x->data; -u32 blksize =ALIGN (crypto_aead_blocksize (aead),4 ); -unsigned int net_adj; - -if (x->props.mode !=XFRM_MODE_TUNNEL ) - net_adj =sizeof (struct ipv6hdr ); -else - net_adj =0 ; - -return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - - net_adj) & ~(blksize -1 )) + net_adj -2 ; -} -static int esp6_err (struct sk_buff *skb,struct inet6_skb_parm *opt,u8 type,u8 code,int offset,__be32 info) {
@@ -919,7 +902,6 @@ static const struct xfrm_type esp6_type = { .flags = XFRM_TYPE_REPLAY_PROT, .init_state = esp6_init_state, .destructor = esp6_destroy, - .get_mtu = esp6_get_mtu, .input = esp6_input, .output = esp6_output, .hdr_offset = xfrm6_find_1stfragopt,
net/xfrm/xfrm_device.c +2 -3
@@ -275,9 +275,8 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x)return false;if ((!dev || (dev ==xfrm_dst_path (dst)->dev)) && - (!xdst->child->xfrm && x->type->get_mtu)) { - mtu = x->type->get_mtu (x, xdst->child_mtu_cached); - + (!xdst->child->xfrm)) { + mtu =xfrm_state_mtu (x, xdst->child_mtu_cached);if (skb->len <= mtu) goto ok;
net/xfrm/xfrm_state.c +29 -5
@@ -27,6 +27,8 @@#include <linux/interrupt.h> #include <linux/kernel.h> +#include <crypto/aead.h> +#include "xfrm_hash.h" #define xfrm_state_deref_prot (table, net) \
@@ -2403,16 +2405,38 @@ void xfrm_state_delete_tunnel(struct xfrm_state *x) }EXPORT_SYMBOL (xfrm_state_delete_tunnel); -int xfrm_state_mtu (struct xfrm_state *x,int mtu) +u32 xfrm_state_mtu (struct xfrm_state *x,int mtu) {const struct xfrm_type *type =READ_ONCE (x->type); +struct crypto_aead *aead; +u32 blksize, net_adj =0 ; + +if (x->km.state !=XFRM_STATE_VALID || + !type || type->proto !=IPPROTO_ESP ) +return mtu - x->props.header_len; + + aead = x->data; + blksize =ALIGN (crypto_aead_blocksize (aead),4 ); -if (x->km.state ==XFRM_STATE_VALID && - type && type->get_mtu) -return type->get_mtu (x, mtu); +switch (x->props.mode) { +case XFRM_MODE_TRANSPORT : +case XFRM_MODE_BEET : +if (x->props.family ==AF_INET ) + net_adj =sizeof (struct iphdr ); +else if (x->props.family ==AF_INET6 ) + net_adj =sizeof (struct ipv6hdr ); +break ; +case XFRM_MODE_TUNNEL : +break ; +default : +WARN_ON_ONCE (1 ); +break ; + } -return mtu - x->props.header_len; +return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - + net_adj) & ~(blksize -1 )) + net_adj -2 ; } +EXPORT_SYMBOL_GPL (xfrm_state_mtu);int __xfrm_init_state (struct xfrm_state *x,bool init_replay,bool offload) {
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Fri, 5 Jul 2019 10:46:01 +0200
Quoted 10 lines
1) A lot of work to remove indirections from the xfrm code. From Florian Westphal.
2) Fix a
WARN_ONwith ipv6 that triggered because of a forgotten break statement. From Florian Westphal.3) Remove
xfrmi_init_net, it is not needed.
From Li RongQing.Please pull or let me know if there are problems.
Pulled, thanks.