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);