Page MenuHomeFreeBSD
Differential D32888

linux: Replace ifdefs with per-architecture callbacks
ClosedPublic
Actions

Authored by trasz on Nov 8 2021, 12:15 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 5:04 PM
Unknown Object (File)
Mon, Mar 17, 1:23 AM
Unknown Object (File)
Fri, Mar 14, 9:56 PM
Unknown Object (File)
Mar 9 2025, 5:41 AM
Unknown Object (File)
Jan 30 2025, 3:44 AM
Unknown Object (File)
Jan 28 2025, 8:17 PM
Unknown Object (File)
Jan 21 2025, 12:40 PM
Unknown Object (File)
Jan 15 2025, 6:56 PM
View All Files
Subscribers
andrew
emaste
imp

Details

Reviewers
manu
jhb
kib
Group Reviewers
Linux Emulation
Commits
rGca5426f9384b: linux: Replace ifdefs in ptrace with per-architecture callbacks
rG0bf8d5d5f434: linux: Replace ifdefs in ptrace with per-architecture callbacks
Summary

It's a cleanup; no (intended) functional changes.

Sponsored By: EPSRC

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 42653
Build 39541: arc lint + arc unit

Event Timeline

trasz created this revision.Nov 8 2021, 12:15 PM
Herald added a reviewer: manu. · View Herald TranscriptNov 8 2021, 12:15 PM
Herald added subscribers: emaste, andrew, imp. · View Herald Transcript
trasz requested review of this revision.Nov 8 2021, 12:15 PM
Harbormaster completed remote builds in B42653: Diff 98188.Nov 8 2021, 12:15 PM
trasz updated this revision to Diff 98189.Nov 8 2021, 12:28 PM

Fix build on arm64.

Harbormaster completed remote builds in B42654: Diff 98189.Nov 8 2021, 12:29 PM
trasz added reviewers: jhb, kib, Linux Emulation.Nov 8 2021, 12:31 PM
kib accepted this revision.Nov 8 2021, 1:54 PM
kib added inline comments.
sys/amd64/linux/linux_machdep.c
398

() != 0

404

() != 0

This revision is now accepted and ready to land.Nov 8 2021, 1:54 PM
Closed by commit rG0bf8d5d5f434: linux: Replace ifdefs in ptrace with per-architecture callbacks (authored by trasz). · Explain WhyNov 9 2021, 12:01 PM
This revision was automatically updated to reflect the committed changes.
trasz added a commit: rG0bf8d5d5f434: linux: Replace ifdefs in ptrace with per-architecture callbacks.
dchagin added a commit: rGca5426f9384b: linux: Replace ifdefs in ptrace with per-architecture callbacks.Jun 17 2022, 7:40 PM

Revision Contents
Changeset List

PathSize
sys/
amd64/
linux/
6 lines
51 lines
arm64/
linux/
5 lines
22 lines
compat/
linux/
22 lines
106 lines

Diff 98188

View Options

sys/amd64/linux/linux.h

Show First 20 Lines • Show All 452 Lines • ▼ Show 20 Linesstruct linux_pt_regset {
l_ulong gs_base; l_ulong gs_base;
l_ulong ds; l_ulong ds;
l_ulong es; l_ulong es;
l_ulong fs; l_ulong fs;
l_ulong gs; l_ulong gs;
}; };
struct reg; struct reg;
struct syscall_info;
void bsd_to_linux_regset(const struct reg *b_reg, void bsd_to_linux_regset(const struct reg *b_reg,
struct linux_pt_regset *l_regset); struct linux_pt_regset *l_regset);
void linux_to_bsd_regset(struct reg *b_reg, void linux_to_bsd_regset(struct reg *b_reg,
const struct linux_pt_regset *l_regset); const struct linux_pt_regset *l_regset);
void linux_ptrace_get_syscall_info_machdep(const struct reg *reg,
struct syscall_info *si);
int linux_ptrace_getregs_machdep(struct thread *td, pid_t pid,
struct linux_pt_regset *l_regset);
#endif /* !_AMD64_LINUX_H_ */ #endif /* !_AMD64_LINUX_H_ */
View Options

