From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 113A4C433E1 for ; Sat, 16 May 2020 12:54:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6D91206D8 for ; Sat, 16 May 2020 12:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726341AbgEPMyP (ORCPT ); Sat, 16 May 2020 08:54:15 -0400 Received: from mga07.intel.com ([134.134.136.100]:47574 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726727AbgEPMyL (ORCPT ); Sat, 16 May 2020 08:54:11 -0400 IronPort-SDR: 6b79BH64DYEl80K0sRQBUI4hi6au2naNifJh2fYaFnu6NJlaLU+4blWRhmvOL06qLjvF+bukyU jbBWIf2bG8aQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2020 05:54:10 -0700 IronPort-SDR: MJo07iisMKJsHLVColE+rvMMYvQhsVNUKFjvwiHVgPKu2vUcUCE4tgaBJ2iCMRmHr0yO1cJHlm Htr0EKpfHOyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,398,1583222400"; d="scan'208";a="288076613" Received: from local-michael-cet-test.sh.intel.com ([10.239.159.128]) by fmsmga004.fm.intel.com with ESMTP; 16 May 2020 05:54:08 -0700 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, ssicleru@bitdefender.com, Yang Weijiang Subject: [PATCH v12 09/11] x86: spp: Add SPP protection check in instruction emulation Date: Sat, 16 May 2020 20:55:05 +0800 Message-Id: <20200516125507.5277-10-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200516125507.5277-1-weijiang.yang@intel.com> References: <20200516125507.5277-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, "fake" an vmexit to userspace to let application handle it. 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 4b033a39d6c3..e3999a3ab911 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5788,6 +5788,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, gfn_start, gfn_end; + struct kvm *kvm = vcpu->kvm; + struct kvm_memory_slot *slot; + u32 *access; + + if (!kvm->arch.spp_active) + return false; + + gfn_start = gpa_to_gfn(gpa); + gfn_end = gpa_to_gfn(gpa + bytes); + for (gfn = gfn_start; gfn <= gfn_end; 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.insn_len = + kvm_x86_ops.get_insn_len(vcpu); + return true; + } + } + } + + return false; +} + static int emulator_read_write_onepage(unsigned long addr, void *val, unsigned int bytes, struct x86_exception *exception, @@ -5817,6 +5848,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; @@ -6963,6 +6997,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, return 1; if (r == EMULATION_FAILED) { + if (vcpu->run->exit_reason == KVM_EXIT_SPP) + return 0; + if (reexecute_instruction(vcpu, cr2_or_gpa, write_fault_to_spt, emulation_type)) return 1; -- 2.17.2