mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 16:07:39 +00:00
scsi: ->queue_rq can't sleep
The blk-mq ->queue_rq method is always called from process context,
but might have preemption disabled. This means we still always
have to use GFP_ATOMIC for memory allocations, and thus need to
revert part of commit 3c356bde1
("scsi: stop passing a gfp_mask
argument down the command setup path").
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Tested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
This commit is contained in:
parent
1018b8b90b
commit
70a0f2c189
1 changed files with 1 additions and 2 deletions
|
@ -591,7 +591,6 @@ static void scsi_free_sgtable(struct scsi_data_buffer *sdb, bool mq)
|
||||||
static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
|
static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
|
||||||
{
|
{
|
||||||
struct scatterlist *first_chunk = NULL;
|
struct scatterlist *first_chunk = NULL;
|
||||||
gfp_t gfp_mask = mq ? GFP_NOIO : GFP_ATOMIC;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
BUG_ON(!nents);
|
BUG_ON(!nents);
|
||||||
|
@ -606,7 +605,7 @@ static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = __sg_alloc_table(&sdb->table, nents, SCSI_MAX_SG_SEGMENTS,
|
ret = __sg_alloc_table(&sdb->table, nents, SCSI_MAX_SG_SEGMENTS,
|
||||||
first_chunk, gfp_mask, scsi_sg_alloc);
|
first_chunk, GFP_ATOMIC, scsi_sg_alloc);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
scsi_free_sgtable(sdb, mq);
|
scsi_free_sgtable(sdb, mq);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue