mmc: dw_mmc: Don't enable interrupts until we're ready
Subsystems (2)
PATCH 1/1 mmc: dw_mmc: Don't enable interrupts until we're ready
On dw_mmc there's a small race if you happen to get a card detect interrupt at just the wrong time during probe. You may have enabled the interrupt but host->slot[0] may be NULL.
Fix the race by enabling interrupts all the way at the end of the probe. We can also use free_irq() instead of dw_mmc specific masking to mask the IRQ at removal time. Note that since we're now managing freeing of the irq ourselves, there's no need to use devm.
FYI, the crash would look like:
dwmmc_rockchip ff0c0000.dwmmc: DW MMC controller at irq 64, 32 bit host data width, 256 deep fifo
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 ... ... [<c0499380>] (dw_mci_work_routine_card) from [<c0134b94>] (process_one_work+0x260/0x3c4) [<c0134b94>] (process_one_work) from [<c0135b10>] (worker_thread+0x240/0x3a8) [<c0135b10>] (worker_thread) from [<c013b64c>] (kthread+0x100/0x118) [<c013b64c>] (kthread) from [<c0106418>] (ret_from_fork+0x14/0x20)
---
FYI: making dw_mmc into a module and trying module removal was not tested. I'd appreciate any testing that folks can do there. This code should be the equivalent and makes the error case of probe match the removal case more closely now.
drivers/mmc/host/dw_mmc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/mmc/host/dw_mmc.c +11 -6
@@ -2577,10 +2577,6 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; }INIT_WORK (&host->card_work, dw_mci_work_routine_card); - ret =devm_request_irq (host->dev, host->irq, dw_mci_interrupt, - host->irq_flags,"dw-mci" , host); -if (ret) - goto err_workqueue;if (host->pdata->num_slots) host->num_slots = host->pdata->num_slots;
@@ -2619,11 +2615,21 @@ int dw_mci_probe(struct dw_mci *host) goto err_workqueue; } + ret =request_irq (host->irq, dw_mci_interrupt, host->irq_flags, +"dw-mci" , host); +if (ret) + goto err_initted; +if (host->quirks &DW_MCI_QUIRK_IDMAC_DTO )dev_info (host->dev,"Internal DMAC interrupt fix enabled.\n" );return 0 ; +err_initted: +for (i =0 ; i < host->num_slots; i++) +if (host->slot[i]) +dw_mci_cleanup_slot (host->slot[i], i); + err_workqueue:destroy_workqueue (host->card_workqueue);
@@ -2649,8 +2655,7 @@ void dw_mci_remove(struct dw_mci *host) {int i; -mci_writel (host,RINTSTS ,0xFFFFFFFF ); -mci_writel (host,INTMASK ,0 );/* disable all mmc interrupt first */ +free_irq (host->irq, host);for (i =0 ; i < host->num_slots; i++) {dev_dbg (host->dev,"remove slot %d\n" , i);
Signature · 1 line
2.1.0.rc2.206.gedb03e5
Jaehoon Chung
maintainerHi Doug
Quoted 47 lines · Doug Anderson
On
dw_mmcthere's a small race if you happen to get a card detect interrupt at just the wrong time during probe. You may have enabled the interrupt but host->slot[0] may be NULL.Fix the race by enabling interrupts all the way at the end of the probe. We can also use
free_irq()instead ofdw_mmcspecific masking to mask the IRQ at removal time. Note that since we're now managing freeing of the irq ourselves, there's no need to use devm.FYI, the crash would look like:
dwmmc_rockchipff0c0000.dwmmc: DW MMC controller at irq 64, 32 bit host data width, 256 deep fifoUnable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 ... ... [<c0499380>] (dw_mci_work_routine_card) from [<c0134b94>] (process_one_work+0x260/0x3c4) [<c0134b94>] (process_one_work) from [<c0135b10>] (worker_thread+0x240/0x3a8) [<c0135b10>] (worker_thread) from [<c013b64c>] (kthread+0x100/0x118) [<c013b64c>] (kthread) from [<c0106418>] (ret_from_fork+0x14/0x20)Signed-off-by Doug Anderson <[email protected]>---
FYI: makingdw_mmcinto a module and trying module removal was not tested. I'd appreciate any testing that folks can do there. This code should be the equivalent and makes the error case of probe match the removal case more closely now.drivers/mmc/host/dw_mmc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/mmc/host/dw_mmc.c +0
-4@@ -2577,10 +2577,6 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; }INIT_WORK (&host->card_work, dw_mci_work_routine_card); - ret =devm_request_irq (host->dev, host->irq, dw_mci_interrupt, - host->irq_flags,"dw-mci" , host); -if (ret) - goto err_workqueue;if (host->pdata->num_slots) host->num_slots = host->pdata->num_slots;
drivers/mmc/host/dw_mmc.c int dw_mci_probe(struct dw_mci *host) · line 2621
Quoted 7 lines
drivers/mmc/host/dw_mmc.c +4
-0@@ -2619,11 +2615,21 @@ int dw_mci_probe(struct dw_mci *host) goto err_workqueue; } + ret =request_irq (host->irq, dw_mci_interrupt, host->irq_flags, +"dw-mci" , host); +if (ret) + goto err_initted;
I didn't test and consider race condition yet.
But if located "request_irq" at here, we can be confused something,
since there is "dev_info(host->dev, "%d slots initialized\n", init_slots)" message at above.
I think you can relocate this.
Best Regards,
Jaehoon Chung
Quoted 25 lines
drivers/mmc/host/dw_mmc.c +7
-2+if (host->quirks &DW_MCI_QUIRK_IDMAC_DTO )dev_info (host->dev,"Internal DMAC interrupt fix enabled.\n" );return 0 ; +err_initted: +for (i =0 ; i < host->num_slots; i++) +if (host->slot[i]) +dw_mci_cleanup_slot (host->slot[i], i); + err_workqueue:destroy_workqueue (host->card_workqueue);@@ -2649,8 +2655,7 @@ void dw_mci_remove(struct dw_mci *host) {int i; -mci_writel (host,RINTSTS ,0xFFFFFFFF ); -mci_writel (host,INTMASK ,0 );/* disable all mmc interrupt first */ +free_irq (host->irq, host);for (i =0 ; i < host->num_slots; i++) {dev_dbg (host->dev,"remove slot %d\n" , i);
Jaehoon,
Quoted 62 lines · Jaehoon Chung
Hi Doug
Quoted 47 lines · Doug Anderson
On
dw_mmcthere's a small race if you happen to get a card detect interrupt at just the wrong time during probe. You may have enabled the interrupt but host->slot[0] may be NULL.Fix the race by enabling interrupts all the way at the end of the probe. We can also use
free_irq()instead ofdw_mmcspecific masking to mask the IRQ at removal time. Note that since we're now managing freeing of the irq ourselves, there's no need to use devm.FYI, the crash would look like:
dwmmc_rockchipff0c0000.dwmmc: DW MMC controller at irq 64, 32 bit host data width, 256 deep fifoUnable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 ... ... [<c0499380>] (dw_mci_work_routine_card) from [<c0134b94>] (process_one_work+0x260/0x3c4) [<c0134b94>] (process_one_work) from [<c0135b10>] (worker_thread+0x240/0x3a8) [<c0135b10>] (worker_thread) from [<c013b64c>] (kthread+0x100/0x118) [<c013b64c>] (kthread) from [<c0106418>] (ret_from_fork+0x14/0x20)Signed-off-by Doug Anderson <[email protected]>---
FYI: makingdw_mmcinto a module and trying module removal was not tested. I'd appreciate any testing that folks can do there. This code should be the equivalent and makes the error case of probe match the removal case more closely now.drivers/mmc/host/dw_mmc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/mmc/host/dw_mmc.c +0
-4@@ -2577,10 +2577,6 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; }INIT_WORK (&host->card_work, dw_mci_work_routine_card); - ret =devm_request_irq (host->dev, host->irq, dw_mci_interrupt, - host->irq_flags,"dw-mci" , host); -if (ret) - goto err_workqueue;if (host->pdata->num_slots) host->num_slots = host->pdata->num_slots;drivers/mmc/host/dw_mmc.c int dw_mci_probe(struct dw_mci *host) · line 2621
Quoted 7 lines
drivers/mmc/host/dw_mmc.c +4
-0@@ -2619,11 +2615,21 @@ int dw_mci_probe(struct dw_mci *host) goto err_workqueue; } + ret =request_irq (host->irq, dw_mci_interrupt, host->irq_flags, +"dw-mci" , host); +if (ret) + goto err_initted;I didn't test and consider race condition yet.
But if located "request_irq" at here, we can be confused something,
since there is "dev_info(host->dev, "%d slots initialized\n", init_slots)" message at above.
Quoted 1 line
I think you can relocate this.
OK, good point. Maybe we should skip this patch after all. There is definitely a race there, but I'm not 100% sure this is the right fix for it.
In general we probably need to look at the dw_mci_work_routine_card() a bit more (used for card detect) since that's only used for official "CD" lines. ...and as we've talked about anyone who wants to properly power their card off should be using GPIOs, thus they won't get the benefit of whatever dw_mci_work_routine_card() does.
I did play around a little bit with trying to test the module remove. Both before and after my patch it hung.
-Doug
Jaehoon Chung
maintainerDoug,
Quoted 65 lines · Doug Anderson
Jaehoon,
Quoted 62 lines · Jaehoon Chung
Hi Doug
Quoted 47 lines · Doug Anderson
On
dw_mmcthere's a small race if you happen to get a card detect interrupt at just the wrong time during probe. You may have enabled the interrupt but host->slot[0] may be NULL.Fix the race by enabling interrupts all the way at the end of the probe. We can also use
free_irq()instead ofdw_mmcspecific masking to mask the IRQ at removal time. Note that since we're now managing freeing of the irq ourselves, there's no need to use devm.FYI, the crash would look like:
dwmmc_rockchipff0c0000.dwmmc: DW MMC controller at irq 64, 32 bit host data width, 256 deep fifoUnable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 ... ... [<c0499380>] (dw_mci_work_routine_card) from [<c0134b94>] (process_one_work+0x260/0x3c4) [<c0134b94>] (process_one_work) from [<c0135b10>] (worker_thread+0x240/0x3a8) [<c0135b10>] (worker_thread) from [<c013b64c>] (kthread+0x100/0x118) [<c013b64c>] (kthread) from [<c0106418>] (ret_from_fork+0x14/0x20)Signed-off-by Doug Anderson <[email protected]>---
FYI: makingdw_mmcinto a module and trying module removal was not tested. I'd appreciate any testing that folks can do there. This code should be the equivalent and makes the error case of probe match the removal case more closely now.drivers/mmc/host/dw_mmc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/mmc/host/dw_mmc.c +0
-4@@ -2577,10 +2577,6 @@ int dw_mci_probe(struct dw_mci *host) goto err_dmaunmap; }INIT_WORK (&host->card_work, dw_mci_work_routine_card); - ret =devm_request_irq (host->dev, host->irq, dw_mci_interrupt, - host->irq_flags,"dw-mci" , host); -if (ret) - goto err_workqueue;if (host->pdata->num_slots) host->num_slots = host->pdata->num_slots;drivers/mmc/host/dw_mmc.c int dw_mci_probe(struct dw_mci *host) · line 2621
Quoted 7 lines
drivers/mmc/host/dw_mmc.c +4
-0@@ -2619,11 +2615,21 @@ int dw_mci_probe(struct dw_mci *host) goto err_workqueue; } + ret =request_irq (host->irq, dw_mci_interrupt, host->irq_flags, +"dw-mci" , host); +if (ret) + goto err_initted;I didn't test and consider race condition yet.
But if located "request_irq" at here, we can be confused something,
since there is "dev_info(host->dev, "%d slots initialized\n", init_slots)" message at above.
Quoted 5 lines
Quoted 1 line
I think you can relocate this.
OK, good point. Maybe we should skip this patch after all. There is definitely a race there, but I'm not 100% sure this is the right fix for it.
I'm not sure this patch is fixed for it, too.
So i will check more with your patch.
But i think if we can maintain current status, it will be the best.
Best Regards,
Jaehoon Chung
Quoted 12 lines
In general we probably need to look at the
dw_mci_work_routine_card()a bit more (used for card detect) since that's only used for official "CD" lines. ...and as we've talked about anyone who wants to properly power their card off should be using GPIOs, thus they won't get the benefit of whateverdw_mci_work_routine_card()does.I did play around a little bit with trying to test the module remove. Both before and after my patch it hung.
-Doug