Commit b328ecc4 authored by Steffen Klassert's avatar Steffen Klassert
Browse files

xfrm: Make the policy hold queue work with VTI. 



We forgot to support the xfrm policy hold queue when
VTI was implemented. This patch adds everything we
need so that we can use the policy hold queue together
with VTI interfaces.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 96a20829

net/ipv4/ip_vti.c

+5 −1
Original line number Diff line number Diff line
@@ -218,12 +218,15 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev, 
	}



	dst_hold(dst);

	dst = xfrm_lookup(tunnel->net, dst, fl, NULL, 0);

	dst = xfrm_lookup_route(tunnel->net, dst, fl, NULL, 0);

	if (IS_ERR(dst)) {

		dev->stats.tx_carrier_errors++;

		goto tx_error_icmp;

	}



	if (dst->flags & DST_XFRM_QUEUE)

		goto queued;



	if (!vti_state_check(dst->xfrm, parms->iph.daddr, parms->iph.saddr)) {

		dev->stats.tx_carrier_errors++;

		dst_release(dst);
@@ -255,6 +258,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev, 
		goto tx_error;

	}



queued:

	skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(dev)));

	skb_dst_set(skb, dst);

	skb->dev = skb_dst(skb)->dev;

net/ipv6/ip6_vti.c

+5 −1
Original line number Diff line number Diff line
@@ -491,13 +491,16 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) 
	}



	dst_hold(dst);

	dst = xfrm_lookup(t->net, dst, fl, NULL, 0);

	dst = xfrm_lookup_route(t->net, dst, fl, NULL, 0);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		dst = NULL;

		goto tx_err_link_failure;

	}



	if (dst->flags & DST_XFRM_QUEUE)

		goto queued;



	x = dst->xfrm;

	if (!vti6_state_check(x, &t->parms.raddr, &t->parms.laddr))

		goto tx_err_link_failure;
@@ -533,6 +536,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) 
		goto tx_err_dst_release;

	}



queued:

	skb_scrub_packet(skb, !net_eq(t->net, dev_net(dev)));

	skb_dst_set(skb, dst);

	skb->dev = skb_dst(skb)->dev;

net/xfrm/xfrm_policy.c

+11 −0
Original line number Diff line number Diff line
@@ -2758,6 +2758,7 @@ static void xfrm_policy_queue_process(struct timer_list *t) 
	struct xfrm_policy_queue *pq = &pol->polq;

	struct flowi fl;

	struct sk_buff_head list;

	__u32 skb_mark;



	spin_lock(&pq->hold_queue.lock);

	skb = skb_peek(&pq->hold_queue);
@@ -2767,7 +2768,12 @@ static void xfrm_policy_queue_process(struct timer_list *t) 
	}

	dst = skb_dst(skb);

	sk = skb->sk;



	/* Fixup the mark to support VTI. */

	skb_mark = skb->mark;

	skb->mark = pol->mark.v;

	xfrm_decode_session(skb, &fl, dst->ops->family);

	skb->mark = skb_mark;

	spin_unlock(&pq->hold_queue.lock);



	dst_hold(xfrm_dst_path(dst));
@@ -2799,7 +2805,12 @@ static void xfrm_policy_queue_process(struct timer_list *t) 
	while (!skb_queue_empty(&list)) {

		skb = __skb_dequeue(&list);



		/* Fixup the mark to support VTI. */

		skb_mark = skb->mark;

		skb->mark = pol->mark.v;

		xfrm_decode_session(skb, &fl, skb_dst(skb)->ops->family);

		skb->mark = skb_mark;



		dst_hold(xfrm_dst_path(skb_dst(skb)));

		dst = xfrm_lookup(net, xfrm_dst_path(skb_dst(skb)), &fl, skb->sk, 0);

		if (IS_ERR(dst)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE