Page MenuHomeFreeBSD
Files F102759497

D42566.id130020.diff
No OneTemporary
Actions

D42566.id130020.diff
View Options

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -973,7 +973,7 @@
* segments also get excluded from phys_avail.
*/
#if defined(KASAN)
- pmap_bootstrap_san(KERNBASE - abp->kern_delta);
+ pmap_bootstrap_san();
#endif
physmem_init_kernel_globals();
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -1365,11 +1365,14 @@
* - Map that entire range using L2 superpages.
*/
void
-pmap_bootstrap_san(vm_paddr_t kernstart)
+pmap_bootstrap_san(void)
{
vm_offset_t va;
+ vm_paddr_t kernstart;
int i, shadow_npages, nkasan_l2;
+ kernstart = pmap_early_vtophys(KERNBASE);
+
/*
* Rebuild physmap one more time, we may have excluded more regions from
* allocation since pmap_bootstrap().
diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h
--- a/sys/arm64/include/pmap.h
+++ b/sys/arm64/include/pmap.h
@@ -192,7 +192,7 @@
#if defined(KASAN) || defined(KMSAN)
struct arm64_bootparams;
-void pmap_bootstrap_san(vm_paddr_t);
+void pmap_bootstrap_san(void);
void pmap_san_enter(vm_offset_t);
void pmap_san_bootstrap(struct arm64_bootparams *);
#endif

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 6:54 PM (18 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14682025
Default Alt Text
D42566.id130020.diff (1 KB)

Event Timeline