Skip to content

Commit 03f20ea

Browse files
HoratiuVulturNipaLocal
HoratiuVultur
authored and
NipaLocal
committed
lan966x: Fix sleeping in atomic context
The following warning was seen when we try to connect using ssh to the device. BUG: sleeping function called from invalid context at kernel/locking/mutex.c:575 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 104, name: dropbear preempt_count: 1, expected: 0 INFO: lockdep is turned off. CPU: 0 UID: 0 PID: 104 Comm: dropbear Tainted: G W 6.18.0-rc2-00399-g6f1ab1b109b9-dirty torvalds#530 NONE Tainted: [W]=WARN Hardware name: Generic DT based system Call trace: unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x7c/0xac dump_stack_lvl from __might_resched+0x16c/0x2b0 __might_resched from __mutex_lock+0x64/0xd34 __mutex_lock from mutex_lock_nested+0x1c/0x24 mutex_lock_nested from lan966x_stats_get+0x5c/0x558 lan966x_stats_get from dev_get_stats+0x40/0x43c dev_get_stats from dev_seq_printf_stats+0x3c/0x184 dev_seq_printf_stats from dev_seq_show+0x10/0x30 dev_seq_show from seq_read_iter+0x350/0x4ec seq_read_iter from seq_read+0xfc/0x194 seq_read from proc_reg_read+0xac/0x100 proc_reg_read from vfs_read+0xb0/0x2b0 vfs_read from ksys_read+0x6c/0xec ksys_read from ret_fast_syscall+0x0/0x1c Exception stack(0xf0b11fa8 to 0xf0b11ff0) 1fa0: 00000001 00001000 00000008 be9048d8 00001000 00000001 1fc0: 00000001 00001000 00000008 00000003 be905920 0000001e 00000000 00000001 1fe0: 0005404c be9048c0 00018684 b6ec2cd8 It seems that we are using a mutex in a atomic context which is wrong. Change the mutex with a spinlock. Fixes: 12c2d0a ("net: lan966x: add ethtool configuration and statistics") Signed-off-by: Horatiu Vultur <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent adb4307 commit 03f20ea

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

‎drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static void lan966x_stats_update(struct lan966x *lan966x)
294294
{
295295
int i, j;
296296

297-
mutex_lock(&lan966x->stats_lock);
297+
spin_lock(&lan966x->stats_lock);
298298

299299
for (i = 0; i < lan966x->num_phys_ports; i++) {
300300
uint idx = i * lan966x->num_stats;
@@ -310,7 +310,7 @@ static void lan966x_stats_update(struct lan966x *lan966x)
310310
}
311311
}
312312

313-
mutex_unlock(&lan966x->stats_lock);
313+
spin_unlock(&lan966x->stats_lock);
314314
}
315315

316316
static int lan966x_get_sset_count(struct net_device *dev, int sset)
@@ -365,7 +365,7 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev,
365365

366366
idx = port->chip_port * lan966x->num_stats;
367367

368-
mutex_lock(&lan966x->stats_lock);
368+
spin_lock(&lan966x->stats_lock);
369369

370370
mac_stats->FramesTransmittedOK =
371371
lan966x->stats[idx + SYS_COUNT_TX_UC] +
@@ -416,7 +416,7 @@ static void lan966x_get_eth_mac_stats(struct net_device *dev,
416416
lan966x->stats[idx + SYS_COUNT_RX_LONG] +
417417
lan966x->stats[idx + SYS_COUNT_RX_PMAC_LONG];
418418

419-
mutex_unlock(&lan966x->stats_lock);
419+
spin_unlock(&lan966x->stats_lock);
420420
}
421421

