From mboxrd@z Thu Jan 1 00:00:00 1970 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 16298C54FB9 for ; Wed, 15 Nov 2023 20:35:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9ADC8003A; Wed, 15 Nov 2023 15:34:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D16080038; Wed, 15 Nov 2023 15:34:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 825D08003A; Wed, 15 Nov 2023 15:34:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6706880038 for ; Wed, 15 Nov 2023 15:34:57 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3E033B5358 for ; Wed, 15 Nov 2023 20:34:57 +0000 (UTC) X-FDA: 81461342634.22.28CC798 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf07.hostedemail.com (Postfix) with ESMTP id F0ED840006 for ; Wed, 15 Nov 2023 20:34:54 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=BBqatkro; spf=pass (imf07.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=1700080495; 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=P1cjC4XvfBd1ePaZbVyG74nHU4A0jWJVPPxmf/C+hLA=; b=mHur0hWfzbW7vYpez8FCWi2k6CP1Twuh4yZj3azdLaMGID5iayTC49GLusJT3AjpOtxWSr Y5Ekv0Xyraq27lXt9gGlxRPww485mBrtp+6LxpsZNzaqL2Ey7EhppmXEI9NOUxrBPVSa4I ojnqXVZhsDAsijGDBE066J7alORKid0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700080495; a=rsa-sha256; cv=none; b=zMj7OWoaX7PwKxb5/sw2BTY8aYbkAUE1hTu6KqCB/+lZ3k7UJYlFlFjlqDwkB8U4sqLYym Skq27df//asVhVsauQssXM2rqq8ZRkd7efQ2RMsUd16g1Jz5SX7o7dCr9kYqEqzcZioU6+ hXYCzIMtHxwOXIa7l0MzTErvXeAhVEc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=BBqatkro; spf=pass (imf07.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 Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AFKFduJ016274; Wed, 15 Nov 2023 20:34:49 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=P1cjC4XvfBd1ePaZbVyG74nHU4A0jWJVPPxmf/C+hLA=; b=BBqatkrohvMlJ0ZVdGnCtZFdEh9QifqfuosrJ5enUrOyRomCmLuHkVHew+XBeCgt+5YV 4W+vbG1oZDmTcDF0zwOmdk5SLjeLU/43009ocryPdPXPSDXsYmRRLHTvAEnsA8oJKcSq 5TdPQfCSqXXmLfAI41R0oGktWUf5zHTlVHXYrfYwfvPfmAsekEzmdmpp9v0WHw0OQC70 Kioo8/OU6VmiOrEJSh1YV3fjf8niq8yUGuTkf3aGLn+JphTIfidM8xYz4tSFDTJ7b/Mj cNniSHa+6Z7ISUnS1ttJGr15qHKAysk7bZnv5iLihoP8XMWdMFqPQqzg+BWhUGlwMSXQ 3A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ud4v2rb9b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:49 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AFKXlFH002863; Wed, 15 Nov 2023 20:34:48 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ud4v2rb93-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:48 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AFKItQs021588; Wed, 15 Nov 2023 20:34:47 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uap5k9kce-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:47 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AFKYi6N22348502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Nov 2023 20:34:44 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 984B020043; Wed, 15 Nov 2023 20:34:44 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4D66C20040; Wed, 15 Nov 2023 20:34:43 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.9.51]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Nov 2023 20:34:43 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , 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 21/32] s390: Use a larger stack for KMSAN Date: Wed, 15 Nov 2023 21:30:53 +0100 Message-ID: <20231115203401.2495875-22-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115203401.2495875-1-iii@linux.ibm.com> References: <20231115203401.2495875-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: HoxbfhrfP30Lz0w1WSeNKxPtFqv8h67h X-Proofpoint-GUID: EtmFvFe8X0_C13hfBo5WWBLzEHggaJhJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-15_20,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 mlxscore=0 clxscore=1015 adultscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 phishscore=0 mlxlogscore=905 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311150163 X-Rspamd-Queue-Id: F0ED840006 X-Rspam-User: X-Stat-Signature: h5abn8huxx5xqoq6rp9htzficusqcsuz X-Rspamd-Server: rspam03 X-HE-Tag: 1700080494-318945 X-HE-Meta: U2FsdGVkX1+3FJH/ywP1jcgpPFlUg6LfWSpEO+c3J+eGsvlLX7ja5FVKeE4AAxuld3JJ+xPMLwPp1YI9TMDmae8u3DWXRpohgtpc+34b6eoY2anyHycpPdaoCgLFs9jcl+V8BNL4h5kB6fXjjqFd6Ke7TJwSxBcFJw/KUOjNYENtp6HJ/vCvnDz1k+PqviHrjAEjvWpxz1Z1wP/inUwJbJUBHluc2xR2AHj8Z2HVpFejl/XKmsW1lXsvDgSmw96N8RgEhF3hmz26tuEincCygfVzNdJQIOcnF2cVWWLmtOREU/HbguUI70RxGrUfO20hOEXohN3Iy7rQj0XZqKst+CUZ+8uvWMp3VeaOOl9bl14ZpBZ2QCd71S0EQTZKBhQqlbyAKZZLZjW5xqR/CKsoXe3Ht66qKTdz6yw4IvHe3QkMtRDLvAeq4frTP5Qq9eHrwWVG32rlMSSCh68EWnkaoVCmaURhpoocikWUuG/rbsCgZl5YUlw3z8d3BJkb4lNRMp1S9Mvedod/8ptDjQDa4i99fONvFHhweRGXFVYV5bFGa29iubNqXFbEO8JP9Ed1yWgWivwmHUdeBZfddqj2XXetuq3Rn4z4swO/BytQi7YapUnSv68WJwDGuy1aRqtCMEyhr2pHOCk8tt+cepgDzekcXuUyL/AX3nFVJIKIaMuGydqn4vVAj+6nIsxVIl04+ny88JhKFwQ65JGS0see6oHm3xf5NI+CWpDjrkCVtzObmeiBXLB+28CmRaZwp1YbiEciebT2xvChH7yP5JPzgGJZ3Ykz90DsUTAgvef3sxT+IyS0/MAuhLSJqw16SQCq4LKl/KK7ezoFeFrMDSAeC3H3qnFCtT9t7eIIKW0mA6+foc49cO/tDZNdhhA1CO4PKXSLcVv1uPYfjLJGIKq4ZqAGdaEOj0euek6OABpAx+AaPVPiQ6emlHzys5QnuhrtMhZZK5YF81VXWcIadIn DA0v0W4z Rm7VMjVATKap6x3FmYH/eqV2hYcZAAFQTPJZ9D0n1yGJDmpv4JNsupUObcOU4yTE8EvNqOqmbjlAXx0C0hSn8maVCyuFTBb1icY8uZbJ8aYswpH83JkPkql/dB9ym08pk/vUFvPTfr9myMuZFzQmJd26wXTiEghjRw4o6mD2hZvaB8U2gAl8HAFZXbvglmX8VH/CeLeL7SKkJUGsnbkJpxNuJPfSbwduhGsnZohwqcQl3diqltomEHd9RFe8ETMCNR+705ldh1Y6fa7zr9KDgQbBTN+N4h8zXkYamKh1W56rU5gO2Twn8QxeTqA== 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 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 73873e451686..a7f5386d25ad 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -34,7 +34,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 -- 2.41.0