Commit c0f21029 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Steffen Klassert
Browse files

xfrm: always initialize offload path 



Offload path is used for GRO with SW IPsec, and not just for HW
offload. So initialize it anyway.

Fixes: 585b64f5 ("xfrm: delay initialization of offload path till its actually requested")
Reported-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Closes: https://lore.kernel.org/all/aEGW_5HfPqU1rFjl@krikkit


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 766f6a78

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ struct xfrm_type_offload { 


int xfrm_register_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);

void xfrm_set_type_offload(struct xfrm_state *x);

void xfrm_set_type_offload(struct xfrm_state *x, bool try_load);

static inline void xfrm_unset_type_offload(struct xfrm_state *x)

{

	if (!x->type_offload)

net/xfrm/xfrm_device.c

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, 
		return -EINVAL;

	}



	xfrm_set_type_offload(x);

	if (!x->type_offload) {

		NL_SET_ERR_MSG(extack, "Type doesn't support offload");

		dev_put(dev);

net/xfrm/xfrm_state.c

+2 −4
Original line number Diff line number Diff line
@@ -424,11 +424,10 @@ void xfrm_unregister_type_offload(const struct xfrm_type_offload *type, 
}

EXPORT_SYMBOL(xfrm_unregister_type_offload);



void xfrm_set_type_offload(struct xfrm_state *x)

void xfrm_set_type_offload(struct xfrm_state *x, bool try_load)

{

	const struct xfrm_type_offload *type = NULL;

	struct xfrm_state_afinfo *afinfo;

	bool try_load = true;



retry:

	afinfo = xfrm_state_get_afinfo(x->props.family);
@@ -607,6 +606,7 @@ static void ___xfrm_state_destroy(struct xfrm_state *x) 
	kfree(x->coaddr);

	kfree(x->replay_esn);

	kfree(x->preplay_esn);

	xfrm_unset_type_offload(x);

	if (x->type) {

		x->type->destructor(x);

		xfrm_put_type(x->type);
@@ -780,8 +780,6 @@ void xfrm_dev_state_free(struct xfrm_state *x) 
	struct xfrm_dev_offload *xso = &x->xso;

	struct net_device *dev = READ_ONCE(xso->dev);



	xfrm_unset_type_offload(x);



	if (dev && dev->xfrmdev_ops) {

		spin_lock_bh(&xfrm_state_dev_gc_lock);

		if (!hlist_unhashed(&x->dev_gclist))

net/xfrm/xfrm_user.c

+1 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ static struct xfrm_state *xfrm_state_construct(struct net *net, 
	/* override default values from above */

	xfrm_update_ae_params(x, attrs, 0);



	xfrm_set_type_offload(x, attrs[XFRMA_OFFLOAD_DEV]);

	/* configure the hardware if offload is requested */

	if (attrs[XFRMA_OFFLOAD_DEV]) {

		err = xfrm_dev_state_add(net, x,