svn commit: r354587 - stable/12/sys/amd64/amd64

Konstantin Belousov kib at FreeBSD.org
Sun Nov 10 09:14:23 UTC 2019


Author: kib
Date: Sun Nov 10 09:14:22 2019
New Revision: 354587
URL: https://svnweb.freebsd.org/changeset/base/354587

Log:
  MFC r354281:
  amd64: Store %cr3 into pcpu saved_ucr3 on double fault.

Modified:
  stable/12/sys/amd64/amd64/exception.S
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/exception.S
==============================================================================
--- stable/12/sys/amd64/amd64/exception.S	Sun Nov 10 09:13:12 2019	(r354586)
+++ stable/12/sys/amd64/amd64/exception.S	Sun Nov 10 09:14:22 2019	(r354587)
@@ -349,6 +349,8 @@ IDTVEC(dblfault)
 	jz	1f			/* already running with kernel GS.base */
 	swapgs
 1:	lfence
+	movq	%cr3,%rax
+	movq	%rax,PCPU(SAVED_UCR3)
 	movq	PCPU(KCR3),%rax
 	cmpq	$~0,%rax
 	je	2f


More information about the svn-src-stable mailing list