D45886.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45886.diff
View Options

	diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
	--- a/sys/amd64/amd64/pmap.c
	+++ b/sys/amd64/amd64/pmap.c
	@@ -6796,8 +6796,7 @@
	*/
	if ((ptpaddr & PG_PS) != 0) {
	/*
	- * Are we protecting the entire large page? If not,
	- * demote the mapping and fall through.
	+ * Are we protecting the entire large page?
	*/
	if (sva + NBPDR == va_next && eva >= va_next) {
	/*
	@@ -6807,9 +6806,23 @@
	if (pmap_protect_pde(pmap, pde, sva, prot))
	anychanged = true;
	continue;
	- } else if (!pmap_demote_pde(pmap, pde, sva)) {
	+ }
	+
	+ /*
	+ * Does the large page mapping need to change? If so,
	+ * demote it and fall through.
	+ */
	+ pbits = ptpaddr;
	+ if ((prot & VM_PROT_WRITE) == 0)
	+ pbits &= ~(PG_RW \| PG_M);
	+ if ((prot & VM_PROT_EXECUTE) == 0)
	+ pbits \|= pg_nx;
	+ if (ptpaddr == pbits \|\| !pmap_demote_pde(pmap, pde,
	+ sva)) {
	/*
	- * The large page mapping was destroyed.
	+ * Either the large page mapping doesn't need
	+ * to change, or it was destroyed during
	+ * demotion.
	*/
	continue;
	}
	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
	@@ -4373,7 +4373,8 @@
	if (sva + L2_SIZE == va_next && eva >= va_next) {
	pmap_protect_l2(pmap, l2, sva, mask, nbits);
	continue;
	- } else if (pmap_demote_l2(pmap, l2, sva) == NULL)
	+ } else if ((pmap_load(l2) & mask) == nbits \|\|
	+ pmap_demote_l2(pmap, l2, sva) == NULL)
	continue;
	}
	KASSERT((pmap_load(l2) & ATTR_DESCR_MASK) == L2_TABLE,