From: Avi Kivity <avi@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: Re: KVM: x86: do not retain disabled or invalid pvclock address
Date: Sun, 09 Sep 2012 17:08:31 +0300 [thread overview]
Message-ID: <504CA2DF.9070104@redhat.com> (raw)
In-Reply-To: <20120823111654.GA18057@amt.cnet>
On 08/23/2012 02:16 PM, Marcelo Tosatti wrote:
>
> In case an invalid or disabled gpa is written to the SYSTEM_TIME
> MSR, do not retain its value. This is not documented behaviour,
> nor should be supported.
>
> Also clear it on system reset. Not doing so can hide bugs.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index e00050c..ed4bfb7 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1528,6 +1528,7 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data)
>
> static void kvmclock_reset(struct kvm_vcpu *vcpu)
> {
> + vcpu->arch.time = 0;
> if (vcpu->arch.time_page) {
> kvm_release_page_dirty(vcpu->arch.time_page);
> vcpu->arch.time_page = NULL;
> @@ -1632,8 +1633,10 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
> kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
>
> /* we verify if the enable bit is set... */
> - if (!(data & 1))
> + if (!(data & 1)) {
> + vcpu->arch.time = 0;
Should we not just assign data to vcpu->arch.time? That's how the real
MSRs work.
> break;
> + }
>
> /* ...but clean it before doing the actual write */
> vcpu->arch.time_offset = data & ~(PAGE_MASK | 1);
> @@ -1641,8 +1644,10 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
> vcpu->arch.time_page =
> gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT);
>
> - if (is_error_page(vcpu->arch.time_page))
> + if (is_error_page(vcpu->arch.time_page)) {
> vcpu->arch.time_page = NULL;
> + vcpu->arch.time = 0;
> + }
>
Don't see why.
--
error compiling committee.c: too many arguments to function
next prev parent reply other threads:[~2012-09-09 14:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-23 11:16 KVM: x86: do not retain disabled or invalid pvclock address Marcelo Tosatti
2012-09-09 14:08 ` Avi Kivity [this message]
2012-09-09 23:37 ` Marcelo Tosatti
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=504CA2DF.9070104@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.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