sys/amd64/linux/linux_machdep.c

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/limits.h> #include <sys/limits.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/priv.h> #include <sys/priv.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/ptrace.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
#include <sys/sched.h> #include <sys/sched.h>
#include <sys/syscallsubr.h> #include <sys/syscallsubr.h>
#include <sys/sysproto.h> #include <sys/sysproto.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/unistd.h> #include <sys/unistd.h>
#include <sys/vnode.h> #include <sys/vnode.h>
Show All 30 Lines
#include <compat/linux/linux_file.h> #include <compat/linux/linux_file.h>
#include <compat/linux/linux_fork.h> #include <compat/linux/linux_fork.h>
#include <compat/linux/linux_ipc.h> #include <compat/linux/linux_ipc.h>
#include <compat/linux/linux_misc.h> #include <compat/linux/linux_misc.h>
#include <compat/linux/linux_mmap.h> #include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_signal.h> #include <compat/linux/linux_signal.h>
#include <compat/linux/linux_util.h> #include <compat/linux/linux_util.h>
#define LINUX_ARCH_AMD64 0xc000003e
int int
linux_execve(struct thread *td, struct linux_execve_args *args) linux_execve(struct thread *td, struct linux_execve_args *args)
{ {
struct image_args eargs; struct image_args eargs;
char *path; char *path;
int error; int error;
LINUX_CTR(execve); LINUX_CTR(execve);
▲ Show 20 Lines • Show All 249 Lines • ▼ Show 20 Lineslinux_to_bsd_regset(struct reg *b_reg, const struct linux_pt_regset *l_regset)
b_reg->r_cs = l_regset->cs; b_reg->r_cs = l_regset->cs;
b_reg->r_rflags = l_regset->eflags; b_reg->r_rflags = l_regset->eflags;
b_reg->r_rsp = l_regset->rsp; b_reg->r_rsp = l_regset->rsp;
b_reg->r_ss = l_regset->ss; b_reg->r_ss = l_regset->ss;
b_reg->r_ds = l_regset->ds; b_reg->r_ds = l_regset->ds;
b_reg->r_es = l_regset->es; b_reg->r_es = l_regset->es;
b_reg->r_fs = l_regset->fs; b_reg->r_fs = l_regset->fs;
b_reg->r_gs = l_regset->gs; b_reg->r_gs = l_regset->gs;
}
void
linux_ptrace_get_syscall_info_machdep(const struct reg *reg,
struct syscall_info *si)
{
si->arch = LINUX_ARCH_AMD64;
si->instruction_pointer = reg->r_rip;
si->stack_pointer = reg->r_rsp;
}
int
linux_ptrace_getregs_machdep(struct thread *td, pid_t pid,
struct linux_pt_regset *l_regset)
{
struct ptrace_lwpinfo lwpinfo;
struct pcb *pcb;
int error;
pcb = td->td_pcb;
if (td == curthread)
update_pcb_bases(pcb);
l_regset->fs_base = pcb->pcb_fsbase;
l_regset->gs_base = pcb->pcb_gsbase;
error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo));
if (error != 0) {
linux_msg(td, "PT_LWPINFO failed with error %d", error);
return (error);
}
if (lwpinfo.pl_flags & PL_FLAG_SCE) {
kibUnsubmitted
Not Done
Inline Actions

() != 0

kib: () != 0
/*
* Undo the mangling done in exception.S:fast_syscall_common().
*/
l_regset->r10 = l_regset->rcx;
}
if (lwpinfo.pl_flags & (PL_FLAG_SCE | PL_FLAG_SCX)) {
kibUnsubmitted
Not Done
Inline Actions

() != 0

kib: () != 0
/*
* In Linux, the syscall number - passed to the syscall
* as rax - is preserved in orig_rax; rax gets overwritten
* with syscall return value.
*/
l_regset->orig_rax = lwpinfo.pl_syscall_code;
}
return (0);
} }
View Options

