| Message ID | eccb2179ce800529851ed4fabc9d3f95fbbf7d7f.1644906731.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: message: fusion: Use GFP_KERNEL instead of GFP_ATOMIC in non-atomic context | expand |
Christophe, > Just a few lines below this kzalloc() we have a mutex_lock() which can > sleep. Applied to 5.18/scsi-staging, thanks!
On Tue, 15 Feb 2022 07:32:34 +0100, Christophe JAILLET wrote: > Just a few lines below this kzalloc() we have a mutex_lock() which can > sleep. > > More over, the only way to call this function is when a delayed work is > schedule. And delayed work can sleep. > INIT_DELAYED_WORK(&fw_event->work, mptsas_firmware_event_work); > --> mptsas_firmware_event_work() > --> mptsas_send_link_status_event() > --> mptsas_expander_add() > > [...] Applied to 5.18/scsi-queue, thanks! [1/1] scsi: message: fusion: Use GFP_KERNEL instead of GFP_ATOMIC in non-atomic context https://git.kernel.org/mkp/scsi/c/e3af2e3b0019
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 4acd8f9a48e1..34901bcd1ce8 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -3680,7 +3680,7 @@ mptsas_expander_add(MPT_ADAPTER *ioc, u16 handle) MPI_SAS_EXPAND_PGAD_FORM_SHIFT), handle))) return NULL; - port_info = kzalloc(sizeof(struct mptsas_portinfo), GFP_ATOMIC); + port_info = kzalloc(sizeof(struct mptsas_portinfo), GFP_KERNEL); if (!port_info) { dfailprintk(ioc, printk(MYIOC_s_ERR_FMT "%s: exit at line=%d\n", ioc->name,
Just a few lines below this kzalloc() we have a mutex_lock() which can sleep. More over, the only way to call this function is when a delayed work is schedule. And delayed work can sleep. INIT_DELAYED_WORK(&fw_event->work, mptsas_firmware_event_work); --> mptsas_firmware_event_work() --> mptsas_send_link_status_event() --> mptsas_expander_add() So there is really no good reason to use GFP_ATOMIC here. Change it to GFP_KERNEL to give more opportunities to the kernel. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/message/fusion/mptsas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)