From nobody Sun Mar 27 01:30:28 2022 X-Original-To: dev-commits-src-all@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 C2B701A47E9C; Sun, 27 Mar 2022 01:30:28 +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 4KQyv8575Nz4vhJ; Sun, 27 Mar 2022 01:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648344628; 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=9I28yDv+Za29EIXpy4qF22KriLN5SxhQcbH/EZMABlw=; b=SSaeHj+GcggzqUc9VvXmSRguQ/YTLG3Cr+/TLWG+uEN+JXQNqSVRnCSYwl8WpoIaEj6Lta nCeOU1X4iUXqFkGPXCLzdzK1Pvi4YO2CqVTxjxQJE1kQZRmVhO+36eAjWCL9/IKjB7JP0+ bjsrgvhRVVHRsYSmdoilnXMclSxZH6XGlIdYLAPglLxh1InqbOl2WRJBUfNiqxX6Jz4qNY bO6CQzCETKVqBYR3Ly3nCpH1zzRidmdNvaKCxBB/R7y+z+d4h1YWGy66/2RCe06DpJGnOd bly8aQOm70fcH76K5zGktXbA4NSDnXFSXNceOcoknVDjNltkEngVU1F4xEFzIg== 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 8B6963ACF; Sun, 27 Mar 2022 01:30:28 +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 22R1US1d024066; Sun, 27 Mar 2022 01:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22R1USqd024065; Sun, 27 Mar 2022 01:30:28 GMT (envelope-from git) Date: Sun, 27 Mar 2022 01:30:28 GMT Message-Id: <202203270130.22R1USqd024065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Kubaj Subject: git: e58a146c5d24 - stable/13 - riscv: actually enable sanitizers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e58a146c5d24172b53f18b953b3d29ee25bdb90c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648344628; 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=9I28yDv+Za29EIXpy4qF22KriLN5SxhQcbH/EZMABlw=; b=iOZ5SyyAhB0duCX9fwKy399ZmMw2vv0/9B03F3Ek1ykK2QHNoZslALWEuqogoRaOYCK0B7 fIg5cT0J1PjXAUYOkeQEW1ApNl9rZ5w7J9AuiTEEgg3wV2RjIku/PEl/TQnjX5p2Eftjn5 EmP4bdWAXBxdtwFZgFruMoHH8Ew6P757ZwlTh5Yny8/LDFeYMKV8zB4o7DN/OttaGGBDEu JHAJaZJyixSBhgQuWEbwonXd0QTo20XWTxb4NFRMZjBaxKkKkUmJNs/p0EUratfspey8hT 7TJpN9BIblUqKE/A817He/onRXT3BlaNobkXOJPwyKz5f4Q0bD5wcgywYgGI6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648344628; a=rsa-sha256; cv=none; b=JhbIFduKJsKbKwkTelpVqAc6QccsOHKYH1Fitzcr3/gQQVBDs9BJ1E2RBXpRELbnmvON1t p4vwP8yKBHQKIFt9OrrjIUHHgtcck4RR+CcI0ySquOOKJFNwoMjX/NrdQ90BHUWiEvWjks 8mG6ksuoxj82+0/l9Qjvo951iGiiiWrBYC889HwNkD1I7y+bJ0s5VFeSjP6io75B2F8M+D IPJuYEThou+vTVvvHywL/oN5ykdTtfr3RhCEl+QuRGzcHZdif0BGpim0avLjcBDWPSLfok cg09006L574pJrUoDRCM8k7Vumoc5Kx4TTHk988bSXl/CElQ1OKVHImMYKv4Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e58a146c5d24172b53f18b953b3d29ee25bdb90c commit e58a146c5d24172b53f18b953b3d29ee25bdb90c Author: Piotr Kubaj AuthorDate: 2022-03-13 03:31:35 +0000 Commit: Piotr Kubaj CommitDate: 2022-03-27 01:30:19 +0000 riscv: actually enable sanitizers 1. Backport https://github.com/llvm/llvm-project/commit/b475ce39e8b1de3a70ea242473f136a567be46e3. 2. Enable libclang_rt for riscv. Previous commit missed it. MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D34543 (cherry picked from commit 3781e77995e9b81afcbf7b3dc84b33b864c48794) --- .../lib/sanitizer_common/sanitizer_linux.cpp | 22 +++++++++++++++++----- lib/Makefile | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp index daa07c15490e..769e8029dfcb 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -416,7 +416,7 @@ uptr internal_unlink(const char *path) { } uptr internal_rename(const char *oldpath, const char *newpath) { -#if defined(__riscv) +#if defined(__riscv) && defined(__linux__) return internal_syscall(SYSCALL(renameat2), AT_FDCWD, (uptr)oldpath, AT_FDCWD, (uptr)newpath, 0); #elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS @@ -1218,7 +1218,8 @@ void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)) { } #endif -#if defined(__x86_64__) && SANITIZER_LINUX +#if SANITIZER_LINUX +#if defined(__x86_64__) // We cannot use glibc's clone wrapper, because it messes with the child // task's TLS. It writes the PID and TID of the child task to its thread // descriptor, but in our case the child task shares the thread descriptor with @@ -1557,7 +1558,7 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, : "cr0", "cr1", "memory", "ctr", "r0", "r27", "r28", "r29"); return res; } -#elif defined(__i386__) && SANITIZER_LINUX +#elif defined(__i386__) uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, int *parent_tidptr, void *newtls, int *child_tidptr) { int res; @@ -1622,7 +1623,7 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, : "memory"); return res; } -#elif defined(__arm__) && SANITIZER_LINUX +#elif defined(__arm__) uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, int *parent_tidptr, void *newtls, int *child_tidptr) { unsigned int res; @@ -1688,7 +1689,8 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, : "memory"); return res; } -#endif // defined(__x86_64__) && SANITIZER_LINUX +#endif +#endif // SANITIZER_LINUX #if SANITIZER_LINUX int internal_uname(struct utsname *buf) { @@ -1918,7 +1920,11 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const { u32 instr = *(u32 *)pc; return (instr >> 21) & 1 ? WRITE: READ; #elif defined(__riscv) +#if SANITIZER_FREEBSD + unsigned long pc = ucontext->uc_mcontext.mc_gpregs.gp_sepc; +#else unsigned long pc = ucontext->uc_mcontext.__gregs[REG_PC]; +#endif unsigned faulty_instruction = *(uint16_t *)pc; #if defined(__riscv_compressed) @@ -2137,9 +2143,15 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { *sp = ucontext->uc_mcontext.gregs[15]; #elif defined(__riscv) ucontext_t *ucontext = (ucontext_t*)context; +# if SANITIZER_FREEBSD + *pc = ucontext->uc_mcontext.mc_gpregs.gp_sepc; + *bp = ucontext->uc_mcontext.mc_gpregs.gp_s[0]; + *sp = ucontext->uc_mcontext.mc_gpregs.gp_sp; +# else *pc = ucontext->uc_mcontext.__gregs[REG_PC]; *bp = ucontext->uc_mcontext.__gregs[REG_S0]; *sp = ucontext->uc_mcontext.__gregs[REG_SP]; +# endif #else # error "Unsupported arch" #endif diff --git a/lib/Makefile b/lib/Makefile index 5e740edc78a5..5896a6812a5b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -180,7 +180,7 @@ SUBDIR.${MK_STATS}+= libstats .if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" && \ (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "powerpc") + ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "riscv") _libclang_rt= libclang_rt .endif