From patchwork Wed Oct 19 23:04:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 5931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp578624wrs; Wed, 19 Oct 2022 16:10:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cJ9jvLNNFeK9XGdyanxPB1NMuyQbPP2ccZH6VWzvS5oz2+XUaW2s0mD+9rHhwBLKsJutL X-Received: by 2002:a17:907:2d0f:b0:78e:9ca5:62af with SMTP id gs15-20020a1709072d0f00b0078e9ca562afmr8562188ejc.334.1666221043707; Wed, 19 Oct 2022 16:10:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666221043; cv=none; d=google.com; s=arc-20160816; b=0KaqyyQAOLZX22NNb+tMIsl7SbP/ZUlI+FVrjBPLP3G3BuUEcNsoCyTlC8AeAJGc69 IVOMHD8OYYLGyA6Gye+H4Gar6Xp/jlYz/i9n4L7yYr5ClLmsPXEfGMlsjrYlXvwO0QqW RU499j8kf3eQ+uIfJHFV3zr+mcUJtG9JQY1L7yV2b89UVnJgQsjpBTgeyi5DeGus+KCt tVQovS3p5O7x8L24Ln9IDW1Z+C5rGB/usdZD9GvevPJDJyYx0Ob2fc1wKyPYncUHT4/P awXPvhJA3uM09qfWMayWDnglmOY/W6sBML1NGK/i3Z7JnFlTtcaHLQJGmZxMLAoJqtLY +3IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PshftWsvo+9EfwI/H/9Yj9OK6Y4o0PErgCiBjyjkGJs=; b=sQSFqlEjJ/9QZPBwXZYvkzeMkVRUPExux6mkNlgIpEDOG/hiIPEedSFbCtL94abRhJ OeQoFeG4LeaFHwjsZkFt3L+tmpVm90ZXF/JveTbdOQb9QadDzA9zMIv4HpSVuGu8ALIu 3RZ8ccgXn8hCk+svfv2ZhK8ZQj53WGLinNP5ztGQJ/QTVhl2gyFkW3GcqNNgsVtEQqCu h6i37CMmaXO7X2c7dTv2nlw1323Oyc0e11FaMSCJSrsbji4Ug+q6CdZwM9KHRcm6Rc5o B5jAswB2WeNM+GdfYvVjMkepR2nxPZ8w9CXzuDG4i/KIlgNCxfEh00hTPjRqy5eesQQ+ HKQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="EdE+Cx/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xg14-20020a170907320e00b0072a6c18f1fasi16733755ejb.639.2022.10.19.16.09.49; Wed, 19 Oct 2022 16:10:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="EdE+Cx/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231710AbiJSXFH (ORCPT + 99 others); Wed, 19 Oct 2022 19:05:07 -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 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747159396933614357?= X-GMAIL-MSGID: =?utf-8?q?1747159396933614357?= From: Marco Elver With Clang version 16+, -fsanitize=thread 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 #include "encoding.h" @@ -1308,3 +1310,51 @@ noinline void __tsan_atomic_signal_fence(int memorder) } } 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 = 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 = 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(memmove); +#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 = 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); From patchwork Wed Oct 19 23:04:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 5928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp576524wrs; Wed, 19 Oct 2022 16:05:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5HoWhRkVIYZcpFBLlp2lYEfW0KtEdDD3cIGpYaG8dIPtWk5lrxNn+JaXTWdlJhV0v8uhuf X-Received: by 2002:a17:907:7d90:b0:78d:bc5a:913c with SMTP id oz16-20020a1709077d9000b0078dbc5a913cmr8490946ejc.390.1666220734320; Wed, 19 Oct 2022 16:05:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666220734; cv=none; d=google.com; s=arc-20160816; b=oqiSbuRhgNaIznUi25nF802S2FDszraUyL7xAW43z9ixcrKitRCjm/+Yuuxo6kJL1E d47b+BXJ3nTLEdgBSJE83B+0WyxfnXbOFePccZLivWjkTyodIbLFQrGzjZgk8C+zb7ut DtD7bJ+M/mVn5UWVatjyAb+gKoIvMxbw5cZ4L0zL96aKuj1lui9WTpQGDClS73PnrI/W fFPdcDyngXyD0btiH5kDS+o/jaK39+z4BtTz04zR+GmIBwRFMfwlR+4ODm/zmDEPxpde aNE/WqiAIzrLaxLW258i5U0cedDT9aOxGaq40fLjm8ZNR0hLi24Mm7TU4kal4R/CadGU aGHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fUtCU4kEsogL3th/B1bpR7s1fXeGGqX6ji/5tcjGGAk=; b=AtA87BKhoMvfrRvUvx6d3K72Hi0xCP490pBFeB6ACZNRHKsyUWXfiJP87CQTp5zR8E Oz2THLqhHrpuc4e7E/FAo9MkN3gGBs240ZZeWAgwKA1IDpnk8Dur5/2M7MA5+THqk55n 5wFNZHzmRlob5aAvPPWFuXceGkCh1wLFR8nBU7IMu5zj2/N9MyQv8u67L5T7IgjghzDP YV7+BK+gGkx7U1YkWfLDL+kvKARamQhnZKqMiCbhpY87iczEqJpmU2JecmnU3CJrOI/m 6NqS5GaRFvjWMiaxEjDgF7C8MqrZNxv63VGeb4A5ZOfAPd6N2hJF+VqRS0DR1kdLel27 nVbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YrX9Uiwq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dz13-20020a0564021d4d00b00453a0393deasi17690647edb.368.2022.10.19.16.05.09; Wed, 19 Oct 2022 16:05:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YrX9Uiwq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231537AbiJSXES (ORCPT + 99 others); Wed, 19 Oct 2022 19:04:18 -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 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747159072630107162?= X-GMAIL-MSGID: =?utf-8?q?1747159072630107162?= 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_volatile_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[] = { "__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", From patchwork Wed Oct 19 23:04:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 5929 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp576740wrs; Wed, 19 Oct 2022 16:06:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/Z3FI+cKt/iDWyG0E7/2x+MOObqeKV+ageqq0BlaVbFxprUBVy8rC8gU7sDnorKJ1cPFe X-Received: by 2002:a05:6402:1587:b0:458:fbea:436c with SMTP id c7-20020a056402158700b00458fbea436cmr9592326edv.407.1666220764929; Wed, 19 Oct 2022 16:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666220764; cv=none; d=google.com; s=arc-20160816; b=L9rTuJdBsVDCfkUJ67lCmu+UY1KxvfXtJqRa+gcoaRrbdCaiR/bX3aFoq7p6jsJJWl +Eexwy8gnOn4QvqM249o/JadCeDV9s74SyS4Z8XaPok276frkh4inS6kMmzEzKlGDpX8 FXemrymsHMyMqDfh3g8nePoa2tnf9doSJmmqBf5TR5W0Tk9TI4bcgsYtpTLyJtp5aeDZ mECChwZwYsWEsSgADrfNRloUqzBTmzdPWLfb1dT3XtpYVS5h/0SqURHenoBG6KfBQmLp 7ziX85Lk8Q78wHSBxsraRajS/YloGsCyi3GP9yQ75AERmuYaLLg6Sv80s8URVBv+SMW/ gG2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xSP9rlOS9aRpp40NQjKXUsx8yG28YUDXIkQYgRT5YSk=; b=mtkXTamTTeMPlKMUbUcKx/U6g7mv0AsDT12zM2I7oSnbXy89l6S0sMGML+xxZxyQAR 3oDS8wKjE5UWMgD2F5A906aN8dAJSN89Vg7bGMITTQfOG29jrD+//yoPz7+DZ8yAqP/W XNecP0c/4Pkjr6lXztn8cU6lu3klUIKOUFAXpNB20rT3M2aJ3ooqyHxXClyJwUr5Ey7H MUqQuuxh8qd+Of1ot16lPJtL5i/T4py2BKuGLJGudyWT29eJck/pKDZ6Q53DdZ+74jKt tqJd3e8Kix+q4/SBRUbe58jUJ2zbHW0qF7r0PemKeyQgOU0E0H4LtBxDnFtLxeKnlKQJ XdNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IEzk79e3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k19-20020a50ce53000000b0045941fa8e21si14224481edj.620.2022.10.19.16.05.39; Wed, 19 Oct 2022 16:06:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IEzk79e3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231461AbiJSXEa (ORCPT + 99 others); Wed, 19 Oct 2022 19:04:30 -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 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747159105072463079?= X-GMAIL-MSGID: =?utf-8?q?1747159105072463079?= 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. config KCSAN_INTERRUPT_WATCHER bool "Interruptible watchers" if !KCSAN_STRICT