D4209.diff
No OneTemporary
Actions

Size

11 KB

Referenced Files

None

Subscribers

None

D4209.diff
View Options

	Index: head/lib/libc/aarch64/sys/Makefile.inc
	===================================================================
	--- head/lib/libc/aarch64/sys/Makefile.inc
	+++ head/lib/libc/aarch64/sys/Makefile.inc
	@@ -1,6 +1,6 @@
	# $FreeBSD$

	-SRCS+= trivial-vdso_tc.c
	+SRCS+= __vdso_gettc.c

	#MDASM= ptrace.S
	MDASM= brk.S \
	Index: head/lib/libc/arm/sys/Makefile.inc
	===================================================================
	--- head/lib/libc/arm/sys/Makefile.inc
	+++ head/lib/libc/arm/sys/Makefile.inc
	@@ -1,6 +1,6 @@
	# $FreeBSD$

	-SRCS+= trivial-vdso_tc.c
	+SRCS+= __vdso_gettc.c

	MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S

	Index: head/sys/arm/arm/elf_machdep.c
	===================================================================
	--- head/sys/arm/arm/elf_machdep.c
	+++ head/sys/arm/arm/elf_machdep.c
	@@ -43,6 +43,7 @@
	#include <vm/pmap.h>
	#include <vm/vm_param.h>

	+#include <machine/acle-compat.h>
	#include <machine/elf.h>
	#include <machine/md_var.h>

	@@ -73,13 +74,20 @@
	.sv_setregs = exec_setregs,
	.sv_fixlimit = NULL,
	.sv_maxssiz = NULL,
	- .sv_flags = SV_ABI_FREEBSD \| SV_ILP32,
	+ .sv_flags =
	+#if __ARM_ARCH >= 6
	+ SV_SHP \| SV_TIMEKEEP \|
	+#endif
	+ SV_ABI_FREEBSD \| SV_ILP32,
	.sv_set_syscall_retval = cpu_set_syscall_retval,
	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
	.sv_syscallnames = syscallnames,
	+ .sv_shared_page_base = SHAREDPAGE,
	+ .sv_shared_page_len = PAGE_SIZE,
	.sv_schedtail = NULL,
	.sv_thread_detach = NULL,
	};
	+INIT_SYSENTVEC(elf32_sysvec, &elf32_freebsd_sysvec);

	static Elf32_Brandinfo freebsd_brand_info = {
	.brand = ELFOSABI_FREEBSD,
	Index: head/sys/arm/arm/generic_timer.c
	===================================================================
	--- head/sys/arm/arm/generic_timer.c
	+++ head/sys/arm/arm/generic_timer.c
	@@ -49,10 +49,13 @@
	#include <sys/rman.h>
	#include <sys/timeet.h>
	#include <sys/timetc.h>
	+#include <sys/smp.h>
	+#include <sys/vdso.h>
	#include <sys/watchdog.h>
	#include <machine/bus.h>
	#include <machine/cpu.h>
	#include <machine/intr.h>
	+#include <machine/md_var.h>

	#ifdef FDT
	#include <dev/fdt/fdt_common.h>
	@@ -121,6 +124,9 @@
	#define set_el1(x, val) WRITE_SPECIALREG(x ##_el1, val)
	#endif

	+static uint32_t arm_tmr_fill_vdso_timehands(struct vdso_timehands *vdso_th,
	+ struct timecounter *tc);
	+
	static int
	get_freq(void)
	{
	@@ -181,17 +187,32 @@
	}

	static void
	-disable_user_access(void)
	+setup_user_access(void *arg __unused)
	{
	uint32_t cntkctl;

	cntkctl = get_el1(cntkctl);
	cntkctl &= ~(GT_CNTKCTL_PL0PTEN \| GT_CNTKCTL_PL0VTEN \|
	- GT_CNTKCTL_EVNTEN \| GT_CNTKCTL_PL0VCTEN \| GT_CNTKCTL_PL0PCTEN);
	+ GT_CNTKCTL_EVNTEN);
	+ if (arm_tmr_sc->physical) {
	+ cntkctl \|= GT_CNTKCTL_PL0PCTEN;
	+ cntkctl &= ~GT_CNTKCTL_PL0VCTEN;
	+ } else {
	+ cntkctl \|= GT_CNTKCTL_PL0VCTEN;
	+ cntkctl &= ~GT_CNTKCTL_PL0PCTEN;
	+ }
	set_el1(cntkctl, cntkctl);
	isb();
	}

	+static void
	+tmr_setup_user_access(void *arg __unused)
	+{
	+
	+ smp_rendezvous(NULL, setup_user_access, NULL, NULL);
	+}
	+SYSINIT(tmr_ua, SI_SUB_SMP, SI_ORDER_SECOND, tmr_setup_user_access, NULL);
	+
	static unsigned
	arm_tmr_get_timecount(struct timecounter *tc)
	{
	@@ -381,7 +402,7 @@
	}
	}

	- disable_user_access();
	+ arm_cpu_fill_vdso_timehands = arm_tmr_fill_vdso_timehands;

	arm_tmr_timecount.tc_frequency = sc->clkfreq;
	tc_init(&arm_tmr_timecount);
	@@ -485,3 +506,13 @@
	first = last;
	}
	}
	+
	+static uint32_t
	+arm_tmr_fill_vdso_timehands(struct vdso_timehands *vdso_th,
	+ struct timecounter *tc)
	+{
	+
	+ vdso_th->th_physical = arm_tmr_sc->physical;
	+ bzero(vdso_th->th_res, sizeof(vdso_th->th_res));
	+ return (tc == &arm_tmr_timecount);
	+}
	Index: head/sys/arm/arm/machdep.c
	===================================================================
	--- head/sys/arm/arm/machdep.c
	+++ head/sys/arm/arm/machdep.c
	@@ -82,6 +82,7 @@
	#include <sys/sysent.h>
	#include <sys/sysproto.h>
	#include <sys/uio.h>
	+#include <sys/vdso.h>

	#include <vm/vm.h>
	#include <vm/pmap.h>
	@@ -271,6 +272,7 @@
	struct trapframe *tf;
	struct sigframe *fp, frame;
	struct sigacts *psp;
	+ struct sysentvec *sysent;
	int onstack;
	int sig;
	int code;
	@@ -337,7 +339,12 @@
	tf->tf_r5 = (register_t)&fp->sf_uc;
	tf->tf_pc = (register_t)catcher;
	tf->tf_usr_sp = (register_t)fp;
	- tf->tf_usr_lr = (register_t)(PS_STRINGS - *(p->p_sysent->sv_szsigcode));
	+ sysent = p->p_sysent;
	+ if (sysent->sv_sigcode_base != 0)
	+ tf->tf_usr_lr = (register_t)sysent->sv_sigcode_base;
	+ else
	+ tf->tf_usr_lr = (register_t)(sysent->sv_psstrings -
	+ *(sysent->sv_szsigcode));
	/* Set the mode to enter in the signal handler */
	#if __ARM_ARCH >= 7
	if ((register_t)catcher & 1)
	@@ -1910,3 +1917,14 @@

	#endif /* !ARM_NEW_PMAP */
	#endif /* FDT */
	+
	+uint32_t (arm_cpu_fill_vdso_timehands)(struct vdso_timehands ,
	+ struct timecounter *);
	+
	+uint32_t
	+cpu_fill_vdso_timehands(struct vdso_timehands vdso_th, struct timecounter tc)
	+{
	+
	+ return (arm_cpu_fill_vdso_timehands != NULL ?
	+ arm_cpu_fill_vdso_timehands(vdso_th, tc) : 0);
	+}
	Index: head/sys/arm/include/md_var.h
	===================================================================
	--- head/sys/arm/include/md_var.h
	+++ head/sys/arm/include/md_var.h
	@@ -45,6 +45,11 @@
	extern int _min_memcpy_size;
	extern int _min_bzero_size;

	+struct vdso_timehands;
	+struct timecounter;
	+extern uint32_t (arm_cpu_fill_vdso_timehands)(struct vdso_timehands ,
	+ struct timecounter *);
	+
	#define DST_IS_USER 0x1
	#define SRC_IS_USER 0x2
	#define IS_PHYSICAL 0x4
	Index: head/sys/arm/include/vdso.h
	===================================================================
	--- head/sys/arm/include/vdso.h
	+++ head/sys/arm/include/vdso.h
	@@ -29,6 +29,7 @@
	#define _ARM_VDSO_H

	#define VDSO_TIMEHANDS_MD \
	- uint32_t th_res[8];
	+ uint32_t th_physical; \
	+ uint32_t th_res[7];

	#endif
	Index: head/sys/arm/include/vmparam.h
	===================================================================
	--- head/sys/arm/include/vmparam.h
	+++ head/sys/arm/include/vmparam.h
	@@ -124,7 +124,8 @@
	#endif
	#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS

	-#define USRSTACK VM_MAXUSER_ADDRESS
	+#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE)
	+#define USRSTACK SHAREDPAGE

	/* initial pagein size of beginning of executable file */
	#ifndef VM_INITIAL_PAGEIN
	Index: head/sys/arm64/arm64/elf_machdep.c
	===================================================================
	--- head/sys/arm64/arm64/elf_machdep.c
	+++ head/sys/arm64/arm64/elf_machdep.c
	@@ -80,12 +80,15 @@
	.sv_setregs = exec_setregs,
	.sv_fixlimit = NULL,
	.sv_maxssiz = NULL,
	- .sv_flags = SV_ABI_FREEBSD \| SV_LP64,
	+ .sv_flags = SV_SHP \| SV_TIMEKEEP \| SV_ABI_FREEBSD \| SV_LP64,
	.sv_set_syscall_retval = cpu_set_syscall_retval,
	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
	.sv_syscallnames = syscallnames,
	+ .sv_shared_page_base = SHAREDPAGE,
	+ .sv_shared_page_len = PAGE_SIZE,
	.sv_schedtail = NULL,
	};
	+INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec);

	static Elf64_Brandinfo freebsd_brand_info = {
	.brand = ELFOSABI_FREEBSD,
	Index: head/sys/arm64/arm64/machdep.c
	===================================================================
	--- head/sys/arm64/arm64/machdep.c
	+++ head/sys/arm64/arm64/machdep.c
	@@ -56,6 +56,7 @@
	#include <sys/sysent.h>
	#include <sys/sysproto.h>
	#include <sys/ucontext.h>
	+#include <sys/vdso.h>

	#include <vm/vm.h>
	#include <vm/vm_kern.h>
	@@ -72,6 +73,7 @@
	#include <machine/devmap.h>
	#include <machine/machdep.h>
	#include <machine/metadata.h>
	+#include <machine/md_var.h>
	#include <machine/pcb.h>
	#include <machine/reg.h>
	#include <machine/vmparam.h>
	@@ -505,6 +507,7 @@
	struct trapframe *tf;
	struct sigframe *fp, frame;
	struct sigacts *psp;
	+ struct sysentvec *sysent;
	int code, onstack, sig;

	td = curthread;
	@@ -563,7 +566,12 @@

	tf->tf_elr = (register_t)catcher;
	tf->tf_sp = (register_t)fp;
	- tf->tf_lr = (register_t)(PS_STRINGS - *(p->p_sysent->sv_szsigcode));
	+ sysent = p->p_sysent;
	+ if (sysent->sv_sigcode_base != 0)
	+ tf->tf_lr = (register_t)sysent->sv_sigcode_base;
	+ else
	+ tf->tf_lr = (register_t)(sysent->sv_psstrings -
	+ *(sysent->sv_szsigcode));

	CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr,
	tf->tf_sp);
	@@ -875,6 +883,17 @@
	early_boot = 0;
	}

	+uint32_t (arm_cpu_fill_vdso_timehands)(struct vdso_timehands ,
	+ struct timecounter *);
	+
	+uint32_t
	+cpu_fill_vdso_timehands(struct vdso_timehands vdso_th, struct timecounter tc)
	+{
	+
	+ return (arm_cpu_fill_vdso_timehands != NULL ?
	+ arm_cpu_fill_vdso_timehands(vdso_th, tc) : 0);
	+}
	+
	#ifdef DDB
	#include <ddb/ddb.h>

	Index: head/sys/arm64/include/md_var.h
	===================================================================
	--- head/sys/arm64/include/md_var.h
	+++ head/sys/arm64/include/md_var.h
	@@ -46,4 +46,9 @@
	void dump_drop_page(vm_paddr_t);
	int minidumpsys(struct dumperinfo *);

	+struct vdso_timehands;
	+struct timecounter;
	+extern uint32_t (arm_cpu_fill_vdso_timehands)(struct vdso_timehands ,
	+ struct timecounter *);
	+
	#endif /* !_MACHINE_MD_VAR_H_ */
	Index: head/sys/arm64/include/vdso.h
	===================================================================
	--- head/sys/arm64/include/vdso.h
	+++ head/sys/arm64/include/vdso.h
	@@ -29,6 +29,7 @@
	#define _MACHINE_VDSO_H_

	#define VDSO_TIMEHANDS_MD \
	- uint32_t th_res[8];
	+ uint32_t th_physical; \
	+ uint32_t th_res[7];

	#endif /* !_MACHINE_VDSO_H_ */
	Index: head/sys/arm64/include/vmparam.h
	===================================================================
	--- head/sys/arm64/include/vmparam.h
	+++ head/sys/arm64/include/vmparam.h
	@@ -194,7 +194,8 @@
	#define VM_MAXUSER_ADDRESS (VM_MAX_USER_ADDRESS)

	#define KERNBASE (VM_MIN_KERNEL_ADDRESS)
	-#define USRSTACK (VM_MAX_USER_ADDRESS)
	+#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE)
	+#define USRSTACK SHAREDPAGE

	/*
	* How many physical pages per kmem arena virtual page.
	Index: head/sys/conf/files.arm
	===================================================================
	--- head/sys/conf/files.arm
	+++ head/sys/conf/files.arm
	@@ -110,7 +110,6 @@
	no-obj no-implicit-rule before-depend \
	clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
	kern/subr_busdma_bufalloc.c standard
	-kern/subr_dummy_vdso_tc.c standard
	kern/subr_sfbuf.c standard
	libkern/arm/aeabi_unwind.c standard
	libkern/arm/divsi3.S standard
	Index: head/sys/conf/files.arm64
	===================================================================
	--- head/sys/conf/files.arm64
	+++ head/sys/conf/files.arm64
	@@ -79,7 +79,6 @@
	dev/vnic/thunder_mdio.c optional vnic
	dev/vnic/lmac_if.m optional vnic
	kern/kern_clocksource.c standard
	-kern/subr_dummy_vdso_tc.c standard
	libkern/bcmp.c standard
	libkern/ffs.c standard
	libkern/ffsl.c standard
	Index: head/sys/kern/imgact_elf.c
	===================================================================
	--- head/sys/kern/imgact_elf.c
	+++ head/sys/kern/imgact_elf.c
	@@ -80,6 +80,9 @@

	#include <machine/elf.h>
	#include <machine/md_var.h>
	+#ifdef __arm__
	+#include <machine/acle-compat.h>
	+#endif

	#define ELF_NOTE_ROUNDSIZE 4
	#define OLD_EI_BRAND 8
	@@ -116,7 +119,8 @@
	&elf_legacy_coredump, 0, "");

	int __elfN(nxstack) =
	-#if defined(__amd64__) \|\| defined(__powerpc64__) /* both 64 and 32 bit */
	+#if defined(__amd64__) \|\| defined(__powerpc64__) /* both 64 and 32 bit */ \|\| \
	+ (defined(__arm__) && __ARM_ARCH >= 7) \|\| defined(__aarch64__)
	1;
	#else
	0;

File Metadata

Mime Type: text/plain
Expires: Sat, Mar 28, 5:06 PM (12 h, 14 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 30484487
Default Alt Text: D4209.diff (11 KB)

D4209.diffNo OneTemporaryActions

D4209.diffView Options

File Metadata

Event Timeline

D4209.diff
No OneTemporary
Actions

D4209.diff
View Options