From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH] svm: use msr safe for erratum 383 Date: Fri, 11 Jun 2010 14:33:40 +0200 Message-ID: <201006111433.40975.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_k0iEMoEVeeB5eUd" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_k0iEMoEVeeB5eUd Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi! Attached patch makes erratum 383 use msr safe variants to work on top of KVM. Signed-off-by: Christoph Egger P.S.: Keir: Please apply this patch to Xen-4.0-testing, too. -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_k0iEMoEVeeB5eUd Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_msr_svm.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_msr_svm.diff" diff -r 125b3493dac9 xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Fri Jun 11 11:37:22 2010 +0100 +++ b/xen/arch/x86/hvm/svm/svm.c Fri Jun 11 14:31:40 2010 +0200 @@ -849,10 +849,14 @@ static void svm_init_erratum_383(struct if ( c->x86 != 0x10 ) return; - rdmsrl(MSR_AMD64_DC_CFG, msr_content); - wrmsrl(MSR_AMD64_DC_CFG, msr_content | (1ULL << 47)); - - amd_erratum383_found = 1; + /* use safe methods to be compatible with nested virtualization */ + if (rdmsr_safe(MSR_AMD64_DC_CFG, msr_content) == 0 && + wrmsr_safe(MSR_AMD64_DC_CFG, msr_content | (1ULL << 47)) == 0) + { + amd_erratum383_found = 1; + } else { + printk("Failed to enable erratum 383\n"); + } } static int svm_cpu_up(void) --Boundary-00=_k0iEMoEVeeB5eUd Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_k0iEMoEVeeB5eUd--