datapath: genl_notify() on port disappearances.

Before this patch, if a vport detached itself from the datapath
without interaction from userspace, rtnetlink notifications would
be sent, but genl notifications would not.

Feature #6809.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 0b6e2e5355d69aef1763acbd17da763210ffdc60..7c9ec3b28e101225630eb0206b567559171add2c 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1603,7 +1603,7 @@ static struct genl_family dp_vport_genl_family = {
        .maxattr = OVS_VPORT_ATTR_MAX
 };
 
-static struct genl_multicast_group dp_vport_multicast_group = {
+struct genl_multicast_group dp_vport_multicast_group = {
        .name = OVS_VPORT_MCGROUP
 };
 
@@ -1662,8 +1662,8 @@ error:
 }
 
 /* Called with RTNL lock or RCU read lock. */
-static struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 pid,
-                                               u32 seq, u8 cmd)
+struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 pid,
+                                        u32 seq, u8 cmd)
 {
        struct sk_buff *skb;
        int retval;

diff --git a/datapath/datapath.h b/datapath/datapath.h
index d14f974aec69c5018ca95f9ea4ac2d15b514acf7..93be155ef39970bb77aa62bf30e02eeb3a9758d8 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -144,6 +144,7 @@ struct dp_upcall_info {
 };
 
 extern struct notifier_block dp_device_notifier;
+extern struct genl_multicast_group dp_vport_multicast_group;
 extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
 
 void dp_process_received_packet(struct vport *, struct sk_buff *);
@@ -154,5 +155,7 @@ void set_internal_devs_mtu(const struct datapath *dp);
 
 struct datapath *get_dp(int dp_idx);
 const char *dp_name(const struct datapath *dp);
+struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
+                                        u8 cmd);
 
 #endif /* datapath.h */

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 94d671dd37a13df626de6b29c84cd9fbf2f3c6b5..7b3b219ac2a97fcd1f0f7a8b4a2826e7231b01a4 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -9,6 +9,7 @@
 /* Handle changes to managed devices */
 
 #include <linux/netdevice.h>
+#include <net/genetlink.h>
 
 #include "datapath.h"
 #include "vport-internal_dev.h"
@@ -33,8 +34,23 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 
        switch (event) {
        case NETDEV_UNREGISTER:
-               if (!is_internal_dev(dev))
+               if (!is_internal_dev(dev)) {
+                       struct sk_buff *reply;
+
                        dp_detach_port(vport);
+                       reply = ovs_vport_cmd_build_info(vport, 0, 0,
+                                                        OVS_VPORT_CMD_DEL);
+                       if (IS_ERR(reply)) {
+                               netlink_set_err(INIT_NET_GENL_SOCK, 0,
+                                               dp_vport_multicast_group.id,
+                                               PTR_ERR(reply));
+                               break;
+                       }
+
+                       genl_notify(reply, dev_net(dev), 0,
+                                   dp_vport_multicast_group.id, NULL,
+                                   GFP_KERNEL);
+               }
                break;
 
        case NETDEV_CHANGENAME: