Re: [RFC 1/6]SEP initialization rework

[Pavel Machek]

Hi!

> Make SEP init per-cpu, so is hotplug safe.
> 
> Thanks,
> Shaohua
> 
> ---
> 
>  linux-2.6.11-root/arch/i386/kernel/smpboot.c           |    6 ++++++
>  linux-2.6.11-root/arch/i386/kernel/sysenter.c          |   10 ++++++----
>  linux-2.6.11-root/arch/i386/mach-voyager/voyager_smp.c |    6 ++++++
>  3 files changed, 18 insertions(+), 4 deletions(-)
> 
> diff -puN arch/i386/kernel/sysenter.c~sep_init_cleanup arch/i386/kernel/sysenter.c
> --- linux-2.6.11/arch/i386/kernel/sysenter.c~sep_init_cleanup	2005-03-28 09:32:30.936304248 +0800
> +++ linux-2.6.11-root/arch/i386/kernel/sysenter.c	2005-03-28 09:58:20.703703792 +0800
> @@ -26,6 +26,11 @@ void enable_sep_cpu(void *info)
>  	int cpu = get_cpu();
>  	struct tss_struct *tss = &per_cpu(init_tss, cpu);
>  
> +	if (!boot_cpu_has(X86_FEATURE_SEP)) {
> +		put_cpu();
> +		return;
> +	}
> +
>  	tss->ss1 = __KERNEL_CS;
>  	tss->esp1 = sizeof(struct tss_struct) + (unsigned long) tss;
>  	wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
> @@ -41,7 +46,7 @@ void enable_sep_cpu(void *info)
>  extern const char vsyscall_int80_start, vsyscall_int80_end;
>  extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
>  
> -static int __init sysenter_setup(void)
> +int __init sysenter_setup(void)
>  {
>  	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
>  

Can this still be __init? I think you are calling it from hotplug code
now, right?

> diff -puN arch/i386/kernel/smpboot.c~sep_init_cleanup arch/i386/kernel/smpboot.c
> --- linux-2.6.11/arch/i386/kernel/smpboot.c~sep_init_cleanup	2005-03-28 09:33:49.972288952 +0800
> +++ linux-2.6.11-root/arch/i386/kernel/smpboot.c	2005-03-28 09:46:01.814032096 +0800
> @@ -415,6 +415,8 @@ static void __init smp_callin(void)
>  
>  static int cpucount;
>  
> +extern int sysenter_setup(void);
> +extern void enable_sep_cpu(void *);
>  /*
>   * Activate a secondary processor.
>   */

Perhaps these should go to header file somewhere?

								Pavel
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/