From patchwork Thu May 27 11:50:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 102613 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4RBoTXS030443 for ; Thu, 27 May 2010 11:50:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934067Ab0E0LuT (ORCPT ); Thu, 27 May 2010 07:50:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22484 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759184Ab0E0LuM (ORCPT ); Thu, 27 May 2010 07:50:12 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4RBo8OY022905 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 May 2010 07:50:08 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4RBo7c7031493; Thu, 27 May 2010 07:50:07 -0400 Received: from file.tlv.redhat.com (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id E978B250AD8; Thu, 27 May 2010 14:50:06 +0300 (IDT) From: Avi Kivity To: Xiao Guangrong , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 2/3] KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page Date: Thu, 27 May 2010 14:50:05 +0300 Message-Id: <1274961006-19413-3-git-send-email-avi@redhat.com> In-Reply-To: <1274961006-19413-1-git-send-email-avi@redhat.com> References: <1274961006-19413-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 27 May 2010 11:50:30 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 39dd8d3..56f8c3c 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1894,6 +1894,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, spte |= PT_WRITABLE_MASK; + if (!tdp_enabled && !(pte_access & ACC_WRITE_MASK)) + spte &= ~PT_USER_MASK; + /* * Optimization: for pte sync, if spte was writable the hash * lookup is unnecessary (and expensive). Write protection