From nobody Mon Oct 30 17:56:19 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 4SK1D36gL4z4yDlt; Mon, 30 Oct 2023 17:56:19 +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 4SK1D35cjpz3Y3k; Mon, 30 Oct 2023 17:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688579; 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=qCOdiWSLJ07Y8x25JZtX6Yru1cTBtygO8XK4SC88in0=; b=ahrK0LgZGDwOl3I0YqxioZi+pmurSN1/WBrL3GT0biObwBbR6I/N3THWN/UABiyiAFHHRn dsHgE4n+5tz4cC8M6SyF0R7iK1gJNLrc1v7Y30Cuc2mTD5c50GNU6azb/V1HQwChYzff5T tS5RPNUkwUyQ8usF6jrnhy/715vqZSxdgK9J/Rks+dbhtqX/jJt0c20gdLzTWSKcbdYME0 fnw1I4ZjqE2Au6pvXqGtQoNqNKEQpA7AU8gMX6QltG/sefNbXXc56olCRF/XY5XZiw2W7J 9VHMVow+dObISU4ZUNtNTkJw9xRpaWaQZ5I24m+rgMbqt2GtxbYyBS94AQckWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688579; 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=qCOdiWSLJ07Y8x25JZtX6Yru1cTBtygO8XK4SC88in0=; b=W6nfnLhw7BQIQVFp1EmNNW94OTVAHpajD6o4f5qOXZAKIbuA12DWmh3PQH2ooAbQDsqj29 dqTtgzpYUcw92EcYSskOr4inAmxqvJ14LuS/LSuvLdm6kqh6yll/LgH9SNqtS5Y0wMSSYV k2q3ia54j1tsJH/Fz6EQ+e1gkiliIjDUqgFLl+F18NzrCiNz9d8twHB7As+LCImscPSKpa L6dGl64ymyDesjvKItdmM+Dpy4qY3nnrJAbl9UdZkzQr5xNYGYVwifzI6xclFP3biU3wvC VCyJcBGNvKlb8yvSxsj0IcVR32sU1dmassA6J5kd0DOWPWAni69KqsBU844p/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698688579; a=rsa-sha256; cv=none; b=uDIrG0d3p3W0UvnRZzHr0biOjyU1P9gTEuRDgHzYwF94x0QgtVA63WjuxHEED9s7eBrJTM hUuqiPFEG30eMNvq12Brt0FaaozbMRWAIc/KTXv5n5QBijj9zA4e/ZGbIQ18m49wyqMPK3 Tnq/NtZpcn1SgVBZ8mEBFEAXMrg8KNNQ7jbZImWbq8WRpNcl5MxfMtS0bLeesxODwbrF0o foyJAyn9oX1IKmHNyl1gQMkF+Ns8KV6qQSSMqYtHZOH2GHfPwsWlh4ETAIy4r31Mjewpth ZcQDW/uWQR/UxiT2O/fZy+GUMlNI9jOvUv9m5jv3Q091H5agzH4h6jDK4F73xQ== 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 4SK1D34kG0zWwc; Mon, 30 Oct 2023 17:56:19 +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 39UHuJhQ028636; Mon, 30 Oct 2023 17:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHuJCh028634; Mon, 30 Oct 2023 17:56:19 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:56:19 GMT Message-Id: <202310301756.39UHuJCh028634@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: 0590ed0967e0 - main - arm64: Add a BTI landing pad to .mcount 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: 0590ed0967e025e1d155da9e06509f3fe9686feb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0590ed0967e025e1d155da9e06509f3fe9686feb commit 0590ed0967e025e1d155da9e06509f3fe9686feb Author: Andrew Turner AuthorDate: 2023-10-16 14:34:19 +0000 Commit: Andrew Turner CommitDate: 2023-10-30 17:55:45 +0000 arm64: Add a BTI landing pad to .mcount The .mcount function needs a BTI branch target. As we can't rely on asm.h being included use the hint version of a "bti c" instruction. This is a nop when BTI is not supported or not used. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42230 --- sys/arm64/include/profile.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index 3e4a34669360..8a61ff995d83 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -68,6 +68,8 @@ static void _mcount " .globl .mcount \n" \ " .mcount: \n" \ " .cfi_startproc \n" \ + /* Allow this to work with BTI, see BTI_C in asm.h */ \ +" hint #34 \n" \ /* Load the caller return address as frompc */ \ " ldr x0, [x29, #8] \n" \ /* Use our return address as selfpc */ \