Module Name: src Committed By: ad Date: Tue Mar 17 18:17:07 UTC 2020
Modified Files: src/sys/arch/amd64/include: pmap.h src/sys/arch/i386/include: pmap.h Log Message: Always set PTEs using atomics. There are too many assumptions to go wrong. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amd64/include/pmap.h cvs rdiff -u -r1.123 -r1.124 src/sys/arch/i386/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/include/pmap.h diff -u src/sys/arch/amd64/include/pmap.h:1.64 src/sys/arch/amd64/include/pmap.h:1.65 --- src/sys/arch/amd64/include/pmap.h:1.64 Thu Nov 14 16:23:52 2019 +++ src/sys/arch/amd64/include/pmap.h Tue Mar 17 18:17:07 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.64 2019/11/14 16:23:52 maxv Exp $ */ +/* $NetBSD: pmap.h,v 1.65 2020/03/17 18:17:07 ad Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -202,7 +202,8 @@ extern bool svs_pcid; #ifndef XENPV #define pmap_pa2pte(a) (a) #define pmap_pte2pa(a) ((a) & PTE_FRAME) -#define pmap_pte_set(p, n) do { *(p) = (n); } while (0) +#define pmap_pte_set(p, n) \ + (void)atomic_swap_ulong((volatile unsigned long *)p, n) #define pmap_pte_cas(p, o, n) atomic_cas_64((p), (o), (n)) #define pmap_pte_testset(p, n) \ atomic_swap_ulong((volatile unsigned long *)p, n) Index: src/sys/arch/i386/include/pmap.h diff -u src/sys/arch/i386/include/pmap.h:1.123 src/sys/arch/i386/include/pmap.h:1.124 --- src/sys/arch/i386/include/pmap.h:1.123 Sat Mar 9 09:09:56 2019 +++ src/sys/arch/i386/include/pmap.h Tue Mar 17 18:17:07 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.123 2019/03/09 09:09:56 maxv Exp $ */ +/* $NetBSD: pmap.h,v 1.124 2020/03/17 18:17:07 ad Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -294,10 +294,11 @@ #ifndef XENPV #define pmap_pa2pte(a) (a) #define pmap_pte2pa(a) ((a) & PTE_FRAME) -#define pmap_pte_set(p, n) do { *(p) = (n); } while (0) #define pmap_pte_flush() /* nothing */ #ifdef PAE +#define pmap_pte_set(p, n) \ + (void)atomic_swap_64((volatile uint64_t *)p, n) #define pmap_pte_cas(p, o, n) atomic_cas_64((p), (o), (n)) #define pmap_pte_testset(p, n) \ atomic_swap_64((volatile uint64_t *)p, n) @@ -306,6 +307,8 @@ #define pmap_pte_clearbits(p, b) \ atomic_and_64((volatile uint64_t *)p, ~(b)) #else /* PAE */ +#define pmap_pte_set(p, n) \ + (void)atomic_swap_ulong((volatile unsigned long *)p, n) #define pmap_pte_cas(p, o, n) atomic_cas_32((p), (o), (n)) #define pmap_pte_testset(p, n) \ atomic_swap_ulong((volatile unsigned long *)p, n)