Commit 272c2330 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

xfrm: bail early on slave pass over skb 



This is prep work for initial support of bonding hardware encryption
pass-through support. The bonding driver will fill in the slave_dev
pointer, and we use that to know not to skb_push() again on a given
skb that was already processed on the bond device.

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: "David S. Miller" <davem@davemloft.net>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Steffen Klassert <steffen.klassert@secunet.com>
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: netdev@vger.kernel.org
CC: intel-wired-lan@lists.osuosl.org
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 389cc2f3

include/net/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ struct xfrm_state_walk { 


struct xfrm_state_offload {

	struct net_device	*dev;

	struct net_device	*slave_dev;

	unsigned long		offload_handle;

	unsigned int		num_exthdrs;

	u8			flags;

net/xfrm/xfrm_device.c

+17 −17
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur 
	struct sk_buff *skb2, *nskb, *pskb = NULL;

	netdev_features_t esp_features = features;

	struct xfrm_offload *xo = xfrm_offload(skb);

	struct net_device *dev = skb->dev;

	struct sec_path *sp;



	if (!xo)
@@ -119,6 +120,10 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur 
	if (xo->flags & XFRM_GRO || x->xso.flags & XFRM_OFFLOAD_INBOUND)

		return skb;



	/* This skb was already validated on the master dev */

	if ((x->xso.dev != dev) && (x->xso.slave_dev == dev))

		return skb;



	local_irq_save(flags);

	sd = this_cpu_ptr(&softnet_data);

	err = !skb_queue_empty(&sd->xfrm_backlog);
@@ -129,15 +134,11 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur 
		return skb;

	}



	if (skb_is_gso(skb)) {

		struct net_device *dev = skb->dev;



		if (unlikely(x->xso.dev != dev)) {

	if (skb_is_gso(skb) && unlikely(x->xso.dev != dev)) {

		struct sk_buff *segs;



		/* Packet got rerouted, fixup features and segment it. */

			esp_features = esp_features & ~(NETIF_F_HW_ESP

							| NETIF_F_GSO_ESP);

		esp_features = esp_features & ~(NETIF_F_HW_ESP | NETIF_F_GSO_ESP);



		segs = skb_gso_segment(skb, esp_features);

		if (IS_ERR(segs)) {
@@ -149,7 +150,6 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur 
			skb = segs;

		}

	}

	}



	if (!skb->next) {

		esp_features |= skb->dev->gso_partial_features;

CRA Git | Maintained and supported by SUSTech CRA and CCSE