From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03on0108.outbound.protection.outlook.com ([104.47.42.108]:58413 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726110AbeIQI1D (ORCPT ); Mon, 17 Sep 2018 04:27:03 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Vasily Gorbik , Martin Schwidefsky , Sasha Levin Subject: [PATCH AUTOSEL 4.18 061/136] s390/scm_blk: correct numa_node in scm_blk_dev_setup Date: Mon, 17 Sep 2018 03:00:50 +0000 Message-ID: <20180917030006.245495-61-alexander.levin@microsoft.com> References: <20180917030006.245495-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030006.245495-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Vasily Gorbik [ Upstream commit d642d6262f4fcfa5d200ec6e218c17f0c15b3390 ] 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: Sebastian Ott Signed-off-by: Vasily Gorbik Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- drivers/s390/block/scm_blk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index b1fcb76dd272..98f66b7b6794 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -455,6 +455,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct = scm_device *scmdev) bdev->tag_set.nr_hw_queues =3D nr_requests; bdev->tag_set.queue_depth =3D nr_requests_per_io * nr_requests; bdev->tag_set.flags =3D BLK_MQ_F_SHOULD_MERGE; + bdev->tag_set.numa_node =3D NUMA_NO_NODE; =20 ret =3D blk_mq_alloc_tag_set(&bdev->tag_set); if (ret) --=20 2.17.1