From nobody Wed Aug 2 13:15:44 2023 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 4RGCVZ0GyXz4qbHF; Wed, 2 Aug 2023 13:28:50 +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 4RGCCP6df2z3j8f; Wed, 2 Aug 2023 13:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; 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=JrhaKXhNlaGQEf6eGRMyaarJkfJbVxAYJPXDQIQ8mJk=; b=Bc8V9RV9MWtrvwlGF7cpWuZiVRTfKNDC5kZhBcypV+3b4U93ApuoO13LnEMSIsMIggqxQt SuRt4PckkkssLXhIDBjdwka4cfq8hafIfUsSpE9tqBLnyxy4XxliFCj2Jhdpbbz7cTtRxG RrkALy6iamPrhFGqDo7ZIefR+JxegO2TYXg/Iv15xzeuylLtICnzFs6l6akJBbCBPVWD6T Nv5dxblKp5/dQutR9195Uy3V+UE5J1CmAIHkybWPqmkyaUKTdWC4qEQ6fOWmImv1WZAXAA m8368e7Ijh64yH0kugOPBgKUFALv7j28IWatQnTz0mMwWhcvz8nv5rlORal18A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690982146; a=rsa-sha256; cv=none; b=RG8/TCi//FsL1AA6bQd54bwf8MZ1jrcUS6clnH/tWy+19Dzxhm3LHuWqNvQN01M9DKCzbv amA3+reivxlI5/tn0/XwxmPVe8+zGCCuRbCxap4KnE71pQ+6xVVk5InyPCgm9/Pwz0voif zy0mqfhAevu5re08vk1ZgjMIuKqF5SDWGw7DwW8Kp4EPC7Ual0dRcrpXDYi2HOohVlkAeS fEtgnCw0AIItZgA80jgsSKi2enaj0VNyudbGE7vbbn0fF0sYx0nQ2qZLpNtxYmAcT05Cpn RY9PAA1wcyurTfS7qqh5oxKcyun2yUyTcBPndL7kZRnzUBBmv/vgseSe/b1vWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690982146; 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=JrhaKXhNlaGQEf6eGRMyaarJkfJbVxAYJPXDQIQ8mJk=; b=m3WA5tdb9GbLRtl/8MzCXYuix+vjuRJgigCOIGIxnqppMcozSUavHoOMyfYdD1G5CS43rj agtIPGLG44ZbWA816ge2KCcoFOfdv1sEnhKelKLW6Qkaki2JmfADzDWm1rbuJ0uPpd4F3E YzcL1SaM/BGBFrRQ/onVF+zZpxQMrkKF9CLik34NRigHedlKM6X63GK4m4nDV6hQKYQ4fo aVZ8xQaxmO17LbvG5cf5WW8jEx0J2uNYzOYqjM24oUxPryYxKA8KvdSq2MGV/eB5e6LeeP jauZqkqDRqsTrLdstqAlvxXDi5AKD4//n6m+jf0eVhO0ZCB+SkKlur/8NyaVdQ== 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 4RGCCP4wmyzLQH; Wed, 2 Aug 2023 13:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372DFing021616; Wed, 2 Aug 2023 13:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DFig3021615; Wed, 2 Aug 2023 13:15:44 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:15:44 GMT Message-Id: <202308021315.372DFig3021615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6de02228409f - main - dtrace: Add WITH_DTRACE_ASAN 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6de02228409fd2b7ca1d7e3b8d9043a105093cdd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6de02228409fd2b7ca1d7e3b8d9043a105093cdd commit 6de02228409fd2b7ca1d7e3b8d9043a105093cdd Author: Domagoj Stolfa AuthorDate: 2023-08-02 00:10:46 +0000 Commit: Mark Johnston CommitDate: 2023-08-02 13:15:08 +0000 dtrace: Add WITH_DTRACE_ASAN See commit 4ae6991228105eb34989c870194ae7b0a1e23be4. This version of the commit avoids inadvertently changing SHLIBDIR for libdtrace.so. --- cddl/lib/libdtrace/Makefile | 10 ++++++++++ cddl/usr.sbin/dtrace/Makefile | 5 +++++ cddl/usr.sbin/lockstat/Makefile | 7 +++++++ cddl/usr.sbin/plockstat/Makefile | 7 +++++++ share/man/man5/src.conf.5 | 5 +++++ share/mk/src.opts.mk | 1 + tools/build/options/WITH_DTRACE_ASAN | 4 ++++ 7 files changed, 39 insertions(+) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 23cc8d2db574..da31618f581e 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,10 +1,15 @@ # $FreeBSD$ +SHLIBDIR?= /lib + +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common PACKAGE= dtrace LIB= dtrace + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -138,6 +143,11 @@ DSRCS+= regs_aarch64.d YFLAGS+=-d +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= ctf elf proc pthread rtld_db CLEANFILES= dt_errtags.c dt_names.c diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index d8510e62fb29..fcc0668f1b1d 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -30,6 +30,11 @@ CFLAGS+= -DHAVE_ISSETUGID #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= dtrace ctf elf proc spl .if ${MK_DTRACE_TESTS} != "no" diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index a4bec42df367..72cedbdb20ed 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat PACKAGE= dtrace @@ -26,6 +28,11 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 22610870c846..41ef446c111b 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat PACKAGE= dtrace @@ -26,6 +28,11 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID +.if ${MK_DTRACE_ASAN} != "no" +CFLAGS+= -fsanitize=address -fsanitize=undefined +LDFLAGS+= -fsanitize=address -fsanitize=undefined +.endif + LIBADD= dtrace proc .include diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 3eeb3440e986..15c80af095e6 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -594,6 +594,11 @@ When set, it enforces these options: .It .Va WITHOUT_CTF .El +.It Va WITH_DTRACE_ASAN +Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) +with address and undefined behavior sanitizers. +Requires that Clang be used as the base system compiler +and that the runtime support library is available. .It Va WITH_DTRACE_TESTS Build and install the DTrace test suite in .Pa /usr/tests/cddl/usr.sbin/dtrace . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index bed2b718654d..155ce97e88c4 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -200,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_FORMAT \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ + DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ diff --git a/tools/build/options/WITH_DTRACE_ASAN b/tools/build/options/WITH_DTRACE_ASAN new file mode 100644 index 000000000000..4240aee4b89b --- /dev/null +++ b/tools/build/options/WITH_DTRACE_ASAN @@ -0,0 +1,4 @@ +Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) +with address and undefined behavior sanitizers. +Requires that Clang be used as the base system compiler +and that the runtime support library is available.