net: dsa: sja1105: Fix sleeping while atomic in .port_hwtstamp_set
Vladimir Oltean
maintainerPATCH 1/1 net: dsa: sja1105: Fix sleeping while atomic in .port_hwtstamp_set
Currently this stack trace can be seen with CONFIG_DEBUG_ATOMIC_SLEEP=y:
[ 41.568348] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:909 [ 41.576757] in_atomic(): 1, irqs_disabled(): 0, pid: 208, name: ptp4l [ 41.583212] INFO: lockdep is turned off. [ 41.587123] CPU: 1 PID: 208 Comm: ptp4l Not tainted 5.3.0-rc6-01445-ge950f2d4bc7f-dirty #1827 [ 41.599873] [<c0313d7c>] (unwind_backtrace) from [<c030e13c>] (show_stack+0x10/0x14) [ 41.607584] [<c030e13c>] (show_stack) from [<c1212d50>] (dump_stack+0xd4/0x100) [ 41.614863] [<c1212d50>] (dump_stack) from [<c037dfc8>] (___might_sleep+0x1c8/0x2b4) [ 41.622574] [<c037dfc8>] (___might_sleep) from [<c122ea90>] (__mutex_lock+0x48/0xab8) [ 41.630368] [<c122ea90>] (__mutex_lock) from [<c122f51c>] (mutex_lock_nested+0x1c/0x24) [ 41.638340] [<c122f51c>] (mutex_lock_nested) from [<c0c6fe08>] (sja1105_static_config_reload+0x30/0x27c) [ 41.647779] [<c0c6fe08>] (sja1105_static_config_reload) from [<c0c7015c>] (sja1105_hwtstamp_set+0x108/0x1cc) [ 41.657562] [<c0c7015c>] (sja1105_hwtstamp_set) from [<c0feb650>] (dev_ifsioc+0x18c/0x330) [ 41.665788] [<c0feb650>] (dev_ifsioc) from [<c0febbd8>] (dev_ioctl+0x320/0x6e8) [ 41.673064] [<c0febbd8>] (dev_ioctl) from [<c0f8b1f4>] (sock_ioctl+0x334/0x5e8) [ 41.680340] [<c0f8b1f4>] (sock_ioctl) from [<c05404a8>] (do_vfs_ioctl+0xb0/0xa10) [ 41.687789] [<c05404a8>] (do_vfs_ioctl) from [<c0540e3c>] (ksys_ioctl+0x34/0x58) [ 41.695151] [<c0540e3c>] (ksys_ioctl) from [<c0301000>] (ret_fast_syscall+0x0/0x28) [ 41.702768] Exception stack(0xe8495fa8 to 0xe8495ff0) [ 41.707796] 5fa0: beff4a8c 00000001 00000011 000089b0 beff4a8c beff4a80 [ 41.715933] 5fc0: beff4a8c 00000001 0000000c 00000036 b6fa98c8 004e19c1 00000001 00000000 [ 41.724069] 5fe0: 004dcedc beff4a6c 004c0738 b6e7af4c [ 41.729860] BUG: scheduling while atomic: ptp4l/208/0x00000002 [ 41.735682] INFO: lockdep is turned off.
Enabling RX timestamping will logically disturb the fastpath (processing of meta frames). Replace bool hwts_rx_en with a bit that is checked atomically from the fastpath and temporarily unset from the sleepable context during a change of the RX timestamping process (a destructive operation anyways, requires switch reset).
If found unset, the fastpath will just drop any received meta frame and not take the meta_lock at all.
--- drivers/net/dsa/sja1105/sja1105_main.c | 20 ++++++++++++-------- include/linux/dsa/sja1105.h | 4 +++- net/dsa/tag_sja1105.c | 12 +++++++++++- 3 files changed, 26 insertions(+), 10 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +12 -8
@@ -1897,7 +1897,9 @@ static int sja1105_set_ageing_time(struct dsa_switch *ds,return sja1105_static_config_reload (priv); } -/* Caller must hold priv->tagger_data.meta_lock */ +/* Must be called only with priv->tagger_data.state bit +* SJA1105_HWTS_RX_EN cleared +*/ static int sja1105_change_rxtstamping (struct sja1105_private *priv,bool on) {
@@ -1954,16 +1956,17 @@ static int sja1105_hwtstamp_set(struct dsa_switch *ds, int port,break ; } -if (rx_on != priv->tagger_data.hwts_rx_en) { -spin_lock (&priv->tagger_data.meta_lock); +if (rx_on !=test_bit (SJA1105_HWTS_RX_EN , &priv->tagger_data.state)) { +clear_bit (SJA1105_HWTS_RX_EN , &priv->tagger_data.state); + rc =sja1105_change_rxtstamping (priv, rx_on); -spin_unlock (&priv->tagger_data.meta_lock);if (rc <0 ) {dev_err (ds->dev,"Failed to change RX timestamping: %d\n" , rc); -return -EFAULT ; +return rc; } - priv->tagger_data.hwts_rx_en = rx_on; +if (rx_on) +set_bit (SJA1105_HWTS_RX_EN , &priv->tagger_data.state); }if (copy_to_user (ifr->ifr_data, &config,sizeof (config)))
@@ -1982,7 +1985,7 @@ static int sja1105_hwtstamp_get(struct dsa_switch *ds, int port, config.tx_type =HWTSTAMP_TX_ON ; else config.tx_type = HWTSTAMP_TX_OFF; -if (priv->tagger_data.hwts_rx_en) +if (test_bit (SJA1105_HWTS_RX_EN , &priv->tagger_data.state)) config.rx_filter =HWTSTAMP_FILTER_PTP_V2_L2_EVENT ;else config.rx_filter =HWTSTAMP_FILTER_NONE ;
@@ -2031,7 +2034,7 @@ static bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,struct sja1105_private *priv = ds->priv;struct sja1105_tagger_data *data = &priv->tagger_data; -if (!data->hwts_rx_en) +if (!test_bit (SJA1105_HWTS_RX_EN , &data->state))return false;/* We need to read the full PTP clock to reconstruct the Rx
@@ -2201,6 +2204,7 @@ static int sja1105_probe(struct spi_device *spi) tagger_data = &priv->tagger_data;skb_queue_head_init (&tagger_data->skb_rxtstamp_queue);INIT_WORK (&tagger_data->rxtstamp_work, sja1105_rxtstamp_work); +spin_lock_init (&tagger_data->meta_lock);/* Connections between dsa_port and sja1105_port */ for (i =0 ; i <SJA1105_NUM_PORTS ; i++) {
include/linux/dsa/sja1105.h +3 -1
@@ -31,6 +31,8 @@#define SJA1105_META_SMAC 0x222222222222ull#define SJA1105_META_DMAC 0x0180C200000Eull +#define SJA1105_HWTS_RX_EN 0 +/* Global tagger data: each struct sja1105_port has a reference to * the structure defined in struct sja1105_private. */
@@ -42,7 +44,7 @@ struct sja1105_tagger_data {* from taggers running on multiple ports on SMP systems */ spinlock_t meta_lock; -bool hwts_rx_en; +unsigned long state; };struct sja1105_skb_cb {
net/dsa/tag_sja1105.c +11 -1
@@ -156,7 +156,11 @@ static struct sk_buff/* Step 1: A timestampable frame was received. * Buffer it until we get its meta frame. */ -if (is_link_local && sp->data->hwts_rx_en) { +if (is_link_local) { +if (!test_bit (SJA1105_HWTS_RX_EN , &sp->data->state)) +/* Do normal processing. */ +return skb; +spin_lock (&sp->data->meta_lock);/* Was this a link-local frame instead of the meta * that we were expecting?
@@ -187,6 +191,12 @@ static struct sk_buff }else if (is_meta) {struct sk_buff *stampable_skb; +/* Drop the meta frame if we're not in the right state +* to process it. +*/ +if (!test_bit (SJA1105_HWTS_RX_EN , &sp->data->state)) +return NULL ; +spin_lock (&sp->data->meta_lock); stampable_skb = sp->data->stampable_skb;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Sun, 29 Sep 2019 01:07:45 +0300
Quoted 1 line
Currently this stack trace can be seen with
CONFIG_DEBUG_ATOMIC_SLEEP=y:
...
Quoted 10 lines
Enabling RX timestamping will logically disturb the fastpath (processing of meta frames). Replace bool
hwts_rx_enwith a bit that is checked atomically from the fastpath and temporarily unset from the sleepable context during a change of the RX timestamping process (a destructive operation anyways, requires switch reset).
If found unset, the fastpath will just drop any received meta frame and not take themeta_lockat all.Fixes a602afd200f5 ("net: dsa: sja1105: Expose PTP timestamping ioctls to userspace")Signed-off-by Vladimir Oltean <[email protected]>
Well, two things:
1) Even assuming #2 wasn't true, you're adding the missing initialization of meta_lock and that would need to be mentioned in the commit message.
2) After these changes meta_lock is no longer used so it should be removed.
Vladimir Oltean
maintainerHi David,
Quoted 14 lines · David Miller
From: Vladimir Oltean <[email protected]>
Date: Sun, 29 Sep 2019 01:07:45 +0300Quoted 1 line
Currently this stack trace can be seen with
CONFIG_DEBUG_ATOMIC_SLEEP=y:...
Quoted 8 lines
Enabling RX timestamping will logically disturb the fastpath (processing of meta frames). Replace bool
hwts_rx_enwith a bit that is checked atomically from the fastpath and temporarily unset from the sleepable context during a change of the RX timestamping process (a destructive operation anyways, requires switch reset).
If found unset, the fastpath will just drop any received meta frame and not take themeta_lockat all.
Quoted 8 lines
Quoted 2 lines
Fixes a602afd200f5 ("net: dsa: sja1105: Expose PTP timestamping ioctls to userspace")Signed-off-by Vladimir Oltean <[email protected]>Well, two things:
1) Even assuming #2 wasn't true, you're adding the missing initialization of
meta_lockand that would need to be mentioned in the commit message.
Thanks, I forgot to break that line apart into a new patch.
Quoted 1 line
2) After these changes
meta_lockis no longer used so it should be removed.
The meta_lock is still very much used: see net/dsa/tag_sja1105.c (that is where DSA keeps its fastpath). The fact that meta_lock is no longer used within the driver (slowpath) is entirely the point of the patch.
-Vladimir