Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jul 2019 19:27:35 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r349681 - stable/12/sys/amd64/amd64
Message-ID:  <201907031927.x63JRZ1n063404@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Wed Jul  3 19:27:34 2019
New Revision: 349681
URL: https://svnweb.freebsd.org/changeset/base/349681

Log:
  MFC r349427:
  amd64 pmap: Fix pkru handling in pmap_remove().

Modified:
  stable/12/sys/amd64/amd64/pmap.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/12/sys/amd64/amd64/pmap.c	Wed Jul  3 19:25:57 2019	(r349680)
+++ stable/12/sys/amd64/amd64/pmap.c	Wed Jul  3 19:27:34 2019	(r349681)
@@ -4533,6 +4533,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t 
 
 	pmap_delayed_invl_started();
 	PMAP_LOCK(pmap);
+	pmap_pkru_on_remove(pmap, sva, eva);
 
 	/*
 	 * special handling of removing one page.  a very
@@ -4626,7 +4627,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t 
 out:
 	if (anyvalid)
 		pmap_invalidate_all(pmap);
-	pmap_pkru_on_remove(pmap, sva, eva);
 	PMAP_UNLOCK(pmap);
 	pmap_delayed_invl_finished();
 	vm_page_free_pages_toq(&free, true);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907031927.x63JRZ1n063404>