Bluetooth: hci_qca: Use del_timer_sync() before freeing
Subsystems (2)
PATCH 1/1 Bluetooth: hci_qca: Use del_timer_sync() before freeing
[ Resending due to cut and paste failure of email address ]
From: Steven Rostedt (Google) <[email protected]>
While looking at a crash report on a timer list being corrupted, which usually happens when a timer is freed while still active. This is commonly triggered by code calling del_timer() instead of del_timer_sync() just before freeing.
One possible culprit is the hci_qca driver, which does exactly that.
UART") Signed-off-by: Steven Rostedt (Google) <[email protected]>
---
drivers/bluetooth/hci_qca.c +2 -2
@@ -696,8 +696,8 @@ static int qca_close(struct hci_uart *hu)skb_queue_purge (&qca->tx_wait_q);skb_queue_purge (&qca->txq);skb_queue_purge (&qca->rx_memdump_q); -del_timer (&qca->tx_idle_timer); -del_timer (&qca->wake_retrans_timer); +del_timer_sync (&qca->tx_idle_timer); +del_timer_sync (&qca->wake_retrans_timer);destroy_workqueue (qca->workqueue); qca->hu =NULL ;
Quoted 20 lines · Steven Rostedt
[ Resending due to cut and paste failure of email address ]
From: Steven Rostedt (Google) <[email protected]>
While looking at a crash report on a timer list being corrupted, which usually happens when a timer is freed while still active. This is commonly triggered by code calling
del_timer()instead ofdel_timer_sync()just before freeing.One possible culprit is the
hci_qcadriver, which does exactly that.Fixes 0ff252c1976da ("Bluetooth: hciuart: Add support QCA chipset forUART") Signed-off-by: Steven Rostedt (Google) <[email protected]>
---drivers/bluetooth/hci_qca.c +0
-0
drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 700
Quoted 7 lines
drivers/bluetooth/hci_qca.c +2
-2@@ -696,8 +696,8 @@ static int qca_close(struct hci_uart *hu)skb_queue_purge (&qca->tx_wait_q);skb_queue_purge (&qca->txq);skb_queue_purge (&qca->rx_memdump_q); -del_timer (&qca->tx_idle_timer); -del_timer (&qca->wake_retrans_timer); +del_timer_sync (&qca->tx_idle_timer); +del_timer_sync (&qca->wake_retrans_timer);
It seems the wake_retrans_timer could be re-armed from a work queue.
So perhaps we need to make sure qca->workqueue is destroyed
before these del_timer_sync() calls ?
drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 701
Quoted 1 line
drivers/bluetooth/hci_qca.c +0
-0destroy_workqueue (qca->workqueue);
ie move this destroy_workqueue() up ?
Quoted 2 lines
drivers/bluetooth/hci_qca.c +0
-0qca->hu =NULL ;
Quoted 16 lines · On Mon, 4 Apr 2022 17:22:00 -0700 Eric Dumazet <[email protected]> wrote:
drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 700
Quoted 12 lines
drivers/bluetooth/hci_qca.c +2
-2@@ -696,8 +696,8 @@ static int qca_close(struct hci_uart *hu)skb_queue_purge (&qca->tx_wait_q);skb_queue_purge (&qca->txq);skb_queue_purge (&qca->rx_memdump_q); -del_timer (&qca->tx_idle_timer); -del_timer (&qca->wake_retrans_timer); +del_timer_sync (&qca->tx_idle_timer); +del_timer_sync (&qca->wake_retrans_timer);It seems the
wake_retrans_timercould be re-armed from a work queue.
Quoted 8 lines
So perhaps we need to make sure
qca->workqueueis destroyedbefore these
del_timer_sync()calls ?drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 701
Quoted 1 line
drivers/bluetooth/hci_qca.c +0
-0destroy_workqueue (qca->workqueue);ie move this
destroy_workqueue()up ?
Yeah, that could be a problem. I would think moving it up would help, if that's what requeue's the timers.
-- Steve
Quoted 4 lines
Quoted 4 lines
drivers/bluetooth/hci_qca.c +0
-0qca->hu =NULL ;
Quoted 33 lines · Eric Dumazet
Quoted 20 lines · Steven Rostedt
[ Resending due to cut and paste failure of email address ]
From: Steven Rostedt (Google) <[email protected]>
While looking at a crash report on a timer list being corrupted, which usually happens when a timer is freed while still active. This is commonly triggered by code calling
del_timer()instead ofdel_timer_sync()just before freeing.One possible culprit is the
hci_qcadriver, which does exactly that.Fixes 0ff252c1976da ("Bluetooth: hciuart: Add support QCA chipset forUART") Signed-off-by: Steven Rostedt (Google) <[email protected]>
---drivers/bluetooth/hci_qca.c +0
-0drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 700
Quoted 7 lines
drivers/bluetooth/hci_qca.c +2
-2@@ -696,8 +696,8 @@ static int qca_close(struct hci_uart *hu)skb_queue_purge (&qca->tx_wait_q);skb_queue_purge (&qca->txq);skb_queue_purge (&qca->rx_memdump_q); -del_timer (&qca->tx_idle_timer); -del_timer (&qca->wake_retrans_timer); +del_timer_sync (&qca->tx_idle_timer); +del_timer_sync (&qca->wake_retrans_timer);It seems the
wake_retrans_timercould be re-armed from a work queue.
Quoted 9 lines
So perhaps we need to make sure
qca->workqueueis destroyedbefore these
del_timer_sync()calls ?drivers/bluetooth/hci_qca.c static int qca_close(struct hci_uart *hu) · line 701
Quoted 1 line
drivers/bluetooth/hci_qca.c +0
-0destroy_workqueue (qca->workqueue);ie move this
destroy_workqueue()up ?
What prevents the timer code from queueing work into the destroyed workqueue ?
Thanks,
Guenter
Quoted 5 lines · On Wed, 6 Apr 2022 08:39:07 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 2 lines
ie move this
destroy_workqueue()up ?What prevents the timer code from queueing work into the destroyed workqueue ?
So we have a chicken verses egg issue here?
-- Steve
Quoted 11 lines · Steven Rostedt
Quoted 5 lines · On Wed, 6 Apr 2022 08:39:07 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 2 lines
ie move this
destroy_workqueue()up ?What prevents the timer code from queueing work into the destroyed workqueue ?
So we have a chicken verses egg issue here?
Almost looks like it, unless I am missing something. Maybe some flag is needed to prevent the timer handling code from queuing into the destroyed workqueue, or the workqueue handler from updating the timer.
Guenter
Quoted 6 lines · On Wed, 6 Apr 2022 09:36:10 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 2 lines
So we have a chicken verses egg issue here?
Almost looks like it, unless I am missing something. Maybe some flag is needed to prevent the timer handling code from queuing into the destroyed workqueue, or the workqueue handler from updating the timer.
That's exactly what I was thinking. I do not know all the code here. I could try to write a patch, but I may likely miss something.
-- Steve
Quoted 5 lines · Steven Rostedt
Quoted 2 lines · On Wed, 6 Apr 2022 09:36:10 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 2 lines
So we have a chicken verses egg issue here?
Quoted 7 lines
Quoted 3 lines
Almost looks like it, unless I am missing something. Maybe some flag is needed to prevent the timer handling code from queuing into the destroyed workqueue, or the workqueue handler from updating the timer.
That's exactly what I was thinking. I do not know all the code here. I could try to write a patch, but I may likely miss something.
-- Steve
Take a look at
Ie, use an ->live (or ->dead) field.