[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <48ADB114.2000304@goop.org>
Date: Thu, 21 Aug 2008 11:16:52 -0700
From: Jeremy Fitzhardinge <jeremy@...p.org>
To: Alex Nixon <alex.nixon@...rix.com>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...e.hu>
Subject: Re: [PATCH 2/7] x86/paravirt: Add paravirt hook for wbinvd_halt
Alex Nixon wrote:
> The native case of wb_invd_halt uses inline asm to ensure the compiler doesn't reorder the sequence of instructions, which has the side-effect of skirting around the paravirt hooks for those instructions. Thus, create a new hook for this case.
>
Not necessary. Halting in Xen doesn't require the caches to be flushed
in this way, and I think that would be true for any virtual environment
(and if it were, the invalidate/halt instruction sequence would work
anyway).
The correct fix is to make sure that the native_play_dead calls this,
but the xen_play_dead doesn't (ie, make sure it's not in the common code
path).
J
> Signed-off-by: Alex Nixon <alex.nixon@...rix.com>
> Cc: Jeremy Fitzhardinge <jeremy@...p.org>
> Cc: Ingo Molnar <mingo@...e.hu>
> ---
> arch/x86/kernel/paravirt.c | 1 +
> include/asm-x86/paravirt.h | 6 ++++++
> include/asm-x86/processor.h | 3 ++-
> 3 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
> index 8ffe4d1..66d6d0d 100644
> --- a/arch/x86/kernel/paravirt.c
> +++ b/arch/x86/kernel/paravirt.c
> @@ -299,6 +299,7 @@ struct pv_irq_ops pv_irq_ops = {
> .restore_fl = native_restore_fl,
> .irq_disable = native_irq_disable,
> .irq_enable = native_irq_enable,
> + .wbinvd_halt = native_wbinvd_halt,
> .safe_halt = native_safe_halt,
> .halt = native_halt,
> #ifdef CONFIG_X86_64
> diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
> index fd922c3..5360f3f 100644
> --- a/include/asm-x86/paravirt.h
> +++ b/include/asm-x86/paravirt.h
> @@ -194,6 +194,7 @@ struct pv_irq_ops {
> void (*restore_fl)(unsigned long);
> void (*irq_disable)(void);
> void (*irq_enable)(void);
> + void (*wbinvd_halt)(void);
> void (*safe_halt)(void);
> void (*halt)(void);
>
> @@ -716,6 +717,11 @@ static inline void raw_safe_halt(void)
> PVOP_VCALL0(pv_irq_ops.safe_halt);
> }
>
> +static inline void wbinvd_halt(void)
> +{
> + PVOP_VCALL0(pv_irq_ops.wbinvd_halt);
> +}
> +
> static inline void halt(void)
> {
> PVOP_VCALL0(pv_irq_ops.safe_halt);
> diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
> index bcfc727..75db315 100644
> --- a/include/asm-x86/processor.h
> +++ b/include/asm-x86/processor.h
> @@ -558,6 +558,7 @@ static inline void load_sp0(struct tss_struct *tss,
> native_load_sp0(tss, thread);
> }
>
> +#define wbinvd_halt native_wbinvd_halt
> #define set_iopl_mask native_set_iopl_mask
> #endif /* CONFIG_PARAVIRT */
>
> @@ -733,7 +734,7 @@ extern unsigned long idle_nomwait;
> *
> * Systems without cache can just go into halt.
> */
> -static inline void wbinvd_halt(void)
> +static inline void native_wbinvd_halt(void)
> {
> mb();
> /* check for clflush to determine if wbinvd is legal */
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists