From patchwork Thu Jun 13 15:34:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13697006 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 BF067C27C4F for ; Thu, 13 Jun 2024 15:40:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB4596B00B8; Thu, 13 Jun 2024 11:40:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0BBD6B00B7; Thu, 13 Jun 2024 11:40:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE9666B00B6; Thu, 13 Jun 2024 11:40:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8BDCD6B00B4 for ; Thu, 13 Jun 2024 11:40:01 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 438FC1601D1 for ; Thu, 13 Jun 2024 15:40:01 +0000 (UTC) X-FDA: 82226276202.04.46E491B Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf17.hostedemail.com (Postfix) with ESMTP id 077F940012 for ; Thu, 13 Jun 2024 15:39:58 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VHXN9WfP; spf=pass (imf17.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 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=1718293198; 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=1vaK2VhVRdHBv9XnV2p+UTqcV3KnAk32NGWHG15RoaeTcruhH7NcTwJXudaHnBgQL4Zbsz crIm4skACNk7ulFbi1PMm/PDMIWuICx3HnUTv+qNsuL6cYxOqxLjozFlGZha8JpJwm8n9v QHfbI1AQXtHQ/Nan2mDF1ek6LaMaQRc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VHXN9WfP; spf=pass (imf17.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 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=1718293198; a=rsa-sha256; cv=none; b=28hkvcsPIIL1aLOLnKIc45GNQC+my3JtVPoEZE1IZYHhbuhQAiJ/X3fbCwzSO9laSuiQQ4 9nxsSUi1oDaWscgF7I1UshW9jppgDt5CpTTjx+NroOE3p0dqOW+f54dZVNbzQigfsRvSqw /Eu2GKhc1fkdCHp9pLybTvM8fdqUH3k= Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45DFCHUA026549; Thu, 13 Jun 2024 15:39:52 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=VHXN9WfPNvhruck+pL72M4V79RivJ ZMl6q2Rwgs3WiWfsRdXS+e3dJlXVyPpJte6qvhoXXifApmELTvQXsNzxeFQo4y8M F5TQO7BMr9esz9c5KNK64+sWYDPu1wj0YsUuFRa1klGGTShdxn2esV3hHQUfmraf pu43lDgkg6o0aJb6J1wYIefxXX1Dv+yO/CLYOB0mk9Uj0w5xmeKTbQclDVkF3M01 ug+AhktgBW6gCNvkeJDqyTik1e9w+RVHdZ3dwBI++r2Zff2mrgxFEbdsq3S9bIiJ EmIGW9MDMJf6NzZC44vnR96SOjCrnsLtil+TC2iDm3oZPgdrnWLtI9+Sw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yr1rbgdet-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:52 +0000 (GMT) Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45DFdp23014395; Thu, 13 Jun 2024 15:39:51 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yr1rbgden-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:51 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45DF7EKI020041; Thu, 13 Jun 2024 15:39:50 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3yn34nh0cj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:50 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45DFdiU951511650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jun 2024 15:39:46 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7916E2006C; Thu, 13 Jun 2024 15:39:44 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 067C320065; Thu, 13 Jun 2024 15:39:44 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Jun 2024 15:39:43 +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 v4 21/35] s390: Use a larger stack for KMSAN Date: Thu, 13 Jun 2024 17:34:23 +0200 Message-ID: <20240613153924.961511-22-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613153924.961511-1-iii@linux.ibm.com> References: <20240613153924.961511-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: lFkUDj6LN0n_-DjPlPRJL1teLrWTofxF X-Proofpoint-GUID: TOtbwEEWWHXcQFHvMIb0mi7O7rB8fdB8 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-13_09,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 spamscore=0 clxscore=1015 bulkscore=0 suspectscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=869 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406130112 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 077F940012 X-Stat-Signature: bechen3k5r3zhwa54sric6rnqtk8oydi X-HE-Tag: 1718293198-64469 X-HE-Meta: U2FsdGVkX1/6R2tk5zo0JzpGaWF4YBs0D5VAagt2bkGNrHQNCtLXcHd3JE0z01M0ajcD0ZxGcIQNAr/b1N/9kSUt5IYk1bh90ZXqYUojK6kt0XEQc9kkcAejonlj4oQb3WjmUlpbYDdKzgCvq1BhIYu67V2AsxXaj8F9LMZShFX1jXeW9JC8QLHwJkrXkSEq3zb/1CUjTtm5QTFyxdYEx4e7pimGBKlMLWhVX6P3DZKld5D0HUzdOzUYE+kYIjpXHEG+aWdi+42fQ0XI+ehAfvIxEGQAZBdysC1ooTJFKUhdHGL+7Sz86ys+2fTFE3uXOBFbuGzhzxN1XrsqhrXkBeyFHc8N2fKBzlZatk7mc0J5rtkDr/9ia98HqWJZwZXteZba3URoj86IYuAe4c6KlHweC4csUkg26hEXd+4icD43Sbf/EVZc+E476vIVX83lEUo9nSDcR7g6LwC/2n8CAh+anBFO83uAW08gn5xxSIrGbENQLlK+Z2xu02sceBCMViJ4B0vgSUVkM64ON12dhMaj8sKmvs9qtGUBwbCjo1ls2MURD8urgUZQUCdU8xOq+0tNi7WvOXUsCqi7pPzeGa0Cfu1tNygKaw505mB/QfiqNndC8HgJ1oLfc85506AKFVnzVajOaDhKzmI66a16iHKV+70tQTWqzmv1XD+7oKhM8XFO/Ty9Punh28rYNIWkLqoSdCN2famYRdMFCNTlnA+j2sLa8ExhYL3HFKxDIXPf6R9/b4RsNIY31NnnxStoEqZdrjFTOZD8TOIKvFkccodaqL9Kx1P28cl33LAGwyyYE/6S7/KNHxTOy1BTK4fHjA+V5NNdvdR7rTkTPu/Brl12LvTaTyEb9+Fp7H4yanoEChRDHI5VxarHZ67vsXmBAB2JEpK5SVtAYbpamdTQuFVGgVpYtIEOr9D02MgkFlZ4sFga2rLF74Rnkdl4R3FhbQlmcEZKPE4dnSHrjtE tXl32ptJ ke1cwlR8BhRAl49lAtCoeLE/nawNBOprLEzYzBFHnfONAvt2ilzqa/30/YvnZKmBUIyWz86My2czX7QlbkQESNXO8+jROtv9xgNM74dQTQDzTAVYAbs3QXrgRRkYnygOoEkIuE9mA3yJuSJzgZzR/KvpQq5E0k7MS1YQ6U0dlU6AqAlWETTFAu3y8DDgoPyJ/WGjYO730LQo7T5Zx1KVJ7DLR4jc/LaSjcHbUu4vE/Or4kUf+xunAlhUc2e/I6nhFZ8aL3zclZleDTlEYO0PZ11bheQ== 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