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 F041CC4332F for ; Wed, 13 Dec 2023 23:40:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D39638D007F; Wed, 13 Dec 2023 18:40:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BFC686B049A; Wed, 13 Dec 2023 18:40:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 961F18D007F; Wed, 13 Dec 2023 18:40:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 82B0A6B048F for ; Wed, 13 Dec 2023 18:40:34 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 35D3A140336 for ; Wed, 13 Dec 2023 23:40:34 +0000 (UTC) X-FDA: 81563416788.08.E06AB01 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf22.hostedemail.com (Postfix) with ESMTP id 0514BC000F for ; Wed, 13 Dec 2023 23:40:31 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=WP8t72Oh; spf=pass (imf22.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=1702510832; 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=uWvuPPN5yMGUzijlzwdfjnYn6oWAG+E9+mRhNLF0PzU=; b=gHA7iYNO20HeL8vhhvyk7+Wttz2gqNeR/MdvpgJGGmYEBX+W0XtdqdeciIWPndq9eN0zii FAajzD9oAux1DyUuxtoaOFdiYEeUIhgP0onhrRI2SpPzDnYtkrRI0l9BbTT3o+xy5PKRyU r3fUzMTLIlYBt72ZM4Q9KOsW7vuDwHk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=WP8t72Oh; spf=pass (imf22.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=1702510832; a=rsa-sha256; cv=none; b=5dd2ZgpqP9w1S2p+vcDkH9aOBKSBmB14I8cSd76YydO4aEuzSSM+0j76bMJlk+FP/M+CI2 0UUTmjcmzSwQ50z6sQBRYYhZ4TvNS41Ta42JrHqEGA3yOD+AYQN2Csui/RjBsZLdDPUJiL Ij90LLABWQE7bOPnt7RvFcqs6zqiEOQ= 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 3BDLr4a2019480; Wed, 13 Dec 2023 23:40:23 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=uWvuPPN5yMGUzijlzwdfjnYn6oWAG+E9+mRhNLF0PzU=; b=WP8t72OhNaIzSvacn7nXU5/AjpTzQseze+jc9c5xggCQfG9sI18/LSi/A5e1V8Px1Y6m M1ZNgzho0bX70AP0C08TU6ffwHcSfuGmtQyUOwcgF5ltpI7lRzcMs680vti9B6yZXtet ZAwIImDghvvwUt8Pzihgck5Ml2k3Pr54R8jQmv21Q1JA5rLuLV7Y3FK3tJbvLomA7jlj pWYsZdWHFDiVWpW80UJcP8aypB1SFLcuVjQkFQVcG7Nivq/PxFN9h10pczfhtKL3hNeU 9bTdjvzRkSombKbAIa21+G0zFIzliyncnnkW6RvbAG0J9acVz2VtvAAhqpSdsa05TZrQ Rg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uymwuj5vp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:40:23 +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 3BDNTnBs001737; Wed, 13 Dec 2023 23:40:22 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uymwuj5d8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:40:22 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDNMPKY013892; Wed, 13 Dec 2023 23:36:44 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uw592c4gm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 23:36:43 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDNafIt17695278 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 23:36:41 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 14B9C2004E; Wed, 13 Dec 2023 23:36:41 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F2BE20043; Wed, 13 Dec 2023 23:36:39 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.70.156]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 23:36:39 +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 v3 20/34] s390: Use a larger stack for KMSAN Date: Thu, 14 Dec 2023 00:24:40 +0100 Message-ID: <20231213233605.661251-21-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231213233605.661251-1-iii@linux.ibm.com> References: <20231213233605.661251-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: _KTup_EWxPhkC5n29RfmF3CCmvf4rKJK X-Proofpoint-ORIG-GUID: riNn7eVXpvOl0DpCewBLQEHSMh_RwdVH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_14,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 malwarescore=0 mlxlogscore=874 priorityscore=1501 impostorscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130167 X-Rspamd-Queue-Id: 0514BC000F X-Rspam-User: X-Stat-Signature: rf9hfrdy85hk6oqj6bu1jdasafmdsw14 X-Rspamd-Server: rspam01 X-HE-Tag: 1702510831-387203 X-HE-Meta: U2FsdGVkX1/3LIXGJN/aAR9+42t6Q4+svRzsIHCtrq7ETJ6vkFdmJpw7/nHA20WBLQelvnN33JS2w1xJTYAybJ/2oiQk9ttKbv4j26SU7DXZdZULKwIB2PbkzYvdmmC/A+8zG/8oEQA7BYuI3BBSls5odUEPcA7DBQYOdyX+d5RSRJrHdgeTOC+fNclJqjI6/F+M9BkDOqYlAa6fRXcqp/Hs66HRVNGEShQ7Dpz/ofZBM2PKuWPvVk4Zo+NHUXwl8s4g3qwo5N+ILvfS8FeFQ0hMq1Jr8pPnp2lhibsNHGKTSyzkoMWr5fb0K3zDc0CA09aoDBbMmfy2dKA2NEAVtJ1nzf03RR6P0f0AaFzQt2ZaIZ6tTkijVwVWac3mehFZqaPeHCDgvNs/NqwCHJSdKAglz5QVBrYoGliy7+7v/L6+MgdieIDeH9KY2qtYB0SHQ0fq+YWCLI0kK+w4uvyB8LHQV7/lSDC2+3mM4cQg1L1Lkw/QrzajndnPChATidsuke9XnykwWO9KfLNvYAwd6uZMyVaEeavUukMt0QXGVdnYExJ6QJiATqzPMuZBj8SGIYSvFGRTIdpRNhItodHTB9lJJC0isKgYfPbGA9AhkLhy88AgSsY3yySzIOA2F0Y83zcJhCzXMtjQeopzoiIavk9AZto8OVjxN1G5RrGy6vdko6ZWvG6hokzI8gRgcv1xlXt5lMNrzwyYHQjPNSPKcpk6ihJp4UD8YVT/YJqxmUrP7exsB59+Wq5UQnbStUYUdKh6d4GSVvTxUS3/6bb6d2wfUvNfs8D0ef8vEKRAyQPqj3x5m6U/TB+bstqFUwVCXPd8rJ79H7EgVpd3KOS9guoskWKwSICdKV2oWJSStmbH36x5ktWgjiXKtogcrij+CjeIQlK0Jbth9P5xY8WLRr/dUuzpju8t670GZG7MpNPX2zLO6qQBr4q2WHZd9H1WOO0ltTitiLYuEdWnbQl +QkWs4s9 wSXn9Tcg90zXNfAUBv++cBRO+j0PLAaelCs27cD3r8nQ7yjfM4za1L0zJfcyfxYWviTROVgUdZEYPMMGhW639qowtVqQ5k7B12UaVc4U+1NrMc7T8GUbDeGKL2mONlZwW0s/kJmbET0vRjXXcpzj3gedwfeyAyhFYeYlHZ8Jxsvyb5uupIU7PSYhP3Vht5nt32wLbvThR6zgyHBMCMYq7k6dx6LXxzhj3x0ALpQnOgqMNGVThm91KYI4BuvnaF2Q/jj+SvpzA71SHltvL0X1Uih+WoDzdDnt+ki/IDsTjWzLINeok/UNOaO85gEJv9gavpkyhrhE34lDqZMo= 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 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.43.0