From nobody Tue Apr 19 10:05:29 2022 X-Original-To: dev-commits-src-branches@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 655AA5D2859; Tue, 19 Apr 2022 10:05:30 +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 4KjKDp1J1Gz4tsS; Tue, 19 Apr 2022 10:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362730; 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=sBgGLHILdoIR6fFByZQC/xPZz9oNbIvVrCb+Fxhe+wI=; b=j5V7rTdA8ORHvMyDR+P2Edto70h8cYSgbiSyflfswfQ0AYm6RA+af7oTnYwnvFo6k1kK9v zFdpqd3zOw5uNTe45U3pv8ZoE2JtqYO4/c1YWgAjUjWh5LEjsTAymHU8vNAxBAL8zKlJp0 zBsUU75znuG8D5MLELh64i4cjnYJUcL14tgExK0fLfBUCyrXrR//q8VekkCSVbmJ5oRQJU tj7sSn+9E56vINusirbAOtjOW2/Mk/SBgmWquuiqLGlYdOpZkh76hZ/9Zanx5QDXNMsBOv DgV/jxsBqH/QhK3qLJK6eW/Q5Rn4MTISehFpFhQDInH+fZmv2hAvn+M54vzo3g== 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 E98DA25494; Tue, 19 Apr 2022 10:05:29 +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 23JA5Txn012834; Tue, 19 Apr 2022 10:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JA5Tx5012833; Tue, 19 Apr 2022 10:05:29 GMT (envelope-from git) Date: Tue, 19 Apr 2022 10:05:29 GMT Message-Id: <202204191005.23JA5Tx5012833@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: 2e38975e5aa4 - stable/13 - Add an implementation of .mcount on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 2e38975e5aa41c576b87e5766b51d28fed0034ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650362730; 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=sBgGLHILdoIR6fFByZQC/xPZz9oNbIvVrCb+Fxhe+wI=; b=el6TLLA5ZdsTN20/0FkhBnwtYahGTP9bb0uyKeoEzw3UcX5AOTSPuDirjBL4+zo0E2qxwJ DHZbOaSHYfJ5fmsZDayXM/OVZzQBvFxM1eYOM0pqzoKS14J0sNTA9sIxKgRuYoy3+h5tAQ 0YAmmaN1ODq3Azf1MfUhm4hw+ENZAQ9oCvOjg4INcXhF0nT4Ad9aTyLcbLTCKhLef/IWoc +rrs1cBhvoxxdK+ylr1eZP4jwWyiVSvdYxns4vBOli/3KV4EA37wHbqBV5uj85PnSVVKfN O1tYtxcRdLrLhyEOlutxrG1nXvK//Ww3GeLocUTvFuSk3dUkQ+IreMcmXpfzSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650362730; a=rsa-sha256; cv=none; b=xoNpPl3OmH/K/9sVTSedCyt53g0x9B2yvcOyeffnlCpApX+4/Wdag6NOjhN3BYPToRuuhx Un84DjQG4sv/bBskj7J/Mn1tikkiKm0k7EVpGhrk7ET5o1f859KqWbQgUca3mHd4qSNZvz lpanOyApD6nSMj2wVNm05r2qWeCQy7SYooS9yecr9LXpHgbDUpSrxKAp1JBOgw3gWuhG1M 9ySW8ApHIj86r56e1n3f8mbTHsMHEQ4IQYt526R7/bza/pdKxY6Zmrn8ogoOA+dJ32ANMe zkP9GkxbSP9IWQ0iBIKvRTVl/ZOyTj3atk5BM+txggSV4aQIq5H1uL23WuiSyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2e38975e5aa41c576b87e5766b51d28fed0034ee commit 2e38975e5aa41c576b87e5766b51d28fed0034ee Author: Andrew Turner AuthorDate: 2022-03-22 15:46:15 +0000 Commit: Andrew Turner CommitDate: 2022-04-19 09:18:02 +0000 Add an implementation of .mcount on arm64 To support cc -pg on arm64 we need to implement .mcount. As clang and gcc think it is function like it just needs to load the arguments to _mcount and call it. On gcc the first argument is passed in x0, however this is missing on clang so we need to load it from the stack. As it's the caller return address this will be at a known location. PR: 262709 Reviewed by: emaste (earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34634 (cherry picked from commit 16d5f9a1649e6a3e5841c6c41d6af9430ed9f064) --- lib/libc/aarch64/Symbol.map | 1 + sys/arm64/include/profile.h | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map index d9121798140c..573dc0e6df0e 100644 --- a/lib/libc/aarch64/Symbol.map +++ b/lib/libc/aarch64/Symbol.map @@ -11,6 +11,7 @@ FBSD_1.0 { /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; fabs; diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index afbfbdb44c0b..0b117d0ff442 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -72,8 +72,51 @@ void mcount(uintfptr_t frompc, uintfptr_t selfpc); typedef __uintfptr_t uintfptr_t; -#define _MCOUNT_DECL void mcount +#define _MCOUNT_DECL \ +static void _mcount(uintfptr_t frompc, uintfptr_t selfpc) __used; \ +static void _mcount + +#ifdef __GNUCLIKE_ASM +/* + * Call into _mcount. On arm64 the .mcount is a function so callers will + * handle caller saved registers. As we don't directly touch any callee + * saved registers we can just load the two arguments and use a tail call + * into the MI _mcount function. + * + * When building with gcc frompc will be in x0, however this is not the + * case on clang. As such we need to load it from the stack. As long as + * the caller follows the ABI this will load the correct value. + */ +#define MCOUNT __asm( \ +" .text \n" \ +" .align 6 \n" \ +" .type .mcount,#function \n" \ +" .globl .mcount \n" \ +" .mcount: \n" \ +" .cfi_startproc \n" \ + /* Load the caller return address as frompc */ \ +" ldr x0, [x29, #8] \n" \ + /* Use our return address as selfpc */ \ +" mov x1, lr \n" \ +" b _mcount \n" \ +" .cfi_endproc \n" \ +" .size .mcount, . - .mcount \n" \ + ); +#if 0 +/* + * If clang passed frompc correctly we could implement it like this, however + * all clang versions we care about would need to be fixed before we could + * make this change. + */ +void +mcount(uintfptr_t frompc) +{ + _mcount(frompc, __builtin_return_address(0)); +} +#endif +#else #define MCOUNT +#endif #endif /* _KERNEL */