xfrm: ipv6: remove hdr_off indirection
Subsystems (4)
v2 cover xfrm: ipv6: remove hdr_off indirection
v2: fix build failure with MIP6=y in last patch.
IPV6 xfrm moves mutable extension headers to make space for the encapsulation header.
For Mobile ipv6 sake this uses an indirect call (ipv6 can be built as module).
These patches remove those indirections by placing a small parsing function in the xfrm core.
While at it, the merged dstopt/rt hdroff function is realigned with ip6_find_1stfragopt (where they were copied from).
ip6_find_1stfragopt received bug fixes that were missing from the cloned ones.
Florian Westphal (5):
xfrm: ipv6: add xfrm6_hdr_offset helper
xfrm: ipv6: move mip6_destopt_offset into xfrm core
xfrm: ipv6: move mip6_rthdr_offset into xfrm core
xfrm: remove hdr_offset indirection
xfrm: merge dstopt and routing hdroff functions
include/net/xfrm.h | 3 -- net/ipv6/ah6.c | 1 - net/ipv6/esp6.c | 1 - net/ipv6/ipcomp6.c | 1 - net/ipv6/mip6.c | 97 ----------------------------------------- net/ipv6/xfrm6_output.c | 7 --- net/xfrm/xfrm_output.c | 79 ++++++++++++++++++++++++++++++++- 7 files changed, 77 insertions(+), 112 deletions(-)
Signature · 1 line
2.31.1
PATCH v2 1/5 xfrm: ipv6: add xfrm6_hdr_offset helper
This moves the ->hdr_offset indirect call to a new helper.
A followup patch can then modify the new function to replace the indirect call by direct calls to the required hdr_offset helper.
--- net/xfrm/xfrm_output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/xfrm/xfrm_output.c +7 -2
@@ -77,6 +77,11 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ; } +static int xfrm6_hdr_offset (struct xfrm_state *x,struct sk_buff *skb,u8 **prevhdr) +{ +return x->type->hdr_offset (x, skb, prevhdr); +} +/* Add encapsulation header. * * The IP header and mutable extension headers will be moved forward to make
@@ -92,7 +97,7 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb) iph =ipv6_hdr (skb);skb_set_inner_transport_header (skb,skb_transport_offset (skb)); - hdr_len = x->type->hdr_offset (x, skb, &prevhdr); + hdr_len =xfrm6_hdr_offset (x, skb, &prevhdr);if (hdr_len <0 )return hdr_len; skb_set_mac_header(skb,
@@ -122,7 +127,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb) iph =ipv6_hdr (skb); - hdr_len = x->type->hdr_offset (x, skb, &prevhdr); + hdr_len =xfrm6_hdr_offset (x, skb, &prevhdr);if (hdr_len <0 )return hdr_len; skb_set_mac_header(skb,
Signature · 1 line
2.31.1
PATCH v2 2/5 xfrm: ipv6: move mip6_destopt_offset into xfrm core
In reply to Florian WestphalThis helper is relatively small, just move this to the xfrm core and call it directly.
Next patch does the same for the ROUTING type.
--- net/ipv6/mip6.c | 49 ------------------------------------ net/xfrm/xfrm_output.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 49 deletions(-)
net/ipv6/mip6.c +0 -49
@@ -247,54 +247,6 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,return err; } -static int mip6_destopt_offset (struct xfrm_state *x,struct sk_buff *skb, -u8 **nexthdr) -{ -u16 offset =sizeof (struct ipv6hdr ); -struct ipv6_opt_hdr *exthdr = - (struct ipv6_opt_hdr *)(ipv6_hdr (skb) +1 ); -const unsigned char *nh =skb_network_header (skb); -unsigned int packet_len =skb_tail_pointer (skb) - -skb_network_header (skb); -int found_rhdr =0 ; - - *nexthdr = &ipv6_hdr (skb)->nexthdr; - -while (offset +1 <= packet_len) { - -switch (**nexthdr) { -case NEXTHDR_HOP : -break ; -case NEXTHDR_ROUTING : - found_rhdr =1 ; -break ; -case NEXTHDR_DEST : -/* -* HAO MUST NOT appear more than once. -* XXX: It is better to try to find by the end of -* XXX: packet if HAO exists. -*/ -if (ipv6_find_tlv (skb, offset,IPV6_TLV_HAO ) >=0 ) { -net_dbg_ratelimited ("mip6: hao exists already, override\n" ); -return offset; - } - -if (found_rhdr) -return offset; - -break ; -default : -return offset; - } - - offset +=ipv6_optlen (exthdr); - *nexthdr = &exthdr->nexthdr; - exthdr = (struct ipv6_opt_hdr *)(nh + offset); - } - -return offset; -} -static int mip6_destopt_init_state (struct xfrm_state *x) {if (x->id.spi) {
@@ -332,7 +284,6 @@ static const struct xfrm_type mip6_destopt_type = { .input = mip6_destopt_input, .output = mip6_destopt_output, .reject = mip6_destopt_reject, - .hdr_offset = mip6_destopt_offset, };static int mip6_rthdr_input (struct xfrm_state *x,struct sk_buff *skb)
net/xfrm/xfrm_output.c +57 -0
65 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v2 3/5 xfrm: ipv6: move mip6_rthdr_offset into xfrm core
In reply to Florian WestphalPlace the call into the xfrm core. After this all remaining users set the hdr_offset function pointer to the same function which opens the possiblity to remove the indirection.
--- net/ipv6/mip6.c | 48 ----------------------------------------- net/xfrm/xfrm_output.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 48 deletions(-)
net/ipv6/mip6.c +0 -48
@@ -333,53 +333,6 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb)return 0 ; } -static int mip6_rthdr_offset (struct xfrm_state *x,struct sk_buff *skb, -u8 **nexthdr) -{ -u16 offset =sizeof (struct ipv6hdr ); -struct ipv6_opt_hdr *exthdr = - (struct ipv6_opt_hdr *)(ipv6_hdr (skb) +1 ); -const unsigned char *nh =skb_network_header (skb); -unsigned int packet_len =skb_tail_pointer (skb) - -skb_network_header (skb); -int found_rhdr =0 ; - - *nexthdr = &ipv6_hdr (skb)->nexthdr; - -while (offset +1 <= packet_len) { - -switch (**nexthdr) { -case NEXTHDR_HOP : -break ; -case NEXTHDR_ROUTING : -if (offset +3 <= packet_len) { -struct ipv6_rt_hdr *rt; - rt = (struct ipv6_rt_hdr *)(nh + offset); -if (rt->type !=0 ) -return offset; - } - found_rhdr =1 ; -break ; -case NEXTHDR_DEST : -if (ipv6_find_tlv (skb, offset,IPV6_TLV_HAO ) >=0 ) -return offset; - -if (found_rhdr) -return offset; - -break ; -default : -return offset; - } - - offset +=ipv6_optlen (exthdr); - *nexthdr = &exthdr->nexthdr; - exthdr = (struct ipv6_opt_hdr *)(nh + offset); - } - -return offset; -} -static int mip6_rthdr_init_state (struct xfrm_state *x) {if (x->id.spi) {
@@ -413,7 +366,6 @@ static const struct xfrm_type mip6_rthdr_type = { .destructor = mip6_rthdr_destroy, .input = mip6_rthdr_input, .output = mip6_rthdr_output, - .hdr_offset = mip6_rthdr_offset, };static int __init mip6_init (void )
net/xfrm/xfrm_output.c +49 -0
61 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v2 4/5 xfrm: remove hdr_offset indirection
In reply to Florian WestphalAfter previous patches all remaining users set the function pointer to the same function: xfrm6_find_1stfragopt.
So remove this function pointer and call ip6_find_1stfragopt directly.
Reduces size of xfrm_type to 64 bytes on 64bit platforms.
--- include/net/xfrm.h | 3 --- net/ipv6/ah6.c | 1 - net/ipv6/esp6.c | 1 - net/ipv6/ipcomp6.c | 1 - net/ipv6/xfrm6_output.c | 7 ------- net/xfrm/xfrm_output.c | 2 +- 6 files changed, 1 insertion(+), 14 deletions(-)
include/net/xfrm.h +0 -3
@@ -402,7 +402,6 @@ struct xfrm_type {int (*output)(struct xfrm_state *,struct sk_buff *pskb);int (*reject)(struct xfrm_state *,struct sk_buff *,const struct flowi *); -int (*hdr_offset)(struct xfrm_state *,struct sk_buff *,u8 **); };int xfrm_register_type (const struct xfrm_type *type,unsigned short family);
@@ -1605,8 +1604,6 @@ __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_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, -u8 **prevhdr);#ifdef CONFIG_XFRM void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu);
net/ipv6/ah6.c +0 -1
@@ -762,7 +762,6 @@ static const struct xfrm_type ah6_type = { .destructor = ah6_destroy, .input = ah6_input, .output = ah6_output, - .hdr_offset = xfrm6_find_1stfragopt, };static struct xfrm6_protocol ah6_protocol = {
net/ipv6/esp6.c +0 -1
@@ -1250,7 +1250,6 @@ static const struct xfrm_type esp6_type = { .destructor = esp6_destroy, .input = esp6_input, .output = esp6_output, - .hdr_offset = xfrm6_find_1stfragopt, };static struct xfrm6_protocol esp6_protocol = {
net/ipv6/ipcomp6.c +0 -1
@@ -178,7 +178,6 @@ static const struct xfrm_type ipcomp6_type = { .destructor = ipcomp_destroy, .input = ipcomp_input, .output = ipcomp_output, - .hdr_offset = xfrm6_find_1stfragopt, };static struct xfrm6_protocol ipcomp6_protocol = {
net/ipv6/xfrm6_output.c +0 -7
@@ -16,13 +16,6 @@#include <net/ip6_route.h> #include <net/xfrm.h> -int xfrm6_find_1stfragopt (struct xfrm_state *x,struct sk_buff *skb, -u8 **prevhdr) -{ -return ip6_find_1stfragopt (skb, prevhdr); -} -EXPORT_SYMBOL (xfrm6_find_1stfragopt); -void xfrm6_local_rxpmtu (struct sk_buff *skb,u32 mtu) {struct flowi6 fl6;
net/xfrm/xfrm_output.c +1 -1
@@ -185,7 +185,7 @@ static int xfrm6_hdr_offset(struct xfrm_state *x, struct sk_buff *skb, u8 **prevbreak ; } -return x->type->hdr_offset (x, skb, prevhdr); +return ip6_find_1stfragopt (skb, prevhdr); }/* Add encapsulation header.
Signature · 1 line
2.31.1
PATCH v2 5/5 xfrm: merge dstopt and routing hdroff functions
In reply to Florian WestphalBoth functions are very similar, so merge them into one.
The nexthdr is passed as argument to break the loop in the ROUTING case, this is the only header type where slightly different rules apply.
While at it, the merged function is realigned with ip6_find_1stfragopt(). That function received bug fixes for an infinite loop, but neither dstopt nor rh parsing functions (copy-pasted from ip6_find_1stfragopt) were changed.
---
v2: - need to return -EINVAL when loop doesn't even run once.
- keep 'nh' around, this broke build with CONFIG_IPV6_MIP6=y.
net/xfrm/xfrm_output.c | 80 ++++++++++++------------------------------ 1 file changed, 22 insertions(+), 58 deletions(-)
net/xfrm/xfrm_output.c +22 -58
@@ -78,24 +78,30 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb) }#if IS_ENABLED (CONFIG_IPV6_MIP6 ) -static int mip6_destopt_offset (struct xfrm_state *x,struct sk_buff *skb, -u8 **nexthdr) +static int mip6_rthdr_offset (struct sk_buff *skb,u8 **nexthdr,int type) { -u16 offset =sizeof (struct ipv6hdr ); -struct ipv6_opt_hdr *exthdr = - (struct ipv6_opt_hdr *)(ipv6_hdr (skb) +1 );const unsigned char *nh =skb_network_header (skb); -unsigned int packet_len =skb_tail_pointer (skb) - -skb_network_header (skb); +unsigned int offset =sizeof (struct ipv6hdr ); +unsigned int packet_len;int found_rhdr =0 ; + packet_len =skb_tail_pointer (skb) - nh; *nexthdr = &ipv6_hdr (skb)->nexthdr; -while (offset +1 <= packet_len) { +while (offset <= packet_len) { +struct ipv6_opt_hdr *exthdr; +switch (**nexthdr) {case NEXTHDR_HOP :break ;case NEXTHDR_ROUTING : +if (type ==IPPROTO_ROUTING && offset +3 <= packet_len) { +struct ipv6_rt_hdr *rt; + + rt = (struct ipv6_rt_hdr *)(nh + offset); +if (rt->type !=0 ) +return offset; + } found_rhdr =1 ;break ;case NEXTHDR_DEST :
@@ -116,59 +122,18 @@ static int mip6_destopt_offset(struct xfrm_state *x, struct sk_buff *skb, return offset; } - offset +=ipv6_optlen (exthdr); - *nexthdr = &exthdr->nexthdr; - exthdr = (struct ipv6_opt_hdr *)(nh + offset); - } - -return offset; -} - -static int mip6_rthdr_offset (struct xfrm_state *x,struct sk_buff *skb, -u8 **nexthdr) -{ -u16 offset =sizeof (struct ipv6hdr ); -struct ipv6_opt_hdr *exthdr = - (struct ipv6_opt_hdr *)(ipv6_hdr (skb) +1 ); -const unsigned char *nh =skb_network_header (skb); -unsigned int packet_len =skb_tail_pointer (skb) - -skb_network_header (skb); -int found_rhdr =0 ; - - *nexthdr = &ipv6_hdr (skb)->nexthdr; - -while (offset +1 <= packet_len) { -switch (**nexthdr) { -case NEXTHDR_HOP : -break ; -case NEXTHDR_ROUTING : -if (offset +3 <= packet_len) { -struct ipv6_rt_hdr *rt; - - rt = (struct ipv6_rt_hdr *)(nh + offset); -if (rt->type !=0 ) -return offset; - } - found_rhdr =1 ; -break ; -case NEXTHDR_DEST : -if (ipv6_find_tlv (skb, offset,IPV6_TLV_HAO ) >=0 ) -return offset; - -if (found_rhdr) -return offset; - -break ; -default : -return offset; - } +if (offset +sizeof (struct ipv6_opt_hdr ) > packet_len) +return -EINVAL ; + exthdr = (struct ipv6_opt_hdr *)(skb_network_header (skb) + + offset); offset +=ipv6_optlen (exthdr); +if (offset >IPV6_MAXPLEN ) +return -EINVAL ; *nexthdr = &exthdr->nexthdr; - exthdr = (struct ipv6_opt_hdr *)(nh + offset); } -return offset; +return -EINVAL ; }#endif
@@ -177,9 +142,8 @@ static int xfrm6_hdr_offset(struct xfrm_state *x, struct sk_buff *skb, u8 **prevswitch (x->type->proto) {#if IS_ENABLED (CONFIG_IPV6_MIP6 )case IPPROTO_DSTOPTS : -return mip6_destopt_offset (x, skb, prevhdr);case IPPROTO_ROUTING : -return mip6_rthdr_offset (x, skb, prevhdr); +return mip6_rthdr_offset (skb, prevhdr, x->type->proto);#endif default :break ;
Signature · 1 line
2.31.1
Steffen Klassert
maintainerQuoted 17 lines · Florian Westphal
v2: fix build failure with MIP6=y in last patch.
IPV6 xfrm moves mutable extension headers to make space for the encapsulation header.
For Mobile ipv6 sake this uses an indirect call (ipv6 can be built as module).
These patches remove those indirections by placing a small parsing function in the xfrm core.
While at it, the merged dstopt/rt hdroff function is realigned with
ip6_find_1stfragopt(where they were copied from).
ip6_find_1stfragoptreceived bug fixes that were missing from the cloned ones.
Quoted 6 lines
Florian Westphal (5):
xfrm: ipv6: addxfrm6_hdr_offsethelper
xfrm: ipv6: movemip6_destopt_offsetinto xfrm core
xfrm: ipv6: movemip6_rthdr_offsetinto xfrm core
xfrm: removehdr_offsetindirection
xfrm: merge dstopt and routing hdroff functions
Series applied, thanks Florian!