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 23EFBC46CD2 for ; Tue, 2 Jan 2024 15:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 941F86B01AB; Tue, 2 Jan 2024 10:05:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F20D6B01AE; Tue, 2 Jan 2024 10:05:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 793586B01B1; Tue, 2 Jan 2024 10:05:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 698796B01AB for ; Tue, 2 Jan 2024 10:05:50 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2C2F4A0810 for ; Tue, 2 Jan 2024 15:05:50 +0000 (UTC) X-FDA: 81634695660.04.DD376E8 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf10.hostedemail.com (Postfix) with ESMTP id 69A27C002A for ; Tue, 2 Jan 2024 15:05:47 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ieo1go8j; spf=pass (imf10.hostedemail.com: domain of hca@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=hca@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=1704207947; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yAUmslGfmAn/v408/JnMAl0laE6kfhNSkhNgHmtKlnU=; b=WE8HDegOPf0QCQ4L4vTH21dZPTMnxBnY/b3FLHYGIZlk5ecRB8ty2RHyap+NvZzeAPrOoS Z2smqjb1jgItuDbrH38zoC2gh98PP2IG117W+I9ZW/5RC1ZxU/vVdIf3XeWW/9k2hisbT0 kPzOomew8KWEXCO6iDJG45xJUtpEAZg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704207947; a=rsa-sha256; cv=none; b=67r98SKR+mWgtgM0RlGq/SwdlJ1Osayn8hMb6jp+zXy5mqpveCKtyrzFQ2MZpTgsx0BzHX uFOS7ggADIvTts+fPaBQEOvScAgl749mYm6f1ClWmLmPl9RQe/twZFZ1fsKWWFCeryQ1vb Z4/vq7PEzp1NMqs5+MmcxVTYknR+6bc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ieo1go8j; spf=pass (imf10.hostedemail.com: domain of hca@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=hca@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 402EQJ9x007842; Tue, 2 Jan 2024 15:05:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=pp1; bh=yAUmslGfmAn/v408/JnMAl0laE6kfhNSkhNgHmtKlnU=; b=ieo1go8j8kWEwJEEg5WO5vqKGg10aSk8+UtbSP/lq+gTsFu7bhHsL8dk9O0Pyb0xCOka lPLOwNHlS9mVhlub+fQfuNPYrAWqE8+/bDNkHm5Q9D7TzRwMTeu5kykgM+1BePfhuD1d bug+utmcst7Ol4gcDORK8Ef0cc3TKi8JQRta/VDfWlwG3ew14GeKqaAua9l1mZ0PA1hQ mUIi1/Jzr+5ZsiOa0DzBH6/YlbWvNkGhPSOtOISnyCmuxhS6/kasesUkVii/tMHZo41/ z1Vqzjuhvyg+bSK0KKIf+g5RQmO0VCUI9bJlbs+7wqXcWnTPgM3XZ4MPDebT/fHaG7et GA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vcf2j7s58-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 Jan 2024 15:05:38 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 402EurZf010225; Tue, 2 Jan 2024 15:05:38 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 3vcf2j7s4t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 Jan 2024 15:05:38 +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 402CNLmp017971; Tue, 2 Jan 2024 15:05:36 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vayrkd7fk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 02 Jan 2024 15:05:36 +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 402F5Xi514680808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 2 Jan 2024 15:05:33 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A82E120043; Tue, 2 Jan 2024 15:05:33 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8E97820040; Tue, 2 Jan 2024 15:05:32 +0000 (GMT) Received: from osiris (unknown [9.171.22.30]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 2 Jan 2024 15:05:32 +0000 (GMT) Date: Tue, 2 Jan 2024 16:05:31 +0100 From: Heiko Carstens To: Ilya Leoshkevich Cc: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , Joonsoo Kim , Marco Elver , Masami Hiramatsu , Pekka Enberg , Steven Rostedt , Vasily Gorbik , Vlastimil Babka , 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 Subject: Re: [PATCH v3 28/34] s390/mm: Define KMSAN metadata for vmalloc and modules Message-ID: <20240102150531.6306-F-hca@linux.ibm.com> References: <20231213233605.661251-1-iii@linux.ibm.com> <20231213233605.661251-29-iii@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231213233605.661251-29-iii@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Ha6_F5y1dtYwlryom_EL-MOezepsJYos X-Proofpoint-ORIG-GUID: YUgncFyGNiUc-bIEjUnn1fILOqO8p_p- 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=2024-01-02_04,2024-01-02_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 malwarescore=0 spamscore=0 mlxlogscore=925 clxscore=1015 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401020115 X-Stat-Signature: y517suu7pzg3ikye3p5qtaqds9moc3n4 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 69A27C002A X-Rspam-User: X-HE-Tag: 1704207947-575741 X-HE-Meta: U2FsdGVkX19bbK61NyR2lu+2xyGWFg/RM1bMo812gZ9Q88NT9iWqEYZxDsvQzsL/zQehIISC/dj1J3Pj3R0Xn6BRuGKqsj9oi5qQSlM4dSxW65pwIf7kbtuuJ70cnmNIhnE8sUrfkQXPfxtqZJFC6tyDHEniOaPznHY+puG4vvZnwU8BUj/aw2OxTEEvIZVjISYUXXATj7hDec9t9/B7JbqgL8VsB3qqnsiW2GbSFSvHedztKzWtjdFxUlzQ/U0U9aztd1c256/4WZNM7PtLu3ZZG+r37BkX/lMhb22i3B/20tQOTA+v15IYV/u3kiTAuV0zQQ5d8pHOuD2aW5MKn1g/tdizOd5IgtQLd202BX3inUNns++3Kf9nL7JYO/LnFMWefI8s2/DZyxdha3bvqjPMK7LkKXuBbBloTGmwvIBVa0fNuh//OfsD6wqLYZAe0QW9HMWA5p7MIMGYNQ3w7cjmLRyh7+tCfnAIVV1OYShNsgt/iSViSjH2LRyYs7AMTqqYbmrhoW8PTiNo6aaXeK4n7Vt4IiAeU5wPzq35egi2RD5+xRGOYsG1mokl7cuGJkbJe86IVIqezCJWN0TYmftWPrcYe11PjtoruwxxX04Xgp1RYS1aqZ5Dj5Ep2BLgYWf4rAErBhhvtsNiuTL9y9KYkFAdHkBRtb8VP3jD4OxRFYVA0VsBbGmWmxe3T54CeygN340uGT5wMfaV9sgO/5gvt5skmotO6NQ9p3DoArcQ4juQpcrEfCLY8JN+HzInGeDgZQJ67+op4EywRRfQl5dvJUAxKOAgV42WBilBBbqTHtxiBQM5+4Z8VGxtcErzBZ4LW2TKvhiIEperXykqSoO7TRg2XHRRGsmcwbby526h7GrqFwgsj+6L8SFu7ZEo/omxnR3loJTpeqvt3M9XeO/trZuBzO5YadHEQkl9CSTRYHTz8bQANE98Wte5tAwYcvBRD/ARp65Q3lrY33Y HtjJIRP8 lwbJTsbnnZ6vy+HID6HG0Wv0gi99PEwjBed7xtOZrs/E+2+wo6yRgPOdVYdD8xNVTe924awF+u2WbFH8yhVHe02Zof/HzT3Zt/lXbCsbUXJcpGxFXxSownCaMDfGZTF9hEtI8drDI12kmi7ht8hUE2ukdBWpBWBztJ21PfEawMX8Xfkj2Laqh72knZCgR3Z5QfFkPtPLd0mDoMkUMk5ZkV2hh2Rgnu/WAQDmejUZs1d3BHnAfjrMMzuARoZ9Bmp2WzRvk33PBlU39k3BcrmQjN+nNJCJDMNQbOXhCY9tGW5RE2qOj1Cv7E9iIBND9WvW2/IIiMotP4O/b7IJqPnPgutfaSQ== 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: On Thu, Dec 14, 2023 at 12:24:48AM +0100, Ilya Leoshkevich wrote: > The pages for the KMSAN metadata associated with most kernel mappings > are taken from memblock by the common code. However, vmalloc and module > metadata needs to be defined by the architectures. > > Be a little bit more careful than x86: allocate exactly MODULES_LEN > for the module shadow and origins, and then take 2/3 of vmalloc for > the vmalloc shadow and origins. This ensures that users passing small > vmalloc= values on the command line do not cause module metadata > collisions. > > Reviewed-by: Alexander Potapenko > Signed-off-by: Ilya Leoshkevich > --- > arch/s390/boot/startup.c | 8 ++++++++ > arch/s390/include/asm/pgtable.h | 10 ++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c > index 8104e0e3d188..e37e7ffda430 100644 > --- a/arch/s390/boot/startup.c > +++ b/arch/s390/boot/startup.c > @@ -253,9 +253,17 @@ static unsigned long setup_kernel_memory_layout(void) > MODULES_END = round_down(__abs_lowcore, _SEGMENT_SIZE); > MODULES_VADDR = MODULES_END - MODULES_LEN; > VMALLOC_END = MODULES_VADDR; > +#ifdef CONFIG_KMSAN > + VMALLOC_END -= MODULES_LEN * 2; > +#endif > > /* allow vmalloc area to occupy up to about 1/2 of the rest virtual space left */ > vmalloc_size = min(vmalloc_size, round_down(VMALLOC_END / 2, _REGION3_SIZE)); > +#ifdef CONFIG_KMSAN > + /* take 2/3 of vmalloc area for KMSAN shadow and origins */ > + vmalloc_size = round_down(vmalloc_size / 3, _REGION3_SIZE); > + VMALLOC_END -= vmalloc_size * 2; > +#endif Please use if (IS_ENABLED(CONFIG_KMSAN)) above, since this way we get more compile time checks. > +#ifdef CONFIG_KMSAN > +#define KMSAN_VMALLOC_SIZE (VMALLOC_END - VMALLOC_START) > +#define KMSAN_VMALLOC_SHADOW_START VMALLOC_END > +#define KMSAN_VMALLOC_ORIGIN_START (KMSAN_VMALLOC_SHADOW_START + \ > + KMSAN_VMALLOC_SIZE) > +#define KMSAN_MODULES_SHADOW_START (KMSAN_VMALLOC_ORIGIN_START + \ > + KMSAN_VMALLOC_SIZE) Long single lines for these, please :) With that, and Alexander Gordeev's comments addressed: Acked-by: Heiko Carstens