upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

amd64 pmap_allocpte_nosleep(): stop testing tautological condition

Browse source 
(cherry picked from commit 10a6ae0ddffb1de842a0ba6a6ca29786de6d3bfd)
This commit is contained in:
Konstantin Belousov 2024-07-13 07:07:18 +03:00
parent 8c405f08c0
commit 010f09a7b1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/amd64/amd64/pmap.c
View file

@ -4704,8 +4704,8 @@ pmap_allocpte_nosleep(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp,
*pml5 = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M;
if (pmap->pm_pmltopu != NULL && pml5index < NUPML5E) {
if (pmap->pm_ucr3 != PMAP_NO_CR3)
*pml5 |= pg_nx;
MPASS(pmap->pm_ucr3 != PMAP_NO_CR3);
*pml5 |= pg_nx;
pml5u = &pmap->pm_pmltopu[pml5index];
*pml5u = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V |
@ -4725,6 +4725,8 @@ pmap_allocpte_nosleep(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp,
if (!pmap_is_la57(pmap) && pmap->pm_pmltopu != NULL &&
pml4index < NUPML4E) {
MPASS(pmap->pm_ucr3 != PMAP_NO_CR3);
/*
* PTI: Make all user-space mappings in the
* kernel-mode page table no-execute so that
@ -4732,8 +4734,7 @@ pmap_allocpte_nosleep(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp,
* the kernel-mode page table active on return
* to user space.
*/
if (pmap->pm_ucr3 != PMAP_NO_CR3)
*pml4 |= pg_nx;
*pml4 |= pg_nx;
pml4u = &pmap->pm_pmltopu[pml4index];
*pml4u = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V |