From c59b72b590a7e4b5787d359a57bd0c2da1c752da Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 12 Aug 2016 10:49:24 -0700 Subject: [PATCH] datapath: backport: openvswitch: do not ignore netdev errors when creating tunnel vports Upstream commit: commit 4b5b9ba553f9aa5f484ab972fc9b58061885ceca Author: Martynas Pumputis Date: Tue Aug 9 16:24:50 2016 +0100 openvswitch: do not ignore netdev errors when creating tunnel vports The creation of a tunnel vport (geneve, gre, vxlan) brings up a corresponding netdev, a multi-step operation which can fail. For example, changing a vxlan vport's netdev state to 'up' binds the vport's socket to a UDP port - if the binding fails (e.g. due to the port being in use), the error is currently ignored giving the appearance that the tunnel vport creation completed successfully. Signed-off-by: Martynas Pumputis Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/linux/compat/dev-openvswitch.c | 1 + datapath/vport-geneve.c | 9 ++++++++- datapath/vport-gre.c | 11 +++++++++-- datapath/vport-lisp.c | 8 +++++++- datapath/vport-stt.c | 9 ++++++++- datapath/vport-vxlan.c | 9 ++++++++- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/datapath/linux/compat/dev-openvswitch.c b/datapath/linux/compat/dev-openvswitch.c index 72576657410..56e1a5b6804 100644 --- a/datapath/linux/compat/dev-openvswitch.c +++ b/datapath/linux/compat/dev-openvswitch.c @@ -53,6 +53,7 @@ int rpl_rtnl_delete_link(struct net_device *dev) return 0; } +EXPORT_SYMBOL_GPL(rpl_rtnl_delete_link); #ifndef USE_UPSTREAM_TUNNEL int ovs_dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) diff --git a/datapath/vport-geneve.c b/datapath/vport-geneve.c index 5821ef481d8..14a54f1997a 100644 --- a/datapath/vport-geneve.c +++ b/datapath/vport-geneve.c @@ -93,7 +93,14 @@ static struct vport *geneve_tnl_create(const struct vport_parms *parms) return ERR_CAST(dev); } - dev_change_flags(dev, dev->flags | IFF_UP); + err = dev_change_flags(dev, dev->flags | IFF_UP); + if (err < 0) { + rtnl_delete_link(dev); + rtnl_unlock(); + ovs_vport_free(vport); + goto error; + } + rtnl_unlock(); return vport; error: diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c index 32d7d9f7939..1d63734f414 100644 --- a/datapath/vport-gre.c +++ b/datapath/vport-gre.c @@ -54,6 +54,7 @@ static struct vport *gre_tnl_create(const struct vport_parms *parms) struct net *net = ovs_dp_get_net(parms->dp); struct net_device *dev; struct vport *vport; + int err; vport = ovs_vport_alloc(0, &ovs_gre_vport_ops, parms); if (IS_ERR(vport)) @@ -67,9 +68,15 @@ static struct vport *gre_tnl_create(const struct vport_parms *parms) return ERR_CAST(dev); } - dev_change_flags(dev, dev->flags | IFF_UP); - rtnl_unlock(); + err = dev_change_flags(dev, dev->flags | IFF_UP); + if (err < 0) { + rtnl_delete_link(dev); + rtnl_unlock(); + ovs_vport_free(vport); + return ERR_PTR(err); + } + rtnl_unlock(); return vport; } diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c index 9e894e80a7b..27f40ab4272 100644 --- a/datapath/vport-lisp.c +++ b/datapath/vport-lisp.c @@ -92,8 +92,14 @@ static struct vport *lisp_tnl_create(const struct vport_parms *parms) ovs_vport_free(vport); return ERR_CAST(dev); } + err = dev_change_flags(dev, dev->flags | IFF_UP); + if (err < 0) { + rtnl_delete_link(dev); + rtnl_unlock(); + ovs_vport_free(vport); + goto error; + } - dev_change_flags(dev, dev->flags | IFF_UP); rtnl_unlock(); return vport; error: diff --git a/datapath/vport-stt.c b/datapath/vport-stt.c index 1c838de7667..31fa4624550 100644 --- a/datapath/vport-stt.c +++ b/datapath/vport-stt.c @@ -95,7 +95,14 @@ static struct vport *stt_tnl_create(const struct vport_parms *parms) return ERR_CAST(dev); } - dev_change_flags(dev, dev->flags | IFF_UP); + err = dev_change_flags(dev, dev->flags | IFF_UP); + if (err < 0) { + rtnl_delete_link(dev); + rtnl_unlock(); + ovs_vport_free(vport); + goto error; + } + rtnl_unlock(); return vport; error: diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index b830a463f07..11965c00421 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -130,7 +130,14 @@ static struct vport *vxlan_tnl_create(const struct vport_parms *parms) return ERR_CAST(dev); } - dev_change_flags(dev, dev->flags | IFF_UP); + err = dev_change_flags(dev, dev->flags | IFF_UP); + if (err < 0) { + rtnl_delete_link(dev); + rtnl_unlock(); + ovs_vport_free(vport); + goto error; + } + rtnl_unlock(); return vport; error: