2005-11-05 23:25:53 +07:00
|
|
|
/*
|
2006-06-26 18:58:53 +07:00
|
|
|
* (c) 2005, 2006 Advanced Micro Devices, Inc.
|
2005-11-05 23:25:53 +07:00
|
|
|
* Your use of this code is subject to the terms and conditions of the
|
|
|
|
* GNU general public license version 2. See "COPYING" or
|
|
|
|
* http://www.gnu.org/licenses/gpl.html
|
|
|
|
*
|
|
|
|
* Written by Jacob Shin - AMD, Inc.
|
|
|
|
*
|
|
|
|
* Support : jacob.shin@amd.com
|
|
|
|
*
|
2006-06-26 18:58:53 +07:00
|
|
|
* April 2006
|
|
|
|
* - added support for AMD Family 0x10 processors
|
2005-11-05 23:25:53 +07:00
|
|
|
*
|
2006-06-26 18:58:53 +07:00
|
|
|
* All MC4_MISCi registers are shared between multi-cores
|
2005-11-05 23:25:53 +07:00
|
|
|
*/
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/notifier.h>
|
2009-04-08 17:31:18 +07:00
|
|
|
#include <linux/kobject.h>
|
x86, mce: trivial clean up for mce_amd_64.c
Fix for followings:
WARNING: Use #include <linux/percpu.h> instead of <asm/percpu.h>
+#include <asm/percpu.h>
ERROR: Macros with multiple statements should be enclosed in a do - while
loop
+#define THRESHOLD_ATTR(_name, _mode, _show, _store) \
+{ \
+ .attr = {.name = __stringify(_name), .mode = _mode }, \
+ .show = _show, \
+ .store = _store, \
+};
WARNING: usage of NR_CPUS is often wrong - consider using cpu_possible(),
num_possible_cpus(), for_each_possible_cpu(), etc
+ if (cpu >= NR_CPUS)
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-04-08 17:31:18 +07:00
|
|
|
#include <linux/percpu.h>
|
2005-11-05 23:25:53 +07:00
|
|
|
#include <linux/sysdev.h>
|
2009-04-08 17:31:18 +07:00
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/sched.h>
|
2005-11-05 23:25:53 +07:00
|
|
|
#include <linux/sysfs.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2009-04-08 17:31:18 +07:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
#include <asm/apic.h>
|
2009-04-08 17:31:18 +07:00
|
|
|
#include <asm/idle.h>
|
2005-11-05 23:25:53 +07:00
|
|
|
#include <asm/mce.h>
|
|
|
|
#include <asm/msr.h>
|
|
|
|
|
2006-06-26 18:58:56 +07:00
|
|
|
#define NR_BANKS 6
|
|
|
|
#define NR_BLOCKS 9
|
|
|
|
#define THRESHOLD_MAX 0xFFF
|
|
|
|
#define INT_TYPE_APIC 0x00020000
|
|
|
|
#define MASK_VALID_HI 0x80000000
|
2007-02-13 19:26:23 +07:00
|
|
|
#define MASK_CNTP_HI 0x40000000
|
|
|
|
#define MASK_LOCKED_HI 0x20000000
|
2006-06-26 18:58:56 +07:00
|
|
|
#define MASK_LVTOFF_HI 0x00F00000
|
|
|
|
#define MASK_COUNT_EN_HI 0x00080000
|
|
|
|
#define MASK_INT_TYPE_HI 0x00060000
|
|
|
|
#define MASK_OVERFLOW_HI 0x00010000
|
2005-11-05 23:25:53 +07:00
|
|
|
#define MASK_ERR_COUNT_HI 0x00000FFF
|
2006-06-26 18:58:53 +07:00
|
|
|
#define MASK_BLKPTR_LO 0xFF000000
|
|
|
|
#define MCG_XBLK_ADDR 0xC0000400
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
struct threshold_block {
|
2009-04-08 17:31:18 +07:00
|
|
|
unsigned int block;
|
|
|
|
unsigned int bank;
|
|
|
|
unsigned int cpu;
|
|
|
|
u32 address;
|
|
|
|
u16 interrupt_enable;
|
|
|
|
u16 threshold_limit;
|
|
|
|
struct kobject kobj;
|
|
|
|
struct list_head miscj;
|
2005-11-05 23:25:53 +07:00
|
|
|
};
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
struct threshold_bank {
|
2009-04-08 17:31:18 +07:00
|
|
|
struct kobject *kobj;
|
|
|
|
struct threshold_block *blocks;
|
|
|
|
cpumask_var_t cpus;
|
2006-06-26 18:58:53 +07:00
|
|
|
};
|
2009-06-24 13:13:45 +07:00
|
|
|
static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks);
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
static unsigned char shared_bank[NR_BANKS] = {
|
|
|
|
0, 0, 0, 0, 1
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static DEFINE_PER_CPU(unsigned char, bank_map); /* see which banks are on */
|
|
|
|
|
2009-02-12 19:49:31 +07:00
|
|
|
static void amd_threshold_interrupt(void);
|
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
/*
|
|
|
|
* CPU Initialization
|
|
|
|
*/
|
|
|
|
|
2008-12-17 08:34:04 +07:00
|
|
|
struct thresh_restart {
|
2009-04-08 17:31:18 +07:00
|
|
|
struct threshold_block *b;
|
|
|
|
int reset;
|
2010-10-25 21:03:35 +07:00
|
|
|
int set_lvt_off;
|
|
|
|
int lvt_off;
|
2009-04-08 17:31:18 +07:00
|
|
|
u16 old_limit;
|
2008-12-17 08:34:04 +07:00
|
|
|
};
|
|
|
|
|
2010-10-25 21:03:37 +07:00
|
|
|
static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi)
|
|
|
|
{
|
|
|
|
int msr = (hi & MASK_LVTOFF_HI) >> 20;
|
|
|
|
|
|
|
|
if (apic < 0) {
|
|
|
|
pr_err(FW_BUG "cpu %d, failed to setup threshold interrupt "
|
|
|
|
"for bank %d, block %d (MSR%08X=0x%x%08x)\n", b->cpu,
|
|
|
|
b->bank, b->block, b->address, hi, lo);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (apic != msr) {
|
|
|
|
pr_err(FW_BUG "cpu %d, invalid threshold interrupt offset %d "
|
|
|
|
"for bank %d, block %d (MSR%08X=0x%x%08x)\n",
|
|
|
|
b->cpu, apic, b->bank, b->block, b->address, hi, lo);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
};
|
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
/* must be called with correct cpu affinity */
|
2009-03-18 07:10:25 +07:00
|
|
|
/* Called via smp_call_function_single() */
|
|
|
|
static void threshold_restart_bank(void *_tr)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2008-12-17 08:34:04 +07:00
|
|
|
struct thresh_restart *tr = _tr;
|
2010-10-25 21:03:36 +07:00
|
|
|
u32 hi, lo;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2010-10-25 21:03:36 +07:00
|
|
|
rdmsr(tr->b->address, lo, hi);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2010-10-25 21:03:36 +07:00
|
|
|
if (tr->b->threshold_limit < (hi & THRESHOLD_MAX))
|
2008-12-17 08:34:04 +07:00
|
|
|
tr->reset = 1; /* limit cannot be lower than err count */
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2008-12-17 08:34:04 +07:00
|
|
|
if (tr->reset) { /* reset err count and overflow bit */
|
2010-10-25 21:03:36 +07:00
|
|
|
hi =
|
|
|
|
(hi & ~(MASK_ERR_COUNT_HI | MASK_OVERFLOW_HI)) |
|
2008-12-17 08:34:04 +07:00
|
|
|
(THRESHOLD_MAX - tr->b->threshold_limit);
|
|
|
|
} else if (tr->old_limit) { /* change limit w/o reset */
|
2010-10-25 21:03:36 +07:00
|
|
|
int new_count = (hi & THRESHOLD_MAX) +
|
2008-12-17 08:34:04 +07:00
|
|
|
(tr->old_limit - tr->b->threshold_limit);
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2010-10-25 21:03:36 +07:00
|
|
|
hi = (hi & ~MASK_ERR_COUNT_HI) |
|
2005-11-05 23:25:53 +07:00
|
|
|
(new_count & THRESHOLD_MAX);
|
|
|
|
}
|
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
if (tr->set_lvt_off) {
|
2010-10-25 21:03:37 +07:00
|
|
|
if (lvt_off_valid(tr->b, tr->lvt_off, lo, hi)) {
|
|
|
|
/* set new lvt offset */
|
|
|
|
hi &= ~MASK_LVTOFF_HI;
|
|
|
|
hi |= tr->lvt_off << 20;
|
|
|
|
}
|
2010-10-25 21:03:35 +07:00
|
|
|
}
|
|
|
|
|
2008-12-17 08:34:04 +07:00
|
|
|
tr->b->interrupt_enable ?
|
2010-10-25 21:03:36 +07:00
|
|
|
(hi = (hi & ~MASK_INT_TYPE_HI) | INT_TYPE_APIC) :
|
|
|
|
(hi &= ~MASK_INT_TYPE_HI);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2010-10-25 21:03:36 +07:00
|
|
|
hi |= MASK_COUNT_EN_HI;
|
|
|
|
wrmsr(tr->b->address, lo, hi);
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
static void mce_threshold_block_init(struct threshold_block *b, int offset)
|
|
|
|
{
|
|
|
|
struct thresh_restart tr = {
|
|
|
|
.b = b,
|
|
|
|
.set_lvt_off = 1,
|
|
|
|
.lvt_off = offset,
|
|
|
|
};
|
|
|
|
|
|
|
|
b->threshold_limit = THRESHOLD_MAX;
|
|
|
|
threshold_restart_bank(&tr);
|
|
|
|
};
|
|
|
|
|
2010-10-25 21:03:37 +07:00
|
|
|
static int setup_APIC_mce(int reserved, int new)
|
|
|
|
{
|
|
|
|
if (reserved < 0 && !setup_APIC_eilvt(new, THRESHOLD_APIC_VECTOR,
|
|
|
|
APIC_EILVT_MSG_FIX, 0))
|
|
|
|
return new;
|
|
|
|
|
|
|
|
return reserved;
|
|
|
|
}
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
/* cpu init entry point, called from mce.c with preempt off */
|
2009-02-21 14:35:51 +07:00
|
|
|
void mce_amd_feature_init(struct cpuinfo_x86 *c)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2010-10-25 21:03:35 +07:00
|
|
|
struct threshold_block b;
|
2005-11-05 23:25:53 +07:00
|
|
|
unsigned int cpu = smp_processor_id();
|
2006-06-26 18:58:53 +07:00
|
|
|
u32 low = 0, high = 0, address = 0;
|
2009-04-08 17:31:18 +07:00
|
|
|
unsigned int bank, block;
|
2010-10-25 21:03:37 +07:00
|
|
|
int offset = -1;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
for (bank = 0; bank < NR_BANKS; ++bank) {
|
2006-06-26 18:58:53 +07:00
|
|
|
for (block = 0; block < NR_BLOCKS; ++block) {
|
|
|
|
if (block == 0)
|
|
|
|
address = MSR_IA32_MC0_MISC + bank * 4;
|
2007-02-13 19:26:23 +07:00
|
|
|
else if (block == 1) {
|
|
|
|
address = (low & MASK_BLKPTR_LO) >> 21;
|
|
|
|
if (!address)
|
|
|
|
break;
|
2010-10-08 17:08:34 +07:00
|
|
|
|
2007-02-13 19:26:23 +07:00
|
|
|
address += MCG_XBLK_ADDR;
|
2009-04-08 17:31:18 +07:00
|
|
|
} else
|
2006-06-26 18:58:53 +07:00
|
|
|
++address;
|
|
|
|
|
|
|
|
if (rdmsr_safe(address, &low, &high))
|
2007-02-13 19:26:23 +07:00
|
|
|
break;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2010-10-08 17:08:34 +07:00
|
|
|
if (!(high & MASK_VALID_HI))
|
|
|
|
continue;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2007-02-13 19:26:23 +07:00
|
|
|
if (!(high & MASK_CNTP_HI) ||
|
|
|
|
(high & MASK_LOCKED_HI))
|
2006-06-26 18:58:53 +07:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!block)
|
|
|
|
per_cpu(bank_map, cpu) |= (1 << bank);
|
2005-11-05 23:25:53 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2006-06-26 18:58:53 +07:00
|
|
|
if (shared_bank[bank] && c->cpu_core_id)
|
|
|
|
break;
|
2005-11-05 23:25:53 +07:00
|
|
|
#endif
|
2010-10-25 21:03:37 +07:00
|
|
|
offset = setup_APIC_mce(offset,
|
|
|
|
(high & MASK_LVTOFF_HI) >> 20);
|
2008-01-30 19:30:40 +07:00
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
memset(&b, 0, sizeof(b));
|
|
|
|
b.cpu = cpu;
|
|
|
|
b.bank = bank;
|
|
|
|
b.block = block;
|
|
|
|
b.address = address;
|
2009-02-12 19:49:31 +07:00
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
mce_threshold_block_init(&b, offset);
|
2009-02-12 19:49:31 +07:00
|
|
|
mce_threshold_vector = amd_threshold_interrupt;
|
2006-06-26 18:58:53 +07:00
|
|
|
}
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* APIC Interrupt Handler
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* threshold interrupt handler will service THRESHOLD_APIC_VECTOR.
|
|
|
|
* the interrupt goes off when error_count reaches threshold_limit.
|
|
|
|
* the handler will simply log mcelog w/ software defined bank number.
|
|
|
|
*/
|
2009-02-12 19:49:31 +07:00
|
|
|
static void amd_threshold_interrupt(void)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2009-04-08 17:31:18 +07:00
|
|
|
u32 low = 0, high = 0, address = 0;
|
2006-06-26 18:58:53 +07:00
|
|
|
unsigned int bank, block;
|
2005-11-05 23:25:53 +07:00
|
|
|
struct mce m;
|
|
|
|
|
2009-02-12 19:43:22 +07:00
|
|
|
mce_setup(&m);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
/* assume first bank caused it */
|
|
|
|
for (bank = 0; bank < NR_BANKS; ++bank) {
|
2007-02-13 19:26:23 +07:00
|
|
|
if (!(per_cpu(bank_map, m.cpu) & (1 << bank)))
|
|
|
|
continue;
|
2006-06-26 18:58:53 +07:00
|
|
|
for (block = 0; block < NR_BLOCKS; ++block) {
|
2009-04-08 17:31:18 +07:00
|
|
|
if (block == 0) {
|
2006-06-26 18:58:53 +07:00
|
|
|
address = MSR_IA32_MC0_MISC + bank * 4;
|
2009-04-08 17:31:18 +07:00
|
|
|
} else if (block == 1) {
|
2007-02-13 19:26:23 +07:00
|
|
|
address = (low & MASK_BLKPTR_LO) >> 21;
|
|
|
|
if (!address)
|
|
|
|
break;
|
|
|
|
address += MCG_XBLK_ADDR;
|
2009-04-08 17:31:18 +07:00
|
|
|
} else {
|
2006-06-26 18:58:53 +07:00
|
|
|
++address;
|
2009-04-08 17:31:18 +07:00
|
|
|
}
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
if (rdmsr_safe(address, &low, &high))
|
2007-02-13 19:26:23 +07:00
|
|
|
break;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
if (!(high & MASK_VALID_HI)) {
|
|
|
|
if (block)
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-02-13 19:26:23 +07:00
|
|
|
if (!(high & MASK_CNTP_HI) ||
|
|
|
|
(high & MASK_LOCKED_HI))
|
2006-06-26 18:58:53 +07:00
|
|
|
continue;
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
/*
|
|
|
|
* Log the machine check that caused the threshold
|
|
|
|
* event.
|
|
|
|
*/
|
2009-02-12 19:49:34 +07:00
|
|
|
machine_check_poll(MCP_TIMESTAMP,
|
|
|
|
&__get_cpu_var(mce_poll_banks));
|
2007-02-13 19:26:23 +07:00
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
if (high & MASK_OVERFLOW_HI) {
|
|
|
|
rdmsrl(address, m.misc);
|
|
|
|
rdmsrl(MSR_IA32_MC0_STATUS + bank * 4,
|
|
|
|
m.status);
|
|
|
|
m.bank = K8_MCE_THRESHOLD_BASE
|
|
|
|
+ bank * NR_BLOCKS
|
|
|
|
+ block;
|
|
|
|
mce_log(&m);
|
2009-02-12 19:49:31 +07:00
|
|
|
return;
|
2006-06-26 18:58:53 +07:00
|
|
|
}
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sysfs Interface
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct threshold_attr {
|
2006-06-26 18:58:56 +07:00
|
|
|
struct attribute attr;
|
2009-04-08 17:31:18 +07:00
|
|
|
ssize_t (*show) (struct threshold_block *, char *);
|
|
|
|
ssize_t (*store) (struct threshold_block *, const char *, size_t count);
|
2005-11-05 23:25:53 +07:00
|
|
|
};
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
#define SHOW_FIELDS(name) \
|
|
|
|
static ssize_t show_ ## name(struct threshold_block *b, char *buf) \
|
|
|
|
{ \
|
|
|
|
return sprintf(buf, "%lx\n", (unsigned long) b->name); \
|
2006-06-26 18:58:56 +07:00
|
|
|
}
|
2005-11-05 23:25:53 +07:00
|
|
|
SHOW_FIELDS(interrupt_enable)
|
|
|
|
SHOW_FIELDS(threshold_limit)
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
static ssize_t
|
2009-04-14 15:26:30 +07:00
|
|
|
store_interrupt_enable(struct threshold_block *b, const char *buf, size_t size)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2008-12-17 08:34:04 +07:00
|
|
|
struct thresh_restart tr;
|
2009-04-08 17:31:18 +07:00
|
|
|
unsigned long new;
|
|
|
|
|
2009-04-14 15:26:30 +07:00
|
|
|
if (strict_strtoul(buf, 0, &new) < 0)
|
2005-11-05 23:25:53 +07:00
|
|
|
return -EINVAL;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
b->interrupt_enable = !!new;
|
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
memset(&tr, 0, sizeof(tr));
|
2009-04-08 17:31:18 +07:00
|
|
|
tr.b = b;
|
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2009-04-14 15:26:30 +07:00
|
|
|
return size;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
static ssize_t
|
2009-04-14 15:26:30 +07:00
|
|
|
store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2008-12-17 08:34:04 +07:00
|
|
|
struct thresh_restart tr;
|
2009-04-08 17:31:18 +07:00
|
|
|
unsigned long new;
|
|
|
|
|
2009-04-14 15:26:30 +07:00
|
|
|
if (strict_strtoul(buf, 0, &new) < 0)
|
2005-11-05 23:25:53 +07:00
|
|
|
return -EINVAL;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
if (new > THRESHOLD_MAX)
|
|
|
|
new = THRESHOLD_MAX;
|
|
|
|
if (new < 1)
|
|
|
|
new = 1;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2010-10-25 21:03:35 +07:00
|
|
|
memset(&tr, 0, sizeof(tr));
|
2008-12-17 08:34:04 +07:00
|
|
|
tr.old_limit = b->threshold_limit;
|
2005-11-05 23:25:53 +07:00
|
|
|
b->threshold_limit = new;
|
2008-12-17 08:34:04 +07:00
|
|
|
tr.b = b;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2009-04-14 15:26:30 +07:00
|
|
|
return size;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
struct threshold_block_cross_cpu {
|
2009-04-08 17:31:18 +07:00
|
|
|
struct threshold_block *tb;
|
|
|
|
long retval;
|
2009-03-18 07:10:25 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static void local_error_count_handler(void *_tbcc)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2009-03-18 07:10:25 +07:00
|
|
|
struct threshold_block_cross_cpu *tbcc = _tbcc;
|
|
|
|
struct threshold_block *b = tbcc->tb;
|
2008-12-17 08:34:04 +07:00
|
|
|
u32 low, high;
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
rdmsr(b->address, low, high);
|
2009-03-18 07:10:25 +07:00
|
|
|
tbcc->retval = (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit);
|
2008-12-17 08:34:04 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t show_error_count(struct threshold_block *b, char *buf)
|
|
|
|
{
|
2009-03-18 07:10:25 +07:00
|
|
|
struct threshold_block_cross_cpu tbcc = { .tb = b, };
|
|
|
|
|
|
|
|
smp_call_function_single(b->cpu, local_error_count_handler, &tbcc, 1);
|
|
|
|
return sprintf(buf, "%lx\n", tbcc.retval);
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
static ssize_t store_error_count(struct threshold_block *b,
|
2005-11-05 23:25:53 +07:00
|
|
|
const char *buf, size_t count)
|
|
|
|
{
|
2008-12-17 08:34:04 +07:00
|
|
|
struct thresh_restart tr = { .b = b, .reset = 1, .old_limit = 0 };
|
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
|
2005-11-05 23:25:53 +07:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
x86, mce: trivial clean up for mce_amd_64.c
Fix for followings:
WARNING: Use #include <linux/percpu.h> instead of <asm/percpu.h>
+#include <asm/percpu.h>
ERROR: Macros with multiple statements should be enclosed in a do - while
loop
+#define THRESHOLD_ATTR(_name, _mode, _show, _store) \
+{ \
+ .attr = {.name = __stringify(_name), .mode = _mode }, \
+ .show = _show, \
+ .store = _store, \
+};
WARNING: usage of NR_CPUS is often wrong - consider using cpu_possible(),
num_possible_cpus(), for_each_possible_cpu(), etc
+ if (cpu >= NR_CPUS)
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-04-08 17:31:18 +07:00
|
|
|
#define RW_ATTR(val) \
|
|
|
|
static struct threshold_attr val = { \
|
|
|
|
.attr = {.name = __stringify(val), .mode = 0644 }, \
|
|
|
|
.show = show_## val, \
|
|
|
|
.store = store_## val, \
|
2005-11-05 23:25:53 +07:00
|
|
|
};
|
|
|
|
|
2006-06-26 18:58:56 +07:00
|
|
|
RW_ATTR(interrupt_enable);
|
|
|
|
RW_ATTR(threshold_limit);
|
|
|
|
RW_ATTR(error_count);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
static struct attribute *default_attrs[] = {
|
|
|
|
&interrupt_enable.attr,
|
|
|
|
&threshold_limit.attr,
|
|
|
|
&error_count.attr,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
#define to_block(k) container_of(k, struct threshold_block, kobj)
|
|
|
|
#define to_attr(a) container_of(a, struct threshold_attr, attr)
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf)
|
|
|
|
{
|
2006-06-26 18:58:53 +07:00
|
|
|
struct threshold_block *b = to_block(kobj);
|
2005-11-05 23:25:53 +07:00
|
|
|
struct threshold_attr *a = to_attr(attr);
|
|
|
|
ssize_t ret;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
ret = a->show ? a->show(b, buf) : -EIO;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t store(struct kobject *kobj, struct attribute *attr,
|
|
|
|
const char *buf, size_t count)
|
|
|
|
{
|
2006-06-26 18:58:53 +07:00
|
|
|
struct threshold_block *b = to_block(kobj);
|
2005-11-05 23:25:53 +07:00
|
|
|
struct threshold_attr *a = to_attr(attr);
|
|
|
|
ssize_t ret;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
ret = a->store ? a->store(b, buf, count) : -EIO;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-01-19 08:58:23 +07:00
|
|
|
static const struct sysfs_ops threshold_ops = {
|
2009-04-08 17:31:18 +07:00
|
|
|
.show = show,
|
|
|
|
.store = store,
|
2005-11-05 23:25:53 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct kobj_type threshold_ktype = {
|
2009-04-08 17:31:18 +07:00
|
|
|
.sysfs_ops = &threshold_ops,
|
|
|
|
.default_attrs = default_attrs,
|
2005-11-05 23:25:53 +07:00
|
|
|
};
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
|
|
|
|
unsigned int bank,
|
|
|
|
unsigned int block,
|
|
|
|
u32 address)
|
|
|
|
{
|
|
|
|
struct threshold_block *b = NULL;
|
2009-04-08 17:31:18 +07:00
|
|
|
u32 low, high;
|
|
|
|
int err;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
if ((bank >= NR_BANKS) || (block >= NR_BLOCKS))
|
|
|
|
return 0;
|
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
if (rdmsr_safe_on_cpu(cpu, address, &low, &high))
|
2007-02-13 19:26:23 +07:00
|
|
|
return 0;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
if (!(high & MASK_VALID_HI)) {
|
|
|
|
if (block)
|
|
|
|
goto recurse;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-13 19:26:23 +07:00
|
|
|
if (!(high & MASK_CNTP_HI) ||
|
|
|
|
(high & MASK_LOCKED_HI))
|
2006-06-26 18:58:53 +07:00
|
|
|
goto recurse;
|
|
|
|
|
|
|
|
b = kzalloc(sizeof(struct threshold_block), GFP_KERNEL);
|
|
|
|
if (!b)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
b->block = block;
|
|
|
|
b->bank = bank;
|
|
|
|
b->cpu = cpu;
|
|
|
|
b->address = address;
|
|
|
|
b->interrupt_enable = 0;
|
|
|
|
b->threshold_limit = THRESHOLD_MAX;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
INIT_LIST_HEAD(&b->miscj);
|
|
|
|
|
2009-04-08 17:31:18 +07:00
|
|
|
if (per_cpu(threshold_banks, cpu)[bank]->blocks) {
|
2006-06-26 18:58:53 +07:00
|
|
|
list_add(&b->miscj,
|
|
|
|
&per_cpu(threshold_banks, cpu)[bank]->blocks->miscj);
|
2009-04-08 17:31:18 +07:00
|
|
|
} else {
|
2006-06-26 18:58:53 +07:00
|
|
|
per_cpu(threshold_banks, cpu)[bank]->blocks = b;
|
2009-04-08 17:31:18 +07:00
|
|
|
}
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2007-12-20 00:23:20 +07:00
|
|
|
err = kobject_init_and_add(&b->kobj, &threshold_ktype,
|
|
|
|
per_cpu(threshold_banks, cpu)[bank]->kobj,
|
|
|
|
"misc%i", block);
|
2006-06-26 18:58:53 +07:00
|
|
|
if (err)
|
|
|
|
goto out_free;
|
|
|
|
recurse:
|
|
|
|
if (!block) {
|
|
|
|
address = (low & MASK_BLKPTR_LO) >> 21;
|
|
|
|
if (!address)
|
|
|
|
return 0;
|
|
|
|
address += MCG_XBLK_ADDR;
|
2009-04-08 17:31:18 +07:00
|
|
|
} else {
|
2006-06-26 18:58:53 +07:00
|
|
|
++address;
|
2009-04-08 17:31:18 +07:00
|
|
|
}
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
err = allocate_threshold_blocks(cpu, bank, ++block, address);
|
|
|
|
if (err)
|
|
|
|
goto out_free;
|
|
|
|
|
2008-01-30 19:29:58 +07:00
|
|
|
if (b)
|
|
|
|
kobject_uevent(&b->kobj, KOBJ_ADD);
|
2007-12-20 00:23:20 +07:00
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
return err;
|
|
|
|
|
|
|
|
out_free:
|
|
|
|
if (b) {
|
2007-12-20 23:13:05 +07:00
|
|
|
kobject_put(&b->kobj);
|
2006-06-26 18:58:53 +07:00
|
|
|
kfree(b);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
static __cpuinit long
|
|
|
|
local_allocate_threshold_blocks(int cpu, unsigned int bank)
|
2008-12-17 08:34:04 +07:00
|
|
|
{
|
2009-03-18 07:10:25 +07:00
|
|
|
return allocate_threshold_blocks(cpu, bank, 0,
|
|
|
|
MSR_IA32_MC0_MISC + bank * 4);
|
2008-12-17 08:34:04 +07:00
|
|
|
}
|
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
/* symlinks sibling shared banks to first core. first core owns dir/files. */
|
2006-06-26 18:58:53 +07:00
|
|
|
static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2006-06-26 18:58:53 +07:00
|
|
|
int i, err = 0;
|
2006-01-12 04:45:57 +07:00
|
|
|
struct threshold_bank *b = NULL;
|
2006-06-26 18:58:53 +07:00
|
|
|
char name[32];
|
2009-09-15 22:17:27 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2009-09-03 14:42:20 +07:00
|
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
2009-09-15 22:17:27 +07:00
|
|
|
#endif
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
sprintf(name, "threshold_bank%i", bank);
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
2007-10-20 01:35:04 +07:00
|
|
|
if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */
|
2009-09-03 14:42:20 +07:00
|
|
|
i = cpumask_first(c->llc_shared_map);
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
/* first core not up yet */
|
2007-10-20 01:35:04 +07:00
|
|
|
if (cpu_data(i).cpu_core_id)
|
2006-06-26 18:58:53 +07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* already linked */
|
|
|
|
if (per_cpu(threshold_banks, cpu)[bank])
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
b = per_cpu(threshold_banks, i)[bank];
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
if (!b)
|
|
|
|
goto out;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2009-04-08 17:31:17 +07:00
|
|
|
err = sysfs_create_link(&per_cpu(mce_dev, cpu).kobj,
|
2007-12-20 00:23:20 +07:00
|
|
|
b->kobj, name);
|
2005-11-05 23:25:53 +07:00
|
|
|
if (err)
|
|
|
|
goto out;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2009-09-03 14:42:20 +07:00
|
|
|
cpumask_copy(b->cpus, c->llc_shared_map);
|
2005-11-05 23:25:53 +07:00
|
|
|
per_cpu(threshold_banks, cpu)[bank] = b;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
b = kzalloc(sizeof(struct threshold_bank), GFP_KERNEL);
|
2005-11-05 23:25:53 +07:00
|
|
|
if (!b) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2010-08-27 16:20:07 +07:00
|
|
|
if (!zalloc_cpumask_var(&b->cpus, GFP_KERNEL)) {
|
2009-01-11 12:58:10 +07:00
|
|
|
kfree(b);
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2005-11-05 23:25:53 +07:00
|
|
|
|
2009-04-08 17:31:17 +07:00
|
|
|
b->kobj = kobject_create_and_add(name, &per_cpu(mce_dev, cpu).kobj);
|
2007-12-20 00:23:20 +07:00
|
|
|
if (!b->kobj)
|
|
|
|
goto out_free;
|
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
#ifndef CONFIG_SMP
|
2009-01-11 12:58:10 +07:00
|
|
|
cpumask_setall(b->cpus);
|
2006-06-26 18:58:53 +07:00
|
|
|
#else
|
2010-08-27 16:20:07 +07:00
|
|
|
cpumask_set_cpu(cpu, b->cpus);
|
2006-06-26 18:58:53 +07:00
|
|
|
#endif
|
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
per_cpu(threshold_banks, cpu)[bank] = b;
|
2006-06-26 18:58:53 +07:00
|
|
|
|
2009-03-18 07:10:25 +07:00
|
|
|
err = local_allocate_threshold_blocks(cpu, bank);
|
2006-06-26 18:58:53 +07:00
|
|
|
if (err)
|
|
|
|
goto out_free;
|
|
|
|
|
2009-01-11 12:58:10 +07:00
|
|
|
for_each_cpu(i, b->cpus) {
|
2006-06-26 18:58:53 +07:00
|
|
|
if (i == cpu)
|
|
|
|
continue;
|
|
|
|
|
2009-04-08 17:31:17 +07:00
|
|
|
err = sysfs_create_link(&per_cpu(mce_dev, i).kobj,
|
2007-12-20 00:23:20 +07:00
|
|
|
b->kobj, name);
|
2006-06-26 18:58:53 +07:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
per_cpu(threshold_banks, i)[bank] = b;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
out_free:
|
|
|
|
per_cpu(threshold_banks, cpu)[bank] = NULL;
|
2009-01-11 12:58:10 +07:00
|
|
|
free_cpumask_var(b->cpus);
|
2006-06-26 18:58:53 +07:00
|
|
|
kfree(b);
|
2006-06-26 18:58:56 +07:00
|
|
|
out:
|
2005-11-05 23:25:53 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* create dir/files for all valid threshold banks */
|
|
|
|
static __cpuinit int threshold_create_device(unsigned int cpu)
|
|
|
|
{
|
2006-06-26 18:58:56 +07:00
|
|
|
unsigned int bank;
|
2005-11-05 23:25:53 +07:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
for (bank = 0; bank < NR_BANKS; ++bank) {
|
2008-01-30 19:33:40 +07:00
|
|
|
if (!(per_cpu(bank_map, cpu) & (1 << bank)))
|
2005-11-05 23:25:53 +07:00
|
|
|
continue;
|
|
|
|
err = threshold_create_bank(cpu, bank);
|
|
|
|
if (err)
|
2010-10-25 21:03:38 +07:00
|
|
|
return err;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
2010-10-25 21:03:38 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* let's be hotplug friendly.
|
|
|
|
* in case of multiple core processors, the first core always takes ownership
|
|
|
|
* of shared sysfs dir/files, and rest of the cores will be symlinked to it.
|
|
|
|
*/
|
|
|
|
|
2006-07-30 17:03:37 +07:00
|
|
|
static void deallocate_threshold_block(unsigned int cpu,
|
2006-06-26 18:58:53 +07:00
|
|
|
unsigned int bank)
|
|
|
|
{
|
|
|
|
struct threshold_block *pos = NULL;
|
|
|
|
struct threshold_block *tmp = NULL;
|
|
|
|
struct threshold_bank *head = per_cpu(threshold_banks, cpu)[bank];
|
|
|
|
|
|
|
|
if (!head)
|
|
|
|
return;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(pos, tmp, &head->blocks->miscj, miscj) {
|
2007-12-20 23:13:05 +07:00
|
|
|
kobject_put(&pos->kobj);
|
2006-06-26 18:58:53 +07:00
|
|
|
list_del(&pos->miscj);
|
|
|
|
kfree(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(per_cpu(threshold_banks, cpu)[bank]->blocks);
|
|
|
|
per_cpu(threshold_banks, cpu)[bank]->blocks = NULL;
|
|
|
|
}
|
|
|
|
|
2006-07-30 17:03:37 +07:00
|
|
|
static void threshold_remove_bank(unsigned int cpu, int bank)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
|
|
|
struct threshold_bank *b;
|
2006-06-26 18:58:53 +07:00
|
|
|
char name[32];
|
2009-04-08 17:31:18 +07:00
|
|
|
int i = 0;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
b = per_cpu(threshold_banks, cpu)[bank];
|
|
|
|
if (!b)
|
|
|
|
return;
|
2006-06-26 18:58:53 +07:00
|
|
|
if (!b->blocks)
|
|
|
|
goto free_out;
|
|
|
|
|
|
|
|
sprintf(name, "threshold_bank%i", bank);
|
|
|
|
|
2006-12-07 11:38:17 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2006-06-26 18:58:53 +07:00
|
|
|
/* sibling symlink */
|
|
|
|
if (shared_bank[bank] && b->blocks->cpu != cpu) {
|
2009-04-08 17:31:17 +07:00
|
|
|
sysfs_remove_link(&per_cpu(mce_dev, cpu).kobj, name);
|
2006-07-10 22:06:09 +07:00
|
|
|
per_cpu(threshold_banks, cpu)[bank] = NULL;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2006-06-26 18:58:53 +07:00
|
|
|
return;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
2006-12-07 11:38:17 +07:00
|
|
|
#endif
|
2006-06-26 18:58:53 +07:00
|
|
|
|
|
|
|
/* remove all sibling symlinks before unregistering */
|
2009-01-11 12:58:10 +07:00
|
|
|
for_each_cpu(i, b->cpus) {
|
2006-06-26 18:58:53 +07:00
|
|
|
if (i == cpu)
|
|
|
|
continue;
|
|
|
|
|
2009-04-08 17:31:17 +07:00
|
|
|
sysfs_remove_link(&per_cpu(mce_dev, i).kobj, name);
|
2006-06-26 18:58:53 +07:00
|
|
|
per_cpu(threshold_banks, i)[bank] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
deallocate_threshold_block(cpu, bank);
|
|
|
|
|
|
|
|
free_out:
|
x86 MCE: Fix CPU hotplug problem with multiple multicore AMD CPUs
During CPU hot-remove the sysfs directory created by
threshold_create_bank(), defined in
arch/x86/kernel/cpu/mcheck/mce_amd_64.c, has to be removed before
its parent directory, created by mce_create_device(), defined in
arch/x86/kernel/cpu/mcheck/mce_64.c . Moreover, when the CPU in
question is hotplugged again, obviously the latter has to be created
before the former. At present, the right ordering is not enforced,
because all of these operations are carried out by CPU hotplug
notifiers which are not appropriately ordered with respect to each
other. This leads to serious problems on systems with two or more
multicore AMD CPUs, among other things during suspend and hibernation.
Fix the problem by placing threshold bank CPU hotplug callbacks in
mce_cpu_callback(), so that they are invoked at the right places,
if defined. Additionally, use kobject_del() to remove the sysfs
directory associated with the kobject created by
kobject_create_and_add() in threshold_create_bank(), to prevent the
kernel from crashing during CPU hotplug operations on systems with
two or more multicore AMD CPUs.
This patch fixes bug #11337.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Andi Kleen <andi@firstfloor.org>
Tested-by: Mark Langsdorf <mark.langsdorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-08-23 03:23:09 +07:00
|
|
|
kobject_del(b->kobj);
|
2007-12-20 23:13:05 +07:00
|
|
|
kobject_put(b->kobj);
|
2009-01-11 12:58:10 +07:00
|
|
|
free_cpumask_var(b->cpus);
|
2006-06-26 18:58:53 +07:00
|
|
|
kfree(b);
|
|
|
|
per_cpu(threshold_banks, cpu)[bank] = NULL;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
|
2006-07-30 17:03:37 +07:00
|
|
|
static void threshold_remove_device(unsigned int cpu)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
2006-06-26 18:58:56 +07:00
|
|
|
unsigned int bank;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
for (bank = 0; bank < NR_BANKS; ++bank) {
|
2008-01-30 19:33:40 +07:00
|
|
|
if (!(per_cpu(bank_map, cpu) & (1 << bank)))
|
2005-11-05 23:25:53 +07:00
|
|
|
continue;
|
|
|
|
threshold_remove_bank(cpu, bank);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get notified when a cpu comes on/off */
|
2009-04-08 17:31:18 +07:00
|
|
|
static void __cpuinit
|
|
|
|
amd_64_threshold_cpu_callback(unsigned long action, unsigned int cpu)
|
2005-11-05 23:25:53 +07:00
|
|
|
{
|
|
|
|
switch (action) {
|
|
|
|
case CPU_ONLINE:
|
2007-05-09 16:35:10 +07:00
|
|
|
case CPU_ONLINE_FROZEN:
|
2005-11-05 23:25:53 +07:00
|
|
|
threshold_create_device(cpu);
|
|
|
|
break;
|
|
|
|
case CPU_DEAD:
|
2007-05-09 16:35:10 +07:00
|
|
|
case CPU_DEAD_FROZEN:
|
2005-11-05 23:25:53 +07:00
|
|
|
threshold_remove_device(cpu);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static __init int threshold_init_device(void)
|
|
|
|
{
|
2006-06-26 18:58:56 +07:00
|
|
|
unsigned lcpu = 0;
|
2005-11-05 23:25:53 +07:00
|
|
|
|
|
|
|
/* to hit CPUs online before the notifier is up */
|
|
|
|
for_each_online_cpu(lcpu) {
|
2006-06-26 18:58:50 +07:00
|
|
|
int err = threshold_create_device(lcpu);
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2005-11-05 23:25:53 +07:00
|
|
|
if (err)
|
2006-06-26 18:58:50 +07:00
|
|
|
return err;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
x86 MCE: Fix CPU hotplug problem with multiple multicore AMD CPUs
During CPU hot-remove the sysfs directory created by
threshold_create_bank(), defined in
arch/x86/kernel/cpu/mcheck/mce_amd_64.c, has to be removed before
its parent directory, created by mce_create_device(), defined in
arch/x86/kernel/cpu/mcheck/mce_64.c . Moreover, when the CPU in
question is hotplugged again, obviously the latter has to be created
before the former. At present, the right ordering is not enforced,
because all of these operations are carried out by CPU hotplug
notifiers which are not appropriately ordered with respect to each
other. This leads to serious problems on systems with two or more
multicore AMD CPUs, among other things during suspend and hibernation.
Fix the problem by placing threshold bank CPU hotplug callbacks in
mce_cpu_callback(), so that they are invoked at the right places,
if defined. Additionally, use kobject_del() to remove the sysfs
directory associated with the kobject created by
kobject_create_and_add() in threshold_create_bank(), to prevent the
kernel from crashing during CPU hotplug operations on systems with
two or more multicore AMD CPUs.
This patch fixes bug #11337.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Andi Kleen <andi@firstfloor.org>
Tested-by: Mark Langsdorf <mark.langsdorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-08-23 03:23:09 +07:00
|
|
|
threshold_cpu_callback = amd_64_threshold_cpu_callback;
|
2009-04-08 17:31:18 +07:00
|
|
|
|
2006-06-26 18:58:50 +07:00
|
|
|
return 0;
|
2005-11-05 23:25:53 +07:00
|
|
|
}
|
|
|
|
device_initcall(threshold_init_device);
|