Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3284df1 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: remove input2 indirection from xfrm_mode 



No 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.o

After:
   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.o

v2: pass inner_mode to xfrm_inner_mode_encap_remove to fix
    AF_UNSPEC selector breakage (bisected by Benedict Wong)

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 7613b92b

include/net/xfrm.h

+0 −13
Original line number Diff line number Diff line
@@ -423,19 +423,6 @@ int xfrm_register_type_offload(const struct xfrm_type_offload *type, unsigned sh 
int 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
Original line number Diff line number Diff line
@@ -80,54 +80,7 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) 
	return 0;

}



static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)

{

	struct iphdr *iph;

	int optlen = 0;

	int err = -EINVAL;



	if (unlikely(XFRM_MODE_SKB_CB(skb)->protocol == IPPROTO_BEETPH)) {

		struct ip_beet_phdr *ph;

		int phlen;



		if (!pskb_may_pull(skb, sizeof(*ph)))

			goto out;



		ph = (struct ip_beet_phdr *)skb->data;



		phlen = sizeof(*ph) + ph->padlen;

		optlen = ph->hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen);

		if (optlen < 0 || optlen & 3 || optlen > 250)

			goto out;



		XFRM_MODE_SKB_CB(skb)->protocol = ph->nexthdr;



		if (!pskb_may_pull(skb, phlen))

			goto out;

		__skb_pull(skb, phlen);

	}



	skb_push(skb, sizeof(*iph));

	skb_reset_network_header(skb);

	skb_mac_header_rebuild(skb);



	xfrm4_beet_make_header(skb);



	iph = ip_hdr(skb);



	iph->ihl += optlen / 4;

	iph->tot_len = htons(skb->len);

	iph->daddr = x->sel.daddr.a4;

	iph->saddr = x->sel.saddr.a4;

	iph->check = 0;

	iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl);

	err = 0;

out:

	return err;

}



static struct xfrm_mode xfrm4_beet_mode = {

	.input2 = xfrm4_beet_input,

	.output2 = xfrm4_beet_output,

	.owner = THIS_MODULE,

	.encap = XFRM_MODE_BEET,

net/ipv4/xfrm4_mode_tunnel.c

+0 −39
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
#include <net/ipv6.h>

#include <net/xfrm.h>



static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)

{

	struct ipv6hdr *inner_iph = ipipv6_hdr(skb);



	if (INET_ECN_is_ce(XFRM_MODE_SKB_CB(skb)->tos))

		IP6_ECN_set_ce(skb, inner_iph);

}



/* Add encapsulation header.

 *

 * The top IP header will be constructed per RFC 2401.
@@ -65,45 +57,7 @@ static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) 
	return 0;

}



#define for_each_input_rcu(head, handler)	\

	for (handler = rcu_dereference(head);	\

	     handler != NULL;			\

	     handler = rcu_dereference(handler->next))





static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)

{

	int err = -EINVAL;



	if (XFRM_MODE_SKB_CB(skb)->protocol != IPPROTO_IPV6)

		goto out;

	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))

		goto out;



	err = skb_unclone(skb, GFP_ATOMIC);

	if (err)

		goto out;



	if (x->props.flags & XFRM_STATE_DECAP_DSCP)

		ipv6_copy_dscp(ipv6_get_dsfield(ipv6_hdr(skb)),

			       ipipv6_hdr(skb));

	if (!(x->props.flags & XFRM_STATE_NOECN))

		ipip6_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 xfrm6_tunnel_mode = {

	.input2 = xfrm6_mode_tunnel_input,

	.output2 = xfrm6_mode_tunnel_output,

	.owner = THIS_MODULE,

	.encap = XFRM_MODE_TUNNEL,