git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Use sequence number to wake up main thread for
[sliver-openvswitch.git]
/
datapath
/
dp_notify.c
diff --git
a/datapath/dp_notify.c
b/datapath/dp_notify.c
index
ec573a5
..
f9a0375
100644
(file)
--- a/
datapath/dp_notify.c
+++ b/
datapath/dp_notify.c
@@
-18,6
+18,8
@@
#include <linux/netdevice.h>
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <net/genetlink.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
#include "datapath.h"
#include "vport-internal_dev.h"
#include "datapath.h"
#include "vport-internal_dev.h"
@@
-29,18
+31,18
@@
static void dp_detach_port_notify(struct vport *vport)
struct datapath *dp;
dp = vport->dp;
struct datapath *dp;
dp = vport->dp;
- notify = ovs_vport_cmd_build_info(vport, 0, 0,
- OVS_VPORT_CMD_DEL);
+ notify = ovs_vport_cmd_build_info(vport, 0, 0, OVS_VPORT_CMD_DEL);
ovs_dp_detach_port(vport);
if (IS_ERR(notify)) {
ovs_dp_detach_port(vport);
if (IS_ERR(notify)) {
-
netlink_set_err(GENL_SOCK(ovs_dp_get_net(dp)
), 0,
-
ovs_dp_vport_multicast_group.id
,
-
PTR_ERR(notify));
+
genl_set_err(&dp_vport_genl_family, ovs_dp_get_net(dp
), 0,
+
GROUP_ID(&ovs_dp_vport_multicast_group)
,
+ PTR_ERR(notify));
return;
}
return;
}
- genlmsg_multicast_netns(ovs_dp_get_net(dp), notify, 0,
- ovs_dp_vport_multicast_group.id,
+ genlmsg_multicast_netns(&dp_vport_genl_family,
+ ovs_dp_get_net(dp), notify, 0,
+ GROUP_ID(&ovs_dp_vport_multicast_group),
GFP_KERNEL);
}
GFP_KERNEL);
}
@@
-64,8
+66,7
@@
void ovs_dp_notify_wq(struct work_struct *work)
continue;
netdev_vport = netdev_vport_priv(vport);
continue;
netdev_vport = netdev_vport_priv(vport);
- if (netdev_vport->dev->reg_state == NETREG_UNREGISTERED ||
- netdev_vport->dev->reg_state == NETREG_UNREGISTERING)
+ if (!(ovs_netdev_get_vport(netdev_vport->dev)))
dp_detach_port_notify(vport);
}
}
dp_detach_port_notify(vport);
}
}
@@
-77,7
+78,7
@@
static int dp_device_event(struct notifier_block *unused, unsigned long event,
void *ptr)
{
struct ovs_net *ovs_net;
void *ptr)
{
struct ovs_net *ovs_net;
- struct net_device *dev =
ptr
;
+ struct net_device *dev =
netdev_notifier_info_to_dev(ptr)
;
struct vport *vport = NULL;
if (!ovs_is_internal_dev(dev))
struct vport *vport = NULL;
if (!ovs_is_internal_dev(dev))
@@
-87,8
+88,12
@@
static int dp_device_event(struct notifier_block *unused, unsigned long event,
return NOTIFY_DONE;
if (event == NETDEV_UNREGISTER) {
return NOTIFY_DONE;
if (event == NETDEV_UNREGISTER) {
+ /* upper_dev_unlink and decrement promisc immediately */
+ ovs_netdev_detach_dev(vport);
+
+ /* schedule vport destroy, dev_put and genl notification */
ovs_net = net_generic(dev_net(dev), ovs_net_id);
ovs_net = net_generic(dev_net(dev), ovs_net_id);
- queue_work(&ovs_net->dp_notify_work);
+ queue_work(
system_wq,
&ovs_net->dp_notify_work);
}
return NOTIFY_DONE;
}
return NOTIFY_DONE;