From patchwork Thu Jun 13 15:34:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Leoshkevich X-Patchwork-Id: 13697140 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 162BAC27C75 for ; Thu, 13 Jun 2024 16:47:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0FA18D0002; Thu, 13 Jun 2024 12:47:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BFA76B00CE; Thu, 13 Jun 2024 12:47:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85FC18D0002; Thu, 13 Jun 2024 12:47:15 -0400 (EDT) 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 69BAD6B00CD for ; Thu, 13 Jun 2024 12:47:15 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EC50180225 for ; Thu, 13 Jun 2024 16:47:14 +0000 (UTC) X-FDA: 82226445588.20.03890F9 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf13.hostedemail.com (Postfix) with ESMTP id A395D2000F for ; Thu, 13 Jun 2024 16:47:12 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ILj8Ey+G; spf=pass (imf13.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=1718297231; 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=uLXUx7Jp3bWbEFcECk7slBB0jNtnowMXhhGygxJBd8E=; b=eWrAJfLY6LI2DPId0Y3+gtMEfyVJj78VuN7Ix9n2Fy+nZ6nJMu97EDtWr2tXEY8OsO+E3b nRjwR3b75W0Yg+WspZ0z8QoZE3DFXaRwcEQibYgYUyIr57+8GbB4fTUupg02UhyEDVhT2a bh8n1GlRBjhu4sE9cGqRuJa3kqHa1dc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718297231; a=rsa-sha256; cv=none; b=5q016qV4xRbwu3CA68BZy7DQ09ORpDXLXytOGi+Be4xo+PVz9QozD9AVKfC2Qr22Xck7Ei NFt2nzAhF0vVd1l/pm7fVsCLO91Df6Y2Uzp7g6fQDceafjF7hWA6N7IMWF1zS2l1vZsHZ/ RHgWvKrtJ81+QHNBx1Rz1ZMMC3pFoiw= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ILj8Ey+G; spf=pass (imf13.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 (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45DDoRSf002951; Thu, 13 Jun 2024 15:39:50 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=uLXUx7Jp3bWbE FcECk7slBB0jNtnowMXhhGygxJBd8E=; b=ILj8Ey+GeP8nN2owTF8zsbzwpRcQj qO8hJBDrYsWHvWkneuCadTPak54P+eMoO9lWl2FOhSUVpgP31wAQ8I0yLWn5X3L4 PQJ7GHenGzZzD1U2GlwV8XNM6BidA9yS2+kFZ8hwPssap+yZlF+RSYCt69fqq7fK Cx7Y9gwdxrUj2hso+XG4MWf7caTzXpg7d1K6d2Qsw14nHavswhandJcqmQJWz/AF rfeF5T3StB+ibSzvbvfLbokeTBY7kLBKfXnUwGEkeKFCzcMQCuR5zIlIvKQwU5q5 UFXYB1n4JNGut/DrvkVJrOLUgRY7lFy9XfSh7AvjA/YOG8z8RcPmnmTMw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yqy258xxg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:49 +0000 (GMT) Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45DFdnRh021098; Thu, 13 Jun 2024 15:39:49 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 3yqy258xxa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:49 +0000 (GMT) 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 45DEAxeS023597; Thu, 13 Jun 2024 15:39:48 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3yn3un0qgj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:48 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45DFdgvl55640438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jun 2024 15:39:44 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 48EFF20063; Thu, 13 Jun 2024 15:39:42 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C9CA52004E; Thu, 13 Jun 2024 15:39:41 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Jun 2024 15:39:41 +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 v4 17/35] mm: kfence: Disable KMSAN when checking the canary Date: Thu, 13 Jun 2024 17:34:19 +0200 Message-ID: <20240613153924.961511-18-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613153924.961511-1-iii@linux.ibm.com> References: <20240613153924.961511-1-iii@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: I4PaEB_PP3Cvo4oOH-ZDVke6KXq6_-uP X-Proofpoint-GUID: X5BX2RWEHptsiw2F2Vy6DfHMQyyCihli 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-13_09,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 suspectscore=0 mlxscore=0 malwarescore=0 adultscore=0 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406130112 X-Stat-Signature: yhx36nz69a9666ytrukna9smctgjm1fr X-Rspamd-Queue-Id: A395D2000F X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1718297232-183678 X-HE-Meta: U2FsdGVkX18CsuBNqQwAID1k/ZEvzg+sqwz4PICLLfWC052xRZbi5geAgk4hAzlPzbJNtFwO32fXv9RWonU+V5aPNmSMK5kfFgBeuCUmpr4cLfsx8fy8Wy/zhmqbgBGvykGy1kQicGDoTuWXfwD+Yd0DNeYwbC9pTekBRg5rTeTRraqiUf05o/c/2J4eZJ/lv08PBy9y9a+IGTslx5nHDwstWErxvx1H/S7wPE/ekgUIEciWxv0afIXsYrv4wPeIGEV+t4AScmDCqDNN4uba5gBn1eZJCGBFcIpcXjKflbp/49N9rfg0+wKN2+P4Q2mWnU4ckECx1dnvLWhyJGzlRfkBeqGbkaOhH11xsEmNR+YpwVNx2PfGVK56ESDNe77LSwrc003Q+aOqIi7+Buz+NSOCNioKNU7wXYKB8cXB/bh4nCYbSXGQFHOnNQg+YnJ2dTzUSJ0h0fnugBWKnT5hTfx+jaQ4tKpPYd76/zb8XUpZGdWWswOJVPzNjC0HKQ2JeYPgLO9cqQAoGQ9ksKu+0hkXYyWT0pCGZcAeT9pmjAVsOz6xK7bVI8sSMElOhtEp2y0AAioWjteK+Z2bjwhPn0HgbN+Ys0SZ1veu7YYJgHTwdfDpsdktB46TwX9H8udJvngUzbgHkpaJxZisX6SyO4jbshWCyA48pTsloJL7cVdfT0Hc4k6q5kO4Gyh3zCdHIxXcnUSp5n1BnD8hyVH3vE2tlBX/UQ3VjjXsZtcRuKmZ3EzoNQVqRcxoAxpAOF0hwvYTQqflYxUISBXmcqAQnxQVEBFFIonZkcBBP/9SD5BZ4URI1zT0y+TSDk++LB4kCQa9WQ4ylpP0FuqR9eTHVLbv/e9KZx9G5FnVRmU3tOZVw2uXV6ROKYCFtiM2vvupnfwWNmV4AIzmesIpXAziaNWivSONkaTVpfMnKAxpNE6SSFMsi828kZVHZUQ+lzyQnCMTCYMpLEvz/kxbBKP Bq2HvW1V Tfn51x3LVTQNvZwdLI884V0Q7TZJS2FrbAkhCpfug/k1uv6w17hstnQR5G9Ca/ywX9JXEOnu33K9Ri7aOGLdn8bh+BAc91KtNeMI/RZ1xazP/Grr4wsms4clwZi0KaWBdGuSGKQ2WyKmlEjI0Hq/DdBIqPKmlIzXJpfbcsVj3H2Hs+9aU6qIRscp64NFUkHr8dY86z5m6A3PI/rB8NgRg9DxpVJBFfR0nSEjKNBnECT2AXgtt6jqY7UDOaOW3vpZnlAVmV9xc47kd/wLwFXOJkiMeSTwk39F4TD6dHj/8Feohy6b32wSo4GKD5Ynb+WVX9TNc1f8PJ99dQXQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: KMSAN warns about check_canary() accessing the canary. The reason is that, even though set_canary() is properly instrumented and sets shadow, slub explicitly poisons the canary's address range afterwards. Unpoisoning the canary is not the right thing to do: only check_canary() is supposed to ever touch it. Instead, disable KMSAN checks around canary read accesses. Reviewed-by: Alexander Potapenko Tested-by: Alexander Potapenko Signed-off-by: Ilya Leoshkevich --- mm/kfence/core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 964b8482275b..cce330d5b797 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -305,8 +305,14 @@ metadata_update_state(struct kfence_metadata *meta, enum kfence_object_state nex WRITE_ONCE(meta->state, next); } +#ifdef CONFIG_KMSAN +#define CHECK_CANARY_ATTRIBUTES noinline __no_kmsan_checks +#else +#define CHECK_CANARY_ATTRIBUTES inline +#endif + /* Check canary byte at @addr. */ -static inline bool check_canary_byte(u8 *addr) +static CHECK_CANARY_ATTRIBUTES bool check_canary_byte(u8 *addr) { struct kfence_metadata *meta; unsigned long flags; @@ -341,7 +347,8 @@ static inline void set_canary(const struct kfence_metadata *meta) *((u64 *)addr) = KFENCE_CANARY_PATTERN_U64; } -static inline void check_canary(const struct kfence_metadata *meta) +static CHECK_CANARY_ATTRIBUTES void +check_canary(const struct kfence_metadata *meta) { const unsigned long pageaddr = ALIGN_DOWN(meta->addr, PAGE_SIZE); unsigned long addr = pageaddr;