4 files changed, 46 insertions, 0 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index fc16bced8e54..a198ce8371db 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -86,6 +86,7 @@ enum {
         IPOIB_MCAST_STARTED       = 8,
         IPOIB_FLAG_NETIF_STOPPED  = 9,
         IPOIB_FLAG_ADMIN_CM       = 10,
+        IPOIB_FLAG_UMCAST         = 11,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
@@ -384,6 +385,7 @@ static inline void ipoib_put_ah(struct ipoib_ah *ah)
 
 int ipoib_open(struct net_device *dev);
 int ipoib_add_pkey_attr(struct net_device *dev);
+int ipoib_add_umcast_attr(struct net_device *dev);
 
 void ipoib_send(struct net_device *dev, struct sk_buff *skb,
                 struct ipoib_ah *address, u32 qpn);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 900335a36e45..ff17fe3c765b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1019,6 +1019,37 @@ static ssize_t show_pkey(struct device *dev,
 }
 static DEVICE_ATTR(pkey, S_IRUGO, show_pkey, NULL);
 
+static ssize_t show_umcast(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));
+
+        return sprintf(buf, "%d\n", test_bit(IPOIB_FLAG_UMCAST, &priv->flags));
+}
+
+static ssize_t set_umcast(struct device *dev,
+                          struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));
+        unsigned long umcast_val = simple_strtoul(buf, NULL, 0);
+
+        if (umcast_val > 0) {
+                set_bit(IPOIB_FLAG_UMCAST, &priv->flags);
+                ipoib_warn(priv, "ignoring multicast groups joined directly "
+                                "by userspace\n");
+        } else
+                clear_bit(IPOIB_FLAG_UMCAST, &priv->flags);
+
+        return count;
+}
+static DEVICE_ATTR(umcast, S_IWUSR | S_IRUGO, show_umcast, set_umcast);
+
+int ipoib_add_umcast_attr(struct net_device *dev)
+{
+        return device_create_file(&dev->dev, &dev_attr_umcast);
+}
+
 static ssize_t create_child(struct device *dev,
                             struct device_attribute *attr,
                             const char *buf, size_t count)
@@ -1136,6 +1167,8 @@ static struct net_device *ipoib_add_port(const char *format,
                 goto sysfs_failed;
         if (ipoib_add_pkey_attr(priv->dev))
                 goto sysfs_failed;
+        if (ipoib_add_umcast_attr(priv->dev))
+                goto sysfs_failed;
         if (device_create_file(&priv->dev->dev, &dev_attr_create_child))
                 goto sysfs_failed;
         if (device_create_file(&priv->dev->dev, &dev_attr_delete_child))
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 94a57097e2b4..62abfb6f35c1 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -761,6 +761,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
         struct ipoib_mcast *mcast, *tmcast;
         LIST_HEAD(remove_list);
         unsigned long flags;
+        struct ib_sa_mcmember_rec rec;
 
         ipoib_dbg_mcast(priv, "restarting multicast task\n");
 
@@ -794,6 +795,14 @@ void ipoib_mcast_restart_task(struct work_struct *work)
                 if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
                         struct ipoib_mcast *nmcast;
 
+                        /* ignore group which is directly joined by userspace */
+                        if (test_bit(IPOIB_FLAG_UMCAST, &priv->flags) &&
+                            !ib_sa_get_mcmember_rec(priv->ca, priv->port, &mgid, &rec)) {
+                                ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid "
+                                                IPOIB_GID_FMT "\n", IPOIB_GID_ARG(mgid));
+                                continue;
+                        }
+
                         /* Not found or send-only group, let's add a new entry */
                         ipoib_dbg_mcast(priv, "adding multicast entry for mgid "
                                         IPOIB_GID_FMT "\n", IPOIB_GID_ARG(mgid));
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 6762988439d1..293f5b892e3f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -119,6 +119,8 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
                 goto sysfs_failed;
         if (ipoib_add_pkey_attr(priv->dev))
                 goto sysfs_failed;
+        if (ipoib_add_umcast_attr(priv->dev))
+                goto sysfs_failed;
 
         if (device_create_file(&priv->dev->dev, &dev_attr_parent))
                 goto sysfs_failed;