From patchwork Thu Apr 30 11:36:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 6302321 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 237739F1C2 for ; Thu, 30 Apr 2015 11:40:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62E9920123 for ; Thu, 30 Apr 2015 11:40:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9518220108 for ; Thu, 30 Apr 2015 11:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750717AbbD3Lgf (ORCPT ); Thu, 30 Apr 2015 07:36:35 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:34622 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750802AbbD3Lgd (ORCPT ); Thu, 30 Apr 2015 07:36:33 -0400 Received: by wgso17 with SMTP id o17so59013965wgs.1; Thu, 30 Apr 2015 04:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=m8YnUoOcQrKfHr/Owv2IpwNCkHw40WJxqdyMDZi6SrM=; b=u2vmMf2+SOsg9ZR79lFmCAaElvgymk7L4cx/kLYIZkWireZlCfAKlHUtQnCQv+4HDA pLwISlAkqXdKO23vU5wvCQMLfpfDGkBnN5idnir2XrxXeTgFMqol9Xqgeicnrf2m6I5p RAL3vBQzJ47ojSWZJ/Ztw+nyG3wLxB+V56AoPuWXMG+pLltjgUjRkG9KUM67FDMvwSc4 0y9VQFlZ0PIOriv12v7s+Xufl6PPpEbPDjr2iHImsLHfnl3PiuWQKqSvJyAIDfeAFLnI AU4yhHZYTlYATm8xr3AAum4dQ7zXb0xQUomIbmm9A6YLdwiv8Qt5/ZhC34T2gViTK599 jPtg== X-Received: by 10.180.73.202 with SMTP id n10mr4937358wiv.0.1430393791749; Thu, 30 Apr 2015 04:36:31 -0700 (PDT) Received: from 640k.localdomain (dynamic-adsl-94-39-185-241.clienti.tiscali.it. [94.39.185.241]) by mx.google.com with ESMTPSA id v3sm2064527wix.8.2015.04.30.04.36.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 04:36:30 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: rkrcmar@redhat.com, bsd@redhat.com, guangrong.xiao@linux.intel.com, Yang Zhang , wanpeng.li@linux.intel.com Subject: [PATCH 01/13] KVM: MMU: fix for CR4.SMEP=1, CR0.WP=0? Date: Thu, 30 Apr 2015 13:36:00 +0200 Message-Id: <1430393772-27208-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1430393772-27208-1-git-send-email-pbonzini@redhat.com> References: <1430393772-27208-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP smep_andnot_wp is initialized in kvm_init_shadow_mmu and shadow pages should not be reused for different values of it. Thus, it has to be added to the mask in kvm_mmu_pte_write. Signed-off-by: Paolo Bonzini Reviewed-by: Xiao Guangrong --- arch/x86/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index d43867c33bc4..209fe1477465 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -4238,7 +4238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, ++vcpu->kvm->stat.mmu_pte_write; kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE); - mask.cr0_wp = mask.cr4_pae = mask.nxe = 1; + mask.cr0_wp = mask.cr4_pae = mask.nxe = mask.smep_andnot_wp = 1; for_each_gfn_indirect_valid_sp(vcpu->kvm, sp, gfn) { if (detect_write_misaligned(sp, gpa, bytes) || detect_write_flooding(sp)) {