422422
static const struct ethtool_rmon_hist_range lan966x_rmon_ranges[] = {
@@ -442,7 +442,7 @@ static void lan966x_get_eth_rmon_stats(struct net_device *dev,
442442

443443
idx = port->chip_port * lan966x->num_stats;
444444

445-
mutex_lock(&lan966x->stats_lock);
445+
spin_lock(&lan966x->stats_lock);
446446

447447
rmon_stats->undersize_pkts =
448448
lan966x->stats[idx + SYS_COUNT_RX_SHORT] +
@@ -500,7 +500,7 @@ static void lan966x_get_eth_rmon_stats(struct net_device *dev,
500500
lan966x->stats[idx + SYS_COUNT_TX_SZ_1024_1526] +
501501
lan966x->stats[idx + SYS_COUNT_TX_PMAC_SZ_1024_1526];
502502

503-
mutex_unlock(&lan966x->stats_lock);
503+
spin_unlock(&lan966x->stats_lock);
504504

505505
*ranges = lan966x_rmon_ranges;
506506
}
@@ -603,7 +603,7 @@ void lan966x_stats_get(struct net_device *dev,
603603

604604
idx = port->chip_port * lan966x->num_stats;
605605

606-
mutex_lock(&lan966x->stats_lock);
606+
spin_lock(&lan966x->stats_lock);
607607

608608
stats->rx_bytes = lan966x->stats[idx + SYS_COUNT_RX_OCT] +
609609
lan966x->stats[idx + SYS_COUNT_RX_PMAC_OCT];
@@ -685,7 +685,7 @@ void lan966x_stats_get(struct net_device *dev,
685685

686686
stats->collisions = lan966x->stats[idx + SYS_COUNT_TX_COL];
687687

688-
mutex_unlock(&lan966x->stats_lock);
688+
spin_unlock(&lan966x->stats_lock);
689689
}
690690

691691
int lan966x_stats_init(struct lan966x *lan966x)
@@ -701,7 +701,7 @@ int lan966x_stats_init(struct lan966x *lan966x)
701701
return -ENOMEM;
702702

703703
/* Init stats worker */
704-
mutex_init(&lan966x->stats_lock);
704+
spin_lock_init(&lan966x->stats_lock);
705705
snprintf(queue_name, sizeof(queue_name), "%s-stats",
706706
dev_name(lan966x->dev));
707707
lan966x->stats_queue = create_singlethread_workqueue(queue_name);

‎drivers/net/ethernet/microchip/lan966x/lan966x_main.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,6 @@ static int lan966x_probe(struct platform_device *pdev)
12611261

12621262
cancel_delayed_work_sync(&lan966x->stats_work);
12631263
destroy_workqueue(lan966x->stats_queue);
1264-
mutex_destroy(&lan966x->stats_lock);
12651264

12661265
debugfs_remove_recursive(lan966x->debugfs_root);
12671266

@@ -1279,7 +1278,6 @@ static void lan966x_remove(struct platform_device *pdev)
12791278

12801279
cancel_delayed_work_sync(&lan966x->stats_work);
12811280
destroy_workqueue(lan966x->stats_queue);
1282-
mutex_destroy(&lan966x->stats_lock);
12831281

12841282
lan966x_mac_purge_entries(lan966x);
12851283
lan966x_mdb_deinit(lan966x);

‎drivers/net/ethernet/microchip/lan966x/lan966x_main.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ struct lan966x {
295295
const struct lan966x_stat_layout *stats_layout;
296296
u32 num_stats;
297297

298-
/* workqueue for reading stats */
299-
struct mutex stats_lock;
298+
/* lock for reading stats */
299+
spinlock_t stats_lock;
300300
u64 *stats;
301301
struct delayed_work stats_work;
302302
struct workqueue_struct *stats_queue;

‎drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,11 @@ static void lan966x_es0_read_esdx_counter(struct lan966x *lan966x,
403403
u32 counter;
404404

405405
id = id & 0xff; /* counter limit */
406-
mutex_lock(&lan966x->stats_lock);
406+
spin_lock(&lan966x->stats_lock);
407407
lan_wr(SYS_STAT_CFG_STAT_VIEW_SET(id), lan966x, SYS_STAT_CFG);
408408
counter = lan_rd(lan966x, SYS_CNT(LAN966X_STAT_ESDX_GRN_PKTS)) +
409409
lan_rd(lan966x, SYS_CNT(LAN966X_STAT_ESDX_YEL_PKTS));
410-
mutex_unlock(&lan966x->stats_lock);
410+
spin_unlock(&lan966x->stats_lock);
411411
if (counter)
412412
admin->cache.counter = counter;
413413
}
@@ -417,14 +417,14 @@ static void lan966x_es0_write_esdx_counter(struct lan966x *lan966x,
417417
{
418418
id = id & 0xff; /* counter limit */
419419

420-
mutex_lock(&lan966x->stats_lock);
420+
spin_lock(&lan966x->stats_lock);
421421
lan_wr(SYS_STAT_CFG_STAT_VIEW_SET(id), lan966x, SYS_STAT_CFG);
422422
lan_wr(0, lan966x, SYS_CNT(LAN966X_STAT_ESDX_GRN_BYTES));
423423
lan_wr(admin->cache.counter, lan966x,
424424
SYS_CNT(LAN966X_STAT_ESDX_GRN_PKTS));
425425
lan_wr(0, lan966x, SYS_CNT(LAN966X_STAT_ESDX_YEL_BYTES));
426426
lan_wr(0, lan966x, SYS_CNT(LAN966X_STAT_ESDX_YEL_PKTS));
427-
mutex_unlock(&lan966x->stats_lock);
427+
spin_unlock(&lan966x->stats_lock);
428428
}
429429

430430
static void lan966x_vcap_cache_write(struct net_device *dev,

0 commit comments

Comments
 (0)