Attachment 139751 Details for Bug 186061 – vm-erratum383.patch

[patch] vm-erratum383.patch

vm-erratum383.patch (text/x-diff), 2.03 KB, created by Simon Matter on 2014-02-06 10:46:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Matter

Created: 2014-02-06 10:46:41 UTC

Size: 2.03 KB

patch

obsolete

>--- /usr/src/sys/x86/x86/mca.c.orig	2014-01-16 21:35:03.000000000 +0100
>+++ /usr/src/sys/x86/x86/mca.c	2014-02-05 22:15:53.109619475 +0100
>@@ -720,8 +720,8 @@
> 	 * parity (L1TP) errors is disabled, enable the recommended workaround
> 	 * for Erratum 383.
> 	 */
>-	if (cpu_vendor_id == CPU_VENDOR_AMD &&
>-	    CPUID_TO_FAMILY(cpu_id) == 0x10 && amd10h_L1TP)
>+	if (vm_guest != VM_GUEST_NO || (cpu_vendor_id == CPU_VENDOR_AMD &&
>+	    CPUID_TO_FAMILY(cpu_id) == 0x10 && amd10h_L1TP))
> 		workaround_erratum383 = 1;
> 
> 	mca_banks = mcg_cap & MCG_CAP_COUNT;
>--- /usr/src/sys/i386/i386/pmap.c.orig	2014-01-16 21:33:36.000000000 +0100
>+++ /usr/src/sys/i386/i386/pmap.c	2014-02-05 22:25:28.395821316 +0100
>@@ -752,12 +752,12 @@
> 	pv_entry_high_water = 9 * (pv_entry_max / 10);
> 
> 	/*
>-	 * If the kernel is running in a virtual machine on an AMD Family 10h
>-	 * processor, then it must assume that MCA is enabled by the virtual
>-	 * machine monitor.
>+	 * If the kernel is running in a virtual machine on any processor
>+	 * family, then it must assume that MCA is enabled by the virtual
>+	 * machine monitor and the vm may migrate to an AMD Family 10h
>+	 * processor.
> 	 */
>-	if (vm_guest == VM_GUEST_VM && cpu_vendor_id == CPU_VENDOR_AMD &&
>-	    CPUID_TO_FAMILY(cpu_id) == 0x10)
>+	if (vm_guest != VM_GUEST_NO)
> 		workaround_erratum383 = 1;
> 
> 	/*
>--- /usr/src/sys/amd64/amd64/pmap.c.orig	2014-01-16 21:33:04.000000000 +0100
>+++ /usr/src/sys/amd64/amd64/pmap.c	2014-02-05 22:28:25.814349113 +0100
>@@ -1005,12 +1005,12 @@
> 	}
> 
> 	/*
>-	 * If the kernel is running in a virtual machine on an AMD Family 10h
>-	 * processor, then it must assume that MCA is enabled by the virtual
>-	 * machine monitor.
>+	 * If the kernel is running in a virtual machine on any processor
>+	 * family, then it must assume that MCA is enabled by the virtual
>+	 * machine monitor and the vm may migrate to an AMD Family 10h
>+	 * processor.
> 	 */
>-	if (vm_guest == VM_GUEST_VM && cpu_vendor_id == CPU_VENDOR_AMD &&
>-	    CPUID_TO_FAMILY(cpu_id) == 0x10)
>+	if (vm_guest != VM_GUEST_NO)
> 		workaround_erratum383 = 1;
> 
> 	/*

Actions: View | Diff

Attachments on bug 186061: 139751 | 139752 | 139753