From nobody Mon Feb 9 20:34:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574758902; cv=none; d=zohomail.com; s=zohoarc; b=LHpiJjQd8eeiKl7T89LI+K6eSUno9zYIsi6GvAq5DYAI+tLfhsLN/3VZykZySIKd2LEuTep33Ex1Fh+6GUU8Ie8emHrF/Va1x6ltRGwpO06earSa83tbXGZCwFvNhtbzb8hdZDiGM/cuEIC8jUnakMBhU2iDnUAObXQB3c27YgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574758902; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dmZ/MWljO9/7PIDmw2I60lQlo/07TU1Uam/BYY6gYeg=; b=Yz4bkUQHLl2p4C16Kh8HAEJ+q+r8dVdp/xPRubaNOIHdic2MLK4vv6Dx7FrFYe8zca2zcA73qaitscrRupvVUJxIKmffWI0yE61XEEtsVGjaBPI2rdT8UQ+fF7PUS1WjrIUIWMPwd9/hTWMn3Xgj6xJBpUush/jFAqujxPf+G6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574758902258423.07817200843533; Tue, 26 Nov 2019 01:01:42 -0800 (PST) Received: from localhost ([::1]:51690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZWj6-0003Wh-QF for importer@patchew.org; Tue, 26 Nov 2019 04:01:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49997) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZWhF-00021c-6O for qemu-devel@nongnu.org; Tue, 26 Nov 2019 03:59:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZWhE-00037A-0A for qemu-devel@nongnu.org; Tue, 26 Nov 2019 03:59:45 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:39936) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZWhD-00036v-QG for qemu-devel@nongnu.org; Tue, 26 Nov 2019 03:59:43 -0500 Received: by mail-wm1-x329.google.com with SMTP id y5so2302448wmi.5 for ; Tue, 26 Nov 2019 00:59:43 -0800 (PST) Received: from donizetti.lan ([2001:b07:6468:f312:5454:a592:5a0a:75c]) by smtp.gmail.com with ESMTPSA id a206sm2349172wmf.15.2019.11.26.00.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 00:59:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dmZ/MWljO9/7PIDmw2I60lQlo/07TU1Uam/BYY6gYeg=; b=uetKLGrR5RS0NrkqselYiyB93a6LmFbTNUuLi2ihlRE/fXsY3RJVAZzBq+asYQhVfM c0/3sJ6hrcMaRe3a5SrjpqC3JophyTtdmp+vQfh3qgo5YxsgffhJd9+N+7HvwQlzhLGe mpNgMM6jSKsyUKet+SnVG1VTLZwHhU/iyfsV/6eavl6XoJzhOAsIuOexq8gcAajrqfHT vMa96s9Df+OJFB2ooytLCXrA2aaedToPHfR89OBSp+ALe2AcRaXMbeVsHhbPdmIswFE2 pQBrOuSTfndLWbRzL7qtP8aULrQE5nJ+4+lILvE+6K6iUpstKzjSocClCcJpGlmiWTQj z4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dmZ/MWljO9/7PIDmw2I60lQlo/07TU1Uam/BYY6gYeg=; b=JBlXPh/zx2dX+hgM0E0vStk8XhckD+SndPf1iWoirc/133VDifSryMHZ2Cosz72jkh /1vZ4+13HEK1Tbj9vOXe7PzrrgKDOQ3gERfU0mOYEe3H2sQd6IMgeknM3kvw/ZLLRFCo EfkdB3J5TzOPY05Hk3lHQ1i5p4ulEFfd6ScfwzcxrS4BgfraW1oKW6D2UbUy8E1SUeL/ 8wF3iaRlmUxay7uBMd69lshrplmTc34lrnEItvS8XWj9cA7R2ijBgnSJRwgxlTBOkS8p A/loE5cUBpux8x2n1mTlunk0zHn0g6Kl/iHmJIMM3Aju7MXEx5yU5pzjQpEkQ0VgVxGs JEWA== X-Gm-Message-State: APjAAAXoF5Y9lykvgSFZcuqo4DKLGV9KpqR3zqPdH8i9MG3q6U6YyRaG TU4O/GPWnUaMgQSraWYqoLW4pZbO X-Google-Smtp-Source: APXvYqz1Pv06jyMP/q3aDbJRMixlvx00Q7s7eVLUOUWSZjrIfG/Ph3iisxGtYkZG6CXm/9U0B0uteQ== X-Received: by 2002:a05:600c:2919:: with SMTP id i25mr3025663wmd.158.1574758782613; Tue, 26 Nov 2019 00:59:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/5] hvf: more accurately match SDM when setting CR0 and PDPTE registers Date: Tue, 26 Nov 2019 09:59:36 +0100 Message-Id: <20191126085936.1689-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191126085936.1689-1-pbonzini@redhat.com> References: <20191126085936.1689-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cameron Esfahani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Cameron Esfahani More accurately match SDM when setting CR0 and PDPTE registers. Clear PDPTE registers when resetting vcpus. Signed-off-by: Cameron Esfahani Message-Id: <464adb39c8699fb8331d8ad6016fc3e2eff53dbc.1574625592.git.dirty@= apple.com> Signed-off-by: Paolo Bonzini --- target/i386/hvf/hvf.c | 8 ++++++++ target/i386/hvf/vmx.h | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 90fd50acfc..784e67d77e 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -441,12 +441,20 @@ static MemoryListener hvf_memory_listener =3D { }; =20 void hvf_reset_vcpu(CPUState *cpu) { + uint64_t pdpte[4] =3D {0, 0, 0, 0}; + int i; =20 /* TODO: this shouldn't be needed; there is already a call to * cpu_synchronize_all_post_reset in vl.c */ wvmcs(cpu->hvf_fd, VMCS_ENTRY_CTLS, 0); wvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER, 0); + + /* Initialize PDPTE */ + for (i =3D 0; i < 4; i++) { + wvmcs(cpu->hvf_fd, VMCS_GUEST_PDPTE0 + i * 2, pdpte[i]); + } + macvm_set_cr0(cpu->hvf_fd, 0x60000010); =20 wvmcs(cpu->hvf_fd, VMCS_CR4_MASK, CR4_VMXE_MASK); diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 5dc52ecad6..eb8894cd58 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -121,6 +121,7 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint= 64_t cr0) uint64_t pdpte[4] =3D {0, 0, 0, 0}; uint64_t efer =3D rvmcs(vcpu, VMCS_GUEST_IA32_EFER); uint64_t old_cr0 =3D rvmcs(vcpu, VMCS_GUEST_CR0); + uint64_t mask =3D CR0_PG | CR0_CD | CR0_NW | CR0_NE | CR0_ET; =20 if ((cr0 & CR0_PG) && (rvmcs(vcpu, VMCS_GUEST_CR4) & CR4_PAE) && !(efer & MSR_EFER_LME)) { @@ -128,18 +129,15 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, ui= nt64_t cr0) rvmcs(vcpu, VMCS_GUEST_CR3) & ~0x1f, MEMTXATTRS_UNSPECIFIED, (uint8_t *)pdpte, 32, 0); + /* Only set PDPTE when appropriate. */ + for (i =3D 0; i < 4; i++) { + wvmcs(vcpu, VMCS_GUEST_PDPTE0 + i * 2, pdpte[i]); + } } =20 - for (i =3D 0; i < 4; i++) { - wvmcs(vcpu, VMCS_GUEST_PDPTE0 + i * 2, pdpte[i]); - } - - wvmcs(vcpu, VMCS_CR0_MASK, CR0_CD | CR0_NE | CR0_PG); + wvmcs(vcpu, VMCS_CR0_MASK, mask); wvmcs(vcpu, VMCS_CR0_SHADOW, cr0); =20 - cr0 &=3D ~CR0_CD; - wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE | CR0_ET); - if (efer & MSR_EFER_LME) { if (!(old_cr0 & CR0_PG) && (cr0 & CR0_PG)) { enter_long_mode(vcpu, cr0, efer); @@ -149,6 +147,10 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uin= t64_t cr0) } } =20 + /* Filter new CR0 after we are finished examining it above. */ + cr0 =3D (cr0 & ~(mask & ~CR0_PG)); + wvmcs(vcpu, VMCS_GUEST_CR0, cr0 | CR0_NE | CR0_ET); + hv_vcpu_invalidate_tlb(vcpu); hv_vcpu_flush(vcpu); } --=20 2.21.0