netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: take care of bonding in build_skb_flow_key
@ 2016-01-06  5:49 Wengang Wang
  2016-01-06  6:18 ` David Miller
  2016-01-06  6:19 ` zhuyj
  0 siblings, 2 replies; 13+ messages in thread
From: Wengang Wang @ 2016-01-06  5:49 UTC (permalink / raw)
  To: netdev; +Cc: wen.gang.wang

A problem is found that we are looking for route basing a bonding device and
deal with path MTU there: The path MTU is set to the active slave device, not
the bonding master.

The patch tries to fix the issue by letting build_skb_flow_key() take care
of the transition of device index from bonding slave to the master.

Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
---
 net/ipv4/route.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 85f184e..3053f10 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -523,11 +523,20 @@ static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,
 			       const struct sock *sk)
 {
 	const struct iphdr *iph = ip_hdr(skb);
-	int oif = skb->dev->ifindex;
+	int oif;
+	struct net_device *master = NULL;
+
 	u8 tos = RT_TOS(iph->tos);
 	u8 prot = iph->protocol;
 	u32 mark = skb->mark;
 
+	if (skb->dev->flags & IFF_SLAVE)
+		master = netdev_master_upper_dev_get(skb->dev);
+	if (master)
+		oif = master->ifindex;
+	else
+		oif = skb->dev->ifindex;
+
 	__build_flow_key(fl4, sk, iph, oif, tos, prot, mark, 0);
 }
 
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2016-01-06  9:00 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-06  5:49 [PATCH] net: take care of bonding in build_skb_flow_key Wengang Wang
2016-01-06  6:18 ` David Miller
2016-01-06  6:32   ` Wengang Wang
2016-01-06  6:44     ` zhuyj
2016-01-06  7:11       ` Wengang Wang
2016-01-06  6:19 ` zhuyj
2016-01-06  7:06   ` Wengang Wang
2016-01-06  7:35     ` zhuyj
2016-01-06  7:45       ` Wengang Wang
2016-01-06  8:00         ` zhuyj
2016-01-06  8:14           ` Wengang Wang
2016-01-06  8:18             ` zhuyj
2016-01-06  9:04               ` Wengang Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).