Re: [PATCH] oprofile: fix CPU unplug panic in ppro_stop()

[Ingo Molnar]

* Eric Dumazet <dada1@xxxxxxxxxxxxx> wrote:

> If oprofile statically compiled in kernel, a cpu unplug triggers
> a panic in ppro_stop(), because a NULL pointer is dereferenced.
>
> Signed-off-by: Eric Dumazet <dada1@xxxxxxxxxxxxx>
> ---
> arch/x86/oprofile/op_model_ppro.c |    4 ++++
> 1 files changed, 4 insertions(+)

> diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
> index 716d26f..e9f80c7 100644
> --- a/arch/x86/oprofile/op_model_ppro.c
> +++ b/arch/x86/oprofile/op_model_ppro.c
> @@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs)
>  	unsigned int low, high;
>  	int i;
>  
> +	if (!reset_value)
> +		return;
>
> 	for (i = 0; i < num_counters; ++i) {
>  		if (reset_value[i]) {
>  			CTRL_READ(low, high, msrs, i);

i checked which commit caused this, and it is:

  From b99170288421c79f0c2efa8b33e26e65f4bb7fb8 Mon Sep 17 00:00:00 2001
  From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
  Date: Mon, 18 Aug 2008 14:50:31 +0200
  Subject: [PATCH] oprofile: Implement Intel architectural perfmon support

it is an absolutely horrible commit - which has caused the second 
regression in a row already. The _real_ "perfmon support" patch should 
have been a _oneliner_:

  -#define NUM_COUNTERS 2
  -#define NUM_CONTROLS 2
  +#define NUM_COUNTERS 8
  +#define NUM_CONTROLS 8

as Nehalem has 4 performance counters so 8 is plenty - and we dont expect 
more than 8 in the next 5 years or so.

It was absolutely unnecessary to add kmalloc to this rarely executed 
codepath - and the way it was added was absolutely horrible as well, it 
was tacked on in the middle of an existing codepath, instead of factoring 
it out nicely. Perfmon will eventually replace PMC management anyway, so 
there was no "this way it's cleaner" argument either. So this code should 
have been changed minimally, instead of slapping in a full kmalloc for a 
simple array extension from 2 to 4 entries ...

You need to be more careful when changing x86 architecture code.

	Ingo
--
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/