projects/linux·commit 927b6b2d

block: Fix null_blk_zoned creation failure with small number of zones

927b6b2d · Shin'ichiro Kawasaki <[email protected]> · 2018-12-11 21:08:26 +09:00

null_blk_zoned creation fails if the number of zones specified is equal to or is
smaller than 64 due to a memory allocation failure in blk_alloc_zones(). With
such a small number of zones, the required memory size for all zones descriptors
fits in a single page, and the page order for alloc_pages_node() is zero. Allow
this value in blk_alloc_zones() for the allocation to succeed.

Fixes: bf5054569653 "block: Introduce blk_revalidate_disk_zones()"
Reviewed-by: Damien Le Moal <[email protected]>
Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Commit
927b6b2d69b4cc900fa50d7e46d8f1fa91c91b3a
Parents
a538e3ff

Changes

1 files changed · +1 −1

FileStatusAddDelContent
block/blk-zoned.cmodified+1−1View file

block/blk-zoned.c

View file
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 13ba201..a327bef 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -378,7 +378,7 @@ static struct blk_zone *blk_alloc_zones(int node, unsigned int *nr_zones)
struct page *page;
int order;
- for (order = get_order(size); order > 0; order--) {
+ for (order = get_order(size); order >= 0; order--) {
page = alloc_pages_node(node, GFP_NOIO | __GFP_ZERO, order);
if (page) {
*nr_zones = min_t(unsigned int, *nr_zones,