Merge branch 'ipvlan-packet-scrub'

davem330 · davem330 · commit d31d38a0a911 · 2017-12-15T11:36:54.000-05:00
Mahesh Bandewar says:

====================
ipvlan: packet scrub

While crossing namespace boundary IPvlan aggressively scrubs packets.
This is creating problems. First thing is that scrubbing changes the
packet type in skb meta-data to PACKET_HOST. This causes erroneous
packet delivery when dev_forward_skb() has already marked the packet
type as OTHER_HOST.

On the egress side scrubbing just before calling dev_queue_xmit()
creates another set of problems. Scrubbing remove skb-&gt;sk so the
prio update gets missed and more seriously, socket back-pressure
fails making TSQ not function correctly.

The first patch in the series just reverts the earlier change which
was adding a mac-check, but that is unnecessary if packet_type that
dev_forward_skb() has set is honored. The second path removes two of
the scrubs which are causing problems described above.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
@@ -315,17 +315,13 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff **pskb,
 
 		*pskb = skb;
 	}
-	ipvlan_skb_crossing_ns(skb, dev);
 
 	if (local) {
 		skb->pkt_type = PACKET_HOST;
 		if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS)
 			success = true;
 	} else {
-		if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest,
-					     ipvlan->phy_dev->dev_addr))
-			skb->pkt_type = PACKET_OTHERHOST;
-
+		skb->dev = dev;
 		ret = RX_HANDLER_ANOTHER;
 		success = true;
 	}
@@ -590,7 +586,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
 		return NET_XMIT_SUCCESS;
 	}
 
-	ipvlan_skb_crossing_ns(skb, ipvlan->phy_dev);
+	skb->dev = ipvlan->phy_dev;
 	return dev_queue_xmit(skb);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -315,17 +315,13 @@ static int ipvlan_rcv_frame(struct ipvl_addr addr, struct sk_buff *pskb,`
`315`	`315`
`316`	`316`	`*pskb = skb;`
`317`	`317`	`}`
`318`		`- ipvlan_skb_crossing_ns(skb, dev);`
`319`	`318`
`320`	`319`	`if (local) {`
`321`	`320`	`skb->pkt_type = PACKET_HOST;`
`322`	`321`	`if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS)`
`323`	`322`	`success = true;`
`324`	`323`	`} else {`
`325`		`- if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest,`
`326`		`- ipvlan->phy_dev->dev_addr))`
`327`		`- skb->pkt_type = PACKET_OTHERHOST;`
`328`		`-`
	`324`	`+ skb->dev = dev;`
`329`	`325`	`ret = RX_HANDLER_ANOTHER;`
`330`	`326`	`success = true;`
`331`	`327`	`}`
`@@ -590,7 +586,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff skb, struct net_device dev)`
`590`	`586`	`return NET_XMIT_SUCCESS;`
`591`	`587`	`}`
`592`	`588`
`593`		`- ipvlan_skb_crossing_ns(skb, ipvlan->phy_dev);`
	`589`	`+ skb->dev = ipvlan->phy_dev;`
`594`	`590`	`return dev_queue_xmit(skb);`
`595`	`591`	`}`
`596`	`592`