Page MenuHomeFreeBSD
Files F156948917

D46192.id.diff
No OneTemporary
Actions

D46192.id.diff
View Options

diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c
--- a/sys/arm64/arm64/genassym.c
+++ b/sys/arm64/arm64/genassym.c
@@ -58,6 +58,8 @@
ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault));
ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags));
+ASSYM(P_PID, offsetof(struct proc, p_pid));
+
ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));
ASSYM(TD_PROC, offsetof(struct thread, td_proc));
diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S
--- a/sys/arm64/arm64/swtch.S
+++ b/sys/arm64/arm64/swtch.S
@@ -55,6 +55,21 @@
999:
.endm
+/*
+ * Lower 32 bits of CONTEXTIDR_EL1 are PID
+ * Upper 32 bits are reserved for future use e.g. TID
+ */
+.macro pid_in_context_idr
+ adrp x9, arm64_pid_in_contextidr
+ ldrb w10, [x9, :lo12:arm64_pid_in_contextidr]
+ cbz w10, 998f
+ ldr x9, [x1, #TD_PROC]
+ /* PID is always 0 or positive, do not sign extend */
+ ldr w10, [x9, #P_PID]
+ msr contextidr_el1, x10
+998:
+.endm
+
/*
* void cpu_throw(struct thread *old, struct thread *new)
*/
@@ -66,7 +81,10 @@
ldr x4, [x0, #TD_PCB]
ldr w5, [x4, #PCB_FLAGS]
clear_step_flag w5, x6
+
1:
+ /* debug/trace: set CONTEXTIDR_EL1 to current PID, if enabled */
+ pid_in_context_idr
#ifdef VFP
/* Backup the new thread pointer around a call to C code */
@@ -147,6 +165,9 @@
mov x20, x1
mov x21, x2
+ /* debug/trace: set CONTEXTIDR_EL1 to current PID, if enabled */
+ pid_in_context_idr
+
#ifdef VFP
bl vfp_save_state_switch
mov x0, x20
diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c
--- a/sys/arm64/arm64/sys_machdep.c
+++ b/sys/arm64/arm64/sys_machdep.c
@@ -30,6 +30,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
+#include <sys/sysctl.h>
#include <sys/sysproto.h>
#include <vm/vm.h>
@@ -80,3 +81,8 @@
return (error);
}
+
+bool arm64_pid_in_contextidr = false;
+SYSCTL_BOOL(_machdep, OID_AUTO, pid_in_contextidr, CTLFLAG_RW,
+ &arm64_pid_in_contextidr, false,
+ "Save PID into CONTEXTIDR_EL1 register on context switch");

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 2:11 PM (19 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33234052
Default Alt Text
D46192.id.diff (1 KB)

Event Timeline