Skip to content

Commit 4218a95

Browse files
damien-lemoalsnitm
authored andcommitted
dm zoned: use GFP_NOIO in I/O path
Use GFP_NOIO for memory allocations in the I/O path. Other memory allocations in the initialization path can use GFP_KERNEL. Reported-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
1 parent edbe959 commit 4218a95

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

drivers/md/dm-zoned-metadata.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)
624624

625625
ret = dmz_rdwr_block(zmd, REQ_OP_WRITE, block, mblk->page);
626626
if (ret == 0)
627-
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_KERNEL, NULL);
627+
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO, NULL);
628628

629629
return ret;
630630
}
@@ -658,7 +658,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd,
658658

659659
/* Flush drive cache (this will also sync data) */
660660
if (ret == 0)
661-
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_KERNEL, NULL);
661+
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO, NULL);
662662

663663
return ret;
664664
}
@@ -722,7 +722,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)
722722

723723
/* If there are no dirty metadata blocks, just flush the device cache */
724724
if (list_empty(&write_list)) {
725-
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_KERNEL, NULL);
725+
ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO, NULL);
726726
goto out;
727727
}
728728

@@ -927,7 +927,7 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)
927927
(zmd->nr_meta_zones << zmd->dev->zone_nr_blocks_shift);
928928
}
929929

930-
page = alloc_page(GFP_KERNEL);
930+
page = alloc_page(GFP_NOIO);
931931
if (!page)
932932
return -ENOMEM;
933933

@@ -1183,7 +1183,7 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)
11831183

11841184
/* Get zone information from disk */
11851185
ret = blkdev_report_zones(zmd->dev->bdev, dmz_start_sect(zmd, zone),
1186-
&blkz, &nr_blkz, GFP_KERNEL);
1186+
&blkz, &nr_blkz, GFP_NOIO);
11871187
if (ret) {
11881188
dmz_dev_err(zmd->dev, "Get zone %u report failed",
11891189
dmz_id(zmd, zone));
@@ -1257,7 +1257,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone)
12571257

12581258
ret = blkdev_reset_zones(dev->bdev,
12591259
dmz_start_sect(zmd, zone),
1260-
dev->zone_nr_sectors, GFP_KERNEL);
1260+
dev->zone_nr_sectors, GFP_NOIO);
12611261
if (ret) {
12621262
dmz_dev_err(dev, "Reset zone %u failed %d",
12631263
dmz_id(zmd, zone), ret);

drivers/md/dm-zoned-reclaim.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int dmz_reclaim_align_wp(struct dmz_reclaim *zrc, struct dm_zone *zone,
7575
nr_blocks = block - wp_block;
7676
ret = blkdev_issue_zeroout(zrc->dev->bdev,
7777
dmz_start_sect(zmd, zone) + dmz_blk2sect(wp_block),
78-
dmz_blk2sect(nr_blocks), GFP_NOFS, false);
78+
dmz_blk2sect(nr_blocks), GFP_NOIO, 0);
7979
if (ret) {
8080
dmz_dev_err(zrc->dev,
8181
"Align zone %u wp %llu to %llu (wp+%u) blocks failed %d",

drivers/md/dm-zoned-target.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ static void dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
541541
int ret;
542542

543543
/* Create a new chunk work */
544-
cw = kmalloc(sizeof(struct dm_chunk_work), GFP_NOFS);
544+
cw = kmalloc(sizeof(struct dm_chunk_work), GFP_NOIO);
545545
if (!cw)
546546
goto out;
547547

@@ -785,7 +785,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
785785

786786
/* Chunk BIO work */
787787
mutex_init(&dmz->chunk_lock);
788-
INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_NOFS);
788+
INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_KERNEL);
789789
dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s", WQ_MEM_RECLAIM | WQ_UNBOUND,
790790
0, dev->name);
791791
if (!dmz->chunk_wq) {

0 commit comments

Comments
 (0)