From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
bsd@redhat.com, guangrong.xiao@linux.intel.com,
Yang Zhang <yang.z.zhang@intel.com>,
wanpeng.li@linux.intel.com
Subject: Re: [PATCH 05/13] KVM: x86: pass host_initiated to functions that read MSRs
Date: Mon, 4 May 2015 16:01:43 +0200 [thread overview]
Message-ID: <20150504140143.GA11234@potion.brq.redhat.com> (raw)
In-Reply-To: <1430393772-27208-6-git-send-email-pbonzini@redhat.com>
2015-04-30 13:36+0200, Paolo Bonzini:
> SMBASE is only readable from SMM for the VCPU, but it must be always
> accessible if userspace is accessing it. Thus, all functions that
> read MSRs are changed to accept a struct msr_data; the host_initiated
> and index fields are pre-initialized, while the data field is filled
> on return.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> @@ -1048,6 +1048,21 @@ EXPORT_SYMBOL_GPL(kvm_set_msr);
> /*
> * Adapt set_msr() to msr_io()'s calling convention
> */
> +static int do_get_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
> +{
> + struct msr_data msr;
> + int r;
> +
> + msr.index = index;
> + msr.host_initiated = true;
> + r = kvm_set_msr(vcpu, &msr);
Should be kvm_get_msr().
> + if (r)
> + return r;
> +
> + *data = msr.data;
> + return 0;
> +}
> +
> @@ -3456,7 +3470,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
> break;
> }
> case KVM_GET_MSRS:
> - r = msr_io(vcpu, argp, kvm_get_msr, 1);
> + r = msr_io(vcpu, argp, do_get_msr, 1);
> break;
> case KVM_SET_MSRS:
> r = msr_io(vcpu, argp, do_set_msr, 0);
> @@ -4948,7 +4962,17 @@ static void emulator_set_segment(struct x86_emulate_ctxt *ctxt, u16 selector,
> static int emulator_get_msr(struct x86_emulate_ctxt *ctxt,
> u32 msr_index, u64 *pdata)
> {
> - return kvm_get_msr(emul_to_vcpu(ctxt), msr_index, pdata);
> + struct msr_data msr;
> + int r;
> +
> + msr.index = msr_index;
> + msr.host_initiated = false;
> + r = kvm_get_msr(emul_to_vcpu(ctxt), &msr);
> + if (r)
> + return r;
> +
> + *pdata = msr.data;
> + return 0;
> }
(Only msr.host_initiated changed from do_get_msr() ...
I'd add a function with an extra bool arg and call it twice.)
next prev parent reply other threads:[~2015-05-04 14:02 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-30 11:35 [RFC PATCH 00/13] KVM: x86: SMM support Paolo Bonzini
2015-04-30 11:36 ` [PATCH 01/13] KVM: MMU: fix for CR4.SMEP=1, CR0.WP=0? Paolo Bonzini
2015-05-08 2:52 ` Xiao Guangrong
2015-04-30 11:36 ` [PATCH 02/13] KVM: reuse memslot in kvm_write_guest_page Paolo Bonzini
2015-05-05 15:03 ` Bandan Das
2015-05-05 16:29 ` Radim Krčmář
2015-04-30 11:36 ` [PATCH 03/13] KVM: export __gfn_to_pfn_memslot, drop gfn_to_pfn_async Paolo Bonzini
2015-04-30 11:36 ` [PATCH 04/13] KVM: remove unnecessary arg from mark_page_dirty_in_slot, export it Paolo Bonzini
2015-04-30 11:36 ` [PATCH 05/13] KVM: x86: pass host_initiated to functions that read MSRs Paolo Bonzini
2015-05-04 14:01 ` Radim Krčmář [this message]
2015-05-04 16:04 ` Paolo Bonzini
2015-04-30 11:36 ` [PATCH 06/13] KVM: x86: pass the whole hflags field to emulator and back Paolo Bonzini
2015-05-05 15:47 ` Bandan Das
2015-05-05 16:16 ` Paolo Bonzini
2015-05-06 16:49 ` Bandan Das
2015-04-30 11:36 ` [PATCH 07/13] KVM: x86: API changes for SMM support Paolo Bonzini
2015-05-04 15:37 ` Radim Krčmář
2015-05-04 16:02 ` Paolo Bonzini
2015-05-05 16:36 ` Bandan Das
2015-05-05 16:45 ` Paolo Bonzini
2015-04-30 11:36 ` [PATCH 08/13] KVM: x86: stubs " Paolo Bonzini
2015-05-04 17:51 ` Radim Krčmář
2015-05-05 9:37 ` Paolo Bonzini
2015-05-05 18:38 ` Bandan Das
2015-05-05 18:48 ` Radim Krčmář
2015-04-30 11:36 ` [PATCH 09/13] KVM: x86: save/load state on SMM switch Paolo Bonzini
2015-05-04 19:59 ` Radim Krčmář
2015-05-05 9:37 ` Paolo Bonzini
2015-05-05 12:48 ` Radim Krčmář
2015-05-05 13:18 ` Paolo Bonzini
2015-05-05 20:44 ` Bandan Das
2015-05-06 10:39 ` Paolo Bonzini
2015-05-06 17:55 ` Bandan Das
2015-05-06 19:38 ` Paolo Bonzini
2015-05-12 23:56 ` Bandan Das
2015-05-13 6:58 ` Paolo Bonzini
2015-04-30 11:36 ` [PATCH 10/13] KVM: x86: add vcpu-specific functions to read/write/translate GFNs Paolo Bonzini
2015-04-30 11:36 ` [PATCH 11/13] KVM: x86: add SMM to the MMU role Paolo Bonzini
2015-04-30 11:36 ` [PATCH 12/13] KVM: x86: add KVM_MEM_X86_SMRAM memory slot flag Paolo Bonzini
2015-05-05 17:17 ` Radim Krčmář
2015-05-06 9:47 ` Paolo Bonzini
2015-05-06 16:24 ` Radim Krčmář
2015-05-06 18:15 ` Bandan Das
2015-05-06 19:43 ` Paolo Bonzini
2015-05-15 20:32 ` Avi Kivity
2015-05-18 8:31 ` Paolo Bonzini
2015-04-30 11:36 ` [PATCH 13/13] KVM: x86: advertise KVM_CAP_X86_SMM Paolo Bonzini
2015-05-05 18:40 ` [RFC PATCH 00/13] KVM: x86: SMM support Radim Krčmář
2015-05-06 11:18 ` Paolo Bonzini
2015-05-06 17:14 ` Radim Krčmář
2015-05-19 14:25 ` Zhang, Yang Z
2015-05-19 14:27 ` Paolo Bonzini
2015-05-20 1:03 ` Zhang, Yang Z
2015-05-20 15:22 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150504140143.GA11234@potion.brq.redhat.com \
--to=rkrcmar@redhat.com \
--cc=bsd@redhat.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=wanpeng.li@linux.intel.com \
--cc=yang.z.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).