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

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

xfrm: remove output indirection from xfrm_mode 



Same 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

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 c2d305e5

include/net/xfrm.h

+5 −14
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,