* [PATCH] KVM: Add reset support for in kernel PIT
@ 2008-03-13 2:24 Yang, Sheng
2008-03-16 14:36 ` Avi Kivity
0 siblings, 1 reply; 4+ messages in thread
From: Yang, Sheng @ 2008-03-13 2:24 UTC (permalink / raw)
To: kvm-devel
[-- Attachment #1: Type: text/plain, Size: 2428 bytes --]
From 2d08f4266a8f47d9c52db9d4f629ab5d2f8fd044 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@intel.com>
Date: Thu, 13 Mar 2008 10:22:26 +0800
Subject: [PATCH] KVM: Add reset support for in kernel PIT
Separate the reset part and prepare for reset support.
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
---
arch/x86/kvm/i8254.c | 30 +++++++++++++++++++-----------
arch/x86/kvm/i8254.h | 1 +
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 7776f50..06a241a 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -476,12 +476,28 @@ static int speaker_in_range(struct kvm_io_device *this,
gpa_t addr)
return (addr == KVM_SPEAKER_BASE_ADDRESS);
}
-struct kvm_pit *kvm_create_pit(struct kvm *kvm)
+void kvm_pit_reset(struct kvm_pit *pit)
{
int i;
+ struct kvm_kpit_channel_state *c;
+
+ mutex_lock(&pit->pit_state.lock);
+ for (i = 0; i < 3; i++) {
+ c = &pit->pit_state.channels[i];
+ c->mode = 0xff;
+ c->gate = (i != 2);
+ pit_load_count(pit->kvm, i, 0);
+ }
+ mutex_unlock(&pit->pit_state.lock);
+
+ atomic_set(&pit->pit_state.pit_timer.pending, 0);
+ pit->pit_state.inject_pending = 1;
+}
+
+struct kvm_pit *kvm_create_pit(struct kvm *kvm)
+{
struct kvm_pit *pit;
struct kvm_kpit_state *pit_state;
- struct kvm_kpit_channel_state *c;
pit = kzalloc(sizeof(struct kvm_pit), GFP_KERNEL);
if (!pit)
@@ -510,17 +526,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
pit_state->pit = pit;
hrtimer_init(&pit_state->pit_timer.timer,
CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
- atomic_set(&pit_state->pit_timer.pending, 0);
- for (i = 0; i < 3; i++) {
- c = &pit_state->channels[i];
- c->mode = 0xff;
- c->gate = (i != 2);
- pit_load_count(kvm, i, 0);
- }
-
mutex_unlock(&pit->pit_state.lock);
- pit->pit_state.inject_pending = 1;
+ kvm_pit_reset(pit);
return pit;
}
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 586bbf0..e63ef38 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -57,5 +57,6 @@ void kvm_pit_timer_intr_post(struct kvm_vcpu *vcpu, int
vec);
void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val);
struct kvm_pit *kvm_create_pit(struct kvm *kvm);
void kvm_free_pit(struct kvm *kvm);
+void kvm_pit_reset(struct kvm_pit *pit);
#endif
--
debian.1.5.3.7.1-dirty
[-- Attachment #2: 0001-KVM-Add-reset-support-for-in-kernel-PIT.patch --]
[-- Type: text/x-diff, Size: 2430 bytes --]
From 2d08f4266a8f47d9c52db9d4f629ab5d2f8fd044 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@intel.com>
Date: Thu, 13 Mar 2008 10:22:26 +0800
Subject: [PATCH] KVM: Add reset support for in kernel PIT
Separate the reset part and prepare for reset support.
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
---
arch/x86/kvm/i8254.c | 30 +++++++++++++++++++-----------
arch/x86/kvm/i8254.h | 1 +
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 7776f50..06a241a 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -476,12 +476,28 @@ static int speaker_in_range(struct kvm_io_device *this, gpa_t addr)
return (addr == KVM_SPEAKER_BASE_ADDRESS);
}
-struct kvm_pit *kvm_create_pit(struct kvm *kvm)
+void kvm_pit_reset(struct kvm_pit *pit)
{
int i;
+ struct kvm_kpit_channel_state *c;
+
+ mutex_lock(&pit->pit_state.lock);
+ for (i = 0; i < 3; i++) {
+ c = &pit->pit_state.channels[i];
+ c->mode = 0xff;
+ c->gate = (i != 2);
+ pit_load_count(pit->kvm, i, 0);
+ }
+ mutex_unlock(&pit->pit_state.lock);
+
+ atomic_set(&pit->pit_state.pit_timer.pending, 0);
+ pit->pit_state.inject_pending = 1;
+}
+
+struct kvm_pit *kvm_create_pit(struct kvm *kvm)
+{
struct kvm_pit *pit;
struct kvm_kpit_state *pit_state;
- struct kvm_kpit_channel_state *c;
pit = kzalloc(sizeof(struct kvm_pit), GFP_KERNEL);
if (!pit)
@@ -510,17 +526,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
pit_state->pit = pit;
hrtimer_init(&pit_state->pit_timer.timer,
CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
- atomic_set(&pit_state->pit_timer.pending, 0);
- for (i = 0; i < 3; i++) {
- c = &pit_state->channels[i];
- c->mode = 0xff;
- c->gate = (i != 2);
- pit_load_count(kvm, i, 0);
- }
-
mutex_unlock(&pit->pit_state.lock);
- pit->pit_state.inject_pending = 1;
+ kvm_pit_reset(pit);
return pit;
}
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 586bbf0..e63ef38 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -57,5 +57,6 @@ void kvm_pit_timer_intr_post(struct kvm_vcpu *vcpu, int vec);
void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val);
struct kvm_pit *kvm_create_pit(struct kvm *kvm);
void kvm_free_pit(struct kvm *kvm);
+void kvm_pit_reset(struct kvm_pit *pit);
#endif
--
debian.1.5.3.7.1-dirty
[-- Attachment #3: Type: text/plain, Size: 228 bytes --]
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
[-- Attachment #4: Type: text/plain, Size: 158 bytes --]
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: Add reset support for in kernel PIT
2008-03-13 2:24 [PATCH] KVM: Add reset support for in kernel PIT Yang, Sheng
@ 2008-03-16 14:36 ` Avi Kivity
2008-03-16 15:01 ` Yang, Sheng
0 siblings, 1 reply; 4+ messages in thread
From: Avi Kivity @ 2008-03-16 14:36 UTC (permalink / raw)
To: Yang, Sheng; +Cc: kvm-devel
Yang, Sheng wrote:
> From 2d08f4266a8f47d9c52db9d4f629ab5d2f8fd044 Mon Sep 17 00:00:00 2001
> From: Sheng Yang <sheng.yang@intel.com>
> Date: Thu, 13 Mar 2008 10:22:26 +0800
> Subject: [PATCH] KVM: Add reset support for in kernel PIT
>
> Separate the reset part and prepare for reset support.
>
>
> diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
> index 7776f50..06a241a 100644
> --- a/arch/x86/kvm/i8254.c
> +++ b/arch/x86/kvm/i8254.c
> @@ -476,12 +476,28 @@ static int speaker_in_range(struct kvm_io_device *this,
> gpa_t addr)
> return (addr == KVM_SPEAKER_BASE_ADDRESS);
> }
>
> -struct kvm_pit *kvm_create_pit(struct kvm *kvm)
> +void kvm_pit_reset(struct kvm_pit *pit)
> {
> int i;
> + struct kvm_kpit_channel_state *c;
> +
> + mutex_lock(&pit->pit_state.lock);
> + for (i = 0; i < 3; i++) {
> + c = &pit->pit_state.channels[i];
> + c->mode = 0xff;
> + c->gate = (i != 2);
> + pit_load_count(pit->kvm, i, 0);
> + }
> + mutex_unlock(&pit->pit_state.lock);
> +
> + atomic_set(&pit->pit_state.pit_timer.pending, 0);
> + pit->pit_state.inject_pending = 1;
> +}
>
Don't you need an hrtimer_cancel() here, in case this is a true reset
and not part of initialization?
--
error compiling committee.c: too many arguments to function
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: Add reset support for in kernel PIT
2008-03-16 14:36 ` Avi Kivity
@ 2008-03-16 15:01 ` Yang, Sheng
2008-03-16 15:15 ` Avi Kivity
0 siblings, 1 reply; 4+ messages in thread
From: Yang, Sheng @ 2008-03-16 15:01 UTC (permalink / raw)
To: Avi Kivity; +Cc: kvm-devel
On Sunday 16 March 2008 22:36:57 Avi Kivity wrote:
> Yang, Sheng wrote:
> > From 2d08f4266a8f47d9c52db9d4f629ab5d2f8fd044 Mon Sep 17 00:00:00 2001
> > From: Sheng Yang <sheng.yang@intel.com>
> > Date: Thu, 13 Mar 2008 10:22:26 +0800
> > Subject: [PATCH] KVM: Add reset support for in kernel PIT
> >
> > Separate the reset part and prepare for reset support.
> >
> >
> >
> > diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
> > index 7776f50..06a241a 100644
> > --- a/arch/x86/kvm/i8254.c
> > +++ b/arch/x86/kvm/i8254.c
> > @@ -476,12 +476,28 @@ static int speaker_in_range(struct kvm_io_device
> > *this, gpa_t addr)
> > return (addr == KVM_SPEAKER_BASE_ADDRESS);
> > }
> >
> > -struct kvm_pit *kvm_create_pit(struct kvm *kvm)
> > +void kvm_pit_reset(struct kvm_pit *pit)
> > {
> > int i;
> > + struct kvm_kpit_channel_state *c;
> > +
> > + mutex_lock(&pit->pit_state.lock);
> > + for (i = 0; i < 3; i++) {
> > + c = &pit->pit_state.channels[i];
> > + c->mode = 0xff;
> > + c->gate = (i != 2);
> > + pit_load_count(pit->kvm, i, 0);
> > + }
> > + mutex_unlock(&pit->pit_state.lock);
> > +
> > + atomic_set(&pit->pit_state.pit_timer.pending, 0);
> > + pit->pit_state.inject_pending = 1;
> > +}
>
> Don't you need an hrtimer_cancel() here, in case this is a true reset
> and not part of initialization?
This was done implicitly, when the function call pit_load_count() with
c->mode=0xff. But may be it's better to do it explicitly?
--
Thanks
Yang, Sheng
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: Add reset support for in kernel PIT
2008-03-16 15:01 ` Yang, Sheng
@ 2008-03-16 15:15 ` Avi Kivity
0 siblings, 0 replies; 4+ messages in thread
From: Avi Kivity @ 2008-03-16 15:15 UTC (permalink / raw)
To: Yang, Sheng; +Cc: kvm-devel
Yang, Sheng wrote:
> On Sunday 16 March 2008 22:36:57 Avi Kivity wrote:
>
>> Yang, Sheng wrote:
>>
>>> From 2d08f4266a8f47d9c52db9d4f629ab5d2f8fd044 Mon Sep 17 00:00:00 2001
>>> From: Sheng Yang <sheng.yang@intel.com>
>>> Date: Thu, 13 Mar 2008 10:22:26 +0800
>>> Subject: [PATCH] KVM: Add reset support for in kernel PIT
>>>
>>> Separate the reset part and prepare for reset support.
>>>
>>>
>>>
>>> diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
>>> index 7776f50..06a241a 100644
>>> --- a/arch/x86/kvm/i8254.c
>>> +++ b/arch/x86/kvm/i8254.c
>>> @@ -476,12 +476,28 @@ static int speaker_in_range(struct kvm_io_device
>>> *this, gpa_t addr)
>>> return (addr == KVM_SPEAKER_BASE_ADDRESS);
>>> }
>>>
>>> -struct kvm_pit *kvm_create_pit(struct kvm *kvm)
>>> +void kvm_pit_reset(struct kvm_pit *pit)
>>> {
>>> int i;
>>> + struct kvm_kpit_channel_state *c;
>>> +
>>> + mutex_lock(&pit->pit_state.lock);
>>> + for (i = 0; i < 3; i++) {
>>> + c = &pit->pit_state.channels[i];
>>> + c->mode = 0xff;
>>> + c->gate = (i != 2);
>>> + pit_load_count(pit->kvm, i, 0);
>>> + }
>>> + mutex_unlock(&pit->pit_state.lock);
>>> +
>>> + atomic_set(&pit->pit_state.pit_timer.pending, 0);
>>> + pit->pit_state.inject_pending = 1;
>>> +}
>>>
>> Don't you need an hrtimer_cancel() here, in case this is a true reset
>> and not part of initialization?
>>
>
> This was done implicitly, when the function call pit_load_count() with
> c->mode=0xff. But may be it's better to do it explicitly?
>
>
It's fine, didn't look closely enough. Will apply, thanks.
--
error compiling committee.c: too many arguments to function
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-03-16 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-13 2:24 [PATCH] KVM: Add reset support for in kernel PIT Yang, Sheng
2008-03-16 14:36 ` Avi Kivity
2008-03-16 15:01 ` Yang, Sheng
2008-03-16 15:15 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox