Skip to content

Commit 447739c

Browse files
aboganismb49
authored andcommitted
igb: Avoid starting unnecessary workqueues
BugLink: https://bugs.launchpad.net/bugs/2039742 [ Upstream commit b888c51 ] If ptp_clock_register() fails or CONFIG_PTP isn't enabled, avoid starting PTP related workqueues. In this way we can fix this: BUG: unable to handle page fault for address: ffffc9000440b6f8 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 100000067 P4D 100000067 PUD 1001e0067 PMD 107dc5067 PTE 0 Oops: 0000 [#1] PREEMPT SMP [...] Workqueue: events igb_ptp_overflow_check RIP: 0010:igb_rd32+0x1f/0x60 [...] Call Trace: igb_ptp_read_82580+0x20/0x50 timecounter_read+0x15/0x60 igb_ptp_overflow_check+0x1a/0x50 process_one_work+0x1cb/0x3c0 worker_thread+0x53/0x3f0 ? rescuer_thread+0x370/0x370 kthread+0x142/0x160 ? kthread_associate_blkcg+0xc0/0xc0 ret_from_fork+0x1f/0x30 Fixes: 1f6e817 ("igb: Prevent dropped Tx timestamps via work items and interrupts.") Fixes: d339b13 ("igb: add PTP Hardware Clock code") Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu> Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://lore.kernel.org/r/20230821171927.2203644-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 67eaa9c commit 447739c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

drivers/net/ethernet/intel/igb/igb_ptp.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,18 +1390,6 @@ void igb_ptp_init(struct igb_adapter *adapter)
13901390
return;
13911391
}
13921392

1393-
spin_lock_init(&adapter->tmreg_lock);
1394-
INIT_WORK(&adapter->ptp_tx_work, igb_ptp_tx_work);
1395-
1396-
if (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)
1397-
INIT_DELAYED_WORK(&adapter->ptp_overflow_work,
1398-
igb_ptp_overflow_check);
1399-
1400-
adapter->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
1401-
adapter->tstamp_config.tx_type = HWTSTAMP_TX_OFF;
1402-
1403-
igb_ptp_reset(adapter);
1404-
14051393
adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps,
14061394
&adapter->pdev->dev);
14071395
if (IS_ERR(adapter->ptp_clock)) {
@@ -1411,6 +1399,18 @@ void igb_ptp_init(struct igb_adapter *adapter)
14111399
dev_info(&adapter->pdev->dev, "added PHC on %s\n",
14121400
adapter->netdev->name);
14131401
adapter->ptp_flags |= IGB_PTP_ENABLED;
1402+
1403+
spin_lock_init(&adapter->tmreg_lock);
1404+
INIT_WORK(&adapter->ptp_tx_work, igb_ptp_tx_work);
1405+
1406+
if (adapter->ptp_flags & IGB_PTP_OVERFLOW_CHECK)
1407+
INIT_DELAYED_WORK(&adapter->ptp_overflow_work,
1408+
igb_ptp_overflow_check);
1409+
1410+
adapter->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
1411+
adapter->tstamp_config.tx_type = HWTSTAMP_TX_OFF;
1412+
1413+
igb_ptp_reset(adapter);
14141414
}
14151415
}
14161416

0 commit comments

Comments
 (0)