From nobody Wed Jan 19 12:11:21 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 DACBE19609F8; Wed, 19 Jan 2022 12:11:21 +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 4Jf4HY5tL9z3m96; Wed, 19 Jan 2022 12:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642594281; 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=72fJY+dBeOw/hw68kyq72VGSW5mFNNXaMU4XM2unpSY=; b=lNmj85xOy5Uhb0wQaF7ZbKuFS9CQ2rW8RCRJ/oKyNozcz+n9Nx3SCWQDUrleccJMg0dEGk 09hgOjFC54vPY13rv92gNy8uKdWPRi6akSc5qqNxgFEfezZWuF1Jsrm6bJZL+VUFN4p/4Z IpEXnyveWAij7FItP1xk9NzG/PXW9kIZMhuV5Dx+v+LQfWkna1lp1SheQiO6Vj8pPl8yLq AT1I8jY8ehGnFPDXVsBdVqVWn+SX5IcvWjh1naAzjmhKSKDfzYXwzUiRS3N8C1IOwMLMSF Z7OyVLIeLoJwSc4d/My7wiIQ5OBXvsChve5wOyj0c++cniPinD31zJ4SIwnf9w== 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 AA0AC14C09; Wed, 19 Jan 2022 12:11:21 +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 20JCBLdB034613; Wed, 19 Jan 2022 12:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JCBLkI034612; Wed, 19 Jan 2022 12:11:21 GMT (envelope-from git) Date: Wed, 19 Jan 2022 12:11:21 GMT Message-Id: <202201191211.20JCBLkI034612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b5876847acfe - main - Teach DTrace about BTI on arm64 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5876847acfeae2dd3a655cde8cdf6145aed16d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642594281; 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=72fJY+dBeOw/hw68kyq72VGSW5mFNNXaMU4XM2unpSY=; b=AOSPg+DvGUk1QVGnukx7JbpJi/Sxtu2Dgnv9CuropGHwR9zKOsIVIaiNt+44eQj2c0N8Aw 45HJLiWrJN1PSt9DhXtrFfd2ev9H2+grlBFW0NxIvUTqHZd8jNj7qUv1MTxFpHFU+m6xwm 1TH3qZpDX2nhtz/Ni720xpY8nV5sVcF6T/6O78vPWSwpf43Zh/q8GDQo76eIX2ag3jTJCR OM9hWLgl5cEuDqzkzVKMcB9ItC31wiuYCKDppnt4teACvxe5/IABNLh8BlVjcGGSXpGZX/ 6GDIHzLDPI6zlrI6jGbPcrGN2x2btkN7dAebI3xOx5J8KJu4lgLmEJsOBzNNeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642594281; a=rsa-sha256; cv=none; b=h41pmXUBONQ9ZA+3WF2Krs6boSkGyTR66g9zyPfiY8C8WXyU0gr4ceiAep47PbWuIQsqxA ktneNfIsSd5aI9IyWtBzKWMnkY8CkhOLAMXF1fUyts/K3AII2ABoPKrMVM9oK2FrBu4r1L TqBDIpu1dRrWyAmyd1tMdVLbi7cE0B93ABGXy/dhxrhSyNBm1TmsQhJmWqDe9AcfGoyWOt rkCC9G3HYjoME3A2Tu3MF5mPqWqx3smIFqimrrjOKN5/pNyc5qmTyib+Ly2c5H5NjLvvke AX5Igsl5bueSVDd55gMbX67EhcJAZ7VVEJ8tAgWxqUm7T8QshilWXz5cWzLdig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b5876847acfeae2dd3a655cde8cdf6145aed16d8 commit b5876847acfeae2dd3a655cde8cdf6145aed16d8 Author: Andrew Turner AuthorDate: 2021-12-22 17:26:33 +0000 Commit: Andrew Turner CommitDate: 2022-01-19 12:07:35 +0000 Teach DTrace about BTI on arm64 The Branch Target Identification (BTI) Armv8-A extension adds new instructions that can be placed where we may indirrectly branch to, e.g. at the start of a function called via a function pointer. We can't emulate these in DTrace as the kernel will have raised a different exception before the DTrace handler has run. Skip over the BTI instruction if it's used as the first instruction in a function. Sponsored by: The FreeBSD Foundation --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 3 +++ sys/cddl/dev/fbt/aarch64/fbt_isa.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index f15a971f12be..c15cc39189b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2466,6 +2466,9 @@ extern void dtrace_helpers_destroy(proc_t *); #define B_DATA_MASK 0x00ffffff #define B_INSTR 0x14000000 +#define BTI_MASK 0xffffff3f +#define BTI_INSTR 0xd503241f + #define NOP_INSTR 0xd503201f #define RET_INSTR 0xd65f03c0 diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index d00aabf0cc81..07f02e2edb72 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -118,6 +118,14 @@ fbt_provide_module_function(linker_file_t lf, int symindx, instr = (uint32_t *)(symval->value); limit = (uint32_t *)(symval->value + symval->size); + /* + * Ignore any bti instruction at the start of the function + * we need to keep it there for any indirect branches calling + * the function on Armv8.5+ + */ + if ((*instr & BTI_MASK) == BTI_INSTR) + instr++; + /* Look for stp (pre-indexed) operation */ found = false; /*