From nobody Fri May 13 17:42:50 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 1E25F1AE516C; Fri, 13 May 2022 17:42:52 +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 4L0GFR38wbz4S29; Fri, 13 May 2022 17:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652463771; 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=aiFi9Qh1gpyvYNsIswAQvM4mtxPPCcetJapGSzVMuE4=; b=CvTgmvBP8FwZrkmSHC3ZJY3FVEiAUtzmMTloU75nw1Uth5IZPN/NVq6qOQe7E1iEvienbQ 0OUxCiG7TpUvck/dj3re7k4tGiVH7/GalZzIwKG1GuXpfZY2m6mELgwn99ngy94nstZTOo +byLv6xSkZULNtGA1vMQEWpgtR2dDVYaf+noYyf0Q8hX/0pJGui384eZhtbwwZumKgxaaH ON0vkciu6cIXokqcAERi0bUms6oxokPZgWGjZM54P1nFkiiNWQsfP6EcX9DNso9ym2+rzi CW5XZqLXRwMjV6P7sbRKGruO1ohRVNCYzc1qdhRb177Owt/AmACkT+QxHuctEg== 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 1BECB27403; Fri, 13 May 2022 17:42:51 +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 24DHgoB9055605; Fri, 13 May 2022 17:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DHgoi2055604; Fri, 13 May 2022 17:42:50 GMT (envelope-from git) Date: Fri, 13 May 2022 17:42:50 GMT Message-Id: <202205131742.24DHgoi2055604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e0b7d19d4408 - stable/13 - arm,arm64: Add a NT_ARM_TLS read-only register set. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0b7d19d4408953396d26dd60d64638d040d6f18 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652463771; 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=aiFi9Qh1gpyvYNsIswAQvM4mtxPPCcetJapGSzVMuE4=; b=dnonc6x4vgTO/rIsJyomZ8w7Vp8eZe/qLZ4LjnBlWcc/1+m+MCnrk6mpgI2a+ZaweWRhTA WaHWSps0PFYhwn03eZ3Zp78fQ/i8A/3Jn47iUCle3SfaoomA1wpd+RXZ7EoKUNr6qyCbc7 0yOWI/mJchGorIBa0WBAuN6CObc/uBKt3vkIDFXbOr/qqhuEN++6KLuoHCv5LhBsYkkw/a KNoC7eXbQP6mtUal7KmULGWy7ly2cA6TYF1D1YOFSDJwPh62XwcX9NOPwe7sY6NemEiz+T K3ImlNNNo7Qkwp0f4FwF5zv44GeZVNPD+Nq0+rKvGx5YmYXLYMMFbkkWI5iwgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652463771; a=rsa-sha256; cv=none; b=m2NX0rK8tBcwFKdtWkujc5mE42k/Q9hO2T/1vN9nxzRx4uHsCCgk+x920S3bjfYJoB4F9U 5wPevkLzTOt0iqjCd9UF339hlgVauwMtYjxWPUbsDcBf5+kMDE4czG++paJ66djZJgaiOj /v4BIuFlso5tGCz97NHxzt+9fLLL56RA9i2nihs7+wd/CqA0n7Xq/IBhr0wYgVYoP2oiIR Eb4Xq1ifIru+AM/0IoYX0YjDF1gEoWHuER5rhJfmsvTl1iWohKBqzXtq7xJbj2Zrhz4H4n rxQ+V9rzoo5d3Yu85dGIRlnOIcq2nUje8WzJGchPgIt0NwtEqCO8nQ9k0JlXmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e0b7d19d4408953396d26dd60d64638d040d6f18 commit e0b7d19d4408953396d26dd60d64638d040d6f18 Author: John Baldwin AuthorDate: 2022-03-23 20:33:06 +0000 Commit: John Baldwin CommitDate: 2022-05-13 00:39:00 +0000 arm,arm64: Add a NT_ARM_TLS read-only register set. This register set exposes the per-thread TLS register. It matches the layout used by Linux on arm64. Linux does not implement this note for 32-bit arm. Reviewed by: andrew, markj Sponsored by: University of Cambridge, Google, Inc. Differential Revision: https://reviews.freebsd.org/D34595 (cherry picked from commit b2cb74c22c4f7087f342cf50b116b040de6bdc6c) --- contrib/elftoolchain/readelf/readelf.c | 1 + sys/arm/arm/ptrace_machdep.c | 22 ++++++++++++++++ sys/arm64/arm64/ptrace_machdep.c | 48 ++++++++++++++++++++++++++++++++++ sys/sys/elf_common.h | 1 + usr.bin/gcore/elfcore.c | 3 +++ 5 files changed, 75 insertions(+) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index fd8e75b66b56..fa3cdca3d682 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -1197,6 +1197,7 @@ note_type_freebsd_core(unsigned int nt) case 0x102: return "NT_PPC_VSX (ppc VSX registers)"; case 0x202: return "NT_X86_XSTATE (x86 XSAVE extended state)"; case 0x400: return "NT_ARM_VFP (arm VFP registers)"; + case 0x401: return "NT_ARM_TLS (arm TLS register)"; case 0x406: return "NT_ARM_ADDR_MASK (arm address mask)"; default: return (note_type_unknown(nt)); } diff --git a/sys/arm/arm/ptrace_machdep.c b/sys/arm/arm/ptrace_machdep.c index d8acc58d0fd0..3edadbd72ddf 100644 --- a/sys/arm/arm/ptrace_machdep.c +++ b/sys/arm/arm/ptrace_machdep.c @@ -67,6 +67,28 @@ static struct regset regset_arm_vfp = { ELF_REGSET(regset_arm_vfp); #endif +static bool +get_arm_tls(struct regset *rs, struct thread *td, void *buf, + size_t *sizep) +{ + if (buf != NULL) { + KASSERT(*sizep == sizeof(td->td_pcb->pcb_regs.sf_tpidrurw), + ("%s: invalid size", __func__)); + memcpy(buf, &td->td_pcb->pcb_regs.sf_tpidrurw, + sizeof(td->td_pcb->pcb_regs.sf_tpidrurw)); + } + *sizep = sizeof(td->td_pcb->pcb_regs.sf_tpidrurw); + + return (true); +} + +static struct regset regset_arm_tls = { + .note = NT_ARM_TLS, + .size = sizeof(uint32_t), + .get = get_arm_tls, +}; +ELF_REGSET(regset_arm_tls); + int cpu_ptrace(struct thread *td, int req, void *addr, int data) { diff --git a/sys/arm64/arm64/ptrace_machdep.c b/sys/arm64/arm64/ptrace_machdep.c index abf1991a51a6..44ca58a49156 100644 --- a/sys/arm64/arm64/ptrace_machdep.c +++ b/sys/arm64/arm64/ptrace_machdep.c @@ -81,6 +81,54 @@ static struct regset regset_arm_vfp = { ELF32_REGSET(regset_arm_vfp); #endif +static bool +get_arm64_tls(struct regset *rs, struct thread *td, void *buf, + size_t *sizep) +{ + if (buf != NULL) { + KASSERT(*sizep == sizeof(td->td_pcb->pcb_tpidr_el0), + ("%s: invalid size", __func__)); + memcpy(buf, &td->td_pcb->pcb_tpidr_el0, + sizeof(td->td_pcb->pcb_tpidr_el0)); + } + *sizep = sizeof(td->td_pcb->pcb_tpidr_el0); + + return (true); +} + +static struct regset regset_arm64_tls = { + .note = NT_ARM_TLS, + .size = sizeof(uint64_t), + .get = get_arm64_tls, +}; +ELF_REGSET(regset_arm64_tls); + +#ifdef COMPAT_FREEBSD32 +static bool +get_arm_tls(struct regset *rs, struct thread *td, void *buf, + size_t *sizep) +{ + if (buf != NULL) { + uint32_t tp; + + KASSERT(*sizep == sizeof(uint32_t), + ("%s: invalid size", __func__)); + tp = (uint32_t)td->td_pcb->pcb_tpidr_el0; + memcpy(buf, &tp, sizeof(tp)); + } + *sizep = sizeof(uint32_t); + + return (true); +} + +static struct regset regset_arm_tls = { + .note = NT_ARM_TLS, + .size = sizeof(uint32_t), + .get = get_arm_tls, +}; +ELF32_REGSET(regset_arm_tls); +#endif + int ptrace_set_pc(struct thread *td, u_long addr) { diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 30f717d32ac7..3c88b59cb5ce 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -825,6 +825,7 @@ typedef struct { #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ #define NT_X86_XSTATE 0x202 /* x86 XSAVE extended state. */ #define NT_ARM_VFP 0x400 /* ARM VFP registers */ +#define NT_ARM_TLS 0x401 /* ARM TLS register */ /* GNU note types. */ #define NT_GNU_ABI_TAG 1 diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c index 42d90aaaf155..c3ef36938ea9 100644 --- a/usr.bin/gcore/elfcore.c +++ b/usr.bin/gcore/elfcore.c @@ -372,6 +372,9 @@ elf_putnotes(pid_t pid, struct sbuf *sb, size_t *sizep) elf_putregnote(NT_FPREGSET, tids[i], sb); elf_putnote(NT_THRMISC, elf_note_thrmisc, tids + i, sb); elf_putnote(NT_PTLWPINFO, elf_note_ptlwpinfo, tids + i, sb); +#if defined(__aarch64__) || defined(__arm__) + elf_putregnote(NT_ARM_TLS, tids[i], sb); +#endif #if (defined(ELFCORE_COMPAT_32) && defined(__aarch64__)) || defined(__arm__) elf_putregnote(NT_ARM_VFP, tids[i], sb); #endif