ipv6: mcast: Use in6_dev_get() in ipv6_dev_mc_dec().

As well as __ipv6_dev_mc_inc(), all code in __ipv6_dev_mc_dec() are
protected by inet6_dev->mc_lock, and RTNL is not needed.

Let's use in6_dev_get() in ipv6_dev_mc_dec() and remove ASSERT_RTNL()
in __ipv6_dev_mc_dec().

Now, we can remove the RTNL comment above addrconf_leave_solict() too.

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250702230210.3115355-6-kuni1840@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index dcc07767e51ffc4c7e70429078ba09161389a16d..8451014457dd94a80667ea187ee5e5a8843f0164 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2241,12 +2241,11 @@ void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr)
        ipv6_dev_mc_inc(dev, &maddr);
 }
 
-/* caller must hold RTNL */
 void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr)
 {
        struct in6_addr maddr;
 
-       if (idev->dev->flags&(IFF_LOOPBACK|IFF_NOARP))
+       if (READ_ONCE(idev->dev->flags) & (IFF_LOOPBACK | IFF_NOARP))
                return;
 
        addrconf_addr_solict_mult(addr, &maddr);

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index aa1280df4c1f46883d893b9e78365bcc31a659c7..b3f063b5ffd7d895f371a4ecac053f4f8a882b86 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1004,9 +1004,8 @@ int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr)
 {
        struct ifmcaddr6 *ma, __rcu **map;
 
-       ASSERT_RTNL();
-
        mutex_lock(&idev->mc_lock);
+
        for (map = &idev->mc_list;
             (ma = mc_dereference(*map, idev));
             map = &ma->next) {
@@ -1037,13 +1036,12 @@ int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr)
        struct inet6_dev *idev;
        int err;
 
-       ASSERT_RTNL();
-
-       idev = __in6_dev_get(dev);
+       idev = in6_dev_get(dev);
        if (!idev)
-               err = -ENODEV;
-       else
-               err = __ipv6_dev_mc_dec(idev, addr);
+               return -ENODEV;
+
+       err = __ipv6_dev_mc_dec(idev, addr);
+       in6_dev_put(idev);
 
        return err;
 }