Re: [PATCH 4/5] x86: Allow nesting of the debug stack IDT setting

[H. Peter Anvin]

On 05/30/2012 06:28 PM, Steven Rostedt wrote:
> 
> diff --git a/arch/x86/kernel/cpu/common.c
> b/arch/x86/kernel/cpu/common.c index 82f29e7..63fc083 100644 ---
> a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c 
> @@ -1101,14 +1101,20 @@ int is_debug_stack(unsigned long addr) addr
> > (__get_cpu_var(debug_stack_addr) - DEBUG_STKSZ)); }
> 
> +static DEFINE_PER_CPU(atomic_t, debug_idt_zero); + void
> debug_stack_set_zero(void) { +
> atomic_inc(&__get_cpu_var(debug_idt_zero)); load_idt((const struct
> desc_ptr *)&nmi_idt_descr); }
> 
> void debug_stack_reset(void) { -	load_idt((const struct desc_ptr
> *)&idt_descr); +	if
> (WARN_ON(!atomic_read(&__get_cpu_var(debug_idt_zero)))) +		return; 
> +	if (atomic_dec_and_test(&__get_cpu_var(debug_idt_zero))) +
> load_idt((const struct desc_ptr *)&idt_descr); }
> 

What you have here is a nesting counter, which is good, but I have
some objections to the implementation.

The name "debug_idt_zero" doesn't convey a counter in any way, shape
or form; perhaps debug_stack_users or something like that.

Since this is percpu, there is no reason to use the atomic operations
(globally locked!), and since it is on the local CPU there is no need
to manifest a pointer; we can instead use this_cpu_inc/dec_return:

static DEFINE_PER_CPU(u32, debug_stack_use_ctr);

void debug_stack_set_zero(void)
{
	if (this_cpu_inc_return(debug_stack_use_ctr) == 1)
	 	load_idt((const struct desc_ptr *)&nmi_idt_descr);
}

void debug_stack_reset(void)
{
	if (this_cpu_dec_return(debug_stack_use_ctr) == 0)
		load_idt((const struct desc_ptr *)&idt_descr);
}

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
--
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/