From patchwork Fri Jun 21 00:24:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13706580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E656C2BA18 for ; Fri, 21 Jun 2024 00:27:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8F8A8D0101; Thu, 20 Jun 2024 20:27:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B127E8D0103; Thu, 20 Jun 2024 20:27:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5287F8D00FF; Thu, 20 Jun 2024 20:27:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EE38A8D0101 for ; Thu, 20 Jun 2024 20:27:04 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B3BCA140678 for ; Fri, 21 Jun 2024 00:27:04 +0000 (UTC) X-FDA: 82253005968.19.60FE929 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf28.hostedemail.com (Postfix) with ESMTP id 7FEF1C0005 for ; Fri, 21 Jun 2024 00:27:02 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=JUnPueuq; spf=pass (imf28.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718929617; a=rsa-sha256; cv=none; b=6SaVGoUsDDLUYU6e4S0s0PyROAIZGCxU87KQ7yJvPKEl9EwZLc5RsKReCjCqh8pIM+Y/OD giMSj7hfBj60wrOWnc/aw1WJRwwDxW87jD6tw6Onj1viufYMParF3ZNImPaQqIyWZXTXtj CTUrRNukURBBmyfiEuOzpggqWgaxbWQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=JUnPueuq; spf=pass (imf28.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718929617; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EM2Q29X1oynbiWdgAiIUaE04pJnjihVfcXc099lsq1w=; b=tbvdv7MG2JOoR609MJbSvxa9tV5IaaPPGK5Fpt2fe8o0uI0dQUO8/3o8TnpNe+bvCBuS+q l9z74Wok3JjwzgInB7C5aQFIAd8nNKRLpuP/QRLQqzDkIPl+SAOrkDxKpOXbmJ+cinJ9+Q gYt1lCzOnIysTmghobLqUtSIWco4s0o= Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45L0Qjxp017866; Fri, 21 Jun 2024 00:26:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=pp1; bh=EM2Q29X1oynbi WdgAiIUaE04pJnjihVfcXc099lsq1w=; b=JUnPueuqBgOu/JsbNPliikwunmim0 JVNEZX68nH0vluumtIPHgffyHdRoJL9E0Osri070l13Hq3Qi006YbJoVovwEkxyg dFm3Rnle6Vj5AwAGgWcol/rBfXclFcVmtwCjFMSXvbp0z6qVg2Zy9cHYWkfxPLMQ WoEKWNdd3E4VMbSqAAwRj2fbEKsMq46nFlbQJ8prfgHYk6TBPRbXQ1pHQkKgdgkk jfP/Iy/VnWbidnkOvHCCcc6v0S0SdGhCK4LgxJh+MlhsrY/BMsYeP2JG9Iv7yM5r xS8iYseXSNnkMQxeiFucR10NuvN33gXs0RjW4BtEkkFFS+3FXZfQlBxag== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yvx4g02nj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 00:26:55 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45L0Qso5017969; Fri, 21 Jun 2024 00:26:54 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yvx4g02ne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 00:26:54 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45KLiBxI007687; Fri, 21 Jun 2024 00:26:53 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yvrspamqc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 00:26:53 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45L0QmSs51315132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Jun 2024 00:26:50 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2432E2004D; Fri, 21 Jun 2024 00:26:48 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00E0220043; Fri, 21 Jun 2024 00:26:47 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.171.10.44]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 21 Jun 2024 00:26:46 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , Heiko Carstens , Joonsoo Kim , Marco Elver , Masami Hiramatsu , Pekka Enberg , Steven Rostedt , Vasily Gorbik , Vlastimil Babka Cc: Christian Borntraeger , Dmitry Vyukov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Mark Rutland , Roman Gushchin , Sven Schnelle , Ilya Leoshkevich Subject: [PATCH v6 23/39] s390: Use a larger stack for KMSAN Date: Fri, 21 Jun 2024 02:24:57 +0200 Message-ID: <20240621002616.40684-24-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240621002616.40684-1-iii@linux.ibm.com> References: <20240621002616.40684-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: eIz9QFB34yT_9zDMbTspjjURecmQhbXd X-Proofpoint-ORIG-GUID: T8FTzAuf5ejUZbTmqx1tz4sH7VNs5dv4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-20_11,2024-06-20_04,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxlogscore=869 phishscore=0 priorityscore=1501 clxscore=1015 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2406140001 definitions=main-2406210001 X-Stat-Signature: htwqdeckbuc3jh77a5ntdypnag3n5ace X-Rspamd-Queue-Id: 7FEF1C0005 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1718929622-455083 X-HE-Meta: U2FsdGVkX1+1sEL3JkWg1Zv1fE1ISKrWeKVnklt4yfadxPHOQm/by4T+1CGdD7V/hgM0/Jq/a0TxsdaPgEHUdVhGrcBpHBo/cFEALdsHWternomongD/EjMcn2SmdG7wyKCLTsj+GAuZoR7riDscYLCTt2ZuZWfhFx010rZTt53h3/rcQ/b3pJQLEyUZnaKzbJFVUcUu+5OJvoeULxcTFGc7jJ/xQ7JLFvu2tp4dgcRU1XkZgs24RYcFqQy5K2MiTyAZTn6ZxvaKmnisBziAtW+f31FfF1o9tpX4YveIAhY4SaVv/dgXEe91Bq4wTJ2qsD0J+PfuFSo9AHbJjEQc5g/ZMDPBHIEdernmOF1T3JS90yYsAth2dmF6CNWkCRp6rVthQx3JoRaxxIY59PB7rRmNytwknNjy6783aDYiRAoQqN0KkcOl3R2mnVNHdSu8XBjI3XnKgM+ZC43NMCquEA01P/cgnpwEVZ3/hBvwY80rRjQNj1xs5mAqY/1wOvQg+4Kf8VJ3c1zDmN9WAhQBGvLUMuhOi/kOMrX/7BYf4djYxawJovDGuALSbO6mqt5FzO6pKu0XjfTmI/zO+LcpLZTCjWtf4pFwCbbw9TCyGW6Nd8vdxPWVCrW0KuvPTKsHWwPhbqeQS+eeVE7fuIwfWwCrTSZddHrgcCKJ1S09aEYenrMejy2WFQlHXpudcUlXC+p8Forh3toy8pzIm443+UpdGITQ3VFyWPPOxMtyTvTejZqzdmeyKBw0Z87g2mH4+ONOnmBqnrteNJE4ceble2aLllwlelC8SxDgP4Ft8Ja+DaOqtEoBd/FtAQIJRX4i+hPrdnzytUe8yMr1RG2IfOMa4xosBBkTfwCHyo9Q+I1xdTIeTfeHspV2XF3n7Lv4ov+bhJgiGsywn4MYLgFYghut5ruYFdTSLNJSY6PiMdLpKc0nK7XwwLR/is8hPtIF27s+/qVXN2z+tlHix3D L2JlwQsf wAIX598AmSz8IBXt8gaUDp34uO9CQAwBNpCwVI4WktTlxd8v4Z5x7S3ewHft5IX0m0azTfv1r5ZlE3iQpsNbtX4bTl0Mxd5ME0QktJmecdvj6zENWkaWoemlFyjQPqm8cz0rJSFVBUj1CFNyTZlhjnQbDAej+2v8ogK/wsLr1zEHYgQ7BotTpq5/ZHW9hJiPXSMRCgnyzSCYGK6DM/nMoL1p9rG8t8ytGJ3GicIgWDuB0jNZIz1OTWwOaayDrTZFgMMYOb8by3pF+MTBRWHYkgEnap6AowKkW43enV0Hsp4HnB52Hhvha04GJ+Ool0J91UB2h8VqloguXjegiePhpD/44lZ8x/bzX6EpkdmWMTFTtViyKS+RKLEqYEQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Adjust the stack size for the KMSAN-enabled kernel like it was done for the KASAN-enabled one in commit 7fef92ccadd7 ("s390/kasan: double the stack size"). Both tools have similar requirements. Reviewed-by: Alexander Gordeev Reviewed-by: Alexander Potapenko Signed-off-by: Ilya Leoshkevich --- arch/s390/Makefile | 2 +- arch/s390/include/asm/thread_info.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/Makefile b/arch/s390/Makefile index f2b21c7a70ef..7fd57398221e 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -36,7 +36,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_CC_NO_ARRAY_BOUNDS),-Wno-array-bounds) UTS_MACHINE := s390x -STACK_SIZE := $(if $(CONFIG_KASAN),65536,16384) +STACK_SIZE := $(if $(CONFIG_KASAN),65536,$(if $(CONFIG_KMSAN),65536,16384)) CHECKFLAGS += -D__s390__ -D__s390x__ export LD_BFD diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index a674c7d25da5..d02a709717b8 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -16,7 +16,7 @@ /* * General size of kernel stacks */ -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN) || defined(CONFIG_KMSAN) #define THREAD_SIZE_ORDER 4 #else #define THREAD_SIZE_ORDER 2