Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp17107715ybl; Wed, 1 Jan 2020 22:10:40 -0800 (PST) X-Google-Smtp-Source: APXvYqxjmEJxK2mmTXOt3Q1rPesOCMLJG9xUW15WZeyN7yl/BNKlkaEbYATmnby6Ahkrm0Bx2pKU X-Received: by 2002:a9d:6181:: with SMTP id g1mr93107384otk.104.1577945440048; Wed, 01 Jan 2020 22:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577945440; cv=none; d=google.com; s=arc-20160816; b=Zbq1s4E6l8x201fpoON8Qby8GYvNq3RBDEz3OJBAIylRFLYvUWp8HhsCe1ZP3QTZtt ohP3B/1vuZlnjL10PygEOktTQbiycQpQTB/U8qeL+PduzQ9rWpAz9oEKrmvdAONhPX/k fwqjkfrBzR/jLa6ua2q+IQm5oAgaGZDitQqnOqekYC/ztszyyKDjbxgwRq26qZZ4uo4o oM1i3Kjwc4Gr7bnEYl3WijnxukyWuD0X2cMsoQ2zs98CknrY7Dxalj7ykEb3osDFMkb+ qTsknijdpH6L5YpOhdKxg7wJonT65qXeSvhVzaT5o7G6DMuoeHxZK+eWHBCw430uYQtB QX3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=oPeo5YT/vfXCQwqwxnbKbx2+8kURifvU6Xeh6nc62eA=; b=m5Xc1zvdN97++h66e5ocsgQkb7frMWIP45yOeToR2xDyq52I46f0zsRIDLQNjggfgs xI8/Ec789bf9OhWOL+uxaFK+rSjnn2QhNEclM+k2VXUM6I+EZsceOKa4HUQlFroAc9pU Gb3EKEdnYk/4lcMH2w5gqLhzrainxxCAYEB8iDI2lDFbjMCLIL9g9lrph+Y6gRnnrBIG 1jQLKGc1MqThgiQxpvoZ71myOGv0rYz9pNuK8lqU+kLfTBedus99NNH4H5H2g5GS4uEr m8lvm4+Uc3rCsCzDya/Y5DrDbtsMIc4P/MAxccEo9vgOm/e3KUEmG4xf5rkVVtLZ7KFQ s0Ww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e20si16404547oti.219.2020.01.01.22.10.28; Wed, 01 Jan 2020 22:10:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbgABGJm (ORCPT + 99 others); Thu, 2 Jan 2020 01:09:42 -0500 Received: from mga07.intel.com ([134.134.136.100]:3905 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727750AbgABGJh (ORCPT ); Thu, 2 Jan 2020 01:09:37 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jan 2020 22:09:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,385,1571727600"; d="scan'208";a="224706779" Received: from local-michael-cet-test.sh.intel.com ([10.239.159.128]) by fmsmga001.fm.intel.com with ESMTP; 01 Jan 2020 22:09:35 -0800 From: Yang Weijiang To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, jmattson@google.com, sean.j.christopherson@intel.com Cc: yu.c.zhang@linux.intel.com, alazar@bitdefender.com, edwin.zhai@intel.com, Yang Weijiang Subject: [RESEND PATCH v10 09/10] x86: spp: Add SPP protection check in emulation Date: Thu, 2 Jan 2020 14:13:18 +0800 Message-Id: <20200102061319.10077-10-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200102061319.10077-1-weijiang.yang@intel.com> References: <20200102061319.10077-1-weijiang.yang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In instruction/mmio emulation cases, if the target write memroy is SPP protected, exit to user-space to handle it as if it's caused by SPP induced EPT violation due to guest write. Signed-off-by: Yang Weijiang --- arch/x86/kvm/x86.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a9d7fc21dad6..f2fb95249bf6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5731,6 +5731,37 @@ static const struct read_write_emulator_ops write_emultor = { .write = true, }; +static bool is_emulator_spp_protected(struct kvm_vcpu *vcpu, + gpa_t gpa, + unsigned int bytes) +{ + gfn_t gfn, start_gfn, end_gfn; + struct kvm *kvm = vcpu->kvm; + struct kvm_memory_slot *slot; + u32 *access; + + if (!kvm->arch.spp_active) + return false; + + start_gfn = gpa >> PAGE_SHIFT; + end_gfn = (gpa + bytes) >> PAGE_SHIFT; + for (gfn = start_gfn; gfn <= end_gfn; gfn++) { + slot = gfn_to_memslot(kvm, gfn); + if (slot) { + access = gfn_to_subpage_wp_info(slot, gfn); + if (access && *access != FULL_SPP_ACCESS) { + vcpu->run->exit_reason = KVM_EXIT_SPP; + vcpu->run->spp.addr = gfn; + vcpu->run->spp.ins_len = + kvm_x86_ops->get_inst_len(vcpu); + return true; + } + } + } + + return false; +} + static int emulator_read_write_onepage(unsigned long addr, void *val, unsigned int bytes, struct x86_exception *exception, @@ -5761,6 +5792,9 @@ static int emulator_read_write_onepage(unsigned long addr, void *val, return X86EMUL_PROPAGATE_FAULT; } + if (write && is_emulator_spp_protected(vcpu, gpa, bytes)) + return X86EMUL_UNHANDLEABLE; + if (!ret && ops->read_write_emulate(vcpu, gpa, val, bytes)) return X86EMUL_CONTINUE; @@ -6837,6 +6871,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, return 1; if (r == EMULATION_FAILED) { + if (vcpu->run->exit_reason == KVM_EXIT_SPP) + return 0; + if (reexecute_instruction(vcpu, cr2, write_fault_to_spt, emulation_type)) return 1; -- 2.17.2