From nobody Tue Apr 7 22:19:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB4D9C4332F for ; Wed, 19 Oct 2022 23:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbiJSXFI (ORCPT ); Wed, 19 Oct 2022 19:05:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231655AbiJSXEw (ORCPT ); Wed, 19 Oct 2022 19:04:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DE57564EF; Wed, 19 Oct 2022 16:04:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 23C19619D2; Wed, 19 Oct 2022 23:04:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73A26C433B5; Wed, 19 Oct 2022 23:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666220647; bh=qrqPKPwr1n/2IdbOQDBDR4+6FyQRRkoFtnq68ywy8ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EdE+Cx/4/hLRjEaXZ4WxQi5eT/mrFUyrIENO/UigZGDLm0MgnRcTIOd5ml7YaE2Dq I3vknSnG5noNinnmmb/tR2gFRms2QUozt+fY2SY4oCRYexkMDKW4wRK1toXH1xIRlB hoPE5RlnjDps7GnXfZfSO21Up7+GRdJ1GKFQ9G0unLVxC8yJw4W6xpiD6bwi2rrPg2 qcIVSXI75u6dK5fouvr8BA+soS+PQEfttdfge00t3dPpdECT54ArZKPFbhuymwlH/4 wEByOMtCbmb+IHRrINkuPGlG5OPT0aXUirZbTNw40E62wJB0nY7NY4PElL7QgJRBVD d/aQ+TLq2C+oA== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 2A0DF5C06B4; Wed, 19 Oct 2022 16:04:07 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kernel-team@fb.com, mingo@kernel.org Cc: elver@google.com, andreyknvl@google.com, glider@google.com, dvyukov@google.com, cai@lca.pw, boqun.feng@gmail.com, stable@vger.kernel.org, "Paul E . McKenney" Subject: [PATCH kcsan 1/3] kcsan: Instrument memcpy/memset/memmove with newer Clang Date: Wed, 19 Oct 2022 16:04:03 -0700 Message-Id: <20221019230405.2502089-1-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> References: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marco Elver With Clang version 16+, -fsanitize=3Dthread will turn memcpy/memset/memmove calls in instrumented functions into __tsan_memcpy/__tsan_memset/__tsan_memmove calls respectively. Add these functions to the core KCSAN runtime, so that we (a) catch data races with mem* functions, and (b) won't run into linker errors with such newer compilers. Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Marco Elver Signed-off-by: Paul E. McKenney --- kernel/kcsan/core.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/kernel/kcsan/core.c b/kernel/kcsan/core.c index fe12dfe254ecf..54d077e1a2dc7 100644 --- a/kernel/kcsan/core.c +++ b/kernel/kcsan/core.c @@ -14,10 +14,12 @@ #include #include #include +#include #include #include #include #include +#include #include =20 #include "encoding.h" @@ -1308,3 +1310,51 @@ noinline void __tsan_atomic_signal_fence(int memorde= r) } } EXPORT_SYMBOL(__tsan_atomic_signal_fence); + +#ifdef __HAVE_ARCH_MEMSET +void *__tsan_memset(void *s, int c, size_t count); +noinline void *__tsan_memset(void *s, int c, size_t count) +{ + /* + * Instead of not setting up watchpoints where accessed size is greater + * than MAX_ENCODABLE_SIZE, truncate checked size to MAX_ENCODABLE_SIZE. + */ + size_t check_len =3D min_t(size_t, count, MAX_ENCODABLE_SIZE); + + check_access(s, check_len, KCSAN_ACCESS_WRITE, _RET_IP_); + return memset(s, c, count); +} +#else +void *__tsan_memset(void *s, int c, size_t count) __alias(memset); +#endif +EXPORT_SYMBOL(__tsan_memset); + +#ifdef __HAVE_ARCH_MEMMOVE +void *__tsan_memmove(void *dst, const void *src, size_t len); +noinline void *__tsan_memmove(void *dst, const void *src, size_t len) +{ + size_t check_len =3D min_t(size_t, len, MAX_ENCODABLE_SIZE); + + check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_); + check_access(src, check_len, 0, _RET_IP_); + return memmove(dst, src, len); +} +#else +void *__tsan_memmove(void *dst, const void *src, size_t len) __alias(memmo= ve); +#endif +EXPORT_SYMBOL(__tsan_memmove); + +#ifdef __HAVE_ARCH_MEMCPY +void *__tsan_memcpy(void *dst, const void *src, size_t len); +noinline void *__tsan_memcpy(void *dst, const void *src, size_t len) +{ + size_t check_len =3D min_t(size_t, len, MAX_ENCODABLE_SIZE); + + check_access(dst, check_len, KCSAN_ACCESS_WRITE, _RET_IP_); + check_access(src, check_len, 0, _RET_IP_); + return memcpy(dst, src, len); +} +#else +void *__tsan_memcpy(void *dst, const void *src, size_t len) __alias(memcpy= ); +#endif +EXPORT_SYMBOL(__tsan_memcpy); --=20 2.31.1.189.g2e36527f23 From nobody Tue Apr 7 22:19:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28B7FC4332F for ; Wed, 19 Oct 2022 23:04:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229657AbiJSXET (ORCPT ); Wed, 19 Oct 2022 19:04:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbiJSXEO (ORCPT ); Wed, 19 Oct 2022 19:04:14 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F375B1BB946 for ; Wed, 19 Oct 2022 16:04:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 1D3B6CE247B for ; Wed, 19 Oct 2022 23:04:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E0A5C433C1; Wed, 19 Oct 2022 23:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666220647; bh=7lFI8jwYjTgUuAGoBEvqrl/zt90PET5zynmRHnpkDdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YrX9Uiwq9Ld4pObV/swVMAbLV4J/q8QJ+0XwveQJ3YWIHa6NxjC1TggJimC5/JPSX s82EOo+IMq0oQpD2fIhpstg/gLAgLD4GQivPTM2FL6W2jzG5vmFZ+A8dK/qmOdopHx LrtuclBvlUEREXEM01VFp6kUiU/KtPl2PPPsRdj4ocvMm73gfv9xkAhp8KxPzPFSa4 6eBu/RI051dPFB+7uWcnr2FFu7pcSvxqNefJ3PymkM3+9TdsDv0z/u/oPvxwXfmqzT GCP1edBgu/TDKecIkfcN2MO7tYaUTNOadBqc35ePGxxZBvZNbWngPZ6mya4HHUGPq7 4r2momI8VJHzg== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 2C6CB5C0879; Wed, 19 Oct 2022 16:04:07 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kernel-team@fb.com, mingo@kernel.org Cc: elver@google.com, andreyknvl@google.com, glider@google.com, dvyukov@google.com, cai@lca.pw, boqun.feng@gmail.com, "Paul E . McKenney" Subject: [PATCH kcsan 2/3] objtool, kcsan: Add volatile read/write instrumentation to whitelist Date: Wed, 19 Oct 2022 16:04:04 -0700 Message-Id: <20221019230405.2502089-2-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> References: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marco Elver Adds KCSAN's volatile instrumentation to objtool's uaccess whitelist. Recent kernel change have shown that this was missing from the uaccess whitelist (since the first upstreamed version of KCSAN): mm/gup.o: warning: objtool: fault_in_readable+0x101: call to __tsan_volat= ile_write1() with UACCESS enabled Fixes: 75d75b7a4d54 ("kcsan: Support distinguishing volatile accesses") Signed-off-by: Marco Elver Reviewed-by: Dmitry Vyukov Signed-off-by: Paul E. McKenney --- tools/objtool/check.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 43ec14c29a60c..a7f1e6c8bb0a7 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -999,6 +999,16 @@ static const char *uaccess_safe_builtin[] =3D { "__tsan_read_write4", "__tsan_read_write8", "__tsan_read_write16", + "__tsan_volatile_read1", + "__tsan_volatile_read2", + "__tsan_volatile_read4", + "__tsan_volatile_read8", + "__tsan_volatile_read16", + "__tsan_volatile_write1", + "__tsan_volatile_write2", + "__tsan_volatile_write4", + "__tsan_volatile_write8", + "__tsan_volatile_write16", "__tsan_atomic8_load", "__tsan_atomic16_load", "__tsan_atomic32_load", --=20 2.31.1.189.g2e36527f23 From nobody Tue Apr 7 22:19:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35A9DC433FE for ; Wed, 19 Oct 2022 23:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231491AbiJSXEb (ORCPT ); Wed, 19 Oct 2022 19:04:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231460AbiJSXEY (ORCPT ); Wed, 19 Oct 2022 19:04:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BABD71D6384 for ; Wed, 19 Oct 2022 16:04:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B3BEEB822C8 for ; Wed, 19 Oct 2022 23:04:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7104AC433D7; Wed, 19 Oct 2022 23:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666220647; bh=gbKGYKusa1lMx667ZRtUIdCKFZvMu4kQkc2U3mIhaJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEzk79e3btdHpj+be6y8fiERudUYg+YIijkSzM0rnIa/6M7cHwp8uajkMjIua8BjP LxJPv2mKcQgHlPn8uV3q3qDZIp8+epxBI136TPF4Od4wPv/3T+ICO1qcebEhslTHSr uLQKA9YeDOkIq9QIPSp2htVk1LTVs8ArK/8KWW0PbK32K5TEtTYtVTKowz3/FL0v4y iZ/Q1AceOZmLdR5ZswSxL0z+1f6fpqb1r57pUyxHo5I5goWgUpKA8ZGjgDovLrpUvk GFiDAybP3mPO5yFF0jtLbZCfphVA/Ew5lCzxxQmCpWIaZgDSjJeUYFKmsvafxNHr3r n/YwcMy1Tefrw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 2EBBD5C0890; Wed, 19 Oct 2022 16:04:07 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kernel-team@fb.com, mingo@kernel.org Cc: elver@google.com, andreyknvl@google.com, glider@google.com, dvyukov@google.com, cai@lca.pw, boqun.feng@gmail.com, Ryosuke Yasuoka , "Paul E . McKenney" Subject: [PATCH kcsan 3/3] kcsan: Fix trivial typo in Kconfig help comments Date: Wed, 19 Oct 2022 16:04:05 -0700 Message-Id: <20221019230405.2502089-3-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> References: <20221019230356.GA2501950@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ryosuke Yasuoka Fix trivial typo in Kconfig help comments in KCSAN_SKIP_WATCH and KCSAN_SKIP_WATCH_RANDOMIZE Signed-off-by: Ryosuke Yasuoka Reviewed-by: Marco Elver Signed-off-by: Paul E. McKenney --- lib/Kconfig.kcsan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Kconfig.kcsan b/lib/Kconfig.kcsan index 47a693c458642..375575a5a0e3c 100644 --- a/lib/Kconfig.kcsan +++ b/lib/Kconfig.kcsan @@ -125,7 +125,7 @@ config KCSAN_SKIP_WATCH default 4000 help The number of per-CPU memory operations to skip, before another - watchpoint is set up, i.e. one in KCSAN_WATCH_SKIP per-CPU + watchpoint is set up, i.e. one in KCSAN_SKIP_WATCH per-CPU memory operations are used to set up a watchpoint. A smaller value results in more aggressive race detection, whereas a larger value improves system performance at the cost of missing some races. @@ -135,8 +135,8 @@ config KCSAN_SKIP_WATCH_RANDOMIZE default y help If instruction skip count should be randomized, where the maximum is - KCSAN_WATCH_SKIP. If false, the chosen value is always - KCSAN_WATCH_SKIP. + KCSAN_SKIP_WATCH. If false, the chosen value is always + KCSAN_SKIP_WATCH. =20 config KCSAN_INTERRUPT_WATCHER bool "Interruptible watchers" if !KCSAN_STRICT --=20 2.31.1.189.g2e36527f23