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

Commit 862b82c6 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Merge most of the output path 



As part of the work on asynchrnous cryptographic operations, we need
to be able to resume from the spot where they occur.  As such, it
helps if we isolate them to one spot.

This patch moves most of the remaining family-specific processing into
the common output code.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef76bc23

include/net/dst.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct dst_ops 
	struct dst_entry *	(*negative_advice)(struct dst_entry *);

	void			(*link_failure)(struct sk_buff *);

	void			(*update_pmtu)(struct dst_entry *dst, u32 mtu);

	int			(*local_out)(struct sk_buff *skb);

	int			entry_size;



	atomic_t		entries;

include/net/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct xfrm_state_afinfo { 
	unsigned int		family;

	unsigned int		proto;

	unsigned int		eth_proto;

	unsigned int		nf_post_routing;

	struct module		*owner;

	struct xfrm_type	*type_map[IPPROTO_MAX];

	struct xfrm_mode	*mode_map[XFRM_MODE_MAX];

net/ipv4/route.c

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static struct dst_ops ipv4_dst_ops = { 
	.negative_advice =	ipv4_negative_advice,

	.link_failure =		ipv4_link_failure,

	.update_pmtu =		ip_rt_update_pmtu,

	.local_out =		ip_local_out,

	.entry_size =		sizeof(struct rtable),

};

net/ipv4/xfrm4_output.c

+4 −72
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb) 
		return err;



	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

	IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE;

	IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED;



	skb->protocol = htons(ETH_P_IP);
@@ -67,87 +67,19 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb) 
}

EXPORT_SYMBOL(xfrm4_prepare_output);



static inline int xfrm4_output_one(struct sk_buff *skb)

{

	int err;



	err = xfrm_output(skb);

	if (err)

		goto error_nolock;



	IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;

	err = 0;



out_exit:

	return err;

error_nolock:

	kfree_skb(skb);

	goto out_exit;

}



static int xfrm4_output_finish2(struct sk_buff *skb)

{

	int err;



	while (likely((err = xfrm4_output_one(skb)) == 0)) {

		nf_reset(skb);



		err = __ip_local_out(skb);

		if (unlikely(err != 1))

			break;



		if (!skb->dst->xfrm)

			return dst_output(skb);



		err = nf_hook(PF_INET, NF_IP_POST_ROUTING, skb, NULL,

			      skb->dst->dev, xfrm4_output_finish2);

		if (unlikely(err != 1))

			break;

	}



	return err;

}



static int xfrm4_output_finish(struct sk_buff *skb)

{

	struct sk_buff *segs;



#ifdef CONFIG_NETFILTER

	if (!skb->dst->xfrm) {

		IPCB(skb)->flags |= IPSKB_REROUTED;

		return dst_output(skb);

	}

#endif



	if (!skb_is_gso(skb))

		return xfrm4_output_finish2(skb);

	IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;

#endif



	skb->protocol = htons(ETH_P_IP);

	segs = skb_gso_segment(skb, 0);

	kfree_skb(skb);

	if (unlikely(IS_ERR(segs)))

		return PTR_ERR(segs);



	do {

		struct sk_buff *nskb = segs->next;

		int err;



		segs->next = NULL;

		err = xfrm4_output_finish2(segs);



		if (unlikely(err)) {

			while ((segs = nskb)) {

				nskb = segs->next;

				segs->next = NULL;

				kfree_skb(segs);

			}

			return err;

		}



		segs = nskb;

	} while (segs);



	return 0;

	return xfrm_output(skb);

}



int xfrm4_output(struct sk_buff *skb)

net/ipv4/xfrm4_policy.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static struct dst_ops xfrm4_dst_ops = { 
	.update_pmtu =		xfrm4_update_pmtu,

	.destroy =		xfrm4_dst_destroy,

	.ifdown =		xfrm4_dst_ifdown,

	.local_out =		__ip_local_out,

	.gc_thresh =		1024,

	.entry_size =		sizeof(struct xfrm_dst),

};