A multi-part RTM_GETMULTICAST dump of dev->mc resumes by position, so entries added or removed between two dump rounds can be skipped or repeated. The IPv4 and IPv6 dumps report that with NLM_F_DUMP_INTR by stamping cb->seq from a per netns generation counter combined with dev_base_seq, see inet_base_seq().
Add the equivalent for the device multicast lists: a per netns counter bumped whenever an entry is added to or removed from any dev->mc. The list helpers do not know which device a list belongs to, so give netdev_hw_addr_list an owner, set for the lists of a device and NULL for snapshots and other standalone lists, and bump the counter of dev_net(owner) from the count helpers when the list is dev->mc. That covers the dev_mc_* helpers, both lists of a sync, the hardware sync helpers drivers call from their rx mode callbacks or their own workers and the reconciliation after an asynchronous rx mode update. It is atomic since the writers only hold the address lock of their own device. Used by the following patch for the AF_PACKET multicast dump. Signed-off-by: Yuyang Huang <[email protected]> --- include/linux/netdevice.h | 5 +++++ include/net/net_namespace.h | 1 + net/core/dev_addr_lists.c | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 97dc053f234cc..d409c56a02459 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -257,6 +257,11 @@ struct netdev_hw_addr_list { /* Auxiliary tree for faster lookup on addition and deletion */ struct rb_root tree; + + /* The device a list belongs to, NULL for snapshots and other + * standalone lists + */ + struct net_device *owner; }; #define netdev_hw_addr_list_count(l) ((l)->_count) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 46b4c67e2966f..d8c681ab5c749 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -71,6 +71,7 @@ struct net { spinlock_t rules_mod_lock; unsigned int dev_base_seq; /* protected by rtnl_mutex */ + atomic_t dev_mc_genid; /* bumped on dev->mc changes */ u32 ifindex; spinlock_t nsid_lock; diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 23f5db99a702d..783c62895249b 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c @@ -16,9 +16,21 @@ #include "dev.h" +/* Only dev->mc is tracked, RTM_GETMULTICAST dumps use the netns generation + * counter to detect changes between dump rounds. + */ +static void __hw_addr_changed(struct netdev_hw_addr_list *list) +{ + struct net_device *dev = list->owner; + + if (dev && list == &dev->mc) + atomic_inc(&dev_net(dev)->dev_mc_genid); +} + static void __hw_addr_count_add(struct netdev_hw_addr_list *list, int value) { list->_count += value; + __hw_addr_changed(list); } static void __hw_addr_count_inc(struct netdev_hw_addr_list *list) @@ -33,7 +45,10 @@ static void __hw_addr_count_dec(struct netdev_hw_addr_list *list) static void __hw_addr_count_reset(struct netdev_hw_addr_list *list) { + if (!list->_count) + return; list->_count = 0; + __hw_addr_changed(list); } /* @@ -521,6 +536,7 @@ void __hw_addr_init(struct netdev_hw_addr_list *list) INIT_LIST_HEAD(&list->list); list->_count = 0; list->tree = RB_ROOT; + list->owner = NULL; } EXPORT_SYMBOL(__hw_addr_init); @@ -705,6 +721,7 @@ int dev_addr_init(struct net_device *dev) /* rtnl_mutex must be held here */ __hw_addr_init(&dev->dev_addrs); + dev->dev_addrs.owner = dev; memset(addr, 0, sizeof(addr)); err = __hw_addr_add(&dev->dev_addrs, addr, sizeof(addr), NETDEV_HW_ADDR_T_LAN); @@ -982,6 +999,7 @@ EXPORT_SYMBOL(dev_uc_flush); void dev_uc_init(struct net_device *dev) { __hw_addr_init(&dev->uc); + dev->uc.owner = dev; } EXPORT_SYMBOL(dev_uc_init); @@ -1197,6 +1215,7 @@ EXPORT_SYMBOL(dev_mc_flush); void dev_mc_init(struct net_device *dev) { __hw_addr_init(&dev->mc); + dev->mc.owner = dev; } EXPORT_SYMBOL(dev_mc_init); @@ -1368,6 +1387,7 @@ static void netif_rx_mode_retry(struct timer_list *t) void netif_rx_mode_init(struct net_device *dev) { __hw_addr_init(&dev->rx_mode_addr_cache); + dev->rx_mode_addr_cache.owner = dev; timer_setup(&dev->rx_mode_retry_timer, netif_rx_mode_retry, 0); } -- 2.43.0
