From nobody Wed Nov 3 09:11:52 2021 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 B8AE0181C8A2; Wed, 3 Nov 2021 09:11: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 4Hkgy04vVHz3kvn; Wed, 3 Nov 2021 09:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 87EC91636E; Wed, 3 Nov 2021 09:11:52 +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 1A39BqhA033778; Wed, 3 Nov 2021 09:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A39BqFQ033777; Wed, 3 Nov 2021 09:11:52 GMT (envelope-from git) Date: Wed, 3 Nov 2021 09:11:52 GMT Message-Id: <202111030911.1A39BqFQ033777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: c91d0e59be10 - main - linux: Make linux_ptrace.c portable 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c91d0e59be10f9412cbce467b8b038f006bb6f18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=c91d0e59be10f9412cbce467b8b038f006bb6f18 commit c91d0e59be10f9412cbce467b8b038f006bb6f18 Author: Edward Tomasz Napierala AuthorDate: 2021-11-03 08:54:30 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-11-03 08:54:35 +0000 linux: Make linux_ptrace.c portable Make sys/amd64/linux/linux_ptrace.c machine-independent, in preparation for moving it into sys/compat/linux/. No functional changes. Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D32756 --- sys/amd64/linux/linux_ptrace.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c index 191e6265b39c..2ebf1c2be997 100644 --- a/sys/amd64/linux/linux_ptrace.c +++ b/sys/amd64/linux/linux_ptrace.c @@ -108,6 +108,7 @@ __FBSDID("$FreeBSD$"); #define LINUX_PTRACE_PEEKUSER_DS 184 #define LINUX_ARCH_AMD64 0xc000003e +#define LINUX_ARCH_AARCH64 0xc00000b7 static int map_signum(int lsig, int *bsigp) @@ -217,6 +218,7 @@ linux_ptrace_peekuser(struct thread *td, pid_t pid, void *addr, void *data) return (error); switch ((uintptr_t)addr) { +#ifdef __amd64__ case LINUX_PTRACE_PEEKUSER_ORIG_RAX: val = b_reg.r_rax; break; @@ -229,6 +231,7 @@ linux_ptrace_peekuser(struct thread *td, pid_t pid, void *addr, void *data) case LINUX_PTRACE_PEEKUSER_DS: val = b_reg.r_ds; break; +#endif /* __amd64__ */ default: linux_msg(td, "PTRACE_PEEKUSER offset %ld not implemented; " "returning EINVAL", (uintptr_t)addr); @@ -343,20 +346,25 @@ linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) struct ptrace_lwpinfo lwpinfo; struct reg b_reg; struct linux_pt_regset l_regset; +#ifdef __amd64__ struct pcb *pcb; +#endif int error; error = kern_ptrace(td, PT_GETREGS, pid, &b_reg, 0); if (error != 0) return (error); + bsd_to_linux_regset(&b_reg, &l_regset); + +#ifdef __amd64__ pcb = td->td_pcb; if (td == curthread) update_pcb_bases(pcb); - bsd_to_linux_regset(&b_reg, &l_regset); l_regset.fs_base = pcb->pcb_fsbase; l_regset.gs_base = pcb->pcb_gsbase; +#endif error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo)); if (error != 0) { @@ -404,7 +412,9 @@ linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data) struct reg b_reg; struct linux_pt_regset l_regset; struct iovec iov; +#ifdef __amd64__ struct pcb *pcb; +#endif size_t len; int error; @@ -418,13 +428,16 @@ linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data) if (error != 0) return (error); + bsd_to_linux_regset(&b_reg, &l_regset); + +#ifdef __amd64__ pcb = td->td_pcb; if (td == curthread) update_pcb_bases(pcb); - bsd_to_linux_regset(&b_reg, &l_regset); l_regset.fs_base = pcb->pcb_fsbase; l_regset.gs_base = pcb->pcb_gsbase; +#endif error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo)); if (error != 0) { @@ -569,9 +582,17 @@ linux_ptrace_get_syscall_info(struct thread *td, pid_t pid, if (error != 0) return (error); +#if defined(__amd64__) si.arch = LINUX_ARCH_AMD64; si.instruction_pointer = b_reg.r_rip; si.stack_pointer = b_reg.r_rsp; +#elif defined(__aarch64__) + si.arch = LINUX_ARCH_AARCH64; + si.instruction_pointer = b_reg.lr; + si.stack_pointer = b_reg.sp; +#else +#error "unknown architecture" +#endif len = MIN(len, sizeof(si)); error = copyout(&si, (void *)data, len);