[10/18] batman-adv: Purge timeouted entries in mcast forw table
Commit Message
With this commit, the multicast forwarding table, which has been
previously filled up due to multicast tracker packets, will now be
checked frequently (once per second) for timeouted entries. If so these
entries get removed from the table.
Note, that a more frequent check interval is not necessary, as multicast
data will not only be forwarded if an entry exists, but also if that one
might not have timeouted yet.
Signed-off-by: Linus Lüssing <linus.luessing@saxnet.de>
---
multicast.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
multicast.h | 1 +
originator.c | 2 +
3 files changed, 78 insertions(+), 0 deletions(-)
@@ -860,6 +860,81 @@ free:
}
}
+static void purge_mcast_nexthop_list(struct hlist_head *mcast_nexthop_list,
+ int *num_nexthops,
+ struct bat_priv *bat_priv)
+{
+ struct mcast_forw_nexthop_entry *nexthop_entry;
+ struct hlist_node *node, *node_tmp;
+
+ hlist_for_each_entry_safe(nexthop_entry, node, node_tmp,
+ mcast_nexthop_list, list) {
+ if (get_remaining_timeout(nexthop_entry, bat_priv))
+ continue;
+
+ hlist_del(&nexthop_entry->list);
+ kfree(nexthop_entry);
+ *num_nexthops = *num_nexthops - 1;
+ }
+}
+
+static void purge_mcast_if_list(struct hlist_head *mcast_if_list,
+ struct bat_priv *bat_priv)
+{
+ struct mcast_forw_if_entry *if_entry;
+ struct hlist_node *node, *node_tmp;
+
+ hlist_for_each_entry_safe(if_entry, node, node_tmp, mcast_if_list,
+ list) {
+ purge_mcast_nexthop_list(&if_entry->mcast_nexthop_list,
+ &if_entry->num_nexthops,
+ bat_priv);
+
+ if (!hlist_empty(&if_entry->mcast_nexthop_list))
+ continue;
+
+ hlist_del(&if_entry->list);
+ kfree(if_entry);
+ }
+}
+
+static void purge_mcast_orig_list(struct hlist_head *mcast_orig_list,
+ struct bat_priv *bat_priv)
+{
+ struct mcast_forw_orig_entry *orig_entry;
+ struct hlist_node *node, *node_tmp;
+
+ hlist_for_each_entry_safe(orig_entry, node, node_tmp, mcast_orig_list,
+ list) {
+ purge_mcast_if_list(&orig_entry->mcast_if_list, bat_priv);
+
+ if (!hlist_empty(&orig_entry->mcast_if_list))
+ continue;
+
+ hlist_del(&orig_entry->list);
+ kfree(orig_entry);
+ }
+}
+
+void purge_mcast_forw_table(struct bat_priv *bat_priv)
+{
+ struct mcast_forw_table_entry *table_entry;
+ struct hlist_node *node, *node_tmp;
+
+ spin_lock_bh(&bat_priv->mcast_forw_table_lock);
+ hlist_for_each_entry_safe(table_entry, node, node_tmp,
+ &bat_priv->mcast_forw_table, list) {
+ purge_mcast_orig_list(&table_entry->mcast_orig_list, bat_priv);
+
+ if (!hlist_empty(&table_entry->mcast_orig_list))
+ continue;
+
+ hlist_del(&table_entry->list);
+ kfree(table_entry);
+ }
+ spin_unlock_bh(&bat_priv->mcast_forw_table_lock);
+}
+
static void mcast_tracker_timer(struct work_struct *work)
{
struct bat_priv *bat_priv = container_of(work, struct bat_priv,
@@ -29,6 +29,7 @@ int mcast_tracker_timeout_set(struct net_device *net_dev, char *buff,
void mcast_tracker_reset(struct bat_priv *bat_priv);
void route_mcast_tracker_packet(struct sk_buff *tracker_packet,
struct bat_priv *bat_priv);
+void purge_mcast_forw_table(struct bat_priv *bat_priv);
int mcast_forw_table_seq_print_text(struct seq_file *seq, void *offset);
int mcast_init(struct bat_priv *bat_priv);
void mcast_free(struct bat_priv *bat_priv);
@@ -30,6 +30,7 @@
#include "hard-interface.h"
#include "unicast.h"
#include "soft-interface.h"
+#include "multicast.h"
static void purge_orig(struct work_struct *work);
@@ -403,6 +404,7 @@ static void purge_orig(struct work_struct *work)
struct bat_priv *bat_priv =
container_of(delayed_work, struct bat_priv, orig_work);
+ purge_mcast_forw_table(bat_priv);
_purge_orig(bat_priv);
start_purge_timer(bat_priv);
}