diff mbox

[kvm-unit-tests,3/3] tests: don't call setup_idt() if with smp_init()

Message ID 1477386030-13955-4-git-send-email-peterx@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Xu Oct. 25, 2016, 9 a.m. UTC
smp_init() will setup idt as default. No need to call it twice.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 x86/apic.c                | 1 -
 x86/hyperv_stimer.c       | 1 -
 x86/hyperv_synic.c        | 1 -
 x86/ioapic.c              | 1 -
 x86/tscdeadline_latency.c | 1 -
 5 files changed, 5 deletions(-)

Comments

Andrew Jones Oct. 25, 2016, 9:53 a.m. UTC | #1
On Tue, Oct 25, 2016 at 05:00:30PM +0800, Peter Xu wrote:
> smp_init() will setup idt as default. No need to call it twice.

This patch should probably be squashed into the previous patch
to maintain bisectability.

> 
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  x86/apic.c                | 1 -
>  x86/hyperv_stimer.c       | 1 -
>  x86/hyperv_synic.c        | 1 -
>  x86/ioapic.c              | 1 -
>  x86/tscdeadline_latency.c | 1 -
>  5 files changed, 5 deletions(-)
> 
> diff --git a/x86/apic.c b/x86/apic.c
> index fefb584..eff9a11 100644
> --- a/x86/apic.c
> +++ b/x86/apic.c
> @@ -393,7 +393,6 @@ int main()
>  {
>      setup_vm();
>      smp_init();
> -    setup_idt();
>  
>      test_lapic_existence();
>  
> diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
> index 6382938..5292523 100644
> --- a/x86/hyperv_stimer.c
> +++ b/x86/hyperv_stimer.c
> @@ -330,7 +330,6 @@ static void stimer_test_all(void)
>  
>      setup_vm();
>      smp_init();
> -    setup_idt();
>      enable_apic();
>  
>      handle_irq(SINT1_VEC, stimer_isr);
> diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
> index 3f98c42..74bbd58 100644
> --- a/x86/hyperv_synic.c
> +++ b/x86/hyperv_synic.c
> @@ -154,7 +154,6 @@ int main(int ac, char **av)
>  
>          setup_vm();
>          smp_init();
> -        setup_idt();
>          enable_apic();
>  
>          synic_prepare_sint_vecs();
> diff --git a/x86/ioapic.c b/x86/ioapic.c
> index a554e43..314c9bb 100644
> --- a/x86/ioapic.c
> +++ b/x86/ioapic.c
> @@ -398,7 +398,6 @@ int main(void)
>  {
>  	setup_vm();
>  	smp_init();
> -	setup_idt();
>  
>  	mask_pic_interrupts();
>  
> diff --git a/x86/tscdeadline_latency.c b/x86/tscdeadline_latency.c
> index 0592802..0617a1b 100644
> --- a/x86/tscdeadline_latency.c
> +++ b/x86/tscdeadline_latency.c
> @@ -106,7 +106,6 @@ int main(int argc, char **argv)
>  
>      setup_vm();
>      smp_init();
> -    setup_idt();
>  
>      test_lapic_existence();
>  
> -- 
> 2.7.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andrew Jones Oct. 25, 2016, 10:16 a.m. UTC | #2
On Tue, Oct 25, 2016 at 11:53:27AM +0200, Andrew Jones wrote:
> On Tue, Oct 25, 2016 at 05:00:30PM +0800, Peter Xu wrote:
> > smp_init() will setup idt as default. No need to call it twice.
> 
> This patch should probably be squashed into the previous patch
> to maintain bisectability.

Nevermind this. I just looked at setup_idt; no asserts or
harmful side-effects would occur with multiple calls of
setup_idt. So, it doesn't matter if they're there or not,
and thus this cleanup can be a separate patch, as it is,
if we want to bother with it at all.

drew

> 
> > 
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> >  x86/apic.c                | 1 -
> >  x86/hyperv_stimer.c       | 1 -
> >  x86/hyperv_synic.c        | 1 -
> >  x86/ioapic.c              | 1 -
> >  x86/tscdeadline_latency.c | 1 -
> >  5 files changed, 5 deletions(-)
> > 
> > diff --git a/x86/apic.c b/x86/apic.c
> > index fefb584..eff9a11 100644
> > --- a/x86/apic.c
> > +++ b/x86/apic.c
> > @@ -393,7 +393,6 @@ int main()
> >  {
> >      setup_vm();
> >      smp_init();
> > -    setup_idt();
> >  
> >      test_lapic_existence();
> >  
> > diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
> > index 6382938..5292523 100644
> > --- a/x86/hyperv_stimer.c
> > +++ b/x86/hyperv_stimer.c
> > @@ -330,7 +330,6 @@ static void stimer_test_all(void)
> >  
> >      setup_vm();
> >      smp_init();
> > -    setup_idt();
> >      enable_apic();
> >  
> >      handle_irq(SINT1_VEC, stimer_isr);
> > diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
> > index 3f98c42..74bbd58 100644
> > --- a/x86/hyperv_synic.c
> > +++ b/x86/hyperv_synic.c
> > @@ -154,7 +154,6 @@ int main(int ac, char **av)
> >  
> >          setup_vm();
> >          smp_init();
> > -        setup_idt();
> >          enable_apic();
> >  
> >          synic_prepare_sint_vecs();
> > diff --git a/x86/ioapic.c b/x86/ioapic.c
> > index a554e43..314c9bb 100644
> > --- a/x86/ioapic.c
> > +++ b/x86/ioapic.c
> > @@ -398,7 +398,6 @@ int main(void)
> >  {
> >  	setup_vm();
> >  	smp_init();
> > -	setup_idt();
> >  
> >  	mask_pic_interrupts();
> >  
> > diff --git a/x86/tscdeadline_latency.c b/x86/tscdeadline_latency.c
> > index 0592802..0617a1b 100644
> > --- a/x86/tscdeadline_latency.c
> > +++ b/x86/tscdeadline_latency.c
> > @@ -106,7 +106,6 @@ int main(int argc, char **argv)
> >  
> >      setup_vm();
> >      smp_init();
> > -    setup_idt();
> >  
> >      test_lapic_existence();
> >  
> > -- 
> > 2.7.4
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paolo Bonzini Oct. 25, 2016, 4 p.m. UTC | #3
On 25/10/2016 11:00, Peter Xu wrote:
> smp_init() will setup idt as default. No need to call it twice.
> 
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  x86/apic.c                | 1 -
>  x86/hyperv_stimer.c       | 1 -
>  x86/hyperv_synic.c        | 1 -
>  x86/ioapic.c              | 1 -
>  x86/tscdeadline_latency.c | 1 -
>  5 files changed, 5 deletions(-)
> 
> diff --git a/x86/apic.c b/x86/apic.c
> index fefb584..eff9a11 100644
> --- a/x86/apic.c
> +++ b/x86/apic.c
> @@ -393,7 +393,6 @@ int main()
>  {
>      setup_vm();
>      smp_init();
> -    setup_idt();
>  
>      test_lapic_existence();
>  
> diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
> index 6382938..5292523 100644
> --- a/x86/hyperv_stimer.c
> +++ b/x86/hyperv_stimer.c
> @@ -330,7 +330,6 @@ static void stimer_test_all(void)
>  
>      setup_vm();
>      smp_init();
> -    setup_idt();
>      enable_apic();
>  
>      handle_irq(SINT1_VEC, stimer_isr);
> diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
> index 3f98c42..74bbd58 100644
> --- a/x86/hyperv_synic.c
> +++ b/x86/hyperv_synic.c
> @@ -154,7 +154,6 @@ int main(int ac, char **av)
>  
>          setup_vm();
>          smp_init();
> -        setup_idt();
>          enable_apic();
>  
>          synic_prepare_sint_vecs();
> diff --git a/x86/ioapic.c b/x86/ioapic.c
> index a554e43..314c9bb 100644
> --- a/x86/ioapic.c
> +++ b/x86/ioapic.c
> @@ -398,7 +398,6 @@ int main(void)
>  {
>  	setup_vm();
>  	smp_init();
> -	setup_idt();
>  
>  	mask_pic_interrupts();
>  
> diff --git a/x86/tscdeadline_latency.c b/x86/tscdeadline_latency.c
> index 0592802..0617a1b 100644
> --- a/x86/tscdeadline_latency.c
> +++ b/x86/tscdeadline_latency.c
> @@ -106,7 +106,6 @@ int main(int argc, char **argv)
>  
>      setup_vm();
>      smp_init();
> -    setup_idt();
>  
>      test_lapic_existence();
>  
> 

... and patch 3 too.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/x86/apic.c b/x86/apic.c
index fefb584..eff9a11 100644
--- a/x86/apic.c
+++ b/x86/apic.c
@@ -393,7 +393,6 @@  int main()
 {
     setup_vm();
     smp_init();
-    setup_idt();
 
     test_lapic_existence();
 
diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
index 6382938..5292523 100644
--- a/x86/hyperv_stimer.c
+++ b/x86/hyperv_stimer.c
@@ -330,7 +330,6 @@  static void stimer_test_all(void)
 
     setup_vm();
     smp_init();
-    setup_idt();
     enable_apic();
 
     handle_irq(SINT1_VEC, stimer_isr);
diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
index 3f98c42..74bbd58 100644
--- a/x86/hyperv_synic.c
+++ b/x86/hyperv_synic.c
@@ -154,7 +154,6 @@  int main(int ac, char **av)
 
         setup_vm();
         smp_init();
-        setup_idt();
         enable_apic();
 
         synic_prepare_sint_vecs();
diff --git a/x86/ioapic.c b/x86/ioapic.c
index a554e43..314c9bb 100644
--- a/x86/ioapic.c
+++ b/x86/ioapic.c
@@ -398,7 +398,6 @@  int main(void)
 {
 	setup_vm();
 	smp_init();
-	setup_idt();
 
 	mask_pic_interrupts();
 
diff --git a/x86/tscdeadline_latency.c b/x86/tscdeadline_latency.c
index 0592802..0617a1b 100644
--- a/x86/tscdeadline_latency.c
+++ b/x86/tscdeadline_latency.c
@@ -106,7 +106,6 @@  int main(int argc, char **argv)
 
     setup_vm();
     smp_init();
-    setup_idt();
 
     test_lapic_existence();