xfrm: remove xfrm_mode indirections
Subsystems (5)
v2 cover xfrm: remove xfrm_mode indirections
This series removes all function pointers from the xfrm_mode struct. They are either replaced by direct calls or a static helper.
This reduces code size: even merging all xfrm{4,6}_,mode* modules into the core reduces total size, as the infrastructure to maintain dynamic (un)register can be removed.
There are more opportunities for indirection avoidance, e.g. in xfrm_type. I plan to follow up once/if this series is accepted.
Tested with xfrm tunnel mode via netns with esp/aead.
I'd like thank Benedict Wong for running Android unit tests and taking the time to bisect a tunnel mode breakage added by v1 of this patch set.
I've addressed the comments/feedback from Sabrina and Eyal. The kbuild robot reported build breakage in patch #8 is fixed as well.
I've not addressed the sparse warning reported by the kbuild robot -- those warnings are in code not touched by this patch set.
Florian Westphal (11):
xfrm: place af number into xfrm_mode struct
xfrm: prefer family stored in xfrm_mode struct
xfrm: remove input indirection from xfrm_mode
xfrm: remove output indirection from xfrm_mode
xfrm: remove xmit indirection from xfrm_mode
xfrm: remove gso_segment indirection from xfrm_mode
xfrm: remove input2 indirection from xfrm_mode
xfrm: remove output2 indirection from xfrm_mode
xfrm: remove afinfo pointer from xfrm_mode
xfrm: make xfrm modes builtin
xfrm: store xfrm_mode directly, not its address
include/net/xfrm.h | 106 ++------- net/core/pktgen.c | 2 net/ipv4/Kconfig | 29 -- net/ipv4/Makefile | 3 net/ipv4/esp4_offload.c | 40 +++ net/ipv4/ip_vti.c | 6 net/ipv4/xfrm4_output.c | 27 +- net/ipv6/Kconfig | 35 --- net/ipv6/Makefile | 4 net/ipv6/esp6_offload.c | 40 +++ net/ipv6/ip6_vti.c | 6 net/ipv6/xfrm6_output.c | 36 +-- net/xfrm/xfrm_device.c | 58 +++++ net/xfrm/xfrm_inout.h | 38 +++ net/xfrm/xfrm_input.c | 299 ++++++++++++++++++++++++++- net/xfrm/xfrm_interface.c | 6 net/xfrm/xfrm_output.c | 377 ++++++++++++++++++++++++++++++++++- net/xfrm/xfrm_policy.c | 14 + net/xfrm/xfrm_state.c | 181 ++++++---------- tools/testing/selftests/net/config | 2 net/ipv4/xfrm4_mode_beet.c | 155 -------------- net/ipv4/xfrm4_mode_transport.c | 114 ---------- net/ipv4/xfrm4_mode_tunnel.c | 152 -------------- net/ipv6/xfrm6_mode_beet.c | 131 ------------ net/ipv6/xfrm6_mode_ro.c | 85 ------- net/ipv6/xfrm6_mode_transport.c | 121 ----------- net/ipv6/xfrm6_mode_tunnel.c | 151 -------------- 27 files changed, 976 insertions(+), 1247 deletions(-)
PATCH v2 1/11 xfrm: place af number into xfrm_mode struct
This will be useful to know if we're supposed to decode ipv4 or ipv6.
While at it, make the unregister function return void, all module_exit functions did just BUG(); there is never a point in doing error checks if there is no way to handle such error.
--- include/net/xfrm.h | 9 +++++---- net/ipv4/xfrm4_mode_beet.c | 8 +++----- net/ipv4/xfrm4_mode_transport.c | 8 +++----- net/ipv4/xfrm4_mode_tunnel.c | 8 +++----- net/ipv6/xfrm6_mode_beet.c | 8 +++----- net/ipv6/xfrm6_mode_ro.c | 8 +++----- net/ipv6/xfrm6_mode_transport.c | 8 +++----- net/ipv6/xfrm6_mode_tunnel.c | 8 +++----- net/xfrm/xfrm_state.c | 19 ++++++------------- 9 files changed, 32 insertions(+), 52 deletions(-)
include/net/xfrm.h +5 -4
@@ -482,8 +482,9 @@ struct xfrm_mode {struct xfrm_state_afinfo *afinfo;struct module *owner; -unsigned int encap; -int flags; +u8 encap; +u8 family; +u8 flags; };/* Flags for xfrm_mode. */
@@ -491,8 +492,8 @@ enum { XFRM_MODE_FLAG_TUNNEL = 1, }; -int xfrm_register_mode (struct xfrm_mode *mode,int family); -int xfrm_unregister_mode (struct xfrm_mode *mode,int family); +int xfrm_register_mode (struct xfrm_mode *mode); +void xfrm_unregister_mode (struct xfrm_mode *mode);static inline int xfrm_af2proto (unsigned int family) {
net/ipv4/xfrm4_mode_beet.c +3 -5
@@ -134,19 +134,17 @@ static struct xfrm_mode xfrm4_beet_mode = { .owner = THIS_MODULE, .encap = XFRM_MODE_BEET, .flags = XFRM_MODE_FLAG_TUNNEL, + .family = AF_INET, };static int __init xfrm4_beet_init (void ) { -return xfrm_register_mode (&xfrm4_beet_mode,AF_INET ); +return xfrm_register_mode (&xfrm4_beet_mode); } static void __exit xfrm4_beet_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm4_beet_mode,AF_INET ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm4_beet_mode); }module_init (xfrm4_beet_init);
net/ipv4/xfrm4_mode_transport.c +3 -5
@@ -93,19 +93,17 @@ static struct xfrm_mode xfrm4_transport_mode = { .xmit = xfrm4_transport_xmit, .owner = THIS_MODULE, .encap = XFRM_MODE_TRANSPORT, + .family = AF_INET, };static int __init xfrm4_transport_init (void ) { -return xfrm_register_mode (&xfrm4_transport_mode,AF_INET ); +return xfrm_register_mode (&xfrm4_transport_mode); } static void __exit xfrm4_transport_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm4_transport_mode,AF_INET ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm4_transport_mode); }module_init (xfrm4_transport_init);
net/ipv4/xfrm4_mode_tunnel.c +3 -5
@@ -131,19 +131,17 @@ static struct xfrm_mode xfrm4_tunnel_mode = { .owner = THIS_MODULE, .encap = XFRM_MODE_TUNNEL, .flags = XFRM_MODE_FLAG_TUNNEL, + .family = AF_INET, };static int __init xfrm4_mode_tunnel_init (void ) { -return xfrm_register_mode (&xfrm4_tunnel_mode,AF_INET ); +return xfrm_register_mode (&xfrm4_tunnel_mode); } static void __exit xfrm4_mode_tunnel_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm4_tunnel_mode,AF_INET ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm4_tunnel_mode); }module_init (xfrm4_mode_tunnel_init);
net/ipv6/xfrm6_mode_beet.c +3 -5
@@ -110,19 +110,17 @@ static struct xfrm_mode xfrm6_beet_mode = { .owner = THIS_MODULE, .encap = XFRM_MODE_BEET, .flags = XFRM_MODE_FLAG_TUNNEL, + .family = AF_INET6, };static int __init xfrm6_beet_init (void ) { -return xfrm_register_mode (&xfrm6_beet_mode,AF_INET6 ); +return xfrm_register_mode (&xfrm6_beet_mode); } static void __exit xfrm6_beet_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm6_beet_mode,AF_INET6 ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm6_beet_mode); }module_init (xfrm6_beet_init);
net/ipv6/xfrm6_mode_ro.c +3 -5
@@ -64,19 +64,17 @@ static struct xfrm_mode xfrm6_ro_mode = { .output = xfrm6_ro_output, .owner = THIS_MODULE, .encap = XFRM_MODE_ROUTEOPTIMIZATION, + .family = AF_INET6, };static int __init xfrm6_ro_init (void ) { -return xfrm_register_mode (&xfrm6_ro_mode,AF_INET6 ); +return xfrm_register_mode (&xfrm6_ro_mode); } static void __exit xfrm6_ro_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm6_ro_mode,AF_INET6 ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm6_ro_mode); }module_init (xfrm6_ro_init);
net/ipv6/xfrm6_mode_transport.c +3 -5
@@ -100,19 +100,17 @@ static struct xfrm_mode xfrm6_transport_mode = { .xmit = xfrm6_transport_xmit, .owner = THIS_MODULE, .encap = XFRM_MODE_TRANSPORT, + .family = AF_INET6, };static int __init xfrm6_transport_init (void ) { -return xfrm_register_mode (&xfrm6_transport_mode,AF_INET6 ); +return xfrm_register_mode (&xfrm6_transport_mode); } static void __exit xfrm6_transport_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm6_transport_mode,AF_INET6 ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm6_transport_mode); }module_init (xfrm6_transport_init);
net/ipv6/xfrm6_mode_tunnel.c +3 -5
@@ -130,19 +130,17 @@ static struct xfrm_mode xfrm6_tunnel_mode = { .owner = THIS_MODULE, .encap = XFRM_MODE_TUNNEL, .flags = XFRM_MODE_FLAG_TUNNEL, + .family = AF_INET6, };static int __init xfrm6_mode_tunnel_init (void ) { -return xfrm_register_mode (&xfrm6_tunnel_mode,AF_INET6 ); +return xfrm_register_mode (&xfrm6_tunnel_mode); } static void __exit xfrm6_mode_tunnel_exit(void) { -int err; - - err =xfrm_unregister_mode (&xfrm6_tunnel_mode,AF_INET6 ); -BUG_ON (err); +xfrm_unregister_mode (&xfrm6_tunnel_mode); }module_init (xfrm6_mode_tunnel_init);
net/xfrm/xfrm_state.c +6 -13
@@ -331,7 +331,7 @@ static void xfrm_put_type_offload(const struct xfrm_type_offload *type) }static DEFINE_SPINLOCK (xfrm_mode_lock); -int xfrm_register_mode (struct xfrm_mode *mode,int family) +int xfrm_register_mode (struct xfrm_mode *mode) {struct xfrm_state_afinfo *afinfo;struct xfrm_mode **modemap;
@@ -340,7 +340,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)if (unlikely (mode->encap >=XFRM_MODE_MAX ))return -EINVAL ; - afinfo =xfrm_state_get_afinfo (family); + afinfo =xfrm_state_get_afinfo (mode->family);if (unlikely (afinfo ==NULL ))return -EAFNOSUPPORT ;
@@ -365,31 +365,24 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family) }EXPORT_SYMBOL (xfrm_register_mode); -int xfrm_unregister_mode (struct xfrm_mode *mode,int family) +void xfrm_unregister_mode (struct xfrm_mode *mode) {struct xfrm_state_afinfo *afinfo;struct xfrm_mode **modemap; -int err; - -if (unlikely (mode->encap >=XFRM_MODE_MAX )) -return -EINVAL ; - afinfo =xfrm_state_get_afinfo (family); -if (unlikely (afinfo ==NULL )) -return -EAFNOSUPPORT ; + afinfo =xfrm_state_get_afinfo (mode->family); +if (WARN_ON_ONCE (!afinfo)) +return ; - err = -ENOENT ; modemap = afinfo->mode_map;spin_lock_bh (&xfrm_mode_lock);if (likely (modemap[mode->encap] == mode)) { modemap[mode->encap] =NULL ;module_put (mode->afinfo->owner); - err =0 ; }spin_unlock_bh (&xfrm_mode_lock);rcu_read_unlock (); -return err; }EXPORT_SYMBOL (xfrm_unregister_mode);
Signature · 1 line
2.19.2
PATCH v2 2/11 xfrm: prefer family stored in xfrm_mode struct
In reply to Florian WestphalNow that we have the family available directly in the xfrm_mode struct, we can use that and avoid one extra dereference.
--- net/ipv4/ip_vti.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/xfrm/xfrm_input.c | 4 ++-- net/xfrm/xfrm_interface.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
net/ipv4/ip_vti.c +1 -1
@@ -137,7 +137,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) } } - family = inner_mode->afinfo->family; + family = inner_mode->family; skb->mark =be32_to_cpu (tunnel->parms.i_key); ret =xfrm_policy_check (NULL ,XFRM_POLICY_IN , skb, family);
net/ipv6/ip6_vti.c +1 -1
@@ -372,7 +372,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) } } - family = inner_mode->afinfo->family; + family = inner_mode->family; skb->mark =be32_to_cpu (t->parms.i_key); ret =xfrm_policy_check (NULL ,XFRM_POLICY_IN , skb, family);
net/xfrm/xfrm_input.c +2 -2
@@ -216,7 +216,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) goto drop; } - family = x->outer_mode->afinfo->family; + family = x->outer_mode->family;/* An encap_type of -1 indicates async resumption. */ if (encap_type ==-1 ) {
@@ -425,7 +425,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)* transport mode so the outer address is identical. */ daddr = &x->id.daddr; - family = x->outer_mode->afinfo->family; + family = x->outer_mode->family; err =xfrm_parse_spi (skb, nexthdr, &spi, &seq);if (err <0 ) {
net/xfrm/xfrm_interface.c +1 -1
@@ -285,7 +285,7 @@ static int xfrmi_rcv_cb(struct sk_buff *skb, int err) }if (!xfrm_policy_check (NULL ,XFRM_POLICY_IN , skb, - inner_mode->afinfo->family)) + inner_mode->family))return -EPERM ; }
Signature · 1 line
2.19.2
PATCH v2 3/11 xfrm: remove input indirection from xfrm_mode
In reply to Florian WestphalNo need for any indirection or abstraction here, both functions are pretty much the same and quite small, they also have no external dependencies.
xfrm_prepare_input can then be made static.
With allmodconfig build, size increase of vmlinux is 25 byte:
Before:
text data bss dec filename 15730207 6936924 4046908 26714039 vmlinux
After:
15730208 6936948 4046908 26714064 vmlinux
v2: Fix INET_XFRM_MODE_TRANSPORT name in is-enabled test (Sabrina Dubroca)
change copied comment to refer to transport and network header, not skb->{h,nh}, which don't exist anymore. (Sabrina)
make xfrm_prepare_input static (Eyal Birger)
--- include/net/xfrm.h | 11 ----- net/ipv4/xfrm4_mode_beet.c | 1 - net/ipv4/xfrm4_mode_transport.c | 23 ---------- net/ipv4/xfrm4_mode_tunnel.c | 1 - net/ipv6/xfrm6_mode_beet.c | 1 - net/ipv6/xfrm6_mode_transport.c | 25 ----------- net/ipv6/xfrm6_mode_tunnel.c | 1 - net/xfrm/xfrm_input.c | 75 +++++++++++++++++++++++++++++++-- 8 files changed, 72 insertions(+), 66 deletions(-)
include/net/xfrm.h +0 -11
@@ -436,16 +436,6 @@ struct xfrm_mode {*/ int (*input2)(struct xfrm_state *x,struct sk_buff *skb); -/* -* This is the actual input entry point. -* -* For transport mode and equivalent this would be identical to -* input2 (which does not need to be set). While tunnel mode -* and equivalent would set this to the tunnel encapsulation function -* xfrm4_prepare_input that would in turn call input2. -*/ -int (*input)(struct xfrm_state *x,struct sk_buff *skb); -/* * Add encapsulation header. *
@@ -1606,7 +1596,6 @@ int xfrm_init_replay(struct xfrm_state *x);int 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_prepare_input (struct xfrm_state *x,struct sk_buff *skb);int xfrm_input (struct sk_buff *skb,int nexthdr,__be32 spi,int encap_type);int xfrm_input_resume (struct sk_buff *skb,int nexthdr); int xfrm_trans_queue(struct sk_buff *skb,
net/ipv4/xfrm4_mode_beet.c +0 -1
@@ -128,7 +128,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm4_beet_mode = { .input2 = xfrm4_beet_input, - .input = xfrm_prepare_input, .output2 = xfrm4_beet_output, .output = xfrm4_prepare_output, .owner =THIS_MODULE ,
net/ipv4/xfrm4_mode_transport.c +0 -23
@@ -35,28 +35,6 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ; } -/* Remove encapsulation header. -* -* The IP header will be moved over the top of the encapsulation header. -* -* On entry, skb->h shall point to where the IP header should be and skb->nh -* shall be set to where the IP header currently is. skb->data shall point -* to the start of the payload. -*/ -static int xfrm4_transport_input (struct xfrm_state *x,struct sk_buff *skb) -{ -int ihl = skb->data -skb_transport_header (skb); - -if (skb->transport_header != skb->network_header) { -memmove (skb_transport_header (skb), -skb_network_header (skb), ihl); - skb->network_header = skb->transport_header; - } -ip_hdr (skb)->tot_len =htons (skb->len + ihl); -skb_reset_transport_header (skb); -return 0 ; -} -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features)
@@ -87,7 +65,6 @@ static void xfrm4_transport_xmit(struct xfrm_state *x, struct sk_buff *skb) }static struct xfrm_mode xfrm4_transport_mode = { - .input = xfrm4_transport_input, .output = xfrm4_transport_output, .gso_segment = xfrm4_transport_gso_segment, .xmit = xfrm4_transport_xmit,
net/ipv4/xfrm4_mode_tunnel.c +0 -1
@@ -123,7 +123,6 @@ static void xfrm4_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm4_tunnel_mode = { .input2 = xfrm4_mode_tunnel_input, - .input = xfrm_prepare_input, .output2 = xfrm4_mode_tunnel_output, .output = xfrm4_prepare_output, .gso_segment = xfrm4_mode_tunnel_gso_segment,
net/ipv6/xfrm6_mode_beet.c +0 -1
@@ -104,7 +104,6 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm6_beet_mode = { .input2 = xfrm6_beet_input, - .input = xfrm_prepare_input, .output2 = xfrm6_beet_output, .output = xfrm6_prepare_output, .owner =THIS_MODULE ,
net/ipv6/xfrm6_mode_transport.c +0 -25
@@ -40,29 +40,6 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ; } -/* Remove encapsulation header. -* -* The IP header will be moved over the top of the encapsulation header. -* -* On entry, skb->h shall point to where the IP header should be and skb->nh -* shall be set to where the IP header currently is. skb->data shall point -* to the start of the payload. -*/ -static int xfrm6_transport_input (struct xfrm_state *x,struct sk_buff *skb) -{ -int ihl = skb->data -skb_transport_header (skb); - -if (skb->transport_header != skb->network_header) { -memmove (skb_transport_header (skb), -skb_network_header (skb), ihl); - skb->network_header = skb->transport_header; - } -ipv6_hdr (skb)->payload_len =htons (skb->len + ihl - -sizeof (struct ipv6hdr )); -skb_reset_transport_header (skb); -return 0 ; -} -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features)
@@ -92,9 +69,7 @@ static void xfrm6_transport_xmit(struct xfrm_state *x, struct sk_buff *skb) } } -static struct xfrm_mode xfrm6_transport_mode = { - .input = xfrm6_transport_input, .output = xfrm6_transport_output, .gso_segment = xfrm4_transport_gso_segment, .xmit = xfrm6_transport_xmit,
net/ipv6/xfrm6_mode_tunnel.c +0 -1
@@ -122,7 +122,6 @@ static void xfrm6_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm6_tunnel_mode = { .input2 = xfrm6_mode_tunnel_input, - .input = xfrm_prepare_input, .output2 = xfrm6_mode_tunnel_output, .output = xfrm6_prepare_output, .gso_segment = xfrm6_mode_tunnel_gso_segment,
net/xfrm/xfrm_input.c +72 -3
93 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v2 4/11 xfrm: remove output indirection from xfrm_mode
In reply to Florian WestphalSame is input indirection. Only exception: we need to export xfrm_outer_mode_output for pktgen.
Increases size of vmlinux by about 163 byte:
Before:
text data bss dec filename
15730208 6936948 4046908 26714064 vmlinux
After:
15730311 6937008 4046908 26714227 vmlinux
xfrm_inner_extract_output has no more external callers, make it static.
v2: add IS_ENABLED(IPV6) guard in xfrm6_prepare_output
add two missing breaks in xfrm_outer_mode_output (Sabrina Dubroca) add WARN_ON_ONCE for 'call AF_INET6 related output function, but CONFIG_IPV6=n' case.
make xfrm_inner_extract_output static
--- include/net/xfrm.h | 19 +--- net/core/pktgen.c | 2 +- net/ipv4/xfrm4_mode_beet.c | 1 - net/ipv4/xfrm4_mode_transport.c | 22 ----- net/ipv4/xfrm4_mode_tunnel.c | 1 - net/ipv4/xfrm4_output.c | 15 --- net/ipv6/xfrm6_mode_beet.c | 1 - net/ipv6/xfrm6_mode_ro.c | 28 ------ net/ipv6/xfrm6_mode_transport.c | 26 ----- net/ipv6/xfrm6_mode_tunnel.c | 1 - net/ipv6/xfrm6_output.c | 15 --- net/xfrm/xfrm_output.c | 166 +++++++++++++++++++++++++++++++- 12 files changed, 169 insertions(+), 128 deletions(-)
include/net/xfrm.h +5 -14
@@ -449,17 +449,6 @@ struct xfrm_mode {*/ int (*output2)(struct xfrm_state *x,struct sk_buff *skb); -/* -* This is the actual output entry point. -* -* For transport mode and equivalent this would be identical to -* output2 (which does not need to be set). While tunnel mode -* and equivalent would set this to a tunnel encapsulation function -* (xfrm4_prepare_output or xfrm6_prepare_output) that would in turn -* call output2. -*/ -int (*output)(struct xfrm_state *x,struct sk_buff *skb); -/* * Adjust pointers into the packet and do GSO segmentation. */
@@ -1603,7 +1592,11 @@ int xfrm_trans_queue(struct sk_buff *skb, struct sk_buff *));int xfrm_output_resume (struct sk_buff *skb,int err);int xfrm_output (struct sock *sk,struct sk_buff *skb); -int xfrm_inner_extract_output (struct xfrm_state *x,struct sk_buff *skb); + +#if IS_ENABLED (CONFIG_NET_PKTGEN ) +int pktgen_xfrm_outer_mode_output (struct xfrm_state *x,struct sk_buff *skb); +#endif +void xfrm_local_error (struct sk_buff *skb,int mtu);int xfrm4_extract_header (struct sk_buff *skb);int xfrm4_extract_input (struct xfrm_state *x,struct sk_buff *skb);
@@ -1622,7 +1615,6 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) }int xfrm4_extract_output (struct xfrm_state *x,struct sk_buff *skb); -int xfrm4_prepare_output (struct xfrm_state *x,struct sk_buff *skb);int xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb);int xfrm4_output_finish (struct sock *sk,struct sk_buff *skb);int xfrm4_rcv_cb (struct sk_buff *skb,u8 protocol,int err);
@@ -1649,7 +1641,6 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)__be32 xfrm6_tunnel_alloc_spi (struct net *net,xfrm_address_t *saddr);__be32 xfrm6_tunnel_spi_lookup (struct net *net,const xfrm_address_t *saddr);int xfrm6_extract_output (struct xfrm_state *x,struct sk_buff *skb); -int xfrm6_prepare_output (struct xfrm_state *x,struct sk_buff *skb);int xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb);int xfrm6_output_finish (struct sock *sk,struct sk_buff *skb); int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
net/core/pktgen.c +1 -1
@@ -2521,7 +2521,7 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev) skb->_skb_refdst = (unsigned long )&pkt_dev->xdst.u.dst |SKB_DST_NOREF ;rcu_read_lock_bh (); - err = x->outer_mode->output (x, skb); + err =pktgen_xfrm_outer_mode_output (x, skb);rcu_read_unlock_bh ();if (err) {XFRM_INC_STATS (net,LINUX_MIB_XFRMOUTSTATEMODEERROR );
net/ipv4/xfrm4_mode_beet.c +0 -1
@@ -129,7 +129,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm4_beet_mode = { .input2 = xfrm4_beet_input, .output2 = xfrm4_beet_output, - .output = xfrm4_prepare_output, .owner =THIS_MODULE , .encap =XFRM_MODE_BEET , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/ipv4/xfrm4_mode_transport.c +0 -22
@@ -14,27 +14,6 @@#include <net/xfrm.h> #include <net/protocol.h> -/* Add encapsulation header. -* -* The IP header will be moved forward to make space for the encapsulation -* header. -*/ -static int xfrm4_transport_output (struct xfrm_state *x,struct sk_buff *skb) -{ -struct iphdr *iph =ip_hdr (skb); -int ihl = iph->ihl *4 ; - -skb_set_inner_transport_header (skb,skb_transport_offset (skb)); - -skb_set_network_header (skb, -x->props.header_len); - skb->mac_header = skb->network_header + - offsetof(struct iphdr , protocol); - skb->transport_header = skb->network_header + ihl; -__skb_pull (skb, ihl); -memmove (skb_network_header (skb), iph, ihl); -return 0 ; -} -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features)
@@ -65,7 +44,6 @@ static void xfrm4_transport_xmit(struct xfrm_state *x, struct sk_buff *skb) }static struct xfrm_mode xfrm4_transport_mode = { - .output = xfrm4_transport_output, .gso_segment = xfrm4_transport_gso_segment, .xmit = xfrm4_transport_xmit, .owner =THIS_MODULE ,
net/ipv4/xfrm4_mode_tunnel.c +0 -1
@@ -124,7 +124,6 @@ static void xfrm4_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm4_tunnel_mode = { .input2 = xfrm4_mode_tunnel_input, .output2 = xfrm4_mode_tunnel_output, - .output = xfrm4_prepare_output, .gso_segment = xfrm4_mode_tunnel_gso_segment, .xmit = xfrm4_mode_tunnel_xmit, .owner =THIS_MODULE ,
net/ipv4/xfrm4_output.c +0 -15
@@ -58,21 +58,6 @@ int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb)return xfrm4_extract_header (skb); } -int xfrm4_prepare_output (struct xfrm_state *x,struct sk_buff *skb) -{ -int err; - - err =xfrm_inner_extract_output (x, skb); -if (err) -return err; - -IPCB (skb)->flags |=IPSKB_XFRM_TUNNEL_SIZE ; - skb->protocol =htons (ETH_P_IP ); - -return x->outer_mode->output2 (x, skb); -} -EXPORT_SYMBOL (xfrm4_prepare_output); -int xfrm4_output_finish (struct sock *sk,struct sk_buff *skb) {memset (IPCB (skb),0 ,sizeof (*IPCB (skb)));
net/ipv6/xfrm6_mode_beet.c +0 -1
@@ -105,7 +105,6 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm6_beet_mode = { .input2 = xfrm6_beet_input, .output2 = xfrm6_beet_output, - .output = xfrm6_prepare_output, .owner =THIS_MODULE , .encap =XFRM_MODE_BEET , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/ipv6/xfrm6_mode_ro.c +0 -28
@@ -33,35 +33,7 @@#include <net/ipv6.h> #include <net/xfrm.h> -/* Add route optimization header space. -* -* The IP header and mutable extension headers will be moved forward to make -* space for the route optimization header. -*/ -static int xfrm6_ro_output (struct xfrm_state *x,struct sk_buff *skb) -{ -struct ipv6hdr *iph; -u8 *prevhdr; -int hdr_len; - - iph =ipv6_hdr (skb); - - hdr_len = x->type->hdr_offset (x, skb, &prevhdr); -if (hdr_len <0 ) -return hdr_len; -skb_set_mac_header (skb, (prevhdr - x->props.header_len) - skb->data); -skb_set_network_header (skb, -x->props.header_len); - skb->transport_header = skb->network_header + hdr_len; -__skb_pull (skb, hdr_len); -memmove (ipv6_hdr (skb), iph, hdr_len); - - x->lastused =ktime_get_real_seconds (); - -return 0 ; -} -static struct xfrm_mode xfrm6_ro_mode = { - .output = xfrm6_ro_output, .owner =THIS_MODULE , .encap =XFRM_MODE_ROUTEOPTIMIZATION , .family =AF_INET6 ,
net/ipv6/xfrm6_mode_transport.c +0 -26
@@ -15,31 +15,6 @@#include <net/xfrm.h> #include <net/protocol.h> -/* Add encapsulation header. -* -* The IP header and mutable extension headers will be moved forward to make -* space for the encapsulation header. -*/ -static int xfrm6_transport_output (struct xfrm_state *x,struct sk_buff *skb) -{ -struct ipv6hdr *iph; -u8 *prevhdr; -int hdr_len; - - iph =ipv6_hdr (skb); -skb_set_inner_transport_header (skb,skb_transport_offset (skb)); - - hdr_len = x->type->hdr_offset (x, skb, &prevhdr); -if (hdr_len <0 ) -return hdr_len; -skb_set_mac_header (skb, (prevhdr - x->props.header_len) - skb->data); -skb_set_network_header (skb, -x->props.header_len); - skb->transport_header = skb->network_header + hdr_len; -__skb_pull (skb, hdr_len); -memmove (ipv6_hdr (skb), iph, hdr_len); -return 0 ; -} -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features)
@@ -70,7 +45,6 @@ static void xfrm6_transport_xmit(struct xfrm_state *x, struct sk_buff *skb) }static struct xfrm_mode xfrm6_transport_mode = { - .output = xfrm6_transport_output, .gso_segment = xfrm4_transport_gso_segment, .xmit = xfrm6_transport_xmit, .owner =THIS_MODULE ,
net/ipv6/xfrm6_mode_tunnel.c +0 -1
@@ -123,7 +123,6 @@ static void xfrm6_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)static struct xfrm_mode xfrm6_tunnel_mode = { .input2 = xfrm6_mode_tunnel_input, .output2 = xfrm6_mode_tunnel_output, - .output = xfrm6_prepare_output, .gso_segment = xfrm6_mode_tunnel_gso_segment, .xmit = xfrm6_mode_tunnel_xmit, .owner =THIS_MODULE ,
net/ipv6/xfrm6_output.c +0 -15
@@ -111,21 +111,6 @@ int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)return xfrm6_extract_header (skb); } -int xfrm6_prepare_output (struct xfrm_state *x,struct sk_buff *skb) -{ -int err; - - err =xfrm_inner_extract_output (x, skb); -if (err) -return err; - - skb->ignore_df =1 ; - skb->protocol =htons (ETH_P_IPV6 ); - -return x->outer_mode->output2 (x, skb); -} -EXPORT_SYMBOL (xfrm6_prepare_output); -int xfrm6_output_finish (struct sock *sk,struct sk_buff *skb) {memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb)));
net/xfrm/xfrm_output.c +163 -3
196 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v2 5/11 xfrm: remove xmit indirection from xfrm_mode
In reply to Florian WestphalThere are only two versions (tunnel and transport). The ip/ipv6 versions are only differ in sizeof(iphdr) vs ipv6hdr.
Place this in the core and use x->outer_mode->encap type to call the correct adjustment helper.
Before:
text data bss dec filename
15730311 6937008 4046908 26714227 vmlinux
After:
15730428 6937008 4046908 26714344 vmlinux
(about 117 byte increase)
v2: use family from x->outer_mode, not inner
--- include/net/xfrm.h | 5 --- net/ipv4/xfrm4_mode_transport.c | 14 -------- net/ipv4/xfrm4_mode_tunnel.c | 13 -------- net/ipv6/xfrm6_mode_transport.c | 14 -------- net/ipv6/xfrm6_mode_tunnel.c | 12 ------- net/xfrm/xfrm_device.c | 58 +++++++++++++++++++++++++++++++-- 6 files changed, 56 insertions(+), 60 deletions(-)
include/net/xfrm.h +0 -5
@@ -454,11 +454,6 @@ struct xfrm_mode {*/ struct sk_buff *(*gso_segment)(struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features); -/* -* Adjust pointers into the packet when IPsec is done at layer2. -*/ -void (*xmit)(struct xfrm_state *x,struct sk_buff *skb); -struct xfrm_state_afinfo *afinfo;struct module *owner;u8 encap;
net/ipv4/xfrm4_mode_transport.c +0 -14
@@ -30,22 +30,8 @@ static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,return segs; } -static void xfrm4_transport_xmit (struct xfrm_state *x,struct sk_buff *skb) -{ -struct xfrm_offload *xo =xfrm_offload (skb); - -skb_reset_mac_len (skb); -pskb_pull (skb, skb->mac_len +sizeof (struct iphdr ) + x->props.header_len); - -if (xo->flags &XFRM_GSO_SEGMENT ) { -skb_reset_transport_header (skb); - skb->transport_header -= x->props.header_len; - } -} -static struct xfrm_mode xfrm4_transport_mode = { .gso_segment = xfrm4_transport_gso_segment, - .xmit = xfrm4_transport_xmit, .owner =THIS_MODULE , .encap =XFRM_MODE_TRANSPORT , .family =AF_INET ,
net/ipv4/xfrm4_mode_tunnel.c +0 -13
@@ -109,23 +109,10 @@ static struct sk_buff *xfrm4_mode_tunnel_gso_segment(struct xfrm_state *x,return skb_mac_gso_segment (skb, features); } -static void xfrm4_mode_tunnel_xmit (struct xfrm_state *x,struct sk_buff *skb) -{ -struct xfrm_offload *xo =xfrm_offload (skb); - -if (xo->flags &XFRM_GSO_SEGMENT ) - skb->transport_header = skb->network_header + -sizeof (struct iphdr ); - -skb_reset_mac_len (skb); -pskb_pull (skb, skb->mac_len + x->props.header_len); -} -static struct xfrm_mode xfrm4_tunnel_mode = { .input2 = xfrm4_mode_tunnel_input, .output2 = xfrm4_mode_tunnel_output, .gso_segment = xfrm4_mode_tunnel_gso_segment, - .xmit = xfrm4_mode_tunnel_xmit, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/ipv6/xfrm6_mode_transport.c +0 -14
@@ -31,22 +31,8 @@ static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,return segs; } -static void xfrm6_transport_xmit (struct xfrm_state *x,struct sk_buff *skb) -{ -struct xfrm_offload *xo =xfrm_offload (skb); - -skb_reset_mac_len (skb); -pskb_pull (skb, skb->mac_len +sizeof (struct ipv6hdr ) + x->props.header_len); - -if (xo->flags &XFRM_GSO_SEGMENT ) { -skb_reset_transport_header (skb); - skb->transport_header -= x->props.header_len; - } -} -static struct xfrm_mode xfrm6_transport_mode = { .gso_segment = xfrm4_transport_gso_segment, - .xmit = xfrm6_transport_xmit, .owner =THIS_MODULE , .encap =XFRM_MODE_TRANSPORT , .family =AF_INET6 ,
net/ipv6/xfrm6_mode_tunnel.c +0 -12
@@ -109,22 +109,10 @@ static struct sk_buff *xfrm6_mode_tunnel_gso_segment(struct xfrm_state *x,return skb_mac_gso_segment (skb, features); } -static void xfrm6_mode_tunnel_xmit (struct xfrm_state *x,struct sk_buff *skb) -{ -struct xfrm_offload *xo =xfrm_offload (skb); - -if (xo->flags &XFRM_GSO_SEGMENT ) - skb->transport_header = skb->network_header +sizeof (struct ipv6hdr ); - -skb_reset_mac_len (skb); -pskb_pull (skb, skb->mac_len + x->props.header_len); -} -static struct xfrm_mode xfrm6_tunnel_mode = { .input2 = xfrm6_mode_tunnel_input, .output2 = xfrm6_mode_tunnel_output, .gso_segment = xfrm6_mode_tunnel_gso_segment, - .xmit = xfrm6_mode_tunnel_xmit, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/xfrm/xfrm_device.c +56 -2
76 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v2 6/11 xfrm: remove gso_segment indirection from xfrm_mode
In reply to Florian WestphalThese functions are small and we only have versions for tunnel and transport mode for ipv4 and ipv6 respectively.
Just place the 'transport or tunnel' conditional in the protocol specific function instead of using an indirection.
Before:
3226 12 0 3238 net/ipv4/esp4_offload.o
7004 492 0 7496 net/ipv4/ip_vti.o
3339 12 0 3351 net/ipv6/esp6_offload.o
11294 460 0 11754 net/ipv6/ip6_vti.o
1180 72 0 1252 net/ipv4/xfrm4_mode_beet.o
428 48 0 476 net/ipv4/xfrm4_mode_transport.o
1271 48 0 1319 net/ipv4/xfrm4_mode_tunnel.o
1083 60 0 1143 net/ipv6/xfrm6_mode_beet.o
172 48 0 220 net/ipv6/xfrm6_mode_ro.o
429 48 0 477 net/ipv6/xfrm6_mode_transport.o
1164 48 0 1212 net/ipv6/xfrm6_mode_tunnel.o
15730428 6937008 4046908 26714344 vmlinuxAfter:
3461 12 0 3473 net/ipv4/esp4_offload.o
7000 492 0 7492 net/ipv4/ip_vti.o
3574 12 0 3586 net/ipv6/esp6_offload.o
11295 460 0 11755 net/ipv6/ip6_vti.o
1180 64 0 1244 net/ipv4/xfrm4_mode_beet.o
171 40 0 211 net/ipv4/xfrm4_mode_transport.o
1163 40 0 1203 net/ipv4/xfrm4_mode_tunnel.o
1083 52 0 1135 net/ipv6/xfrm6_mode_beet.o
172 40 0 212 net/ipv6/xfrm6_mode_ro.o
172 40 0 212 net/ipv6/xfrm6_mode_transport.o
1056 40 0 1096 net/ipv6/xfrm6_mode_tunnel.o
15730424 6937008 4046908 26714340 vmlinux--- include/net/xfrm.h | 5 ----- net/ipv4/esp4_offload.c | 40 ++++++++++++++++++++++++++++++++- net/ipv4/xfrm4_mode_transport.c | 17 -------------- net/ipv4/xfrm4_mode_tunnel.c | 9 -------- net/ipv6/esp6_offload.c | 40 ++++++++++++++++++++++++++++++++- net/ipv6/xfrm6_mode_transport.c | 17 -------------- net/ipv6/xfrm6_mode_tunnel.c | 8 ------- 7 files changed, 78 insertions(+), 58 deletions(-)
include/net/xfrm.h +0 -5
@@ -449,11 +449,6 @@ struct xfrm_mode {*/ int (*output2)(struct xfrm_state *x,struct sk_buff *skb); -/* -* Adjust pointers into the packet and do GSO segmentation. -*/ -struct sk_buff *(*gso_segment)(struct xfrm_state *x,struct sk_buff *skb,netdev_features_t features); -struct xfrm_state_afinfo *afinfo;struct module *owner;u8 encap;
net/ipv4/esp4_offload.c +39 -1
@@ -107,6 +107,44 @@ static void esp4_gso_encap(struct xfrm_state *x, struct sk_buff *skb) xo->proto = proto; } +static struct sk_buff *xfrm4_tunnel_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +__skb_push (skb, skb->mac_len); +return skb_mac_gso_segment (skb, features); +} + +static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +const struct net_offload *ops; +struct sk_buff *segs =ERR_PTR (-EINVAL ); +struct xfrm_offload *xo =xfrm_offload (skb); + + skb->transport_header += x->props.header_len; + ops =rcu_dereference (inet_offloads[xo->proto]); +if (likely (ops && ops->callbacks.gso_segment)) + segs = ops->callbacks.gso_segment (skb, features); + +return segs; +} + +static struct sk_buff *xfrm4_outer_mode_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +switch (x->outer_mode->encap) { +case XFRM_MODE_TUNNEL : +return xfrm4_tunnel_gso_segment (x, skb, features); +case XFRM_MODE_TRANSPORT : +return xfrm4_transport_gso_segment (x, skb, features); + } + +return ERR_PTR (-EOPNOTSUPP ); +} +static struct sk_buff *esp4_gso_segment (struct sk_buff *skb,netdev_features_t features) {
@@ -147,7 +185,7 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, xo->flags |=XFRM_GSO_SEGMENT ; -return x->outer_mode->gso_segment (x, skb, esp_features); +return xfrm4_outer_mode_gso_segment (x, skb, esp_features); }static int esp_input_tail (struct xfrm_state *x,struct sk_buff *skb)
net/ipv4/xfrm4_mode_transport.c +0 -17
@@ -14,24 +14,7 @@#include <net/xfrm.h> #include <net/protocol.h> -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x, -struct sk_buff *skb, -netdev_features_t features) -{ -const struct net_offload *ops; -struct sk_buff *segs =ERR_PTR (-EINVAL ); -struct xfrm_offload *xo =xfrm_offload (skb); - - skb->transport_header += x->props.header_len; - ops =rcu_dereference (inet_offloads[xo->proto]); -if (likely (ops && ops->callbacks.gso_segment)) - segs = ops->callbacks.gso_segment (skb, features); - -return segs; -} -static struct xfrm_mode xfrm4_transport_mode = { - .gso_segment = xfrm4_transport_gso_segment, .owner =THIS_MODULE , .encap =XFRM_MODE_TRANSPORT , .family =AF_INET ,
net/ipv4/xfrm4_mode_tunnel.c +0 -9
@@ -101,18 +101,9 @@ static int xfrm4_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)return err; } -static struct sk_buff *xfrm4_mode_tunnel_gso_segment (struct xfrm_state *x, -struct sk_buff *skb, -netdev_features_t features) -{ -__skb_push (skb, skb->mac_len); -return skb_mac_gso_segment (skb, features); -} -static struct xfrm_mode xfrm4_tunnel_mode = { .input2 = xfrm4_mode_tunnel_input, .output2 = xfrm4_mode_tunnel_output, - .gso_segment = xfrm4_mode_tunnel_gso_segment, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/ipv6/esp6_offload.c +39 -1
@@ -134,6 +134,44 @@ static void esp6_gso_encap(struct xfrm_state *x, struct sk_buff *skb) xo->proto = proto; } +static struct sk_buff *xfrm6_tunnel_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +__skb_push (skb, skb->mac_len); +return skb_mac_gso_segment (skb, features); +} + +static struct sk_buff *xfrm6_transport_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +const struct net_offload *ops; +struct sk_buff *segs =ERR_PTR (-EINVAL ); +struct xfrm_offload *xo =xfrm_offload (skb); + + skb->transport_header += x->props.header_len; + ops =rcu_dereference (inet6_offloads[xo->proto]); +if (likely (ops && ops->callbacks.gso_segment)) + segs = ops->callbacks.gso_segment (skb, features); + +return segs; +} + +static struct sk_buff *xfrm6_outer_mode_gso_segment (struct xfrm_state *x, +struct sk_buff *skb, +netdev_features_t features) +{ +switch (x->outer_mode->encap) { +case XFRM_MODE_TUNNEL : +return xfrm6_tunnel_gso_segment (x, skb, features); +case XFRM_MODE_TRANSPORT : +return xfrm6_transport_gso_segment (x, skb, features); + } + +return ERR_PTR (-EOPNOTSUPP ); +} +static struct sk_buff *esp6_gso_segment (struct sk_buff *skb,netdev_features_t features) {
@@ -172,7 +210,7 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb, xo->flags |=XFRM_GSO_SEGMENT ; -return x->outer_mode->gso_segment (x, skb, esp_features); +return xfrm6_outer_mode_gso_segment (x, skb, esp_features); }static int esp6_input_tail (struct xfrm_state *x,struct sk_buff *skb)
net/ipv6/xfrm6_mode_transport.c +0 -17
@@ -15,24 +15,7 @@#include <net/xfrm.h> #include <net/protocol.h> -static struct sk_buff *xfrm4_transport_gso_segment (struct xfrm_state *x, -struct sk_buff *skb, -netdev_features_t features) -{ -const struct net_offload *ops; -struct sk_buff *segs =ERR_PTR (-EINVAL ); -struct xfrm_offload *xo =xfrm_offload (skb); - - skb->transport_header += x->props.header_len; - ops =rcu_dereference (inet6_offloads[xo->proto]); -if (likely (ops && ops->callbacks.gso_segment)) - segs = ops->callbacks.gso_segment (skb, features); - -return segs; -} -static struct xfrm_mode xfrm6_transport_mode = { - .gso_segment = xfrm4_transport_gso_segment, .owner =THIS_MODULE , .encap =XFRM_MODE_TRANSPORT , .family =AF_INET6 ,
net/ipv6/xfrm6_mode_tunnel.c +0 -8
@@ -101,18 +101,10 @@ static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)return err; } -static struct sk_buff *xfrm6_mode_tunnel_gso_segment (struct xfrm_state *x, -struct sk_buff *skb, -netdev_features_t features) -{ -__skb_push (skb, skb->mac_len); -return skb_mac_gso_segment (skb, features); -}static struct xfrm_mode xfrm6_tunnel_mode = { .input2 = xfrm6_mode_tunnel_input, .output2 = xfrm6_mode_tunnel_output, - .gso_segment = xfrm6_mode_tunnel_gso_segment, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL , .flags =XFRM_MODE_FLAG_TUNNEL ,
Signature · 1 line
2.19.2
PATCH v2 7/11 xfrm: remove input2 indirection from xfrm_mode
In reply to Florian WestphalNo external dependencies on any module, place this in the core. Increase is about 1800 byte for xfrm_input.o.
The beet helpers get added to internal header, as they can be reused from xfrm_output.c in the next patch (kernel contains several copies of them in the xfrm{4,6}_mode_beet.c files).
Before:
text data bss dec filename
5578 176 2364 8118 net/xfrm/xfrm_input.o
1180 64 0 1244 net/ipv4/xfrm4_mode_beet.o
171 40 0 211 net/ipv4/xfrm4_mode_transport.o
1163 40 0 1203 net/ipv4/xfrm4_mode_tunnel.o
1083 52 0 1135 net/ipv6/xfrm6_mode_beet.o
172 40 0 212 net/ipv6/xfrm6_mode_ro.o
172 40 0 212 net/ipv6/xfrm6_mode_transport.o
1056 40 0 1096 net/ipv6/xfrm6_mode_tunnel.oAfter:
text data bss dec filename
7373 200 2364 9937 net/xfrm/xfrm_input.o
587 44 0 631 net/ipv4/xfrm4_mode_beet.o
171 32 0 203 net/ipv4/xfrm4_mode_transport.o
649 32 0 681 net/ipv4/xfrm4_mode_tunnel.o
625 44 0 669 net/ipv6/xfrm6_mode_beet.o
172 32 0 204 net/ipv6/xfrm6_mode_ro.o
172 32 0 204 net/ipv6/xfrm6_mode_transport.o
599 32 0 631 net/ipv6/xfrm6_mode_tunnel.ov2: pass inner_mode to xfrm_inner_mode_encap_remove to fix
AF_UNSPEC selector breakage (bisected by Benedict Wong)
--- include/net/xfrm.h | 13 --- net/ipv4/xfrm4_mode_beet.c | 47 --------- net/ipv4/xfrm4_mode_tunnel.c | 39 -------- net/ipv6/xfrm6_mode_beet.c | 27 ----- net/ipv6/xfrm6_mode_tunnel.c | 46 --------- net/xfrm/xfrm_inout.h | 38 +++++++ net/xfrm/xfrm_input.c | 185 ++++++++++++++++++++++++++++++++++- 7 files changed, 222 insertions(+), 173 deletions(-) create mode 100644 net/xfrm/xfrm_inout.h
include/net/xfrm.h +0 -13
@@ -423,19 +423,6 @@ int xfrm_register_type_offload(const struct xfrm_type_offload *type, unsigned shint xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family);struct xfrm_mode { -/* -* Remove encapsulation header. -* -* The IP header will be moved over the top of the encapsulation -* header. -* -* On entry, the transport header shall point to where the IP header -* should be and the network header shall be set to where the IP -* header currently is. skb->data shall point to the start of the -* payload. -*/ -int (*input2)(struct xfrm_state *x,struct sk_buff *skb); -/* * Add encapsulation header. *
net/ipv4/xfrm4_mode_beet.c +0 -47
54 lines not on this page · raw message
net/ipv4/xfrm4_mode_tunnel.c +0 -39
@@ -15,14 +15,6 @@#include <net/ip.h> #include <net/xfrm.h> -static inline void ipip_ecn_decapsulate (struct sk_buff *skb) -{ -struct iphdr *inner_iph =ipip_hdr (skb); - -if (INET_ECN_is_ce (XFRM_MODE_SKB_CB (skb)->tos)) -IP_ECN_set_ce (inner_iph); -} -/* Add encapsulation header. * * The top IP header will be constructed per RFC 2401.
@@ -71,38 +63,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ; } -static int xfrm4_mode_tunnel_input (struct xfrm_state *x,struct sk_buff *skb) -{ -int err = -EINVAL ; - -if (XFRM_MODE_SKB_CB (skb)->protocol !=IPPROTO_IPIP ) - goto out; - -if (!pskb_may_pull (skb,sizeof (struct iphdr ))) - goto out; - - err =skb_unclone (skb,GFP_ATOMIC ); -if (err) - goto out; - -if (x->props.flags &XFRM_STATE_DECAP_DSCP ) -ipv4_copy_dscp (XFRM_MODE_SKB_CB (skb)->tos,ipip_hdr (skb)); -if (!(x->props.flags &XFRM_STATE_NOECN )) -ipip_ecn_decapsulate (skb); - -skb_reset_network_header (skb); -skb_mac_header_rebuild (skb); -if (skb->mac_len) -eth_hdr (skb)->h_proto = skb->protocol; - - err =0 ; - -out: -return err; -} -static struct xfrm_mode xfrm4_tunnel_mode = { - .input2 = xfrm4_mode_tunnel_input, .output2 = xfrm4_mode_tunnel_output, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL ,
net/ipv6/xfrm6_mode_beet.c +0 -27
@@ -76,34 +76,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->daddr = *(struct in6_addr *)&x->id.daddr;return 0 ; } - -static int xfrm6_beet_input (struct xfrm_state *x,struct sk_buff *skb) -{ -struct ipv6hdr *ip6h; -int size =sizeof (struct ipv6hdr ); -int err; - - err =skb_cow_head (skb, size + skb->mac_len); -if (err) - goto out; - -__skb_push (skb, size); -skb_reset_network_header (skb); -skb_mac_header_rebuild (skb); - -xfrm6_beet_make_header (skb); - - ip6h =ipv6_hdr (skb); - ip6h->payload_len =htons (skb->len - size); - ip6h->daddr = x->sel.daddr.in6; - ip6h->saddr = x->sel.saddr.in6; - err =0 ; -out: -return err; -} -static struct xfrm_mode xfrm6_beet_mode = { - .input2 = xfrm6_beet_input, .output2 = xfrm6_beet_output, .owner =THIS_MODULE , .encap =XFRM_MODE_BEET ,
net/ipv6/xfrm6_mode_tunnel.c +0 -46
59 lines not on this page · raw message
net/xfrm/xfrm_inout.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <linux/ipv6.h> +#include <net/dsfield.h> +#include <net/xfrm.h> + +#ifndef XFRM_INOUT_H +#define XFRM_INOUT_H 1 + +static inline void xfrm6_beet_make_header (struct sk_buff *skb) +{ +struct ipv6hdr *iph =ipv6_hdr (skb); + + iph->version =6 ; + +memcpy (iph->flow_lbl,XFRM_MODE_SKB_CB (skb)->flow_lbl, +sizeof (iph->flow_lbl)); + iph->nexthdr =XFRM_MODE_SKB_CB (skb)->protocol; + +ipv6_change_dsfield (iph,0 ,XFRM_MODE_SKB_CB (skb)->tos); + iph->hop_limit =XFRM_MODE_SKB_CB (skb)->ttl; +} + +static inline void xfrm4_beet_make_header (struct sk_buff *skb) +{ +struct iphdr *iph =ip_hdr (skb); + + iph->ihl =5 ; + iph->version =4 ; + + iph->protocol =XFRM_MODE_SKB_CB (skb)->protocol; + iph->tos =XFRM_MODE_SKB_CB (skb)->tos; + + iph->id =XFRM_MODE_SKB_CB (skb)->id; + iph->frag_off =XFRM_MODE_SKB_CB (skb)->frag_off; + iph->ttl =XFRM_MODE_SKB_CB (skb)->ttl; +} + +#endif
net/xfrm/xfrm_input.c +184 -1
203 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v2 8/11 xfrm: remove output2 indirection from xfrm_mode
In reply to Florian Westphalsimilar to previous patch: no external module dependencies, so we can avoid the indirection by placing this in the core.
This change removes the last indirection from xfrm_mode and the xfrm4|6_mode_{beet,tunnel}.c modules contain (almost) no code anymore.
Before:
text data bss dec hex filename
3957 136 0 4093 ffd net/xfrm/xfrm_output.o
587 44 0 631 277 net/ipv4/xfrm4_mode_beet.o
649 32 0 681 2a9 net/ipv4/xfrm4_mode_tunnel.o
625 44 0 669 29d net/ipv6/xfrm6_mode_beet.o
599 32 0 631 277 net/ipv6/xfrm6_mode_tunnel.o
After:
text data bss dec hex filename
5359 184 0 5543 15a7 net/xfrm/xfrm_output.o
171 24 0 195 c3 net/ipv4/xfrm4_mode_beet.o
171 24 0 195 c3 net/ipv4/xfrm4_mode_tunnel.o
172 24 0 196 c4 net/ipv6/xfrm6_mode_beet.o
172 24 0 196 c4 net/ipv6/xfrm6_mode_tunnel.ov2: fold the *encap_add functions into xfrm*_prepare_output
preserve (move) output2 comment (Sabrina)
use x->outer_mode->encap, not inner
fix a build breakage on ppc (kbuild robot)
--- include/net/xfrm.h | 13 --- net/ipv4/xfrm4_mode_beet.c | 63 ----------- net/ipv4/xfrm4_mode_tunnel.c | 49 -------- net/ipv6/xfrm6_mode_beet.c | 58 ---------- net/ipv6/xfrm6_mode_tunnel.c | 36 ------ net/xfrm/xfrm_output.c | 212 ++++++++++++++++++++++++++++++++++- 6 files changed, 207 insertions(+), 224 deletions(-)
include/net/xfrm.h +0 -13
@@ -423,19 +423,6 @@ int xfrm_register_type_offload(const struct xfrm_type_offload *type, unsigned shint xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family);struct xfrm_mode { -/* -* Add encapsulation header. -* -* On exit, the transport header will be set to the start of the -* encapsulation header to be filled in by x->type->output and -* the mac header will be set to the nextheader (protocol for -* IPv4) field of the extension header directly preceding the -* encapsulation header, or in its absence, that of the top IP -* header. The value of the network header will always point -* to the top IP header while skb->data will point to the payload. -*/ -int (*output2)(struct xfrm_state *x,struct sk_buff *skb); -struct xfrm_state_afinfo *afinfo;struct module *owner;u8 encap;
net/ipv4/xfrm4_mode_beet.c +0 -63
71 lines not on this page · raw message
net/ipv4/xfrm4_mode_tunnel.c +0 -49
56 lines not on this page · raw message
net/ipv6/xfrm6_mode_beet.c +0 -58
65 lines not on this page · raw message
net/ipv6/xfrm6_mode_tunnel.c +0 -36
@@ -22,43 +22,7 @@* * The top IP header will be constructed per RFC 2401. */ -static int xfrm6_mode_tunnel_output (struct xfrm_state *x,struct sk_buff *skb) -{ -struct dst_entry *dst =skb_dst (skb); -struct ipv6hdr *top_iph; -int dsfield; - -skb_set_inner_network_header (skb,skb_network_offset (skb)); -skb_set_inner_transport_header (skb,skb_transport_offset (skb)); - -skb_set_network_header (skb, -x->props.header_len); - skb->mac_header = skb->network_header + - offsetof(struct ipv6hdr , nexthdr); - skb->transport_header = skb->network_header +sizeof (*top_iph); - top_iph =ipv6_hdr (skb); - - top_iph->version =6 ; - -memcpy (top_iph->flow_lbl,XFRM_MODE_SKB_CB (skb)->flow_lbl, -sizeof (top_iph->flow_lbl)); - top_iph->nexthdr =xfrm_af2proto (skb_dst (skb)->ops->family); - -if (x->props.extra_flags &XFRM_SA_XFLAG_DONT_ENCAP_DSCP ) - dsfield =0 ; -else - dsfield =XFRM_MODE_SKB_CB (skb)->tos; - dsfield =INET_ECN_encapsulate (dsfield,XFRM_MODE_SKB_CB (skb)->tos); -if (x->props.flags &XFRM_STATE_NOECN ) - dsfield &= ~INET_ECN_MASK ; -ipv6_change_dsfield (top_iph,0 , dsfield); - top_iph->hop_limit =ip6_dst_hoplimit (xfrm_dst_child (dst)); - top_iph->saddr = *(struct in6_addr *)&x->props.saddr; - top_iph->daddr = *(struct in6_addr *)&x->id.daddr; -return 0 ; -} -static struct xfrm_mode xfrm6_tunnel_mode = { - .output2 = xfrm6_mode_tunnel_output, .owner =THIS_MODULE , .encap =XFRM_MODE_TUNNEL , .flags =XFRM_MODE_FLAG_TUNNEL ,
net/xfrm/xfrm_output.c +207 -5
239 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v2 9/11 xfrm: remove afinfo pointer from xfrm_mode
In reply to Florian WestphalAdds an EXPORT_SYMBOL for afinfo_get_rcu, as it will now be called from ipv6 in case of CONFIG_IPV6=m.
This change has virtually no effect on vmlinux size, but it reduces afinfo size and allows followup patch to make xfrm modes const.
v2: mark if (afinfo) tests as likely (Sabrina)
re-fetch afinfo according to inner_mode in xfrm_prepare_input().
--- include/net/xfrm.h | 1 - net/ipv4/xfrm4_output.c | 12 +++++++++++- net/ipv6/xfrm6_output.c | 21 +++++++++++++++++++-- net/xfrm/xfrm_input.c | 34 ++++++++++++++++++++++++++++------ net/xfrm/xfrm_output.c | 12 +++++++++++- net/xfrm/xfrm_policy.c | 10 +++++++++- net/xfrm/xfrm_state.c | 4 ++-- 7 files changed, 80 insertions(+), 14 deletions(-)
include/net/xfrm.h +0 -1
@@ -423,7 +423,6 @@ int xfrm_register_type_offload(const struct xfrm_type_offload *type, unsigned shint xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family);struct xfrm_mode { -struct xfrm_state_afinfo *afinfo;struct module *owner;u8 encap;u8 family;
net/ipv4/xfrm4_output.c +11 -1
@@ -72,6 +72,8 @@ int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb)static int __xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb) {struct xfrm_state *x =skb_dst (skb)->xfrm; +const struct xfrm_state_afinfo *afinfo; +int ret = -EAFNOSUPPORT ;#ifdef CONFIG_NETFILTER if (!x) {
@@ -80,7 +82,15 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb) }#endif -return x->outer_mode->afinfo->output_finish (sk, skb); +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); +if (likely (afinfo)) + ret = afinfo->output_finish (sk, skb); +else +kfree_skb (skb); +rcu_read_unlock (); + +return ret; }int xfrm4_output (struct net *net,struct sock *sk,struct sk_buff *skb)
net/ipv6/xfrm6_output.c +19 -2
@@ -122,11 +122,28 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)return xfrm_output (sk, skb); } +static int __xfrm6_output_state_finish (struct xfrm_state *x,struct sock *sk, +struct sk_buff *skb) +{ +const struct xfrm_state_afinfo *afinfo; +int ret = -EAFNOSUPPORT ; + +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); +if (likely (afinfo)) + ret = afinfo->output_finish (sk, skb); +else +kfree_skb (skb); +rcu_read_unlock (); + +return ret; +} +static int __xfrm6_output_finish (struct net *net,struct sock *sk,struct sk_buff *skb) {struct xfrm_state *x =skb_dst (skb)->xfrm; -return x->outer_mode->afinfo->output_finish (sk, skb); +return __xfrm6_output_state_finish (x, sk, skb); }static int __xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb)
@@ -168,7 +185,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) __xfrm6_output_finish); skip_frag: -return x->outer_mode->afinfo->output_finish (sk, skb); +return __xfrm6_output_state_finish (x, sk, skb); }int xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb)
net/xfrm/xfrm_input.c +28 -6
@@ -352,19 +352,35 @@ xfrm_inner_mode_encap_remove(struct xfrm_state *x,static int xfrm_prepare_input (struct xfrm_state *x,struct sk_buff *skb) {struct xfrm_mode *inner_mode = x->inner_mode; -int err; +const struct xfrm_state_afinfo *afinfo; +int err = -EAFNOSUPPORT ; - err = x->outer_mode->afinfo->extract_input (x, skb); -if (err) +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); +if (likely (afinfo)) + err = afinfo->extract_input (x, skb); + +if (err) { +rcu_read_unlock ();return err; + }if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol); -if (inner_mode ==NULL ) +if (!inner_mode) { +rcu_read_unlock ();return -EAFNOSUPPORT ; + } } - skb->protocol = inner_mode->afinfo->eth_proto; + afinfo =xfrm_state_afinfo_get_rcu (inner_mode->family); +if (unlikely (!afinfo)) { +rcu_read_unlock (); +return -EAFNOSUPPORT ; + } + + skb->protocol = afinfo->eth_proto; +rcu_read_unlock ();return xfrm_inner_mode_encap_remove (x, inner_mode, skb); }
@@ -440,6 +456,7 @@ static int xfrm_inner_mode_input(struct xfrm_state *x,int xfrm_input (struct sk_buff *skb,int nexthdr,__be32 spi,int encap_type) { +const struct xfrm_state_afinfo *afinfo;struct net *net =dev_net (skb->dev);int err;__be32 seq;
@@ -705,7 +722,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)if (xo) xfrm_gro = xo->flags &XFRM_GRO ; - err = x->inner_mode->afinfo->transport_finish (skb, xfrm_gro || async); + err = -EAFNOSUPPORT ; +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (x->inner_mode->family); +if (likely (afinfo)) + err = afinfo->transport_finish (skb, xfrm_gro || async); +rcu_read_unlock ();if (xfrm_gro) { sp =skb_sec_path (skb);if (sp)
net/xfrm/xfrm_output.c +11 -1
@@ -623,7 +623,10 @@ EXPORT_SYMBOL_GPL(xfrm_output);static int xfrm_inner_extract_output (struct xfrm_state *x,struct sk_buff *skb) { +const struct xfrm_state_afinfo *afinfo;struct xfrm_mode *inner_mode; +int err = -EAFNOSUPPORT ; +if (x->sel.family ==AF_UNSPEC ) inner_mode =xfrm_ip2inner_mode (x,xfrm_af2proto (skb_dst (skb)->ops->family));
@@ -632,7 +635,14 @@ static int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb)if (inner_mode ==NULL )return -EAFNOSUPPORT ; -return inner_mode->afinfo->extract_output (x, skb); + +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (inner_mode->family); +if (likely (afinfo)) + err = afinfo->extract_output (x, skb); +rcu_read_unlock (); + +return err; }void xfrm_local_error (struct sk_buff *skb,int mtu)
net/xfrm/xfrm_policy.c +9 -1
@@ -2545,6 +2545,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,const struct flowi *fl, struct dst_entry *dst) { + const struct xfrm_state_afinfo *afinfo;struct net *net =xp_net (policy);unsigned long now = jiffies;struct net_device *dev;
@@ -2622,7 +2623,14 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, dst1->lastuse = now; dst1->input = dst_discard; - dst1->output = inner_mode->afinfo->output; + +rcu_read_lock (); + afinfo =xfrm_state_afinfo_get_rcu (inner_mode->family); +if (likely (afinfo)) + dst1->output = afinfo->output; +else + dst1->output = dst_discard_out; +rcu_read_unlock (); xdst_prev = xdst;
net/xfrm/xfrm_state.c +2 -2
@@ -354,7 +354,6 @@ int xfrm_register_mode(struct xfrm_mode *mode)if (!try_module_get (afinfo->owner)) goto out; - mode->afinfo = afinfo; modemap[mode->encap] = mode; err =0 ;
@@ -378,7 +377,7 @@ void xfrm_unregister_mode(struct xfrm_mode *mode)spin_lock_bh (&xfrm_mode_lock);if (likely (modemap[mode->encap] == mode)) { modemap[mode->encap] =NULL ; -module_put (mode->afinfo->owner); +module_put (afinfo->owner); }spin_unlock_bh (&xfrm_mode_lock);
@@ -2188,6 +2187,7 @@ struct xfrm_state_afinfo *xfrm_state_afinfo_get_rcu(unsigned int family)return rcu_dereference (xfrm_state_afinfo[family]); } +EXPORT_SYMBOL_GPL (xfrm_state_afinfo_get_rcu);struct xfrm_state_afinfo *xfrm_state_get_afinfo (unsigned int family) {
Signature · 1 line
2.19.2
PATCH v2 10/11 xfrm: make xfrm modes builtin
In reply to Florian Westphalafter previous changes, xfrm_mode contains no function pointers anymore and all modules defining such struct contain no code except an init/exit functions to register the xfrm_mode struct with the xfrm core.
Just place the xfrm modes core and remove the modules, the run-time xfrm_mode register/unregister functionality is removed.
Before:
text data bss dec filename
7523 200 2364 10087 net/xfrm/xfrm_input.o
40003 628 440 41071 net/xfrm/xfrm_state.o
15730338 6937080 4046908 26714326 vmlinux
7389 200 2364 9953 net/xfrm/xfrm_input.o 40574 656 440 41670 net/xfrm/xfrm_state.o
15730084 6937068 4046908 26714060 vmlinux
The xfrm*_mode_{transport,tunnel,beet} modules are gone.
v2: replace CONFIG_INET6_XFRM_MODE_* IS_ENABLED guards with CONFIG_IPV6
ones rather than removing them.
--- include/net/xfrm.h | 13 +-- net/ipv4/Kconfig | 29 +----- net/ipv4/Makefile | 3 - net/ipv4/ip_vti.c | 2 +- net/ipv4/xfrm4_mode_beet.c | 41 -------- net/ipv4/xfrm4_mode_transport.c | 36 ------- net/ipv4/xfrm4_mode_tunnel.c | 38 ------- net/ipv6/Kconfig | 35 +------ net/ipv6/Makefile | 4 - net/ipv6/ip6_vti.c | 2 +- net/ipv6/xfrm6_mode_beet.c | 42 -------- net/ipv6/xfrm6_mode_ro.c | 55 ---------- net/ipv6/xfrm6_mode_transport.c | 37 ------- net/ipv6/xfrm6_mode_tunnel.c | 45 -------- net/xfrm/xfrm_input.c | 13 +-- net/xfrm/xfrm_interface.c | 2 +- net/xfrm/xfrm_output.c | 15 +-- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 158 +++++++++++------------------ tools/testing/selftests/net/config | 2 - 20 files changed, 81 insertions(+), 493 deletions(-) delete mode 100644 net/ipv4/xfrm4_mode_beet.c delete mode 100644 net/ipv4/xfrm4_mode_transport.c delete mode 100644 net/ipv4/xfrm4_mode_tunnel.c delete mode 100644 net/ipv6/xfrm6_mode_beet.c delete mode 100644 net/ipv6/xfrm6_mode_ro.c delete mode 100644 net/ipv6/xfrm6_mode_transport.c delete mode 100644 net/ipv6/xfrm6_mode_tunnel.c
include/net/xfrm.h +4 -9
@@ -234,9 +234,9 @@ struct xfrm_state {/* Reference to data common to all the instances of this * transformer. */ const struct xfrm_type *type; -struct xfrm_mode *inner_mode; -struct xfrm_mode *inner_mode_iaf; -struct xfrm_mode *outer_mode; +const struct xfrm_mode *inner_mode; +const struct xfrm_mode *inner_mode_iaf; +const struct xfrm_mode *outer_mode;const struct xfrm_type_offload *type_offload;
@@ -347,7 +347,6 @@ struct xfrm_state_afinfo {struct module *owner;const struct xfrm_type *type_map[IPPROTO_MAX ];const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX ]; -struct xfrm_mode *mode_map[XFRM_MODE_MAX ];int (*init_flags)(struct xfrm_state *x); void (*init_tempsel)(struct xfrm_selector *sel,
@@ -423,7 +422,6 @@ int xfrm_register_type_offload(const struct xfrm_type_offload *type, unsigned shint xfrm_unregister_type_offload (const struct xfrm_type_offload *type,unsigned short family);struct xfrm_mode { -struct module *owner;u8 encap;u8 family;u8 flags;
@@ -434,9 +432,6 @@ enum { XFRM_MODE_FLAG_TUNNEL = 1, }; -int xfrm_register_mode (struct xfrm_mode *mode); -void xfrm_unregister_mode (struct xfrm_mode *mode); -static inline int xfrm_af2proto (unsigned int family) {switch (family) {
@@ -449,7 +444,7 @@ static inline int xfrm_af2proto(unsigned int family) } } -static inline struct xfrm_mode *xfrm_ip2inner_mode (struct xfrm_state *x,int ipproto) +static inline const struct xfrm_mode *xfrm_ip2inner_mode (struct xfrm_state *x,int ipproto) {if ((ipproto ==IPPROTO_IPIP && x->props.family ==AF_INET ) || (ipproto ==IPPROTO_IPV6 && x->props.family ==AF_INET6 ))
net/ipv4/Kconfig +1 -28
@@ -304,7 +304,7 @@ config NET_IPVTI tristate "Virtual (secure) IP: tunneling" select INET_TUNNEL select NET_IP_TUNNEL - depends on INET_XFRM_MODE_TUNNEL + select XFRM ---help--- Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the
@@ -396,33 +396,6 @@ config INET_TUNNEL tristate default n -config INET_XFRM_MODE_TRANSPORT - tristate "IP: IPsec transport mode" - default y - select XFRM - ---help--- - Support for IPsec transport mode. - - If unsure, say Y. - -config INET_XFRM_MODE_TUNNEL - tristate "IP: IPsec tunnel mode" - default y - select XFRM - ---help--- - Support for IPsec tunnel mode. - - If unsure, say Y. - -config INET_XFRM_MODE_BEET - tristate "IP: IPsec BEET mode" - default y - select XFRM - ---help--- - Support for IPsec BEET mode. - - If unsure, say Y. - config INET_DIAG tristate "INET: socket monitoring interface" default y
net/ipv4/Makefile +0 -3
@@ -37,10 +37,7 @@ obj-$(CONFIG_INET_ESP) += esp4.o obj-$(CONFIG_INET_ESP_OFFLOAD) += esp4_offload.o obj-$(CONFIG_INET_IPCOMP) += ipcomp.o obj-$(CONFIG_INET_XFRM_TUNNEL) += xfrm4_tunnel.o -obj-$(CONFIG_INET_XFRM_MODE_BEET) += xfrm4_mode_beet.o obj-$(CONFIG_INET_TUNNEL) += tunnel4.o -obj-$(CONFIG_INET_XFRM_MODE_TRANSPORT) += xfrm4_mode_transport.o -obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o obj-$(CONFIG_IP_PNP) += ipconfig.o obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ obj-$(CONFIG_INET_DIAG) += inet_diag.o
net/ipv4/ip_vti.c +1 -1
@@ -107,7 +107,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)struct net_device *dev;struct pcpu_sw_netstats *tstats;struct xfrm_state *x; -struct xfrm_mode *inner_mode; +const struct xfrm_mode *inner_mode;struct ip_tunnel *tunnel =XFRM_TUNNEL_SKB_CB (skb)->tunnel.ip4;u32 orig_mark = skb->mark;int ret;
net/ipv4/xfrm4_mode_beet.c deleted +0 -41
41 lines not on this page · raw message
net/ipv4/xfrm4_mode_transport.c deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* xfrm4_mode_transport.c - Transport mode encapsulation for IPv4. -* -* Copyright (c) 2004-2006 Herbert Xu <[email protected]> -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/stringify.h> -#include <net/dst.h> -#include <net/ip.h> -#include <net/xfrm.h> -#include <net/protocol.h> - -static struct xfrm_mode xfrm4_transport_mode = { - .owner =THIS_MODULE , - .encap =XFRM_MODE_TRANSPORT , - .family =AF_INET , -}; - -static int __init xfrm4_transport_init (void ) -{ -return xfrm_register_mode (&xfrm4_transport_mode); -} - -static void __exit xfrm4_transport_exit(void) -{ -xfrm_unregister_mode (&xfrm4_transport_mode); -} - -module_init (xfrm4_transport_init); -module_exit (xfrm4_transport_exit); -MODULE_LICENSE ("GPL" ); -MODULE_ALIAS_XFRM_MODE (AF_INET ,XFRM_MODE_TRANSPORT );
net/ipv4/xfrm4_mode_tunnel.c deleted +0 -38
@@ -1,38 +0,0 @@ -/* -* xfrm4_mode_tunnel.c - Tunnel mode encapsulation for IPv4. -* -* Copyright (c) 2004-2006 Herbert Xu <[email protected]> -*/ - -#include <linux/gfp.h> -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/stringify.h> -#include <net/dst.h> -#include <net/inet_ecn.h> -#include <net/ip.h> -#include <net/xfrm.h> - -static struct xfrm_mode xfrm4_tunnel_mode = { - .owner =THIS_MODULE , - .encap =XFRM_MODE_TUNNEL , - .flags =XFRM_MODE_FLAG_TUNNEL , - .family =AF_INET , -}; - -static int __init xfrm4_mode_tunnel_init (void ) -{ -return xfrm_register_mode (&xfrm4_tunnel_mode); -} - -static void __exit xfrm4_mode_tunnel_exit(void) -{ -xfrm_unregister_mode (&xfrm4_tunnel_mode); -} - -module_init (xfrm4_mode_tunnel_init); -module_exit (xfrm4_mode_tunnel_exit); -MODULE_LICENSE ("GPL" ); -MODULE_ALIAS_XFRM_MODE (AF_INET ,XFRM_MODE_TUNNEL );
net/ipv6/Kconfig +1 -34
@@ -135,44 +135,11 @@ config INET6_TUNNEL tristate default n -config INET6_XFRM_MODE_TRANSPORT - tristate "IPv6: IPsec transport mode" - default IPV6 - select XFRM - ---help--- - Support for IPsec transport mode. - - If unsure, say Y. - -config INET6_XFRM_MODE_TUNNEL - tristate "IPv6: IPsec tunnel mode" - default IPV6 - select XFRM - ---help--- - Support for IPsec tunnel mode. - - If unsure, say Y. - -config INET6_XFRM_MODE_BEET - tristate "IPv6: IPsec BEET mode" - default IPV6 - select XFRM - ---help--- - Support for IPsec BEET mode. - - If unsure, say Y. - -config INET6_XFRM_MODE_ROUTEOPTIMIZATION - tristate "IPv6: MIPv6 route optimization mode" - select XFRM - ---help--- - Support for MIPv6 route optimization mode. - config IPV6_VTI tristate "Virtual (secure) IPv6: tunneling" select IPV6_TUNNEL select NET_IP_TUNNEL - depends on INET6_XFRM_MODE_TUNNEL + select XFRM ---help--- Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the
net/ipv6/Makefile +0 -4
@@ -35,10 +35,6 @@ obj-$(CONFIG_INET6_ESP_OFFLOAD) += esp6_offload.o obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o -obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o -obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o -obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o -obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o obj-$(CONFIG_IPV6_MIP6) += mip6.o obj-$(CONFIG_IPV6_ILA) += ila/ obj-$(CONFIG_NETFILTER) += netfilter/
net/ipv6/ip6_vti.c +1 -1
@@ -342,7 +342,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)struct net_device *dev;struct pcpu_sw_netstats *tstats;struct xfrm_state *x; -struct xfrm_mode *inner_mode; +const struct xfrm_mode *inner_mode;struct ip6_tnl *t =XFRM_TUNNEL_SKB_CB (skb)->tunnel.ip6;u32 orig_mark = skb->mark;int ret;
net/ipv6/xfrm6_mode_beet.c deleted +0 -42
42 lines not on this page · raw message
net/ipv6/xfrm6_mode_ro.c deleted +0 -55
55 lines not on this page · raw message
net/ipv6/xfrm6_mode_transport.c deleted +0 -37
@@ -1,37 +0,0 @@ -/* -* xfrm6_mode_transport.c - Transport mode encapsulation for IPv6. -* -* Copyright (C) 2002 USAGI/WIDE Project -* Copyright (c) 2004-2006 Herbert Xu <[email protected]> -*/ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/skbuff.h> -#include <linux/stringify.h> -#include <net/dst.h> -#include <net/ipv6.h> -#include <net/xfrm.h> -#include <net/protocol.h> - -static struct xfrm_mode xfrm6_transport_mode = { - .owner =THIS_MODULE , - .encap =XFRM_MODE_TRANSPORT , - .family =AF_INET6 , -}; - -static int __init xfrm6_transport_init (void ) -{ -return xfrm_register_mode (&xfrm6_transport_mode); -} - -static void __exit xfrm6_transport_exit(void) -{ -xfrm_unregister_mode (&xfrm6_transport_mode); -} - -module_init (xfrm6_transport_init); -module_exit (xfrm6_transport_exit); -MODULE_LICENSE ("GPL" ); -MODULE_ALIAS_XFRM_MODE (AF_INET6 ,XFRM_MODE_TRANSPORT );
net/ipv6/xfrm6_mode_tunnel.c deleted +0 -45
45 lines not on this page · raw message
net/xfrm/xfrm_input.c +5 -8
@@ -351,7 +351,7 @@ xfrm_inner_mode_encap_remove(struct xfrm_state *x,static int xfrm_prepare_input (struct xfrm_state *x,struct sk_buff *skb) { -struct xfrm_mode *inner_mode = x->inner_mode; +const struct xfrm_mode *inner_mode = x->inner_mode;const struct xfrm_state_afinfo *afinfo;int err = -EAFNOSUPPORT ;
@@ -394,7 +394,6 @@ static int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb)*/ static int xfrm4_transport_input (struct xfrm_state *x,struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_INET_XFRM_MODE_TRANSPORT )int ihl = skb->data -skb_transport_header (skb);if (skb->transport_header != skb->network_header) {
@@ -405,14 +404,11 @@ static int xfrm4_transport_input(struct xfrm_state *x, struct sk_buff *skb)ip_hdr (skb)->tot_len =htons (skb->len + ihl);skb_reset_transport_header (skb);return 0 ; -#else -return -EOPNOTSUPP ; -#endif }static int xfrm6_transport_input (struct xfrm_state *x,struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_INET6_XFRM_MODE_TRANSPORT ) +#if IS_ENABLED (CONFIG_IPV6 )int ihl = skb->data -skb_transport_header (skb);if (skb->transport_header != skb->network_header) {
@@ -425,7 +421,8 @@ static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb)skb_reset_transport_header (skb);return 0 ;#else -return -EOPNOTSUPP ; +WARN_ON_ONCE (1 ); +return -EAFNOSUPPORT ;#endif }
@@ -458,12 +455,12 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) {const struct xfrm_state_afinfo *afinfo;struct net *net =dev_net (skb->dev); +const struct xfrm_mode *inner_mode;int err;__be32 seq;__be32 seq_hi;struct xfrm_state *x =NULL ;xfrm_address_t *daddr; -struct xfrm_mode *inner_mode;u32 mark = skb->mark;unsigned int family =AF_UNSPEC ;int decaps =0 ;
net/xfrm/xfrm_interface.c +1 -1
@@ -244,8 +244,8 @@ static void xfrmi_scrub_packet(struct sk_buff *skb, bool xnet)static int xfrmi_rcv_cb (struct sk_buff *skb,int err) { +const struct xfrm_mode *inner_mode;struct pcpu_sw_netstats *tstats; -struct xfrm_mode *inner_mode;struct net_device *dev;struct xfrm_state *x;struct xfrm_if *xi;
net/xfrm/xfrm_output.c +5 -10
@@ -61,7 +61,6 @@ static struct dst_entry *skb_dst_pop(struct sk_buff *skb)*/ static int xfrm4_transport_output (struct xfrm_state *x,struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_INET_XFRM_MODE_TRANSPORT )struct iphdr *iph =ip_hdr (skb);int ihl = iph->ihl *4 ;
@@ -74,10 +73,6 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)__skb_pull (skb, ihl);memmove (skb_network_header (skb), iph, ihl);return 0 ; -#else -WARN_ON_ONCE (1 ); -return -EOPNOTSUPP ; -#endif }/* Add encapsulation header.
@@ -87,7 +82,7 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)*/ static int xfrm6_transport_output (struct xfrm_state *x,struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_INET6_XFRM_MODE_TRANSPORT ) +#if IS_ENABLED (CONFIG_IPV6 )struct ipv6hdr *iph;u8 *prevhdr;int hdr_len;
@@ -107,7 +102,7 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ;#else WARN_ON_ONCE (1 ); -return -EOPNOTSUPP ; +return -EAFNOSUPPORT ;#endif }
@@ -118,7 +113,7 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)*/ static int xfrm6_ro_output (struct xfrm_state *x,struct sk_buff *skb) { -#if IS_ENABLED (CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION ) +#if IS_ENABLED (CONFIG_IPV6 )struct ipv6hdr *iph;u8 *prevhdr;int hdr_len;
@@ -140,7 +135,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ;#else WARN_ON_ONCE (1 ); -return -EOPNOTSUPP ; +return -EAFNOSUPPORT ;#endif }
@@ -624,7 +619,7 @@ EXPORT_SYMBOL_GPL(xfrm_output);static int xfrm_inner_extract_output (struct xfrm_state *x,struct sk_buff *skb) {const struct xfrm_state_afinfo *afinfo; -struct xfrm_mode *inner_mode; +const struct xfrm_mode *inner_mode;int err = -EAFNOSUPPORT ;if (x->sel.family ==AF_UNSPEC )
net/xfrm/xfrm_policy.c +1 -1
@@ -2546,10 +2546,10 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, struct dst_entry *dst) {const struct xfrm_state_afinfo *afinfo; +const struct xfrm_mode *inner_mode;struct net *net =xp_net (policy);unsigned long now = jiffies;struct net_device *dev; -struct xfrm_mode *inner_mode;struct xfrm_dst *xdst_prev =NULL ;struct xfrm_dst *xdst0 =NULL ;int i =0 ;
net/xfrm/xfrm_state.c +61 -97
205 lines not on this page · raw message
tools/testing/selftests/net/config +0 -2
@@ -7,9 +7,7 @@ CONFIG_NET_L3_MASTER_DEV=y CONFIG_IPV6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_VETH=y -CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_NET_IPVTI=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_IPV6_VTI=y CONFIG_DUMMY=y CONFIG_BRIDGE=y
Signature · 1 line
2.19.2
PATCH v2 11/11 xfrm: store xfrm_mode directly, not its address
In reply to Florian WestphalThis structure is now only 4 bytes, so its more efficient to cache a copy rather than its address.
No significant size difference in allmodconfig vmlinux.
With non-modular kernel that has all XFRM options enabled, this series reduces vmlinux image size by ~11kb. All xfrm_mode indirections are gone and all modes are built-in.
before (ipsec-next master):
text data bss dec filename
21071494 7233140 11104324 39408958 vmlinux.master
after this series:
21066448 7226772 11104324 39397544 vmlinux.patched
With allmodconfig kernel, the size increase is only 362 bytes, even all the xfrm config options removed in this series are modular.
before:
text data bss dec filename
15731286 6936912 4046908 26715106 vmlinux.master
after this series:
15731492 6937068 4046908 26715468 vmlinux
--- include/net/xfrm.h | 34 +++++++++++++++++----------------- net/ipv4/esp4_offload.c | 2 +- net/ipv4/ip_vti.c | 2 +- net/ipv4/xfrm4_output.c | 2 +- net/ipv6/esp6_offload.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/ipv6/xfrm6_output.c | 2 +- net/xfrm/xfrm_device.c | 10 +++++----- net/xfrm/xfrm_input.c | 14 +++++++------- net/xfrm/xfrm_interface.c | 2 +- net/xfrm/xfrm_output.c | 20 ++++++++++---------- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 16 ++++++++-------- 13 files changed, 55 insertions(+), 55 deletions(-)
include/net/xfrm.h +17 -17
@@ -132,6 +132,17 @@ struct xfrm_state_offload {u8 flags; }; +struct xfrm_mode { +u8 encap; +u8 family; +u8 flags; +}; + +/* Flags for xfrm_mode. */ +enum { +XFRM_MODE_FLAG_TUNNEL =1 , +}; +/* Full description of state of transformer. */ struct xfrm_state {possible_net_t xs_net;
@@ -234,9 +245,9 @@ struct xfrm_state {/* Reference to data common to all the instances of this * transformer. */ const struct xfrm_type *type; -const struct xfrm_mode *inner_mode; -const struct xfrm_mode *inner_mode_iaf; -const struct xfrm_mode *outer_mode; +struct xfrm_mode inner_mode; +struct xfrm_mode inner_mode_iaf; +struct xfrm_mode outer_mode;const struct xfrm_type_offload *type_offload;
@@ -421,17 +432,6 @@ 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); -struct xfrm_mode { -u8 encap; -u8 family; -u8 flags; -}; - -/* Flags for xfrm_mode. */ -enum { -XFRM_MODE_FLAG_TUNNEL =1 , -}; -static inline int xfrm_af2proto (unsigned int family) {switch (family) {
@@ -448,9 +448,9 @@ static inline const struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, i {if ((ipproto ==IPPROTO_IPIP && x->props.family ==AF_INET ) || (ipproto ==IPPROTO_IPV6 && x->props.family ==AF_INET6 )) -return x->inner_mode; +return &x->inner_mode;else -return x->inner_mode_iaf; +return &x->inner_mode_iaf; }struct xfrm_tmpl {
@@ -1990,7 +1990,7 @@ static inline int xfrm_tunnel_check(struct sk_buff *skb, struct xfrm_state *x, tunnel = true;break ; } -if (tunnel && !(x->outer_mode->flags &XFRM_MODE_FLAG_TUNNEL )) +if (tunnel && !(x->outer_mode.flags &XFRM_MODE_FLAG_TUNNEL ))return -EINVAL ;return 0 ;
net/ipv4/esp4_offload.c +1 -1
@@ -135,7 +135,7 @@ static struct sk_buff *xfrm4_outer_mode_gso_segment(struct xfrm_state *x, struct sk_buff *skb, netdev_features_t features) { -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_TUNNEL :return xfrm4_tunnel_gso_segment (x, skb, features);case XFRM_MODE_TRANSPORT :
net/ipv4/ip_vti.c +1 -1
@@ -126,7 +126,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) x =xfrm_input_state (skb); - inner_mode = x->inner_mode; + inner_mode = &x->inner_mode;if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol);
net/ipv4/xfrm4_output.c +1 -1
@@ -83,7 +83,7 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)#endif rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family);if (likely (afinfo)) ret = afinfo->output_finish (sk, skb);else
net/ipv6/esp6_offload.c +1 -1
@@ -162,7 +162,7 @@ static struct sk_buff *xfrm6_outer_mode_gso_segment(struct xfrm_state *x, struct sk_buff *skb, netdev_features_t features) { -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_TUNNEL :return xfrm6_tunnel_gso_segment (x, skb, features);case XFRM_MODE_TRANSPORT :
net/ipv6/ip6_vti.c +1 -1
@@ -361,7 +361,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) x =xfrm_input_state (skb); - inner_mode = x->inner_mode; + inner_mode = &x->inner_mode;if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol);
net/ipv6/xfrm6_output.c +1 -1
@@ -129,7 +129,7 @@ static int __xfrm6_output_state_finish(struct xfrm_state *x, struct sock *sk,int ret = -EAFNOSUPPORT ;rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family);if (likely (afinfo)) ret = afinfo->output_finish (sk, skb);else
net/xfrm/xfrm_device.c +5 -5
@@ -53,20 +53,20 @@ static void __xfrm_mode_tunnel_prep(struct xfrm_state *x, struct sk_buff *skb,/* Adjust pointers into the packet when IPsec is done at layer2 */ static void xfrm_outer_mode_prep (struct xfrm_state *x,struct sk_buff *skb) { -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_TUNNEL : -if (x->outer_mode->family ==AF_INET ) +if (x->outer_mode.family ==AF_INET )return __xfrm_mode_tunnel_prep (x, skb,sizeof (struct iphdr )); -if (x->outer_mode->family ==AF_INET6 ) +if (x->outer_mode.family ==AF_INET6 )return __xfrm_mode_tunnel_prep (x, skb,sizeof (struct ipv6hdr ));break ;case XFRM_MODE_TRANSPORT : -if (x->outer_mode->family ==AF_INET ) +if (x->outer_mode.family ==AF_INET )return __xfrm_transport_prep (x, skb,sizeof (struct iphdr )); -if (x->outer_mode->family ==AF_INET6 ) +if (x->outer_mode.family ==AF_INET6 )return __xfrm_transport_prep (x, skb,sizeof (struct ipv6hdr ));break ;
net/xfrm/xfrm_input.c +7 -7
@@ -351,12 +351,12 @@ xfrm_inner_mode_encap_remove(struct xfrm_state *x,static int xfrm_prepare_input (struct xfrm_state *x,struct sk_buff *skb) { -const struct xfrm_mode *inner_mode = x->inner_mode; +const struct xfrm_mode *inner_mode = &x->inner_mode;const struct xfrm_state_afinfo *afinfo;int err = -EAFNOSUPPORT ;rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode->family); + afinfo =xfrm_state_afinfo_get_rcu (x->outer_mode.family);if (likely (afinfo)) err = afinfo->extract_input (x, skb);
@@ -482,7 +482,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) goto drop; } - family = x->outer_mode->family; + family = x->outer_mode.family;/* An encap_type of -1 indicates async resumption. */ if (encap_type ==-1 ) {
@@ -666,7 +666,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)XFRM_MODE_SKB_CB (skb)->protocol = nexthdr; - inner_mode = x->inner_mode; + inner_mode = &x->inner_mode;if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol);
@@ -681,7 +681,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) goto drop; } -if (x->outer_mode->flags &XFRM_MODE_FLAG_TUNNEL ) { +if (x->outer_mode.flags &XFRM_MODE_FLAG_TUNNEL ) { decaps =1 ;break ; }
@@ -691,7 +691,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)* transport mode so the outer address is identical. */ daddr = &x->id.daddr; - family = x->outer_mode->family; + family = x->outer_mode.family; err =xfrm_parse_spi (skb, nexthdr, &spi, &seq);if (err <0 ) {
@@ -721,7 +721,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) err = -EAFNOSUPPORT ;rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->inner_mode->family); + afinfo =xfrm_state_afinfo_get_rcu (x->inner_mode.family);if (likely (afinfo)) err = afinfo->transport_finish (skb, xfrm_gro || async);rcu_read_unlock ();
net/xfrm/xfrm_interface.c +1 -1
@@ -273,7 +273,7 @@ static int xfrmi_rcv_cb(struct sk_buff *skb, int err) xnet = !net_eq (xi->net,dev_net (skb->dev));if (xnet) { - inner_mode = x->inner_mode; + inner_mode = &x->inner_mode;if (x->sel.family ==AF_UNSPEC ) { inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol);
net/xfrm/xfrm_output.c +10 -10
@@ -334,7 +334,7 @@ static int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb)IPCB (skb)->flags |=IPSKB_XFRM_TUNNEL_SIZE ; skb->protocol =htons (ETH_P_IP ); -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_BEET :return xfrm4_beet_encap_add (x, skb);case XFRM_MODE_TUNNEL :
@@ -357,7 +357,7 @@ static int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb) skb->ignore_df =1 ; skb->protocol =htons (ETH_P_IPV6 ); -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_BEET :return xfrm6_beet_encap_add (x, skb);case XFRM_MODE_TUNNEL :
@@ -373,22 +373,22 @@ static int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)static int xfrm_outer_mode_output (struct xfrm_state *x,struct sk_buff *skb) { -switch (x->outer_mode->encap) { +switch (x->outer_mode.encap) {case XFRM_MODE_BEET :case XFRM_MODE_TUNNEL : -if (x->outer_mode->family ==AF_INET ) +if (x->outer_mode.family ==AF_INET )return xfrm4_prepare_output (x, skb); -if (x->outer_mode->family ==AF_INET6 ) +if (x->outer_mode.family ==AF_INET6 )return xfrm6_prepare_output (x, skb);break ;case XFRM_MODE_TRANSPORT : -if (x->outer_mode->family ==AF_INET ) +if (x->outer_mode.family ==AF_INET )return xfrm4_transport_output (x, skb); -if (x->outer_mode->family ==AF_INET6 ) +if (x->outer_mode.family ==AF_INET6 )return xfrm6_transport_output (x, skb);break ;case XFRM_MODE_ROUTEOPTIMIZATION : -if (x->outer_mode->family ==AF_INET6 ) +if (x->outer_mode.family ==AF_INET6 )return xfrm6_ro_output (x, skb);WARN_ON_ONCE (1 );break ;
@@ -489,7 +489,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) }skb_dst_set (skb, dst); x = dst->xfrm; - }while (x && !(x->outer_mode->flags &XFRM_MODE_FLAG_TUNNEL )); + }while (x && !(x->outer_mode.flags &XFRM_MODE_FLAG_TUNNEL ));return 0 ;
@@ -626,7 +626,7 @@ static int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb) inner_mode =xfrm_ip2inner_mode (x,xfrm_af2proto (skb_dst (skb)->ops->family)); else - inner_mode = x->inner_mode; + inner_mode = &x->inner_mode;if (inner_mode ==NULL )return -EAFNOSUPPORT ;
net/xfrm/xfrm_policy.c +1 -1
@@ -2595,7 +2595,7 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, goto put_states; } }else - inner_mode = xfrm[i]->inner_mode; + inner_mode = &xfrm[i]->inner_mode; xdst->route = dst;dst_copy_metrics (dst1, dst);
net/xfrm/xfrm_state.c +8 -8
@@ -551,8 +551,6 @@ struct xfrm_state *xfrm_state_alloc(struct net *net) x->lft.hard_packet_limit =XFRM_INF ; x->replay_maxage =0 ; x->replay_maxdiff =0 ; - x->inner_mode =NULL ; - x->inner_mode_iaf =NULL ;spin_lock_init (&x->lock); }return x;
@@ -2204,8 +2202,9 @@ 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_mode *inner_mode;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;
@@ -2234,7 +2233,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) family != x->sel.family) goto error; - x->inner_mode = inner_mode; + x->inner_mode = *inner_mode; }else {const struct xfrm_mode *inner_mode_iaf;int iafamily =AF_INET ;
@@ -2246,7 +2245,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)if (!(inner_mode->flags &XFRM_MODE_FLAG_TUNNEL )) goto error; - x->inner_mode = inner_mode; + x->inner_mode = *inner_mode;if (x->props.family ==AF_INET ) iafamily =AF_INET6 ;
@@ -2254,7 +2253,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) inner_mode_iaf =xfrm_get_mode (x->props.mode, iafamily);if (inner_mode_iaf) {if (inner_mode_iaf->flags &XFRM_MODE_FLAG_TUNNEL ) - x->inner_mode_iaf = inner_mode_iaf; + x->inner_mode_iaf = *inner_mode_iaf; } }
@@ -2268,12 +2267,13 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)if (err) goto error; - x->outer_mode =xfrm_get_mode (x->props.mode, family); -if (x->outer_mode ==NULL ) { + outer_mode =xfrm_get_mode (x->props.mode, family); +if (!outer_mode) { err = -EPROTONOSUPPORT ; goto error; } + x->outer_mode = *outer_mode;if (init_replay) { err =xfrm_init_replay (x);if (err)
Signature · 1 line
2.19.2
Quoted 24 lines · Florian Westphal
This series removes all function pointers from the
xfrm_modestruct. They are either replaced by direct calls or a static helper.This reduces code size: even merging all xfrm{4,6}_,mode* modules into the core reduces total size, as the infrastructure to maintain dynamic (un)register can be removed.
There are more opportunities for indirection avoidance, e.g. in
xfrm_type. I plan to follow up once/if this series is accepted.Tested with xfrm tunnel mode via netns with esp/aead.
I'd like thank Benedict Wong for running Android unit tests and taking the time to bisect a tunnel mode breakage added by v1 of this patch set.
I've addressed the comments/feedback from Sabrina and Eyal. The kbuild robot reported build breakage in patch #8 is fixed as well.
I've not addressed the sparse warning reported by the kbuild robot -- those warnings are in code not touched by this patch set.
Quoted 12 lines
Florian Westphal (11):
xfrm: place af number intoxfrm_modestruct
xfrm: prefer family stored inxfrm_modestruct
xfrm: remove input indirection fromxfrm_mode
xfrm: remove output indirection fromxfrm_mode
xfrm: remove xmit indirection fromxfrm_mode
xfrm: removegso_segmentindirection fromxfrm_mode
xfrm: remove input2 indirection fromxfrm_mode
xfrm: remove output2 indirection fromxfrm_mode
xfrm: remove afinfo pointer fromxfrm_mode
xfrm: make xfrm modes builtin
xfrm: storexfrm_modedirectly, not its address
Series:
Signature · 1 line
Sabrina
Steffen Klassert
maintainerQuoted 24 lines · Florian Westphal
This series removes all function pointers from the
xfrm_modestruct. They are either replaced by direct calls or a static helper.This reduces code size: even merging all xfrm{4,6}_,mode* modules into the core reduces total size, as the infrastructure to maintain dynamic (un)register can be removed.
There are more opportunities for indirection avoidance, e.g. in
xfrm_type. I plan to follow up once/if this series is accepted.Tested with xfrm tunnel mode via netns with esp/aead.
I'd like thank Benedict Wong for running Android unit tests and taking the time to bisect a tunnel mode breakage added by v1 of this patch set.
I've addressed the comments/feedback from Sabrina and Eyal. The kbuild robot reported build breakage in patch #8 is fixed as well.
I've not addressed the sparse warning reported by the kbuild robot -- those warnings are in code not touched by this patch set.
Quoted 12 lines
Florian Westphal (11):
xfrm: place af number intoxfrm_modestruct
xfrm: prefer family stored inxfrm_modestruct
xfrm: remove input indirection fromxfrm_mode
xfrm: remove output indirection fromxfrm_mode
xfrm: remove xmit indirection fromxfrm_mode
xfrm: removegso_segmentindirection fromxfrm_mode
xfrm: remove input2 indirection fromxfrm_mode
xfrm: remove output2 indirection fromxfrm_mode
xfrm: remove afinfo pointer fromxfrm_mode
xfrm: make xfrm modes builtin
xfrm: storexfrm_modedirectly, not its address
Series applied to ipsec-next, thanks a lot for your work Florian!