From patchwork Tue Nov 21 22:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13463645 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 D2C7AC61D97 for ; Tue, 21 Nov 2023 22:06:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FA6E8D0021; Tue, 21 Nov 2023 17:06:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AB798D0001; Tue, 21 Nov 2023 17:06:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54B638D0021; Tue, 21 Nov 2023 17:06:42 -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 41FB88D0001 for ; Tue, 21 Nov 2023 17:06:42 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1DD2D120C64 for ; Tue, 21 Nov 2023 22:06:42 +0000 (UTC) X-FDA: 81483346644.10.D64B31E Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf02.hostedemail.com (Postfix) with ESMTP id D17C38002D for ; Tue, 21 Nov 2023 22:06:39 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=IMKNmzrv; spf=pass (imf02.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=1700604399; 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=7CSL1yly+mfTewmMZpRp6TG2r/w75e0//7iE+NvfE7E=; b=W21nFRUusw9oWZJKGjKtbeB29ibcOYmn5YBLi/JIAQIMTLyf5NeS8etdv/1FHdUI+VX/Ja sTUxQUsZN2aac7Ok0GzLDrjZE+6SVUPlvmrPGoeBqAv6lMTGCzfcAHKrdcGD+EzY4M2rA6 SwUkiysj5DN/KC11OWKAhj8WmIToXi4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=IMKNmzrv; spf=pass (imf02.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=1700604399; a=rsa-sha256; cv=none; b=kgT9aQwO1sv4FhRXjoMWGKsAefNa6+aqUyOZFgepkLwlHHN4kva8NJygacDLa/l1U9sU+J Hzt7xgh6Py2aSxOxCd9wfdHhU9n1cSoNUIJSb8GtEsVvncCJxCWd3AmFXzbrAJwCSDXGE1 j8FdhkobAYrquidNEirLnc2SVED5T/4= 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 3ALLqdb5007881; Tue, 21 Nov 2023 22:06:33 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=7CSL1yly+mfTewmMZpRp6TG2r/w75e0//7iE+NvfE7E=; b=IMKNmzrvo2Eo6V60mMj4RFIARPo+7F1PlxgqF8q6cf/KbNzTCU3WJP0ahuImAo+bILu1 3feVzO+eGZ49N2SotNFg6qyMVsHYbtnNqv++anEJbzVQcyWJN23+YGC8bdKrZKgtIjPX ln7dXg9erwkh4REvEUNInwbUfUerJFksxiYK4vy2SqF//xP0Ytw4DDx31L6IWVF58LtJ QKzdsfuyeiZQrofXus6zU3yO4+p02MHuIf9ybalLA2zmLJhmWsVDQiyb3pXlKw+UzvTS gmvvKot37h6szY0cTURVHoJm/9vGGIxKfQxT1sMar8LYhiAZqgdvXfqJTrfZKebTkiZ+ 6g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh4um08k2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:06:32 +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 3ALM6Von010668; Tue, 21 Nov 2023 22:06:31 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 3uh4um083j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:06:31 +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 3ALLnblU007094; Tue, 21 Nov 2023 22:02:28 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3ufaa236f7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:28 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ALM2QxG22545122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Nov 2023 22:02:26 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 01C3F20063; Tue, 21 Nov 2023 22:02:26 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A1332006A; Tue, 21 Nov 2023 22:02:24 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.23.98]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 21 Nov 2023 22:02:24 +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 v2 12/33] kmsan: Allow disabling KMSAN checks for the current task Date: Tue, 21 Nov 2023 23:01:06 +0100 Message-ID: <20231121220155.1217090-13-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121220155.1217090-1-iii@linux.ibm.com> References: <20231121220155.1217090-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: vq9TrT9-Ju98k7vaL7yav1286yi8B8Ws X-Proofpoint-ORIG-GUID: _KHwdu07uF0ruSXi3x2EIAiyQ3KGTxsR 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-21_12,2023-11-21_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 mlxlogscore=999 phishscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 spamscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311210172 X-Rspamd-Queue-Id: D17C38002D X-Rspam-User: X-Stat-Signature: 3t1px9mhe3jf6cb6j55ugf9uh9jrougn X-Rspamd-Server: rspam01 X-HE-Tag: 1700604399-410800 X-HE-Meta: U2FsdGVkX1+ZONp3CujJCt2k2qhDGht8pp3oN34UW1N1iOAA5gMQKbIFjTM6LtHKa1M5VfHvoBZBBO1Vcs4m6KdUnI+E0ctk+L43AdR2GpoQR237oDrJxViEVlAOEVf+59yQlBNW3Z5KlIn3NhajwTZmdwdY9jpOjy314/Go2aQsp4pUxfW31Buujzngtt2JJuXfvZWSLTKqwZUJrGgCtN9o2x90rlFF5e6oyPJNAoOFibDk/QI9u5XuS8on4HOwTYJCdnroLI5Je6kLPR5kUFUrwrNqNodKHKRwbq9RLiEfdQJZ24h25airqSaRfE9qeegGMN2RtCy7pbXH0E4cGkhdGrFv1tfCc/0Y0eANc2mbNftEV63tt29IrPCvA/xYrtCRVM+NijIYNKm/mbHrCnMvxiTrRXS5+eyvF+wCsmG1gmnKr4WEhH2DLClqDYnUw9i+R4kN/8uEB0qxiDKGB2CRAoN9sLfZrtHgJ9UOrmNPkLkcYgxKnbxQus7m1UdGFhgBcalBoBAmoMPr9hXIiNsg4pD9rJnamvMXXLblJiQqrKEch7eleJjoyyHjWvJEfsnHdpHyFw/WGVF8EJrOQjQm3VzFQvuoBUtXo4VElmVybrh54U7nbRPbtRToz+tjWtFw+FGfGAbvyqVVx4VvEqOQQXQAo82B+74w1sba8Ml37T4UdcgQHcboz4rfaeM48TlhvBjHdjcIBUHudm6SSe7xTaEKO2EakwPbaa0Eg416gvBhSUz7WcMDZ8rqsrMQmshhgD4Uq7o3tnR0Q8I5g0DQ6A0m9zqbGstZvHDXhCi/RsDb62MhuECpzs4/PWFuloTrqA0e4Md0VJTgJtuoMyPziD99JQ768zR/CeDymJ7aQ2Gdbx9n9Uys0l6eQNYB3+jmew4janqhNIVWaoiCQugL7SG8mg45z+iOZy7n4xth6D5QYcBectsSmRfqdBb56GI+Es7nIe6Lrf3rwCa nOs9BUqH ZJPZi5sPrSNogOtpM5JC280cVqCx2x5Eau0/kUL78WbAO65tIL2M1c2boKEGp8HWIf67/O8CVUpdgw0Hvuemql5AtqSqH1b+jmjlif34m2Dq2Dfc3knSWQfuftMLyBBKY9Rh/nK+hz7SPOxCVHnuHtUCWVDURnbK5P5926fhT5SkuxChtwphvj0fTl5DqLrPd+QqFCUW7FrU1q3i7efmdnAdfor4ScyXRRatOocG/llx4V4IzKQms+ykd4eN4r6Gij02/6SEaoeqlRe8SJUCGOM9CkDsro8Q92wqJyi3kr1RSTmr/BrNFs+5rww== 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: Like for KASAN, it's useful to temporarily disable KMSAN checks around, e.g., redzone accesses. Introduce kmsan_disable_current() and kmsan_enable_current(), which are similar to their KASAN counterparts. Even though it's not strictly necessary, make them reentrant, in order to match the KASAN behavior. Repurpose the allow_reporting field for this. Signed-off-by: Ilya Leoshkevich --- Documentation/dev-tools/kmsan.rst | 4 ++-- include/linux/kmsan-checks.h | 12 ++++++++++++ include/linux/kmsan_types.h | 2 +- mm/kmsan/core.c | 2 +- mm/kmsan/hooks.c | 14 +++++++++++++- mm/kmsan/report.c | 6 +++--- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/Documentation/dev-tools/kmsan.rst b/Documentation/dev-tools/kmsan.rst index 323eedad53cd..022a823f5f1b 100644 --- a/Documentation/dev-tools/kmsan.rst +++ b/Documentation/dev-tools/kmsan.rst @@ -338,11 +338,11 @@ Per-task KMSAN state ~~~~~~~~~~~~~~~~~~~~ Every task_struct has an associated KMSAN task state that holds the KMSAN -context (see above) and a per-task flag disallowing KMSAN reports:: +context (see above) and a per-task counter disallowing KMSAN reports:: struct kmsan_context { ... - bool allow_reporting; + unsigned int depth; struct kmsan_context_state cstate; ... } diff --git a/include/linux/kmsan-checks.h b/include/linux/kmsan-checks.h index 5218973f0ad0..bab2603685f7 100644 --- a/include/linux/kmsan-checks.h +++ b/include/linux/kmsan-checks.h @@ -72,6 +72,10 @@ void kmsan_copy_to_user(void __user *to, const void *from, size_t to_copy, */ void kmsan_memmove_metadata(void *dst, const void *src, size_t n); +void kmsan_enable_current(void); + +void kmsan_disable_current(void); + #else static inline void kmsan_poison_memory(const void *address, size_t size, @@ -92,6 +96,14 @@ static inline void kmsan_memmove_metadata(void *dst, const void *src, size_t n) { } +static inline void kmsan_enable_current(void) +{ +} + +static inline void kmsan_disable_current(void) +{ +} + #endif #endif /* _LINUX_KMSAN_CHECKS_H */ diff --git a/include/linux/kmsan_types.h b/include/linux/kmsan_types.h index 8bfa6c98176d..27bb146ece95 100644 --- a/include/linux/kmsan_types.h +++ b/include/linux/kmsan_types.h @@ -29,7 +29,7 @@ struct kmsan_context_state { struct kmsan_ctx { struct kmsan_context_state cstate; int kmsan_in_runtime; - bool allow_reporting; + unsigned int depth; }; #endif /* _LINUX_KMSAN_TYPES_H */ diff --git a/mm/kmsan/core.c b/mm/kmsan/core.c index c19f47af0424..b8767378cf8a 100644 --- a/mm/kmsan/core.c +++ b/mm/kmsan/core.c @@ -43,7 +43,7 @@ void kmsan_internal_task_create(struct task_struct *task) struct thread_info *info = current_thread_info(); __memset(ctx, 0, sizeof(*ctx)); - ctx->allow_reporting = true; + ctx->depth = 0; kmsan_internal_unpoison_memory(info, sizeof(*info), false); } diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 4d477a0a356c..7b5814412e9f 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -44,7 +44,7 @@ void kmsan_task_exit(struct task_struct *task) if (!kmsan_enabled || kmsan_in_runtime()) return; - ctx->allow_reporting = false; + ctx->depth++; } void kmsan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags) @@ -434,3 +434,15 @@ void kmsan_check_memory(const void *addr, size_t size) REASON_ANY); } EXPORT_SYMBOL(kmsan_check_memory); + +void kmsan_enable_current(void) +{ + current->kmsan_ctx.depth--; +} +EXPORT_SYMBOL(kmsan_enable_current); + +void kmsan_disable_current(void) +{ + current->kmsan_ctx.depth++; +} +EXPORT_SYMBOL(kmsan_disable_current); diff --git a/mm/kmsan/report.c b/mm/kmsan/report.c index c79d3b0d2d0d..edcf53ca428e 100644 --- a/mm/kmsan/report.c +++ b/mm/kmsan/report.c @@ -158,12 +158,12 @@ void kmsan_report(depot_stack_handle_t origin, void *address, int size, if (!kmsan_enabled) return; - if (!current->kmsan_ctx.allow_reporting) + if (current->kmsan_ctx.depth) return; if (!origin) return; - current->kmsan_ctx.allow_reporting = false; + current->kmsan_ctx.depth++; ua_flags = user_access_save(); raw_spin_lock(&kmsan_report_lock); pr_err("=====================================================\n"); @@ -216,5 +216,5 @@ void kmsan_report(depot_stack_handle_t origin, void *address, int size, if (panic_on_kmsan) panic("kmsan.panic set ...\n"); user_access_restore(ua_flags); - current->kmsan_ctx.allow_reporting = true; + current->kmsan_ctx.depth--; }