Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 02:36:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dev_addr_lists: move locking out of init/exit in kunit

Browse Source 
We lock and unlock rtnl in init/exit for convenience,
but it started causing problems if the exit is handled
by a different thread. To avoid having to futz with
disabling locking assertions move the locking into
the test cases. We don't use ASSERTs so it should
be safe.

   ============= dev-addr-list-test (6 subtests) ==============
   [PASSED] dev_addr_test_basic
   [PASSED] dev_addr_test_sync_one
   [PASSED] dev_addr_test_add_del
   [PASSED] dev_addr_test_del_main
   [PASSED] dev_addr_test_add_set
   [PASSED] dev_addr_test_add_excl
   =============== [PASSED] dev-addr-list-test ================

Link: https://lore.kernel.org/all/20240403131936.787234-7-linux@roeck-us.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2024-04-11 11:32:22 -07:00 committed by David S. Miller
parent f1e197a665
commit 3db3b62955
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/core/dev_addr_lists_test.c
View File

@ -49,7 +49,6 @@ static int dev_addr_test_init(struct kunit *test)
KUNIT_FAIL(test, "Can't register netdev %d", err); KUNIT_FAIL(test, "Can't register netdev %d", err);
} }
rtnl_lock();
return 0; return 0;
} }
@ -57,7 +56,6 @@ static void dev_addr_test_exit(struct kunit *test)
{ {
struct net_device *netdev = test->priv; struct net_device *netdev = test->priv;
rtnl_unlock();
unregister_netdev(netdev); unregister_netdev(netdev);
free_netdev(netdev); free_netdev(netdev);
} }
@ -67,6 +65,7 @@ static void dev_addr_test_basic(struct kunit *test)
struct net_device *netdev = test->priv; struct net_device *netdev = test->priv;
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
rtnl_lock();
KUNIT_EXPECT_TRUE(test, !!netdev->dev_addr); KUNIT_EXPECT_TRUE(test, !!netdev->dev_addr);
memset(addr, 2, sizeof(addr)); memset(addr, 2, sizeof(addr));
@ -76,6 +75,7 @@ static void dev_addr_test_basic(struct kunit *test)
memset(addr, 3, sizeof(addr)); memset(addr, 3, sizeof(addr));
dev_addr_set(netdev, addr); dev_addr_set(netdev, addr);
KUNIT_EXPECT_MEMEQ(test, netdev->dev_addr, addr, sizeof(addr)); KUNIT_EXPECT_MEMEQ(test, netdev->dev_addr, addr, sizeof(addr));
rtnl_unlock();
} }
static void dev_addr_test_sync_one(struct kunit *test) static void dev_addr_test_sync_one(struct kunit *test)
@ -86,6 +86,7 @@ static void dev_addr_test_sync_one(struct kunit *test)
datp = netdev_priv(netdev); datp = netdev_priv(netdev);
rtnl_lock();
memset(addr, 1, sizeof(addr)); memset(addr, 1, sizeof(addr));
eth_hw_addr_set(netdev, addr); eth_hw_addr_set(netdev, addr);
@ -103,6 +104,7 @@ static void dev_addr_test_sync_one(struct kunit *test)
* considered synced and we overwrite in place. * considered synced and we overwrite in place.
*/ */
KUNIT_EXPECT_EQ(test, 0, datp->addr_seen); KUNIT_EXPECT_EQ(test, 0, datp->addr_seen);
rtnl_unlock();
} }
static void dev_addr_test_add_del(struct kunit *test) static void dev_addr_test_add_del(struct kunit *test)
@ -114,6 +116,7 @@ static void dev_addr_test_add_del(struct kunit *test)
datp = netdev_priv(netdev); datp = netdev_priv(netdev);
rtnl_lock();
for (i = 1; i < 4; i++) { for (i = 1; i < 4; i++) {
memset(addr, i, sizeof(addr)); memset(addr, i, sizeof(addr));
KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr, KUNIT_EXPECT_EQ(test, 0, dev_addr_add(netdev, addr,
@ -143,6 +146,7 @@ static void dev_addr_test_add_del(struct kunit *test)
__hw_addr_sync_dev(&netdev->dev_addrs, netdev, dev_addr_test_sync, __hw_addr_sync_dev(&netdev->dev_addrs, netdev, dev_addr_test_sync,
dev_addr_test_unsync); dev_addr_test_unsync);
KUNIT_EXPECT_EQ(test, 1, datp->addr_seen); KUNIT_EXPECT_EQ(test, 1, datp->addr_seen);
rtnl_unlock();
} }
static void dev_addr_test_del_main(struct kunit *test) static void dev_addr_test_del_main(struct kunit *test)
@ -150,6 +154,7 @@ static void dev_addr_test_del_main(struct kunit *test)
struct net_device *netdev = test->priv; struct net_device *netdev = test->priv;
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
rtnl_lock();
memset(addr, 1, sizeof(addr)); memset(addr, 1, sizeof(addr));
eth_hw_addr_set(netdev, addr); eth_hw_addr_set(netdev, addr);
@ -161,6 +166,7 @@ static void dev_addr_test_del_main(struct kunit *test)
NETDEV_HW_ADDR_T_LAN)); NETDEV_HW_ADDR_T_LAN));
KUNIT_EXPECT_EQ(test, -ENOENT, dev_addr_del(netdev, addr, KUNIT_EXPECT_EQ(test, -ENOENT, dev_addr_del(netdev, addr,
NETDEV_HW_ADDR_T_LAN)); NETDEV_HW_ADDR_T_LAN));
rtnl_unlock();
} }
static void dev_addr_test_add_set(struct kunit *test) static void dev_addr_test_add_set(struct kunit *test)
@ -172,6 +178,7 @@ static void dev_addr_test_add_set(struct kunit *test)
datp = netdev_priv(netdev); datp = netdev_priv(netdev);
rtnl_lock();
/* There is no external API like dev_addr_add_excl(), /* There is no external API like dev_addr_add_excl(),
* so shuffle the tree a little bit and exploit aliasing. * so shuffle the tree a little bit and exploit aliasing.
*/ */
@ -191,6 +198,7 @@ static void dev_addr_test_add_set(struct kunit *test)
__hw_addr_sync_dev(&netdev->dev_addrs, netdev, dev_addr_test_sync, __hw_addr_sync_dev(&netdev->dev_addrs, netdev, dev_addr_test_sync,
dev_addr_test_unsync); dev_addr_test_unsync);
KUNIT_EXPECT_EQ(test, 0xffff, datp->addr_seen); KUNIT_EXPECT_EQ(test, 0xffff, datp->addr_seen);
rtnl_unlock();
} }
static void dev_addr_test_add_excl(struct kunit *test) static void dev_addr_test_add_excl(struct kunit *test)
@ -199,6 +207,7 @@ static void dev_addr_test_add_excl(struct kunit *test)
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
int i; int i;
rtnl_lock();
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
memset(addr, i, sizeof(addr)); memset(addr, i, sizeof(addr));
KUNIT_EXPECT_EQ(test, 0, dev_uc_add_excl(netdev, addr)); KUNIT_EXPECT_EQ(test, 0, dev_uc_add_excl(netdev, addr));
@ -213,6 +222,7 @@ static void dev_addr_test_add_excl(struct kunit *test)
memset(addr, i, sizeof(addr)); memset(addr, i, sizeof(addr));
KUNIT_EXPECT_EQ(test, -EEXIST, dev_uc_add_excl(netdev, addr)); KUNIT_EXPECT_EQ(test, -EEXIST, dev_uc_add_excl(netdev, addr));
} }
rtnl_unlock();
} }
static struct kunit_case dev_addr_test_cases[] = { static struct kunit_case dev_addr_test_cases[] = {