From nobody Mon Feb 19 16:45:16 2024 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 4TdpLP3nXQz5C9Hx; Mon, 19 Feb 2024 16:45:17 +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 4TdpLP1LH6z4bpq; Mon, 19 Feb 2024 16:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361117; 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=GLJMAlkvfIrWOaha7TuD9jKY+/Hk6rr+To1g5c6+xV4=; b=aeSp9s0zC4cSRqclaCEgNeyamfCd913prSlmDolTXJHmYbrJJ7uwKVvNdrbCP77mxepV4I xfXCpQdtAlDMmLjLDnyWWlEcAL4uYsUQ9ZakYFiWYKQ7ZF8r+KjcaBmWRJdK4lYX2mIVyn ebWo7FPhWReKuJhwy9eOyD/XR2IMYwa8VY6GvSh9dWjsv1q/nLt5pw1Qjy8LHoKGPOHT2a aoZvHA1YoVb9ly1gqJapQ3BCx4wwVXiQY47PV8vHHmiphVmCg7JQXJPUq2SX5CW9jpFHvc mevuHnRvaqzOlBorGDMf4R3yUTBKoh3OwuIUhpNjSMUDx2D3092hvRDmYHb3NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361117; 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=GLJMAlkvfIrWOaha7TuD9jKY+/Hk6rr+To1g5c6+xV4=; b=vL2oIdoBPFBmOxyS9OaNA/kj+Ev4DIek4LXrglwU15ORCuTWMUvWgUw3slb6970eR8xO6C EZCL/tPhVEJ3XzNB7EKh1yIHcyI6ETlspKgl7cRfptjCM6bVXzcxBJgPLnzsdwG5m4Td9V z/Y0GEo2312lFvR3yqb8YubUCOCy91tiLGuA1y2M55+kyaGFop5s7cK8NZplKHG2L+zw66 J1iFhT+4fHI/vp32vnnvEnEEkN/0nfkhhf0+nfcBfUNdrIoJshEumbV/fZZ9JaZlJs6Nmm 2pv7mwOD3iEDZLjY5JFKPxYcprlPYNODurrfBcQOd2fr1zw67NKOA0NhZahg4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361117; a=rsa-sha256; cv=none; b=sPdLMylCSNDrakd+gaPmD3fjTN767WWgsLKE6GsFLhSw81dqc1WJziEjXH6Veqgj9/KqcQ bQCu11ex1req6CtmRcr1M71bRhEX6nwVWsK8/PMvbKDHjMdawtROymSvEKcF25ZWzyERnn 43oPPikYWWb3O51DxbX6jF14oLiDPeC4fhC16NBf04EcJoEVIZhPzYAEDlXZuGQqW0sRnz PeIuyQZFkPwd80Z0PoYEIlRX9kAYNTD2nrsa64DDmnSF0wM1qnDIHvn5VfmyfQAo7TBzwF XU9soSALwHz53s+S4PDrHITtxHpQ9uGtAiImBY0RwZsxYxGiWgBw+a029C4Qug== 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 4TdpLP0RrGzj9T; Mon, 19 Feb 2024 16:45:17 +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 41JGjGAZ095968; Mon, 19 Feb 2024 16:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGjG4v095965; Mon, 19 Feb 2024 16:45:16 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:16 GMT Message-Id: <202402191645.41JGjG4v095965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: aace2b59a835 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: aace2b59a835bb6b90a134e370e6af63792f4a12 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aace2b59a835bb6b90a134e370e6af63792f4a12 commit aace2b59a835bb6b90a134e370e6af63792f4a12 Author: Andrew Turner AuthorDate: 2023-10-16 14:34:19 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 13:12:30 +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 (cherry picked from commit 0590ed0967e025e1d155da9e06509f3fe9686feb) --- 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 */ \