system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arm64: Use void pointers for arguments to arm64_get_writable_addr

Browse source 
No functional change, but this reduces diffs with CheriBSD downstream.

Reviewed by:	andrew
Sponsored by:	University of Cambridge, Google, Inc.
Differential Revision:	https://reviews.freebsd.org/D44344
This commit is contained in:
John Baldwin 2024-03-15 10:10:24 -07:00
parent 66658b0f27
commit e48770de68
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/arm64/arm64/db_interface.c
View file

@ -155,7 +155,7 @@ int
db_write_bytes(vm_offset_t addr, size_t size, char *data)
{
jmp_buf jb;
void *prev_jb;
void *prev_jb, *kaddr;
char *dst;
size_t i;
int ret;
@ -163,7 +163,7 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
prev_jb = kdb_jmpbuf(jb);
ret = setjmp(jb);
if (ret == 0) {
if (!arm64_get_writable_addr(addr, &addr)) {
if (!arm64_get_writable_addr((void *)addr, &kaddr)) {
ret = 1;
} else {
dst = (char *)addr;
@ -175,7 +175,7 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
* Ensure the I & D cache are in sync if we wrote
* to executable memory.
*/
cpu_icache_sync_range((void *)addr, (vm_size_t)size);
cpu_icache_sync_range(kaddr, size);
}
}
(void)kdb_jmpbuf(prev_jb);

11
sys/arm64/arm64/machdep.c
View file

@ -424,12 +424,12 @@ init_proc0(vm_offset_t kstack)
* read-only, e.g. to patch kernel code.
*/
bool
arm64_get_writable_addr(vm_offset_t addr, vm_offset_t *out)
arm64_get_writable_addr(void *addr, void **out)
{
vm_paddr_t pa;
/* Check if the page is writable */
if (PAR_SUCCESS(arm64_address_translate_s1e1w(addr))) {
if (PAR_SUCCESS(arm64_address_translate_s1e1w((vm_offset_t)addr))) {
*out = addr;
return (true);
}
@ -437,7 +437,7 @@ arm64_get_writable_addr(vm_offset_t addr, vm_offset_t *out)
/*
* Find the physical address of the given page.
*/
if (!pmap_klookup(addr, &pa)) {
if (!pmap_klookup((vm_offset_t)addr, &pa)) {
return (false);
}
@ -445,8 +445,9 @@ arm64_get_writable_addr(vm_offset_t addr, vm_offset_t *out)
* If it is within the DMAP region and is writable use that.
*/
if (PHYS_IN_DMAP(pa)) {
addr = PHYS_TO_DMAP(pa);
if (PAR_SUCCESS(arm64_address_translate_s1e1w(addr))) {
addr = (void *)PHYS_TO_DMAP(pa);
if (PAR_SUCCESS(arm64_address_translate_s1e1w(
(vm_offset_t)addr))) {
*out = addr;
return (true);
}

2
sys/arm64/include/cpufunc.h
View file

@ -191,7 +191,7 @@ int arm64_icache_sync_range_checked(void *, vm_size_t);
void arm64_dcache_wbinv_range(void *, vm_size_t);
void arm64_dcache_inv_range(void *, vm_size_t);
void arm64_dcache_wb_range(void *, vm_size_t);
bool arm64_get_writable_addr(vm_offset_t, vm_offset_t *);
bool arm64_get_writable_addr(void *, void **);
#endif /* _KERNEL */
#endif /* _MACHINE_CPUFUNC_H_ */

4
sys/cddl/dev/fbt/aarch64/fbt_isa.c
View file

@ -71,9 +71,9 @@ fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
void
fbt_patch_tracepoint(fbt_probe_t *fbt, fbt_patchval_t val)
{
vm_offset_t addr;
void *addr;
if (!arm64_get_writable_addr((vm_offset_t)fbt->fbtp_patchpoint, &addr))
if (!arm64_get_writable_addr(fbt->fbtp_patchpoint, &addr))
panic("%s: Unable to write new instruction", __func__);
*(fbt_patchval_t *)addr = val;

4
sys/cddl/dev/kinst/aarch64/kinst_isa.c
View file

@ -235,9 +235,9 @@ kinst_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch)
void
kinst_patch_tracepoint(struct kinst_probe *kp, kinst_patchval_t val)
{
vm_offset_t addr;
void *addr;
if (!arm64_get_writable_addr((vm_offset_t)kp->kp_patchpoint, &addr))
if (!arm64_get_writable_addr(kp->kp_patchpoint, &addr))
panic("%s: Unable to write new instruction", __func__);
*(kinst_patchval_t *)addr = val;
cpu_icache_sync_range(kp->kp_patchpoint, INSN_SIZE);