Merge remote-tracking branch 'sound/for-next'

[linux] / net / ipv4 / ipmr_base.c

diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c
index eab8cd5..3e614cc 100644 (file)
--- a/net/ipv4/ipmr_base.c
+++ b/net/ipv4/ipmr_base.c
@@ -268,6 +268,81 @@ int mr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
 }
 EXPORT_SYMBOL(mr_fill_mroute);
 
+static bool mr_mfc_uses_dev(const struct mr_table *mrt,
+                           const struct mr_mfc *c,
+                           const struct net_device *dev)
+{
+       int ct;
+
+       for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) {
+               if (VIF_EXISTS(mrt, ct) && c->mfc_un.res.ttls[ct] < 255) {
+                       const struct vif_device *vif;
+
+                       vif = &mrt->vif_table[ct];
+                       if (vif->dev == dev)
+                               return true;
+               }
+       }
+       return false;
+}
+
+int mr_table_dump(struct mr_table *mrt, struct sk_buff *skb,
+                 struct netlink_callback *cb,
+                 int (*fill)(struct mr_table *mrt, struct sk_buff *skb,
+                             u32 portid, u32 seq, struct mr_mfc *c,
+                             int cmd, int flags),
+                 spinlock_t *lock, struct fib_dump_filter *filter)
+{
+       unsigned int e = 0, s_e = cb->args[1];
+       unsigned int flags = NLM_F_MULTI;
+       struct mr_mfc *mfc;
+       int err;
+
+       if (filter->filter_set)
+               flags |= NLM_F_DUMP_FILTERED;
+
+       list_for_each_entry_rcu(mfc, &mrt->mfc_cache_list, list) {
+               if (e < s_e)
+                       goto next_entry;
+               if (filter->dev &&
+                   !mr_mfc_uses_dev(mrt, mfc, filter->dev))
+                       goto next_entry;
+
+               err = fill(mrt, skb, NETLINK_CB(cb->skb).portid,
+                          cb->nlh->nlmsg_seq, mfc, RTM_NEWROUTE, flags);
+               if (err < 0)
+                       goto out;
+next_entry:
+               e++;
+       }
+
+       spin_lock_bh(lock);
+       list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) {
+               if (e < s_e)
+                       goto next_entry2;
+               if (filter->dev &&
+                   !mr_mfc_uses_dev(mrt, mfc, filter->dev))
+                       goto next_entry2;
+
+               err = fill(mrt, skb, NETLINK_CB(cb->skb).portid,
+                          cb->nlh->nlmsg_seq, mfc, RTM_NEWROUTE, flags);
+               if (err < 0) {
+                       spin_unlock_bh(lock);
+                       goto out;
+               }
+next_entry2:
+               e++;
+       }
+       spin_unlock_bh(lock);
+       err = 0;
+       e = 0;
+
+out:
+       cb->args[1] = e;
+       return err;
+}
+EXPORT_SYMBOL(mr_table_dump);
+
 int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
                     struct mr_table *(*iter)(struct net *net,
                                              struct mr_table *mrt),
@@ -275,51 +350,35 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
                                 struct sk_buff *skb,
                                 u32 portid, u32 seq, struct mr_mfc *c,
                                 int cmd, int flags),
-                    spinlock_t *lock)
+                    spinlock_t *lock, struct fib_dump_filter *filter)
 {
-       unsigned int t = 0, e = 0, s_t = cb->args[0], s_e = cb->args[1];
+       unsigned int t = 0, s_t = cb->args[0];
        struct net *net = sock_net(skb->sk);
        struct mr_table *mrt;
-       struct mr_mfc *mfc;
+       int err;
+
+       /* multicast does not track protocol or have route type other
+        * than RTN_MULTICAST
+        */
+       if (filter->filter_set) {
+               if (filter->protocol || filter->flags ||
+                   (filter->rt_type && filter->rt_type != RTN_MULTICAST))
+                       return skb->len;
+       }
 
        rcu_read_lock();
        for (mrt = iter(net, NULL); mrt; mrt = iter(net, mrt)) {
                if (t < s_t)
                        goto next_table;
-               list_for_each_entry_rcu(mfc, &mrt->mfc_cache_list, list) {
-                       if (e < s_e)
-                               goto next_entry;
-                       if (fill(mrt, skb, NETLINK_CB(cb->skb).portid,
-                                cb->nlh->nlmsg_seq, mfc,
-                                RTM_NEWROUTE, NLM_F_MULTI) < 0)
-                               goto done;
-next_entry:
-                       e++;
-               }
 
-               spin_lock_bh(lock);
-               list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) {
-                       if (e < s_e)
-                               goto next_entry2;
-                       if (fill(mrt, skb, NETLINK_CB(cb->skb).portid,
-                                cb->nlh->nlmsg_seq, mfc,
-                                RTM_NEWROUTE, NLM_F_MULTI) < 0) {
-                               spin_unlock_bh(lock);
-                               goto done;
-                       }
-next_entry2:
-                       e++;
-               }
-               spin_unlock_bh(lock);
-               e = 0;
-               s_e = 0;
+               err = mr_table_dump(mrt, skb, cb, fill, lock, filter);
+               if (err < 0)
+                       break;
 next_table:
                t++;
        }
-done:
        rcu_read_unlock();
 
-       cb->args[1] = e;
        cb->args[0] = t;
 
        return skb->len;