releases/2.6.32.3/x86-msr-unify-rdmsr_on_cpus-wrmsr_on_cpus.patch

   1 From b8a4754147d61f5359a765a3afd3eb03012aa052 Mon Sep 17 00:00:00 2001
   2 From: Borislav Petkov <borislav.petkov@amd.com>
   3 Date: Thu, 30 Jul 2009 11:10:02 +0200
   4 Subject: x86, msr: Unify rdmsr_on_cpus/wrmsr_on_cpus
   5
   6 From: Borislav Petkov <borislav.petkov@amd.com>
   7
   8 commit b8a4754147d61f5359a765a3afd3eb03012aa052 upstream.
   9
  10 Since rdmsr_on_cpus and wrmsr_on_cpus are almost identical, unify them
  11 into a common __rwmsr_on_cpus helper thus avoiding code duplication.
  12
  13 While at it, convert cpumask_t's to const struct cpumask *.
  14
  15 Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  16 Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  17 Signed-off-by: Ingo Molnar <mingo@elte.hu>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  arch/x86/include/asm/msr.h |    4 +--
  22  arch/x86/lib/msr.c         |   46 ++++++++++++++++++---------------------------
  23  2 files changed, 21 insertions(+), 29 deletions(-)
  24
  25 --- a/arch/x86/include/asm/msr.h
  26 +++ b/arch/x86/include/asm/msr.h
  27 @@ -247,8 +247,8 @@ do {
  28  #ifdef CONFIG_SMP
  29  int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
  30  int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
  31 -void rdmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs);
  32 -void wrmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs);
  33 +void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
  34 +void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
  35  int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
  36  int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
  37  int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]);
  38 --- a/arch/x86/lib/msr.c
  39 +++ b/arch/x86/lib/msr.c
  40 @@ -71,14 +71,9 @@ int wrmsr_on_cpu(unsigned int cpu, u32 m
  41  }
  42  EXPORT_SYMBOL(wrmsr_on_cpu);
  43
  44 -/* rdmsr on a bunch of CPUs
  45 - *
  46 - * @mask:       which CPUs
  47 - * @msr_no:     which MSR
  48 - * @msrs:       array of MSR values
  49 - *
  50 - */
  51 -void rdmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs)
  52 +static void __rwmsr_on_cpus(const struct cpumask *mask, u32 msr_no,
  53 +                           struct msr *msrs,
  54 +                           void (*msr_func) (void *info))
  55  {
  56         struct msr_info rv;
  57         int this_cpu;
  58 @@ -92,11 +87,23 @@ void rdmsr_on_cpus(const cpumask_t *mask
  59         this_cpu = get_cpu();
  60
  61         if (cpumask_test_cpu(this_cpu, mask))
  62 -               __rdmsr_on_cpu(&rv);
  63 +               msr_func(&rv);
  64
  65 -       smp_call_function_many(mask, __rdmsr_on_cpu, &rv, 1);
  66 +       smp_call_function_many(mask, msr_func, &rv, 1);
  67         put_cpu();
  68  }
  69 +
  70 +/* rdmsr on a bunch of CPUs
  71 + *
  72 + * @mask:       which CPUs
  73 + * @msr_no:     which MSR
  74 + * @msrs:       array of MSR values
  75 + *
  76 + */
  77 +void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs)
  78 +{
  79 +       __rwmsr_on_cpus(mask, msr_no, msrs, __rdmsr_on_cpu);
  80 +}
  81  EXPORT_SYMBOL(rdmsr_on_cpus);
  82
  83  /*
  84 @@ -107,24 +114,9 @@ EXPORT_SYMBOL(rdmsr_on_cpus);
  85   * @msrs:       array of MSR values
  86   *
  87   */
  88 -void wrmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs)
  89 +void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs)
  90  {
  91 -       struct msr_info rv;
  92 -       int this_cpu;
  93 -
  94 -       memset(&rv, 0, sizeof(rv));
  95 -
  96 -       rv.off    = cpumask_first(mask);
  97 -       rv.msrs   = msrs;
  98 -       rv.msr_no = msr_no;
  99 -
 100 -       this_cpu = get_cpu();
 101 -
 102 -       if (cpumask_test_cpu(this_cpu, mask))
 103 -               __wrmsr_on_cpu(&rv);
 104 -
 105 -       smp_call_function_many(mask, __wrmsr_on_cpu, &rv, 1);
 106 -       put_cpu();
 107 +       __rwmsr_on_cpus(mask, msr_no, msrs, __wrmsr_on_cpu);
 108  }
 109  EXPORT_SYMBOL(wrmsr_on_cpus);
 110