From nobody Mon Sep 26 19:26:02 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 4Mbt5l1Xztz4cYYN; Mon, 26 Sep 2022 19:26:03 +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 4Mbt5k581Mz3Xpr; Mon, 26 Sep 2022 19:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664220362; 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=Qq+G5yYxMlI+KNnNoFK7LldSAkNKICVEIOD+Eyso5XM=; b=yST5JLT15JP+ov95GQv1jHAKYZUrGDO+WtwhmBGzVqaDfOsClcUjk+WmR61eDce+znDdCr sDRdlbNU7DUS/4I99yFNe0zeOI/CcWvjYBJgm3qPAe8Tqm0pWiRoIPvpcmblDWsSwiGQ84 OUZNcJmPOVCY+eCqFNdSixeruEFiTI111G0iUBOP7YrsWm7xQks1C72hmU33WpzuaMz50j Be0Gm0v2rVbKsRWgCX7R1KbkQTKdlmSYG1nT+DBw2jyA75EYU9gheaEX13FLwpCXcshpaC wktQeOhvTu+0WVNCXqB9pmRoFXdg65j0bB2cpqXd+yzrpaJk29dfVFS8ISQ9Gw== 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 4Mbt5k4CwCzsPM; Mon, 26 Sep 2022 19:26:02 +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 28QJQ272037904; Mon, 26 Sep 2022 19:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QJQ28W037903; Mon, 26 Sep 2022 19:26:02 GMT (envelope-from git) Date: Mon, 26 Sep 2022 19:26:02 GMT Message-Id: <202209261926.28QJQ28W037903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 818cae0ff752 - main - kasan: provide bus peek/poke definitions 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 818cae0ff7527f39ef5efe1180de3e6461fff93c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664220362; 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=Qq+G5yYxMlI+KNnNoFK7LldSAkNKICVEIOD+Eyso5XM=; b=Ujhuz7PQMqVEJCMpV3lT3svdBiJmhl2zyB4kY7y/bEruh1rKejw+Ff+uu7OJoI1mteWZZl hCpv9RopONURO8+CIs7REMsv82MaTS9BiotDpK98qwsw+/5OshJVkGZv6lbzT+0m3nTTmU 7J4WigG4gVkoUiO7z3xTGBUOwE0h+Nr7jIryzQQGvKRwb/rZh2/LhdIv4hn1zm2pe5Et7J MJCXr5N8A6kBlxmbPPAveCgVI+QSJOydAYDFk/1R9Xl1pG5G+X11XWpb4XboCaEg4cx6mK /jeYdrhKa8V4pJwc6A4t0bsIsnoFHsojVLODgrkdTi6Gx+22BgIdcugEUsFUEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664220362; a=rsa-sha256; cv=none; b=YqPELMoyciqUMGZLNhRQlSIj99SF9xwyF3DWlimCofpdHgZwiJ3yFJjKk1srRJ1feqdcRi gRwHWVVYFEN7dYEgyMP77qx/V4ff4LhQM288MGLZBo5dZPURkX/VHQM134zvGc7TjgziYJ Sk6JUK7qeQ98f/Blrvl8h/om0s8lD/d8HyZIlYhNTQOUWsOL6miTuZ0YoaN0tTjhTZQw6O ntAyRxuSjbrPCCn1JgPBtqlOhy2fA78U9GRa6JUXLxBzcgTr2fkReoNVLUZUkMCk5RgPkw dJ4jqzr9sxeYclUvwR/XC63FliQy4OIGjWm+ghkv+VLrzFiqw1q+54s6BBbFBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=818cae0ff7527f39ef5efe1180de3e6461fff93c commit 818cae0ff7527f39ef5efe1180de3e6461fff93c Author: Mitchell Horne AuthorDate: 2022-09-26 19:24:21 +0000 Commit: Kyle Evans CommitDate: 2022-09-26 19:25:05 +0000 kasan: provide bus peek/poke definitions Reviewed by: andrew, markj Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D36700 --- sys/kern/subr_asan.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 11f7996cfe73..d82b25e33257 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.26 2020/09/10 14:10:46 maxv Exp $"); #include #include +#include /* ASAN constants. Part of the compiler ABI. */ #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE - 1) @@ -1017,6 +1018,32 @@ ASAN_BUS_SET_FUNC(region, 4, uint32_t) ASAN_BUS_SET_FUNC(multi_stream, 4, uint32_t) ASAN_BUS_SET_FUNC(region_stream, 4, uint32_t) +#define ASAN_BUS_PEEK_FUNC(width, type) \ + int kasan_bus_space_peek_##width(bus_space_tag_t tag, \ + bus_space_handle_t hnd, bus_size_t offset, type *valuep) \ + { \ + return (bus_space_peek_##width(tag, hnd, offset, \ + valuep)); \ + } + +ASAN_BUS_PEEK_FUNC(1, uint8_t) +ASAN_BUS_PEEK_FUNC(2, uint16_t) +ASAN_BUS_PEEK_FUNC(4, uint32_t) +ASAN_BUS_PEEK_FUNC(8, uint64_t) + +#define ASAN_BUS_POKE_FUNC(width, type) \ + int kasan_bus_space_poke_##width(bus_space_tag_t tag, \ + bus_space_handle_t hnd, bus_size_t offset, type value) \ + { \ + return (bus_space_poke_##width(tag, hnd, offset, \ + value)); \ + } + +ASAN_BUS_POKE_FUNC(1, uint8_t) +ASAN_BUS_POKE_FUNC(2, uint16_t) +ASAN_BUS_POKE_FUNC(4, uint32_t) +ASAN_BUS_POKE_FUNC(8, uint64_t) + /* -------------------------------------------------------------------------- */ void __asan_register_globals(struct __asan_global *, size_t);