From e33e03c5a6bff7f76a78db26975b0a1f862ee62b Mon Sep 17 00:00:00 2001 From: Miroslav Franc Date: May 12 2023 18:30:48 +0000 Subject: s390/dasd: correct numa_node in dasd_alloc_queue (git-fixes bsc#1211362). --- diff --git a/patches.suse/s390-dasd-correct-numa_node-in-dasd_alloc_queue.patch b/patches.suse/s390-dasd-correct-numa_node-in-dasd_alloc_queue.patch new file mode 100644 index 0000000..b2a9756 --- /dev/null +++ b/patches.suse/s390-dasd-correct-numa_node-in-dasd_alloc_queue.patch @@ -0,0 +1,32 @@ +From: Vasily Gorbik +Date: Sun, 24 Jun 2018 09:21:59 +0200 +Subject: s390/dasd: correct numa_node in dasd_alloc_queue +Git-commit: b17e3abb0af404cb62ad4ef1a5962f58b06e2b78 +Patch-mainline: v4.19-rc1 +References: git-fixes bsc#1211362 + +The numa_node field of the tag_set struct has to be explicitly +initialized, otherwise it stays as 0, which is a valid numa node id and +cause memory allocation failure if node 0 is offline. + +Acked-by: Stefan Haberland +Signed-off-by: Vasily Gorbik +Signed-off-by: Martin Schwidefsky +Acked-by: Miroslav Franc +--- + drivers/s390/block/dasd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c +index d3a38c421503..7c3dddeb781c 100644 +--- a/drivers/s390/block/dasd.c ++++ b/drivers/s390/block/dasd.c +@@ -3120,6 +3120,7 @@ static int dasd_alloc_queue(struct dasd_block *block) + block->tag_set.nr_hw_queues = nr_hw_queues; + block->tag_set.queue_depth = queue_depth; + block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; ++ block->tag_set.numa_node = NUMA_NO_NODE; + + rc = blk_mq_alloc_tag_set(&block->tag_set); + if (rc) + diff --git a/series.conf b/series.conf index be58d38..2d8d253 100644 --- a/series.conf +++ b/series.conf @@ -36249,6 +36249,7 @@ patches.suse/s390-sles15sp1-00-03-04-zcrypt-Review-inline-assembler-constraints.patch patches.suse/s390-sles15sp1-00-03-05-zcrypt-Show-load-of-cards-and-queues-in-sysfs.patch patches.suse/s390-sles15sp1-00-03-06-zcrypt-Integrate-ap_asm.h-into-include-asm-ap.h.patch + patches.suse/s390-dasd-correct-numa_node-in-dasd_alloc_queue.patch patches.suse/s390-sles15sp1-00-03-07-zcrypt-add-copy_from_user-length-plausibility-c.patch patches.suse/0085-RAID-s390-Remove-VLA-usage.patch patches.suse/s390-mm-correct-allocate_pgste-proc_handler-callback.patch