svn commit: r345325 - stable/12/sys/i386/i386

[Konstantin Belousov]

Author: kib
Date: Wed Mar 20 13:10:47 2019
New Revision: 345325
URL: https://svnweb.freebsd.org/changeset/base/345325

Log:
  MFC r345246:
  i386: improve detection of the fast page fault assist.

Modified:
  stable/12/sys/i386/i386/exception.s
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/i386/i386/exception.s
==============================================================================
--- stable/12/sys/i386/i386/exception.s	Wed Mar 20 13:07:57 2019	(r345324)
+++ stable/12/sys/i386/i386/exception.s	Wed Mar 20 13:10:47 2019	(r345325)
@@ -131,6 +131,10 @@ IDTVEC(prot)
 	pushl	$T_PROTFLT
 	jmp	irettraps
 IDTVEC(page)
+	testl	$PSL_VM, TF_EFLAGS-TF_ERR(%esp)
+	jnz	1f
+	testb	$SEL_RPL_MASK, TF_CS-TF_ERR(%esp)
+	jnz	1f
 	cmpl	$PMAP_TRM_MIN_ADDRESS, TF_EIP-TF_ERR(%esp)
 	jb	1f
 	movl	%ebx, %cr3