From patchwork Fri Jun 21 11:35:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13707338 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 49E69C27C4F for ; Fri, 21 Jun 2024 11:38:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D3FC8D015D; Fri, 21 Jun 2024 07:37:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45A2B8D015B; Fri, 21 Jun 2024 07:37:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AF978D015D; Fri, 21 Jun 2024 07:37:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 053408D015B for ; Fri, 21 Jun 2024 07:37:39 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C19FA160D93 for ; Fri, 21 Jun 2024 11:37:39 +0000 (UTC) X-FDA: 82254695838.22.9026F9D Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf28.hostedemail.com (Postfix) with ESMTP id 85F54C0005 for ; Fri, 21 Jun 2024 11:37:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=UkWan7cU; 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=1718969847; 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=cEMqaywvtORaQ6RknV2VWxRB+KzeFhGbGuANc+GngUHUzXyZPcCb61HcF1Fc/tzR7Pt/fF R/3TetsaG51vKdA0WUuDY/tCOmjrOTEoygw7LzOxdpqZOqRQXmNv4pg5RCa/b4HkSVg1dG U+EdWXi06EwRJqNDShwPAW35AXllalA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718969847; a=rsa-sha256; cv=none; b=JoDhmCp/FMVe47WnFiusAxMWu+pIMpUmOqqQhcv3/zYKGWcsS0PIoZjq6bCWIpAHH1Sz0p LTVIgFC1bPFAIGcwgAeMxAdoN9b1zqllaFcsH7o0AujbPfkJZEBlm6BhkOtjxarxEzO+Qp V/DTsDkaO1wjzWFRsZ4779unTn5YVPI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=UkWan7cU; 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 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 45LBCX9O024566; Fri, 21 Jun 2024 11:37:31 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=UkWan7cUcNRH8oR2BBetTb9Dvr7/H O0/Uo54O80JTg3Xx8tiuzYP3owLeKfk10eiNGRV7kUCmNqoZUEVhQpnVejQ+72cv aaktkQPOGnwT4U4rxPwalFcQtGI/GPo1T6omd7N+OzLAlwRI1nGD42bB4n4esgDM 1TLfXHekE22RLh/tLO2ZsrEF0nXGHx9kZ/Gb5Z+KI7kjDfWG2S9t9xiDgvQ4kM21 ZcZ8W44cRdC6mOiEkarhqIhgKlCPlp8QVWvNgu+qscLb7T+zFK1HAP4yXded+WCd SoW8dn5BXOgbDsKrXqUZ/BxBfP35iTMCQJzPCmQYB5Tsor50i14Y0+shw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yw89g0294-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 11:37:30 +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 45LBbTmw029867; Fri, 21 Jun 2024 11:37:30 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 3yw89g0291-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 11:37:29 +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 45L9Jwlo007675; Fri, 21 Jun 2024 11:37:28 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yvrspeuq7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jun 2024 11:37:28 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45LBbNVf18285046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Jun 2024 11:37:25 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2DF4920043; Fri, 21 Jun 2024 11:37:23 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 994292005A; Fri, 21 Jun 2024 11:37:22 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 21 Jun 2024 11:37:22 +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 v7 23/38] s390: Use a larger stack for KMSAN Date: Fri, 21 Jun 2024 13:35:07 +0200 Message-ID: <20240621113706.315500-24-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240621113706.315500-1-iii@linux.ibm.com> References: <20240621113706.315500-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: LpWocQY_2z3LBTS-d-yrj84PF4O_dgDf X-Proofpoint-ORIG-GUID: q9YeCvfYquJu68q92OV0j4NyHKdiD2Re 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-21_04,2024-06-21_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=869 clxscore=1015 impostorscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2406140001 definitions=main-2406210084 X-Stat-Signature: 8u3zhjx1e6fc6yjho551ncmz1b1kzcjp X-Rspamd-Queue-Id: 85F54C0005 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1718969857-469788 X-HE-Meta: U2FsdGVkX1+Gt4P+EUbxB8YdojMZZcCcrv3iG3RfWm06ZFZdtlucyr+FgQeGZRALD/BtJGeS+aB07g9HdsuS2RUKU+ZGdiIqreEyEptHRI2d72Nz8Ft98AIatlbATSjI8nb38tMiMCT/QixcC+Ufz1NTzoJImryDDBFBw0rfjECF1gls9i7b5oaGb7bQ3tJpAfkP9vlGyvRcYiGnpeWYyL29ZJDG7wclydAMmfG6YVhb32+Ofp6/Jtu0pFGo4P+m5xI/gHComAXKJZ8ZgK6OeaGS+xec+EIVKCGo3z99HjUSbfPfKfzW7NADT2SaOWNSYeFDZS1OSJJ1VWy2MwonYc/txu6wnBx17CG48jjhhjI4Ld+uDhZFnlIAxYGeT67X36qEQq7ad0Cvi4WS27ZkuHRMRUfG1pIYbuKIjgkYzLw+5g+UwSg6ps50okJA2+NGyULWu+b87hYpb7m6nzd1AbvHrhE5fplsPdB5urTkOv8shLnTU5Y6AfIrLlPE/xfRwtU5xWyk3vxMqrCPoYNInN2UKPJP675GykNIs8Qksy0+XzGpAKKRAvyu0BtWGxub2l5i2OltaQXLSYqAxqiC8vlBA6cFvjUCXt4dxUoN903yGukEx7a6jwjE04TwfFXpduZipFKiczsjTRy3ZJlJ3sJe5ghqJgngX0TRb6hRtwvA2vT7lb86MsaCB/jtne4r5KoHci1ktxSH8z1YV6An/XqVl0H7Ig9Ak2MNbF/B+hqIO9M39TgBWqvdY8reEWrP7IrVBmpXe8u4XBTdneHz3O+qdNXBj8ruYZTLTwLyfAqQPF+737c1bnwC46cqxkD2V6fhqSAW/1VHOZYlz08QmEstaAI3s+BN8F8ky5xThx2BKx+DMoPz3WQZZhXZ14ukNQ31a5FHlc0JRkXmvMfIVblKlMiDJv7Y2za35wNseW4JF4irmhsa3vahiadYO9miw4DND7bL5YNPGMVi9nq 6WkIfgZI w87A498p3eEDE46vHoAfo/MaiLqhpoZ7ZYEVrK5sHLjIvCIETdaVYte5QaHDuPWOHIKcOqFrca5WR8PtF9D/5+grXZTF8VIV9o1U7yp4alvado+066Q8D8HhpXSLAdDyF4ID7nUViWb5QFIIhY4V84juNDmbHUtbRNYV5GkupIE7hdm82Rhh3vGSDA/UjAThnMM1wk2rGYn+5sPsQLyxlj1QU9dxzF3OWQlvCFQysG6y/xyXffONs7vf4kOCPTnmTk/136exuhb760fNqS7v8gOJQMiEA+ppw2k9d7VKlZxz4zeEqIEbHLJC8cayS5WClMZBZz64kKK2HtGBYccB7Pe0fYq3cdudi/3lnwe9/FpTP/1G9s9UWxQ4y8BEpcUpuvi+8RriB7mG7MgfDW+rpgWQkABZ6HOqT2li+yMZ9GZN9nLE5LpzQunFLFXZDMVDTsb8Fh/i/FmWjXpU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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