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

Commit ffdb5211 authored by Ilan Tayari's avatar Ilan Tayari Committed by Steffen Klassert
Browse files

xfrm: Auto-load xfrm offload modules 



IPSec crypto offload depends on the protocol-specific
offload module (such as esp_offload.ko).

When the user installs an SA with crypto-offload, load
the offload module automatically, in the same way
that the protocol module is loaded (such as esp.ko)

Signed-off-by: default avatarIlan Tayari <ilant@mellanox.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent a9b28c2b

include/net/xfrm.h

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
	MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))

#define MODULE_ALIAS_XFRM_TYPE(family, proto) \

	MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto))

#define MODULE_ALIAS_XFRM_OFFLOAD_TYPE(family, proto) \

	MODULE_ALIAS("xfrm-offload-" __stringify(family) "-" __stringify(proto))



#ifdef CONFIG_XFRM_STATISTICS

#define XFRM_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.xfrm_statistics, field)
@@ -1558,7 +1560,7 @@ 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);

int __xfrm_init_state(struct xfrm_state *x, bool init_replay);

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload);

int xfrm_init_state(struct xfrm_state *x);

int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb);

int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);

net/ipv4/esp4_offload.c

+1 −0
Original line number Diff line number Diff line
@@ -305,3 +305,4 @@ module_init(esp4_offload_init); 
module_exit(esp4_offload_exit);

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");

MODULE_ALIAS_XFRM_OFFLOAD_TYPE(AF_INET, XFRM_PROTO_ESP);

net/ipv6/esp6_offload.c

+1 −0
Original line number Diff line number Diff line
@@ -334,3 +334,4 @@ module_init(esp6_offload_init); 
module_exit(esp6_offload_exit);

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");

MODULE_ALIAS_XFRM_OFFLOAD_TYPE(AF_INET6, XFRM_PROTO_ESP);

net/xfrm/xfrm_device.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, 
	xfrm_address_t *daddr;



	if (!x->type_offload)

		return 0;

		return -EINVAL;



	/* We don't yet support UDP encapsulation, TFC padding and ESN. */

	if (x->encap || x->tfcpad || (x->props.flags & XFRM_STATE_ESN))

net/xfrm/xfrm_state.c

+12 −4
Original line number Diff line number Diff line
@@ -296,12 +296,14 @@ int xfrm_unregister_type_offload(const struct xfrm_type_offload *type, 
}

EXPORT_SYMBOL(xfrm_unregister_type_offload);



static const struct xfrm_type_offload *xfrm_get_type_offload(u8 proto, unsigned short family)

static const struct xfrm_type_offload *

xfrm_get_type_offload(u8 proto, unsigned short family, bool try_load)

{

	struct xfrm_state_afinfo *afinfo;

	const struct xfrm_type_offload **typemap;

	const struct xfrm_type_offload *type;



retry:

	afinfo = xfrm_state_get_afinfo(family);

	if (unlikely(afinfo == NULL))

		return NULL;
@@ -311,6 +313,12 @@ static const struct xfrm_type_offload *xfrm_get_type_offload(u8 proto, unsigned 
	if ((type && !try_module_get(type->owner)))

		type = NULL;



	if (!type && try_load) {

		request_module("xfrm-offload-%d-%d", family, proto);

		try_load = 0;

		goto retry;

	}



	rcu_read_unlock();

	return type;

}
@@ -2165,7 +2173,7 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu) 
	return mtu - x->props.header_len;

}



int __xfrm_init_state(struct xfrm_state *x, bool init_replay)

int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)

{

	struct xfrm_state_afinfo *afinfo;

	struct xfrm_mode *inner_mode;
@@ -2230,7 +2238,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay) 
	if (x->type == NULL)

		goto error;



	x->type_offload = xfrm_get_type_offload(x->id.proto, family);

	x->type_offload = xfrm_get_type_offload(x->id.proto, family, offload);



	err = x->type->init_state(x);

	if (err)
@@ -2258,7 +2266,7 @@ EXPORT_SYMBOL(__xfrm_init_state); 


int xfrm_init_state(struct xfrm_state *x)

{

	return __xfrm_init_state(x, true);

	return __xfrm_init_state(x, true, false);

}



EXPORT_SYMBOL(xfrm_init_state);