From nobody Sat Apr 29 07:36:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB76RdQz48cZT; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7hB75xrMz3G68; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyvCF//HtXZvVb4ClYQADX9rD6V0vl16g6IBOEuVGxo=; b=DGYtsUcsK/XZUG5p84LZQC6J8wBjGRnxv8nk+NO32mOZCOdEjogODwjU5/3NlqGKgREJ8r jVRmyFghZLiP1vHgJi/r5Y8dnmVMXhg5QFh80YgWweKCTxBtOBWLgAKhwcuBzFxgY6z2uC ZWnStc3XWfPrsdcEIMFjQGd0Vvj/M0ReFOJEXANK1/hYpG7plNa2aFCKdi1gVK/9qPd8zh ZVinJX/s1Jwr1GTMCg0Cxk3UWh+odN5k5pW83REbz/ESLPTmS6bu8vmIfxGAgcXQ8usqhr ckqtqbIqsqwG0wY9YPKFneGOMfC74P0HEZk60WD18HfOPx9krTM5yew30OSz5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyvCF//HtXZvVb4ClYQADX9rD6V0vl16g6IBOEuVGxo=; b=e+b3kWM3Meajr/+IHmjht56xC96XSxa/zmnqybo1f9lvnN7apR8FXqPTVywUVMx1wwD9M2 bBJ1BzbsuhObeC9832G+EPsQQb55F+29rJnKZieyLOm8hbxa3HclhztswaHOXy7NG5X9OD 1ducC1kaTzMfz05Jc1dGLWR8PflAfQflqxydcxMWvCLY2SubqyC5cmNzp5VnDmdd2uKCNz UMnDvwGTY2rKVF7kr5zeTAv8g5jwzuJa4QPqEhoVeiTDT6EVWIcgI+ZnPM+PvggKyzI3HA IMEbH3QqLHGONf5gBgyZkAVl2jmt+idMxJCH0ALQsUzk1ZXJSMJD8Sh//Ake0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753807; a=rsa-sha256; cv=none; b=vv3Ic5JqBQr83iIBwJHstgz/a8fdTC4qzK7eD6pakp45LxkYNf0KU6ehA4ekU2Ibob9IVL FQY0S8EmhtdpIwrWA3ZtWC7LkUhal/jvhOrNWjrYmFCszUFOh+zaHBq0O31p4O/NQ91GvR 8iIiDw4GtCVs4HwMKQ/knEeNpm/RqyPUEh8BvMUvnaNqT5EOET+7iTQwBsoP+btKvlmyxm GoSAdUCicXO1EaTuZS4DFSsCgeuV5Z9Dx2al75lghVJ2TBvREMbgRFRtiGNYWVYjT9yNCP ZW4uH4ktBxKVKG/UHu3oit/hP0bqq7yMweykITCZymNyqhNVuKmx07ptsQip+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB74tzTzYbD; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7alFs064148; Sat, 29 Apr 2023 07:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7alS0064147; Sat, 29 Apr 2023 07:36:47 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:47 GMT Message-Id: <202304290736.33T7alS0064147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: beb6b55d5095 - stable/13 - kcsan: add __tsan_mem(cpy|move|set) aliases for clang >= 16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: beb6b55d509533977988c5823b42e4d6c21abb5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=beb6b55d509533977988c5823b42e4d6c21abb5f commit beb6b55d509533977988c5823b42e4d6c21abb5f Author: Dimitry Andric AuthorDate: 2023-04-23 18:11:34 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:13 +0000 kcsan: add __tsan_mem(cpy|move|set) aliases for clang >= 16 Summary: After https://github.com/llvm/llvm-project/commit/b4257d3bf58c ("[tsan] Replace mem intrinsics with calls to interceptors") intrinsic calls to memcpy, memmove or memset will directly call sanitizer interceptors, e.g. __tsan_memcpy, __tsan_memmove or __tsan_memset. Building GENERIC-KCSAN with clang >= 16 would thus result in link errors similar to: ld: error: undefined symbol: __tsan_memcpy >>> referenced by cam_compat.c:150 (/usr/src/sys/cam/cam_compat.c:150) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced by cam_compat.c:151 (/usr/src/sys/cam/cam_compat.c:151) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced by cam_compat.c:152 (/usr/src/sys/cam/cam_compat.c:152) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced 1692 more times Similar to subr_msan.c, add aliases from the existing kcsan_* versions of these functions to __tsan_* names. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39772 (cherry picked from commit 42162fb2fe30c0881e7e4d2143ddcfee3e1dd752) --- sys/kern/subr_csan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c index 3a542207fbfb..d607204b222f 100644 --- a/sys/kern/subr_csan.c +++ b/sys/kern/subr_csan.c @@ -301,6 +301,10 @@ kcsan_memmove(void *dst, const void *src, size_t len) return __builtin_memmove(dst, src, len); } +__strong_reference(kcsan_memcpy, __tsan_memcpy); +__strong_reference(kcsan_memset, __tsan_memset); +__strong_reference(kcsan_memmove, __tsan_memmove); + char * kcsan_strcpy(char *dst, const char *src) {