sys/arm64/linux/linux.h

Show First 20 Lines • Show All 315 Lines • ▼ Show 20 Lines
struct linux_pt_regset { struct linux_pt_regset {
l_ulong x[31]; l_ulong x[31];
l_ulong sp; l_ulong sp;
l_ulong pc; l_ulong pc;
l_ulong cpsr; l_ulong cpsr;
}; };
struct reg; struct reg;
struct syscall_info;
void bsd_to_linux_regset(const struct reg *b_reg, void bsd_to_linux_regset(const struct reg *b_reg,
struct linux_pt_regset *l_regset); struct linux_pt_regset *l_regset);
void linux_to_bsd_regset(struct reg *b_reg, void linux_to_bsd_regset(struct reg *b_reg,
const struct linux_pt_regset *l_regset); const struct linux_pt_regset *l_regset);
void linux_ptrace_get_syscall_info_machdep(const struct reg *reg,
struct syscall_info *si);
int linux_ptrace_getregs_machdep(struct thread *td, pid_t pid,
struct linux_pt_regset *l_regset);
#endif /* _ARM64_LINUX_H_ */ #endif /* _ARM64_LINUX_H_ */
View Options

sys/arm64/linux/linux_machdep.c

Show All 30 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/imgact.h> #include <sys/imgact.h>
#include <sys/ktr.h> #include <sys/ktr.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/ptrace.h>
#include <sys/reg.h> #include <sys/reg.h>
#include <sys/sdt.h> #include <sys/sdt.h>
#include <security/audit/audit.h> #include <security/audit/audit.h>
#include <arm64/linux/linux.h> #include <arm64/linux/linux.h>
#include <arm64/linux/linux_proto.h> #include <arm64/linux/linux_proto.h>
#include <compat/linux/linux_dtrace.h> #include <compat/linux/linux_dtrace.h>
#include <compat/linux/linux_emul.h> #include <compat/linux/linux_emul.h>
#include <compat/linux/linux_fork.h> #include <compat/linux/linux_fork.h>
#include <compat/linux/linux_misc.h> #include <compat/linux/linux_misc.h>
#include <compat/linux/linux_mmap.h> #include <compat/linux/linux_mmap.h>
#include <compat/linux/linux_util.h> #include <compat/linux/linux_util.h>
#define LINUX_ARCH_AARCH64 0xc00000b7
/* DTrace init */ /* DTrace init */
LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
/* DTrace probes */ /* DTrace probes */
LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo);
/* /*
* LINUXTODO: deduplicate; linux_execve is common across archs, except that on * LINUXTODO: deduplicate; linux_execve is common across archs, except that on
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lineslinux_to_bsd_regset(struct reg *b_reg, const struct linux_pt_regset *l_regset)
KASSERT(sizeof(l_regset->x) == sizeof(b_reg->x) + sizeof(l_ulong), KASSERT(sizeof(l_regset->x) == sizeof(b_reg->x) + sizeof(l_ulong),
("%s: size mismatch\n", __func__)); ("%s: size mismatch\n", __func__));
memcpy(b_reg->x, l_regset->x, sizeof(b_reg->x)); memcpy(b_reg->x, l_regset->x, sizeof(b_reg->x));
b_reg->sp = l_regset->sp; b_reg->sp = l_regset->sp;
b_reg->elr = l_regset->pc; b_reg->elr = l_regset->pc;
b_reg->spsr = l_regset->cpsr; b_reg->spsr = l_regset->cpsr;
} }
void
linux_ptrace_get_syscall_info_machdep(struct syscall_info *si,
const struct reg *reg)
{
si->arch = LINUX_ARCH_AARCH64;
si->instruction_pointer = b_reg.lr;
si->stack_pointer = b_reg.sp;
}
int
linux_ptrace_getregs_machdep(struct thread *td __unused, pid_t pid __unused,
struct linux_pt_regset *l_regset __unused)
{
return (0);
}
View Options

sys/compat/linux/linux_misc.h

Loading...
View Options

sys/compat/linux/linux_ptrace.c

Loading...