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

Commit e3b60ffb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2019-07-05

1) A lot of work to remove indirections from the xfrm code.
   From Florian Westphal.

2) Fix a WARN_ON with ipv6 that triggered because of a
   forgotten break statement. From Florian Westphal.

3)  Remove xfrmi_init_net, it is not needed.
    From Li RongQing.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c4cde580 c7b37c76

include/net/xfrm.h

+23 −30
Original line number Diff line number Diff line
@@ -346,22 +346,19 @@ void km_state_expired(struct xfrm_state *x, int hard, u32 portid); 
int __xfrm_state_delete(struct xfrm_state *x);



struct xfrm_state_afinfo {

	unsigned int			family;

	unsigned int			proto;

	__be16				eth_proto;

	struct module			*owner;

	const struct xfrm_type		*type_map[IPPROTO_MAX];

	const struct xfrm_type_offload	*type_offload_map[IPPROTO_MAX];

	u8				family;

	u8				proto;



	const struct xfrm_type_offload *type_offload_esp;



	const struct xfrm_type		*type_esp;

	const struct xfrm_type		*type_ipip;

	const struct xfrm_type		*type_ipip6;

	const struct xfrm_type		*type_comp;

	const struct xfrm_type		*type_ah;

	const struct xfrm_type		*type_routing;

	const struct xfrm_type		*type_dstopts;



	int			(*init_flags)(struct xfrm_state *x);

	void			(*init_tempsel)(struct xfrm_selector *sel,

						const struct flowi *fl);

	void			(*init_temprop)(struct xfrm_state *x,

						const struct xfrm_tmpl *tmpl,

						const xfrm_address_t *daddr,

						const xfrm_address_t *saddr);

	int			(*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);

	int			(*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);

	int			(*output)(struct net *net, struct sock *sk, struct sk_buff *skb);

	int			(*output_finish)(struct sock *sk, struct sk_buff *skb);

	int			(*extract_input)(struct xfrm_state *x,
@@ -407,12 +404,10 @@ struct xfrm_type { 
	int			(*reject)(struct xfrm_state *, struct sk_buff *,

					  const struct flowi *);

	int			(*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);

	/* Estimate maximal size of result of transformation of a dgram */

	u32			(*get_mtu)(struct xfrm_state *, int size);

};



int xfrm_register_type(const struct xfrm_type *type, unsigned short family);

int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);

void xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);



struct xfrm_type_offload {

	char		*description;
@@ -424,7 +419,7 @@ 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);

void xfrm_unregister_type_offload(const struct xfrm_type_offload *type, unsigned short family);



static inline int xfrm_af2proto(unsigned int family)

{
@@ -1508,21 +1503,19 @@ struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, u32 mark, 
					    u8 proto,

					    unsigned short family);

#ifdef CONFIG_XFRM_SUB_POLICY

int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n,

		   unsigned short family, struct net *net);

int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n,

void xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n,

		    unsigned short family);

void xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n,

		     unsigned short family);

#else

static inline int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,

				 int n, unsigned short family, struct net *net)

static inline void xfrm_tmpl_sort(struct xfrm_tmpl **d, struct xfrm_tmpl **s,

				  int n, unsigned short family)

{

	return -ENOSYS;

}



static inline int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src,

static inline void xfrm_state_sort(struct xfrm_state **d, struct xfrm_state **s,

				   int n, unsigned short family)

{

	return -ENOSYS;

}

#endif
@@ -1551,7 +1544,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si); 
void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si);

u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);

int xfrm_init_replay(struct xfrm_state *x);

int xfrm_state_mtu(struct xfrm_state *x, int mtu);

u32 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_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);

net/ipv4/ah4.c

+1 −2
Original line number Diff line number Diff line
@@ -590,8 +590,7 @@ static void __exit ah4_fini(void) 
{

	if (xfrm4_protocol_deregister(&ah4_protocol, IPPROTO_AH) < 0)

		pr_info("%s: can't remove protocol\n", __func__);

	if (xfrm_unregister_type(&ah_type, AF_INET) < 0)

		pr_info("%s: can't remove xfrm type\n", __func__);

	xfrm_unregister_type(&ah_type, AF_INET);

}



module_init(ah4_init);

net/ipv4/esp4.c

+2 −28
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ struct esp_output_extra { 


#define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&((__skb)->cb[0]))



static u32 esp4_get_mtu(struct xfrm_state *x, int mtu);



/*

 * Allocate an AEAD request structure with extra space for SG and IV.

 *
@@ -506,7 +504,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);

		u32 padto;



		padto = min(x->tfcpad, esp4_get_mtu(x, dst->child_mtu_cached));

		padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));

		if (skb->len < padto)

			esp.tfclen = padto - skb->len;

	}
@@ -788,28 +786,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
	return err;

}



static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)

{

	struct crypto_aead *aead = x->data;

	u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);

	unsigned int net_adj;



	switch (x->props.mode) {

	case XFRM_MODE_TRANSPORT:

	case XFRM_MODE_BEET:

		net_adj = sizeof(struct iphdr);

		break;

	case XFRM_MODE_TUNNEL:

		net_adj = 0;

		break;

	default:

		BUG();

	}



	return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -

		 net_adj) & ~(blksize - 1)) + net_adj - 2;

}



static int esp4_err(struct sk_buff *skb, u32 info)

{

	struct net *net = dev_net(skb->dev);
@@ -1035,7 +1011,6 @@ static const struct xfrm_type esp_type = 
	.flags		= XFRM_TYPE_REPLAY_PROT,

	.init_state	= esp_init_state,

	.destructor	= esp_destroy,

	.get_mtu	= esp4_get_mtu,

	.input		= esp_input,

	.output		= esp_output,

};
@@ -1066,8 +1041,7 @@ static void __exit esp4_fini(void) 
{

	if (xfrm4_protocol_deregister(&esp4_protocol, IPPROTO_ESP) < 0)

		pr_info("%s: can't remove protocol\n", __func__);

	if (xfrm_unregister_type(&esp_type, AF_INET) < 0)

		pr_info("%s: can't remove xfrm type\n", __func__);

	xfrm_unregister_type(&esp_type, AF_INET);

}



module_init(esp4_init);

net/ipv4/esp4_offload.c

+1 −3
Original line number Diff line number Diff line
@@ -312,9 +312,7 @@ static int __init esp4_offload_init(void) 


static void __exit esp4_offload_exit(void)

{

	if (xfrm_unregister_type_offload(&esp_type_offload, AF_INET) < 0)

		pr_info("%s: can't remove xfrm type offload\n", __func__);



	xfrm_unregister_type_offload(&esp_type_offload, AF_INET);

	inet_del_offload(&esp4_offload, IPPROTO_ESP);

}

net/ipv4/ipcomp.c

+1 −2
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ static void __exit ipcomp4_fini(void) 
{

	if (xfrm4_protocol_deregister(&ipcomp4_protocol, IPPROTO_COMP) < 0)

		pr_info("%s: can't remove protocol\n", __func__);

	if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0)

		pr_info("%s: can't remove xfrm type\n", __func__);

	xfrm_unregister_type(&ipcomp_type, AF_INET);

}



module_init(ipcomp4_init);