* KVM: x86: disable kvmclock on non constant TSC hosts
@ 2009-02-10 17:24 Marcelo Tosatti
2009-02-10 22:59 ` Marcelo Tosatti
0 siblings, 1 reply; 11+ messages in thread
From: Marcelo Tosatti @ 2009-02-10 17:24 UTC (permalink / raw)
To: Avi Kivity; +Cc: Glauber de Oliveira Costa, kvm-devel
Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.
There's a module parameter for the adventurous who want to force
it.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
arch/x86/kvm/x86.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e96edda..6286f08 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -979,6 +979,9 @@ out:
return r;
}
+static int force_kvmclock = 0;
+module_param(force_kvmclock, bool, 0644);
+
int kvm_dev_ioctl_check_extension(long ext)
{
int r;
@@ -989,7 +992,6 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:
case KVM_CAP_SET_TSS_ADDR:
case KVM_CAP_EXT_CPUID:
- case KVM_CAP_CLOCKSOURCE:
case KVM_CAP_PIT:
case KVM_CAP_NOP_IO_DELAY:
case KVM_CAP_MP_STATE:
@@ -1015,6 +1017,9 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_IOMMU:
r = iommu_found();
break;
+ case KVM_CAP_CLOCKSOURCE:
+ r = force_kvmclock || boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
+ break;
default:
r = 0;
break;
^ permalink raw reply related [flat|nested] 11+ messages in thread
* KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-10 17:24 KVM: x86: disable kvmclock on non constant TSC hosts Marcelo Tosatti
@ 2009-02-10 22:59 ` Marcelo Tosatti
2009-02-11 12:01 ` Avi Kivity
0 siblings, 1 reply; 11+ messages in thread
From: Marcelo Tosatti @ 2009-02-10 22:59 UTC (permalink / raw)
To: Avi Kivity; +Cc: Glauber de Oliveira Costa, kvm-devel
This is better.
Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Index: kvm/arch/x86/kvm/x86.c
===================================================================
--- kvm.orig/arch/x86/kvm/x86.c
+++ kvm/arch/x86/kvm/x86.c
@@ -989,7 +989,6 @@ int kvm_dev_ioctl_check_extension(long e
case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:
case KVM_CAP_SET_TSS_ADDR:
case KVM_CAP_EXT_CPUID:
- case KVM_CAP_CLOCKSOURCE:
case KVM_CAP_PIT:
case KVM_CAP_NOP_IO_DELAY:
case KVM_CAP_MP_STATE:
@@ -1015,6 +1014,9 @@ int kvm_dev_ioctl_check_extension(long e
case KVM_CAP_IOMMU:
r = iommu_found();
break;
+ case KVM_CAP_CLOCKSOURCE:
+ r = boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
+ break;
default:
r = 0;
break;
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-10 22:59 ` Marcelo Tosatti
@ 2009-02-11 12:01 ` Avi Kivity
2009-02-11 20:08 ` Mark McLoughlin
0 siblings, 1 reply; 11+ messages in thread
From: Avi Kivity @ 2009-02-11 12:01 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: Glauber de Oliveira Costa, kvm-devel
Marcelo Tosatti wrote:
> This is better.
>
> Currently, this code path is posing us big troubles,
> and we won't have a decent patch in time. So, temporarily
> disable it.
>
>
Applied to master and kvm-updates/2.6.29, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-11 12:01 ` Avi Kivity
@ 2009-02-11 20:08 ` Mark McLoughlin
2009-02-11 22:55 ` Marcelo Tosatti
0 siblings, 1 reply; 11+ messages in thread
From: Mark McLoughlin @ 2009-02-11 20:08 UTC (permalink / raw)
To: Avi Kivity; +Cc: Marcelo Tosatti, Glauber de Oliveira Costa, kvm-devel
On Wed, 2009-02-11 at 14:01 +0200, Avi Kivity wrote:
> Marcelo Tosatti wrote:
> > This is better.
> >
> > Currently, this code path is posing us big troubles,
> > and we won't have a decent patch in time. So, temporarily
> > disable it.
> >
> >
>
> Applied to master and kvm-updates/2.6.29, thanks.
Should we add:
Cc: stable@kernel.org
Cheers,
Mark.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-11 20:08 ` Mark McLoughlin
@ 2009-02-11 22:55 ` Marcelo Tosatti
2009-02-12 10:02 ` Avi Kivity
0 siblings, 1 reply; 11+ messages in thread
From: Marcelo Tosatti @ 2009-02-11 22:55 UTC (permalink / raw)
To: Mark McLoughlin
Cc: Avi Kivity, Glauber de Oliveira Costa, kvm-devel, Chris Wright
On Wed, Feb 11, 2009 at 08:08:23PM +0000, Mark McLoughlin wrote:
> On Wed, 2009-02-11 at 14:01 +0200, Avi Kivity wrote:
> > Marcelo Tosatti wrote:
> > > This is better.
> > >
> > > Currently, this code path is posing us big troubles,
> > > and we won't have a decent patch in time. So, temporarily
> > > disable it.
> > >
> > >
> >
> > Applied to master and kvm-updates/2.6.29, thanks.
>
> Should we add:
>
> Cc: stable@kernel.org
I suppose Avi prefers the master->stable route so it can get
autotested?
But some sort of flag in the commit, like "Stable:Y" would
help. Could setup a robot to monitor kvm-commits and maintain
kvm-updates/2.6.2current (the queue to Linus), with human intervention
when necessary.
Then autotest can run continuously on that.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-11 22:55 ` Marcelo Tosatti
@ 2009-02-12 10:02 ` Avi Kivity
2009-02-12 14:33 ` Mark McLoughlin
2009-02-12 16:29 ` Chris Wright
0 siblings, 2 replies; 11+ messages in thread
From: Avi Kivity @ 2009-02-12 10:02 UTC (permalink / raw)
To: Marcelo Tosatti
Cc: Mark McLoughlin, Glauber de Oliveira Costa, kvm-devel, Chris Wright
Marcelo Tosatti wrote:
> On Wed, Feb 11, 2009 at 08:08:23PM +0000, Mark McLoughlin wrote:
>
>> On Wed, 2009-02-11 at 14:01 +0200, Avi Kivity wrote:
>>
>>> Marcelo Tosatti wrote:
>>>
>>>> This is better.
>>>>
>>>> Currently, this code path is posing us big troubles,
>>>> and we won't have a decent patch in time. So, temporarily
>>>> disable it.
>>>>
>>>>
>>>>
>>> Applied to master and kvm-updates/2.6.29, thanks.
>>>
>> Should we add:
>>
>> Cc: stable@kernel.org
>>
>
> I suppose Avi prefers the master->stable route so it can get
> autotested?
>
> But some sort of flag in the commit, like "Stable:Y" would
> help. Could setup a robot to monitor kvm-commits and maintain
> kvm-updates/2.6.2current (the queue to Linus), with human intervention
> when necessary.
>
> Then autotest can run continuously on that.
>
Does 'Cc: stable' mean -stable picks it up automatically? That doesn't
seem right.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-12 10:02 ` Avi Kivity
@ 2009-02-12 14:33 ` Mark McLoughlin
2009-02-12 16:29 ` Chris Wright
1 sibling, 0 replies; 11+ messages in thread
From: Mark McLoughlin @ 2009-02-12 14:33 UTC (permalink / raw)
To: Avi Kivity
Cc: Marcelo Tosatti, Glauber de Oliveira Costa, kvm-devel, Chris Wright
On Thu, 2009-02-12 at 12:02 +0200, Avi Kivity wrote:
> Marcelo Tosatti wrote:
> > On Wed, Feb 11, 2009 at 08:08:23PM +0000, Mark McLoughlin wrote:
> >
> >> On Wed, 2009-02-11 at 14:01 +0200, Avi Kivity wrote:
> >>
> >>> Marcelo Tosatti wrote:
> >>>
> >>>> This is better.
> >>>>
> >>>> Currently, this code path is posing us big troubles,
> >>>> and we won't have a decent patch in time. So, temporarily
> >>>> disable it.
> >>>>
> >>>>
> >>>>
> >>> Applied to master and kvm-updates/2.6.29, thanks.
> >>>
> >> Should we add:
> >>
> >> Cc: stable@kernel.org
> >>
> >
> > I suppose Avi prefers the master->stable route so it can get
> > autotested?
> >
> > But some sort of flag in the commit, like "Stable:Y" would
> > help. Could setup a robot to monitor kvm-commits and maintain
> > kvm-updates/2.6.2current (the queue to Linus), with human intervention
> > when necessary.
> >
> > Then autotest can run continuously on that.
I'm not really following Marcelo here ...
> Does 'Cc: stable' mean -stable picks it up automatically? That doesn't
> seem right.
Yeah, I think if you CC: stable it gets pulled into the stable queue by
scripts once linus merges it.
Cheers,
Mark.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-12 10:02 ` Avi Kivity
2009-02-12 14:33 ` Mark McLoughlin
@ 2009-02-12 16:29 ` Chris Wright
2009-02-12 16:35 ` Avi Kivity
1 sibling, 1 reply; 11+ messages in thread
From: Chris Wright @ 2009-02-12 16:29 UTC (permalink / raw)
To: Avi Kivity
Cc: Marcelo Tosatti, Mark McLoughlin, Glauber de Oliveira Costa,
kvm-devel, Chris Wright
* Avi Kivity (avi@redhat.com) wrote:
> Does 'Cc: stable' mean -stable picks it up automatically? That doesn't
> seem right.
Yes. If you add "Cc: stable@kernel.org" to the commit message, it will
get routed to stable when it's committed upstream (still gets human
touch, it's not automatically committed to stable).
thanks,
-chris
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-12 16:29 ` Chris Wright
@ 2009-02-12 16:35 ` Avi Kivity
2009-02-12 16:39 ` Chris Wright
0 siblings, 1 reply; 11+ messages in thread
From: Avi Kivity @ 2009-02-12 16:35 UTC (permalink / raw)
To: Chris Wright
Cc: Marcelo Tosatti, Mark McLoughlin, Glauber de Oliveira Costa, kvm-devel
Chris Wright wrote:
> * Avi Kivity (avi@redhat.com) wrote:
>
>> Does 'Cc: stable' mean -stable picks it up automatically? That doesn't
>> seem right.
>>
>
> Yes. If you add "Cc: stable@kernel.org" to the commit message, it will
> get routed to stable when it's committed upstream (still gets human
> touch, it's not automatically committed to stable).
>
What about porting the patch? And testing it?
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-12 16:35 ` Avi Kivity
@ 2009-02-12 16:39 ` Chris Wright
2009-02-12 17:54 ` Avi Kivity
0 siblings, 1 reply; 11+ messages in thread
From: Chris Wright @ 2009-02-12 16:39 UTC (permalink / raw)
To: Avi Kivity
Cc: Chris Wright, Marcelo Tosatti, Mark McLoughlin,
Glauber de Oliveira Costa, kvm-devel
* Avi Kivity (avi@redhat.com) wrote:
> Chris Wright wrote:
>> * Avi Kivity (avi@redhat.com) wrote:
>>
>>> Does 'Cc: stable' mean -stable picks it up automatically? That
>>> doesn't seem right.
>>
>> Yes. If you add "Cc: stable@kernel.org" to the commit message, it will
>> get routed to stable when it's committed upstream (still gets human
>> touch, it's not automatically committed to stable).
>
> What about porting the patch? And testing it?
Porting is done by stable maintainers if it's trivial, push back to
developer/subsytem maintainer if it's not. Testing depends again, in
most cases the upstream testing is still valid. If not..."please
verify"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: KVM: x86: disable kvmclock on non constant TSC hosts
2009-02-12 16:39 ` Chris Wright
@ 2009-02-12 17:54 ` Avi Kivity
0 siblings, 0 replies; 11+ messages in thread
From: Avi Kivity @ 2009-02-12 17:54 UTC (permalink / raw)
To: Chris Wright
Cc: Marcelo Tosatti, Mark McLoughlin, Glauber de Oliveira Costa, kvm-devel
Chris Wright wrote:
> Porting is done by stable maintainers if it's trivial, push back to
> developer/subsytem maintainer if it's not. Testing depends again, in
> most cases the upstream testing is still valid. If not..."please
> verify"
>
Warm, fuzzy feeling.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2009-02-12 17:53 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-10 17:24 KVM: x86: disable kvmclock on non constant TSC hosts Marcelo Tosatti
2009-02-10 22:59 ` Marcelo Tosatti
2009-02-11 12:01 ` Avi Kivity
2009-02-11 20:08 ` Mark McLoughlin
2009-02-11 22:55 ` Marcelo Tosatti
2009-02-12 10:02 ` Avi Kivity
2009-02-12 14:33 ` Mark McLoughlin
2009-02-12 16:29 ` Chris Wright
2009-02-12 16:35 ` Avi Kivity
2009-02-12 16:39 ` Chris Wright
2009-02-12 17:54 ` Avi Kivity
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.