x86/mce: Streamline MCE subsystem's naming

PATCH In review Borislav Petkov 4 participants 14 messages Dec 5, 2018 – Dec 18, 2018

Subsystems (3)

x86 EDAC-core x86 MCE infrastructure

lore

Share & tools

lore

Borislav Petkov

author maintainer

2018-12-05 14:13 UTC #0 lore raw

PATCH 1/1 x86/mce: Streamline MCE subsystem's naming

From: Borislav Petkov <[email protected]>

Rename the containing folder to "mce" which is the most widespread name. Drop the "mce[-_]" filename prefix of some compilation units (while others don't have it).

This unifies the file naming in the MCE subsystem:

mce/

|-- amd.c
|-- apei.c
|-- core.c
|-- dev-mcelog.c
|-- genpool.c
|-- inject.c
|-- intel.c
|-- internal.h
|-- Makefile
|-- p5.c
|-- severity.c
|-- therm_throt.c
|-- threshold.c

`-- winchip.c

No functional changes.

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/kernel/cpu/Makefile                           |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/Makefile           | 10 +++++-----
 arch/x86/kernel/cpu/{mcheck/mce_amd.c => mce/amd.c}    |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-apei.c => mce/apei.c}  |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce.c => mce/core.c}       |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/dev-mcelog.c       |  2 +-
 .../kernel/cpu/{mcheck/mce-genpool.c => mce/genpool.c} |  2 +-
 .../kernel/cpu/{mcheck/mce-inject.c => mce/inject.c}   |  2 +-
 .../x86/kernel/cpu/{mcheck/mce_intel.c => mce/intel.c} |  2 +-
 .../cpu/{mcheck/mce-internal.h => mce/internal.h}      |  0
 arch/x86/kernel/cpu/{mcheck => mce}/p5.c               |  0
 .../cpu/{mcheck/mce-severity.c => mce/severity.c}      |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/therm_throt.c      |  0
 arch/x86/kernel/cpu/{mcheck => mce}/threshold.c        |  0
 arch/x86/kernel/cpu/{mcheck => mce}/winchip.c          |  0
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename arch/x86/kernel/cpu/{mcheck => mce}/Makefile (52%)
 rename arch/x86/kernel/cpu/{mcheck/mce_amd.c => mce/amd.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-apei.c => mce/apei.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce.c => mce/core.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/dev-mcelog.c (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-genpool.c => mce/genpool.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-inject.c => mce/inject.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce_intel.c => mce/intel.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck/mce-internal.h => mce/internal.h} (100%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/p5.c (100%)
 rename arch/x86/kernel/cpu/{mcheck/mce-severity.c => mce/severity.c} (99%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/therm_throt.c (100%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/threshold.c (100%)
 rename arch/x86/kernel/cpu/{mcheck => mce}/winchip.c (100%)

arch/x86/kernel/cpu/Makefile +1 -1

index 1f5d2291c31e..43afe707c6fb 100644
@@ -40,7 +40,7 @@ obj-$(CONFIG_INTEL_RDT)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_monitor.o
 obj-$(CONFIG_INTEL_RDT)	+= intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock.o
 CFLAGS_intel_rdt_pseudo_lock.o = -I$(src)
 
-obj-$(CONFIG_X86_MCE)			+= mcheck/
+obj-$(CONFIG_X86_MCE)			+= mce/
 obj-$(CONFIG_MTRR)			+= mtrr/
 obj-$(CONFIG_MICROCODE)			+= microcode/

arch/x86/kernel/cpu/mce/Makefile renamed from arch/x86/kernel/cpu/mcheck/Makefile +5 -5

similarity index 52%
rename from arch/x86/kernel/cpu/mcheck/Makefile
rename to arch/x86/kernel/cpu/mce/Makefile
index bcc7c54c7041..765759765ab7 100644
@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y				=  mce.o mce-severity.o mce-genpool.o
+obj-y				=  core.o severity.o genpool.o
 
 obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
-obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o
-obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd.o
+obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o
+obj-$(CONFIG_X86_MCE_AMD)	+= amd.o
 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
-obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o
+obj-$(CONFIG_X86_MCE_INJECT)	+= inject.o
 
 obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
 
-obj-$(CONFIG_ACPI_APEI)		+= mce-apei.o
+obj-$(CONFIG_ACPI_APEI)		+= apei.o
 
 obj-$(CONFIG_X86_MCELOG_LEGACY)	+= dev-mcelog.o

arch/x86/kernel/cpu/mce/amd.c renamed from arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce_amd.c
rename to arch/x86/kernel/cpu/mce/amd.c
index e12454e21b8a..4a2fb59a372e 100644
@@ -28,7 +28,7 @@
 #include <asm/msr.h>
 #include <asm/trace/irq_vectors.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 #define NR_BLOCKS         5
 #define THRESHOLD_MAX     0xFFF

arch/x86/kernel/cpu/mce/apei.c renamed from arch/x86/kernel/cpu/mcheck/mce-apei.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-apei.c
rename to arch/x86/kernel/cpu/mce/apei.c
index 2eee85379689..1d9b3ce662a0 100644
@@ -36,7 +36,7 @@
 #include <acpi/ghes.h>
 #include <asm/mce.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
 {

arch/x86/kernel/cpu/mce/core.c renamed from arch/x86/kernel/cpu/mcheck/mce.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce.c
rename to arch/x86/kernel/cpu/mce/core.c
index 36d2696c9563..b0ae12cf7827 100644
@@ -52,7 +52,7 @@
 #include <asm/msr.h>
 #include <asm/reboot.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 static DEFINE_MUTEX(mce_log_mutex);

arch/x86/kernel/cpu/mce/dev-mcelog.c renamed from arch/x86/kernel/cpu/mcheck/dev-mcelog.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/dev-mcelog.c
rename to arch/x86/kernel/cpu/mce/dev-mcelog.c
index 27f394ac983f..41d9169d27fa 100644
@@ -15,7 +15,7 @@
 #include <linux/kmod.h>
 #include <linux/poll.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 static BLOCKING_NOTIFIER_HEAD(mce_injector_chain);

arch/x86/kernel/cpu/mce/genpool.c renamed from arch/x86/kernel/cpu/mcheck/mce-genpool.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-genpool.c
rename to arch/x86/kernel/cpu/mce/genpool.c
index 217cd4449bc9..3395549c51d3 100644
@@ -10,7 +10,7 @@
 #include <linux/mm.h>
 #include <linux/genalloc.h>
 #include <linux/llist.h>
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * printk() is not safe in MCE context. This is a lock-less memory allocator

arch/x86/kernel/cpu/mce/inject.c renamed from arch/x86/kernel/cpu/mcheck/mce-inject.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-inject.c
rename to arch/x86/kernel/cpu/mce/inject.c
index 1fc424c40a31..8492ef7d9015 100644
@@ -38,7 +38,7 @@
 #include <asm/nmi.h>
 #include <asm/smp.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Collect all the MCi_XXX settings

arch/x86/kernel/cpu/mce/intel.c renamed from arch/x86/kernel/cpu/mcheck/mce_intel.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce_intel.c
rename to arch/x86/kernel/cpu/mce/intel.c
index d05be307d081..e43eb6732630 100644
@@ -18,7 +18,7 @@
 #include <asm/msr.h>
 #include <asm/mce.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Support for Intel Correct Machine Check Interrupts. This allows

arch/x86/kernel/cpu/mce/internal.h renamed from arch/x86/kernel/cpu/mcheck/mce-internal.h +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/mce-internal.h
rename to arch/x86/kernel/cpu/mce/internal.h

arch/x86/kernel/cpu/mce/p5.c renamed from arch/x86/kernel/cpu/mcheck/p5.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/p5.c
rename to arch/x86/kernel/cpu/mce/p5.c

arch/x86/kernel/cpu/mce/severity.c renamed from arch/x86/kernel/cpu/mcheck/mce-severity.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-severity.c
rename to arch/x86/kernel/cpu/mce/severity.c
index 44396d521987..dc3e26e905a3 100644
@@ -16,7 +16,7 @@
 #include <asm/mce.h>
 #include <linux/uaccess.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Grade an mce by severity. In general the most severe ones are processed

arch/x86/kernel/cpu/mce/therm_throt.c renamed from arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/therm_throt.c
rename to arch/x86/kernel/cpu/mce/therm_throt.c

arch/x86/kernel/cpu/mce/threshold.c renamed from arch/x86/kernel/cpu/mcheck/threshold.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/threshold.c
rename to arch/x86/kernel/cpu/mce/threshold.c

arch/x86/kernel/cpu/mce/winchip.c renamed from arch/x86/kernel/cpu/mcheck/winchip.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/winchip.c
rename to arch/x86/kernel/cpu/mce/winchip.c

Ingo Molnar

Reviewed-by on v1 1/1

2018-12-05 16:30 UTC #1 lore raw

Quoted 22 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>
Rename the containing folder to "mce" which is the most widespread name. Drop the "mce[-_]" filename prefix of some compilation units (while others don't have it).
This unifies the file naming in the MCE subsystem:
mce/
|-- amd.c
|-- apei.c
|-- core.c
|-- dev-mcelog.c
|-- genpool.c
|-- inject.c
|-- intel.c
|-- internal.h
|-- Makefile
|-- p5.c
|-- severity.c
|-- therm_throt.c
|-- threshold.c

Quoted 3 lines

`-- winchip.c
No functional changes.

Cool!

Would it make sense to organize it a bit more and separate out vendor specific functionality:

mce/cpu/intel.c
mce/cpu/intel-p5.c
mce/cpu/amd.c
mce/cpu/winchip.c

mce/internal.h
mce/core.c

mce/genpool.c
mce/threshold.c
mce/severity.c
mce/inject.c
mce/therm_throt.c
mce/dev-mcelog.c
mce/apei.c

This way there's a clear separation between low level, vendor specific MCE logic and higher level MCE logic.

mce/apei.c, if this is an Intel-only feature, could perhaps become mce/cpu/intel-apei.c?

Anyway, your patch is fine too, so whichever subset you decide to use:

Reviewed-by Ingo Molnar <[email protected]>

Thanks,

Ingo

Borislav Petkov

author maintainer

2018-12-05 17:00 UTC #2 lore raw

Quoted 7 lines · Ingo Molnar

Would it make sense to organize it a bit more and separate out vendor specific functionality:
mce/cpu/intel.c
mce/cpu/intel-p5.c
mce/cpu/amd.c
mce/cpu/winchip.c

That's too fine-grained IMO and look at the path we'd get then:

arch/x86/kernel/cpu/mce/cpu/intel.c

		^^^     ^^^

which brings me to something we already talked about: the "kernel" part of the arch/x86/ paths. See this thread:

https://lkml.kernel.org/r/[email protected]

from 2014. We practically agreed there that "kernel/" is redundant as it all is kernel. So maybe we should start moving stuff up into arch/x86/ and then kill kernel/ eventually.

Quoted 5 lines

This way there's a clear separation between low level, vendor specific MCE logic and higher level MCE logic.
mce/apei.c, if this is an Intel-only feature, could perhaps become mce/cpu/intel-apei.c?

Yeah, I think the pile in mce/ is pretty succinct now. We can always separate it more later, if it starts to hurt but right now it is ok, IMO.

Quoted 3 lines

Anyway, your patch is fine too, so whichever subset you decide to use:
Reviewed-by Ingo Molnar <[email protected]>

Thx.

Ingo Molnar

2018-12-05 18:01 UTC #3 lore raw

Quoted 9 lines · Borislav Petkov

Quoted 7 lines · Ingo Molnar
Would it make sense to organize it a bit more and separate out vendor specific functionality:
mce/cpu/intel.c
mce/cpu/intel-p5.c
mce/cpu/amd.c
mce/cpu/winchip.c

Quoted 4 lines

That's too fine-grained IMO and look at the path we'd get then:
arch/x86/kernel/cpu/mce/cpu/intel.c
		^^^     ^^^

Oh - I thought we'd have arch/x86/mce/ or so?

There's machine check events that are not tied to any particular CPU, correct? So this would be the right conceptual level - and it would also remove the somewhat redundant 'kernel' part.

Thanks,

Ingo

Borislav Petkov

author maintainer

2018-12-05 19:03 UTC #4 lore raw

Quoted 5 lines · Ingo Molnar

Oh - I thought we'd have arch/x86/mce/ or so?
There's machine check events that are not tied to any particular CPU, correct? So this would be the right conceptual level - and it would also remove the somewhat redundant 'kernel' part.

Well, all the MCE events reported are some way or the other tied to the CPU and they're reported in the CPU's MCA banks so I think we want

	arch/x86/cpu/mce/

Ingo Molnar

2018-12-06 16:27 UTC #5 lore raw

Quoted 11 lines · Borislav Petkov

Quoted 5 lines · Ingo Molnar
Oh - I thought we'd have arch/x86/mce/ or so?
There's machine check events that are not tied to any particular CPU, correct? So this would be the right conceptual level - and it would also remove the somewhat redundant 'kernel' part.
Well, all the MCE events reported are some way or the other tied to the CPU and they're reported in the CPU's MCA banks so I think we want
	arch/x86/cpu/mce/

Well, *everything* the kernel does is in some way connected to a CPU, because we always execute the kernel on a CPU, still we have things like discrete PMUs and abstractions for other pieces of hardware that are not per CPU.

So the real question is, is there a signifcant class of MCE events that are not tied to the reporting channel which is per CPU (-ish ...) MCA banks?

Thanks,

Ingo

Luck, Tony

maintainer

2018-12-06 17:36 UTC #6 lore raw

Quoted 3 lines

So the real question is, is there a signifcant class of MCE events that are not tied to the reporting channel which is per CPU (-ish ...) MCA banks?

Perhaps QPI/UPI interconnect errors?

-Tony

Borislav Petkov

author maintainer

2018-12-06 18:05 UTC #7 lore raw

Quoted 5 lines · Tony

Quoted 3 lines
So the real question is, is there a signifcant class of MCE events that are not tied to the reporting channel which is per CPU (-ish ...) MCA banks?
Perhaps QPI/UPI interconnect errors?

Whatever, this is pure bikeshedding what we're doing right now. All the errors are reported through the CPU's MCA banks and the argument whether an error class which is maybe not really tied to the CPU, should dictate which path to put the files in, does not make any sense to me.

The only argument which makes sense IMO is whether the path should be short. :-)

And both

arch/x86/cpu/mce/
arch/x86/mce/

are short enough to me.

Now, the real question is, how do we want to place the rest of the files/folders so that we can get rid of deeper directory structures.

If we say, we don't want to have .../cpu/... and put everything in arch/x86/ then this answers the above question too.

IMO, of course.

Luck, Tony

maintainer Acked-by on v1 1/1

2018-12-05 16:57 UTC #8 lore raw

In reply to Borislav Petkov

Quoted 22 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>
Rename the containing folder to "mce" which is the most widespread name. Drop the "mce[-_]" filename prefix of some compilation units (while others don't have it).
This unifies the file naming in the MCE subsystem:
mce/
|-- amd.c
|-- apei.c
|-- core.c
|-- dev-mcelog.c
|-- genpool.c
|-- inject.c
|-- intel.c
|-- internal.h
|-- Makefile
|-- p5.c
|-- severity.c
|-- therm_throt.c
|-- threshold.c

Quoted 5 lines

`-- winchip.c
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>

Acked-by Tony Luck <[email protected]>

Borislav Petkov

author maintainer

2018-12-05 20:09 UTC #9 lore raw

PATCH 1/1 x86/mce: Unify pr_* prefix

Quoted 1 line · Tony

Acked-by Tony Luck <[email protected]>

One more thing we need to do ontop, otherwise the prefix changes:

-mce: CPU supports 23 MCE banks
+core: CPU supports 23 MCE banks
---
Move the pr_fmt prefix to internal.h and include it everywhere. This way, all pr_* printed strings will be prepended with "mce: ".

No functional changes.

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/kernel/cpu/mce/core.c        | 2 --
 arch/x86/kernel/cpu/mce/dev-mcelog.c  | 2 --
 arch/x86/kernel/cpu/mce/internal.h    | 3 +++
 arch/x86/kernel/cpu/mce/p5.c          | 2 ++
 arch/x86/kernel/cpu/mce/therm_throt.c | 2 ++
 arch/x86/kernel/cpu/mce/threshold.c   | 2 ++
 arch/x86/kernel/cpu/mce/winchip.c     | 2 ++
 7 files changed, 11 insertions(+), 4 deletions(-)

arch/x86/kernel/cpu/mce/core.c +0 -2

index b0ae12cf7827..ad8f62a0c706 100644
@@ -8,8 +8,6 @@
  * Author: Andi Kleen
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/thread_info.h>
 #include <linux/capability.h>
 #include <linux/miscdevice.h>

arch/x86/kernel/cpu/mce/dev-mcelog.c +0 -2

index 41d9169d27fa..9690ec5c8051 100644
@@ -8,8 +8,6 @@
  * Author: Andi Kleen
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>

arch/x86/kernel/cpu/mce/internal.h +3 -0

index ceb67cd5918f..af5eab1e65e2 100644
@@ -2,6 +2,9 @@
 #ifndef __X86_MCE_INTERNAL_H__
 #define __X86_MCE_INTERNAL_H__
 
+#undef pr_fmt
+#define pr_fmt(fmt) "mce: " fmt
+
 #include <linux/device.h>
 #include <asm/mce.h>

arch/x86/kernel/cpu/mce/p5.c +2 -0

index 5cddf831720f..4ae6df556526 100644
@@ -14,6 +14,8 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 
+#include "internal.h"
+
 /* By default disabled */
 int mce_p5_enabled __read_mostly;

arch/x86/kernel/cpu/mce/therm_throt.c +2 -0

index 2da67b70ba98..df01ff8513a5 100644
@@ -30,6 +30,8 @@
 #include <asm/msr.h>
 #include <asm/trace/irq_vectors.h>
 
+#include "internal.h"
+
 /* How long to wait between reporting thermal events */
 #define CHECK_INTERVAL		(300 * HZ)

arch/x86/kernel/cpu/mce/threshold.c +2 -0

index 2b584b319eff..10586a85c23f 100644
@@ -10,6 +10,8 @@
 #include <asm/mce.h>
 #include <asm/trace/irq_vectors.h>
 
+#include "internal.h"
+
 static void default_threshold_interrupt(void)
 {
 	pr_err("Unexpected threshold interrupt at vector %x\n",

arch/x86/kernel/cpu/mce/winchip.c +2 -0

index 3b45b270a865..a30ea13cccc2 100644
@@ -13,6 +13,8 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 
+#include "internal.h"
+
 /* Machine check handler for WinChip C6: */
 static void winchip_machine_check(struct pt_regs *regs, long error_code)
 {

tip-bot for Borislav Petkov

merge bot

2018-12-11 13:31 UTC #10 lore raw

[tip:ras/core] x86/mce: Unify pr_* prefix

x86/mce: Unify pr_* prefix

Commit-ID:  3bfaf95cb1fe81872df884956c704469e68a5bee
Gitweb:     https://git.kernel.org/tip/3bfaf95cb1fe81872df884956c704469e68a5bee
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 5 Dec 2018 21:05:13 +0100
Committer:  Borislav Petkov <[email protected]>
CommitDate: Thu, 6 Dec 2018 12:04:52 +0100

x86/mce: Unify pr_* prefix

Move the pr_fmt prefix to internal.h and include it everywhere. This way, all pr_* printed strings will be prepended with "mce: ".

No functional changes.

Signed-off-by Borislav Petkov <[email protected]>

Cc Tony Luck <[email protected]>

Link https://lkml.kernel.org/r/[email protected] open here

---
 arch/x86/kernel/cpu/mce/core.c        | 2 --
 arch/x86/kernel/cpu/mce/dev-mcelog.c  | 2 --
 arch/x86/kernel/cpu/mce/internal.h    | 3 +++
 arch/x86/kernel/cpu/mce/p5.c          | 2 ++
 arch/x86/kernel/cpu/mce/therm_throt.c | 2 ++
 arch/x86/kernel/cpu/mce/threshold.c   | 2 ++
 arch/x86/kernel/cpu/mce/winchip.c     | 2 ++
 7 files changed, 11 insertions(+), 4 deletions(-)

arch/x86/kernel/cpu/mce/core.c +0 -2

index b0ae12cf7827..ad8f62a0c706 100644
@@ -8,8 +8,6 @@
  * Author: Andi Kleen
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/thread_info.h>
 #include <linux/capability.h>
 #include <linux/miscdevice.h>

arch/x86/kernel/cpu/mce/dev-mcelog.c +0 -2

index 41d9169d27fa..9690ec5c8051 100644
@@ -8,8 +8,6 @@
  * Author: Andi Kleen
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>

arch/x86/kernel/cpu/mce/internal.h +3 -0

index ceb67cd5918f..af5eab1e65e2 100644
@@ -2,6 +2,9 @@
 #ifndef __X86_MCE_INTERNAL_H__
 #define __X86_MCE_INTERNAL_H__
 
+#undef pr_fmt
+#define pr_fmt(fmt) "mce: " fmt
+
 #include <linux/device.h>
 #include <asm/mce.h>

arch/x86/kernel/cpu/mce/p5.c +2 -0

index 5cddf831720f..4ae6df556526 100644
@@ -14,6 +14,8 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 
+#include "internal.h"
+
 /* By default disabled */
 int mce_p5_enabled __read_mostly;

arch/x86/kernel/cpu/mce/therm_throt.c +2 -0

index 2da67b70ba98..df01ff8513a5 100644
@@ -30,6 +30,8 @@
 #include <asm/msr.h>
 #include <asm/trace/irq_vectors.h>
 
+#include "internal.h"
+
 /* How long to wait between reporting thermal events */
 #define CHECK_INTERVAL		(300 * HZ)

arch/x86/kernel/cpu/mce/threshold.c +2 -0

index 2b584b319eff..10586a85c23f 100644
@@ -10,6 +10,8 @@
 #include <asm/mce.h>
 #include <asm/trace/irq_vectors.h>
 
+#include "internal.h"
+
 static void default_threshold_interrupt(void)
 {
 	pr_err("Unexpected threshold interrupt at vector %x\n",

arch/x86/kernel/cpu/mce/winchip.c +2 -0

index 3b45b270a865..a30ea13cccc2 100644
@@ -13,6 +13,8 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 
+#include "internal.h"
+
 /* Machine check handler for WinChip C6: */
 static void winchip_machine_check(struct pt_regs *regs, long error_code)
 {

Borislav Petkov

author maintainer

2018-12-18 18:25 UTC #11 lore raw

PATCH 1/1 x86/mce: Restore MCE injector's module name

In reply to Luck, Tony

Aaand one more fix ontop... Yeah, renames are nasty. :-\
---
From: Borislav Petkov <[email protected]>

It was mce-inject.ko but it turned into inject.ko since the containing source file got renamed. Restore it.

Cc Tony Luck <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/kernel/cpu/mce/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

arch/x86/kernel/cpu/mce/Makefile +3 -1

index 765759765ab7..9f020c994154 100644
@@ -5,7 +5,9 @@ obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
 obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o
 obj-$(CONFIG_X86_MCE_AMD)	+= amd.o
 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
-obj-$(CONFIG_X86_MCE_INJECT)	+= inject.o
+
+mce-inject-y			:= inject.o
+obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o
 
 obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o

tip-bot for Borislav Petkov

merge bot

2018-12-18 23:09 UTC #12 lore raw

[tip:ras/core] x86/mce: Restore MCE injector's module name

x86/mce: Restore MCE injector's module name

Commit-ID:  72a8f089c382c078f8c7c1c759cb726de80d4284
Gitweb:     https://git.kernel.org/tip/72a8f089c382c078f8c7c1c759cb726de80d4284
Author:     Borislav Petkov <[email protected]>
AuthorDate: Tue, 18 Dec 2018 19:25:46 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 19 Dec 2018 00:04:36 +0100

x86/mce: Restore MCE injector's module name

It was mce-inject.ko but it turned into inject.ko since the containing source file got renamed. Restore it.

Fixes 21afaf181362 ("x86/mce: Streamline MCE subsystem's naming")

Signed-off-by Borislav Petkov <[email protected]>

Signed-off-by Thomas Gleixner <[email protected]>

Cc linux-edac <[email protected]>

Cc Tony Luck <[email protected]>

Link https://lkml.kernel.org/r/[email protected] open here

---
 arch/x86/kernel/cpu/mce/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

arch/x86/kernel/cpu/mce/Makefile +3 -1

index 765759765ab7..9f020c994154 100644
@@ -5,7 +5,9 @@ obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
 obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o
 obj-$(CONFIG_X86_MCE_AMD)	+= amd.o
 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
-obj-$(CONFIG_X86_MCE_INJECT)	+= inject.o
+
+mce-inject-y			:= inject.o
+obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o
 
 obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o

tip-bot for Borislav Petkov

merge bot

2018-12-11 13:31 UTC #13 lore raw

In reply to Borislav Petkov

x86/mce: Streamline MCE subsystem's naming

Commit-ID:  21afaf181362b4aeb5be72705d2914673b336149
Gitweb:     https://git.kernel.org/tip/21afaf181362b4aeb5be72705d2914673b336149
Author:     Borislav Petkov <[email protected]>
AuthorDate: Sun, 18 Nov 2018 15:15:05 +0100
Committer:  Borislav Petkov <[email protected]>
CommitDate: Wed, 5 Dec 2018 18:00:29 +0100

x86/mce: Streamline MCE subsystem's naming

Rename the containing folder to "mce" which is the most widespread name. Drop the "mce[-_]" filename prefix of some compilation units (while others don't have it).

This unifies the file naming in the MCE subsystem:

mce/

|-- amd.c
|-- apei.c
|-- core.c
|-- dev-mcelog.c
|-- genpool.c
|-- inject.c
|-- intel.c
|-- internal.h
|-- Makefile
|-- p5.c
|-- severity.c
|-- therm_throt.c
|-- threshold.c

`-- winchip.c

No functional changes.

Signed-off-by Borislav Petkov <[email protected]>

Reviewed-by Ingo Molnar <[email protected]>

Acked-by Tony Luck <[email protected]>

Link https://lkml.kernel.org/r/[email protected] open here

---
 arch/x86/kernel/cpu/Makefile                                  |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/Makefile                  | 10 +++++-----
 arch/x86/kernel/cpu/{mcheck/mce_amd.c => mce/amd.c}           |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-apei.c => mce/apei.c}         |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce.c => mce/core.c}              |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/dev-mcelog.c              |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-genpool.c => mce/genpool.c}   |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-inject.c => mce/inject.c}     |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce_intel.c => mce/intel.c}       |  2 +-
 arch/x86/kernel/cpu/{mcheck/mce-internal.h => mce/internal.h} |  0
 arch/x86/kernel/cpu/{mcheck => mce}/p5.c                      |  0
 arch/x86/kernel/cpu/{mcheck/mce-severity.c => mce/severity.c} |  2 +-
 arch/x86/kernel/cpu/{mcheck => mce}/therm_throt.c             |  0
 arch/x86/kernel/cpu/{mcheck => mce}/threshold.c               |  0
 arch/x86/kernel/cpu/{mcheck => mce}/winchip.c                 |  0
 15 files changed, 14 insertions(+), 14 deletions(-)

arch/x86/kernel/cpu/Makefile +1 -1

index 1f5d2291c31e..43afe707c6fb 100644
@@ -40,7 +40,7 @@ obj-$(CONFIG_INTEL_RDT)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_monitor.o
 obj-$(CONFIG_INTEL_RDT)	+= intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock.o
 CFLAGS_intel_rdt_pseudo_lock.o = -I$(src)
 
-obj-$(CONFIG_X86_MCE)			+= mcheck/
+obj-$(CONFIG_X86_MCE)			+= mce/
 obj-$(CONFIG_MTRR)			+= mtrr/
 obj-$(CONFIG_MICROCODE)			+= microcode/

arch/x86/kernel/cpu/mce/Makefile renamed from arch/x86/kernel/cpu/mcheck/Makefile +5 -5

similarity index 52%
rename from arch/x86/kernel/cpu/mcheck/Makefile
rename to arch/x86/kernel/cpu/mce/Makefile
index bcc7c54c7041..765759765ab7 100644
@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y				=  mce.o mce-severity.o mce-genpool.o
+obj-y				=  core.o severity.o genpool.o
 
 obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
-obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o
-obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd.o
+obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o
+obj-$(CONFIG_X86_MCE_AMD)	+= amd.o
 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
-obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o
+obj-$(CONFIG_X86_MCE_INJECT)	+= inject.o
 
 obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
 
-obj-$(CONFIG_ACPI_APEI)		+= mce-apei.o
+obj-$(CONFIG_ACPI_APEI)		+= apei.o
 
 obj-$(CONFIG_X86_MCELOG_LEGACY)	+= dev-mcelog.o

arch/x86/kernel/cpu/mce/amd.c renamed from arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce_amd.c
rename to arch/x86/kernel/cpu/mce/amd.c
index e12454e21b8a..4a2fb59a372e 100644
@@ -28,7 +28,7 @@
 #include <asm/msr.h>
 #include <asm/trace/irq_vectors.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 #define NR_BLOCKS         5
 #define THRESHOLD_MAX     0xFFF

arch/x86/kernel/cpu/mce/apei.c renamed from arch/x86/kernel/cpu/mcheck/mce-apei.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-apei.c
rename to arch/x86/kernel/cpu/mce/apei.c
index 2eee85379689..1d9b3ce662a0 100644
@@ -36,7 +36,7 @@
 #include <acpi/ghes.h>
 #include <asm/mce.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
 {

arch/x86/kernel/cpu/mce/core.c renamed from arch/x86/kernel/cpu/mcheck/mce.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce.c
rename to arch/x86/kernel/cpu/mce/core.c
index 36d2696c9563..b0ae12cf7827 100644
@@ -52,7 +52,7 @@
 #include <asm/msr.h>
 #include <asm/reboot.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 static DEFINE_MUTEX(mce_log_mutex);

arch/x86/kernel/cpu/mce/dev-mcelog.c renamed from arch/x86/kernel/cpu/mcheck/dev-mcelog.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/dev-mcelog.c
rename to arch/x86/kernel/cpu/mce/dev-mcelog.c
index 27f394ac983f..41d9169d27fa 100644
@@ -15,7 +15,7 @@
 #include <linux/kmod.h>
 #include <linux/poll.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 static BLOCKING_NOTIFIER_HEAD(mce_injector_chain);

arch/x86/kernel/cpu/mce/genpool.c renamed from arch/x86/kernel/cpu/mcheck/mce-genpool.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-genpool.c
rename to arch/x86/kernel/cpu/mce/genpool.c
index 217cd4449bc9..3395549c51d3 100644
@@ -10,7 +10,7 @@
 #include <linux/mm.h>
 #include <linux/genalloc.h>
 #include <linux/llist.h>
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * printk() is not safe in MCE context. This is a lock-less memory allocator

arch/x86/kernel/cpu/mce/inject.c renamed from arch/x86/kernel/cpu/mcheck/mce-inject.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-inject.c
rename to arch/x86/kernel/cpu/mce/inject.c
index 1fc424c40a31..8492ef7d9015 100644
@@ -38,7 +38,7 @@
 #include <asm/nmi.h>
 #include <asm/smp.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Collect all the MCi_XXX settings

arch/x86/kernel/cpu/mce/intel.c renamed from arch/x86/kernel/cpu/mcheck/mce_intel.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce_intel.c
rename to arch/x86/kernel/cpu/mce/intel.c
index d05be307d081..e43eb6732630 100644
@@ -18,7 +18,7 @@
 #include <asm/msr.h>
 #include <asm/mce.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Support for Intel Correct Machine Check Interrupts. This allows

arch/x86/kernel/cpu/mce/internal.h renamed from arch/x86/kernel/cpu/mcheck/mce-internal.h +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/mce-internal.h
rename to arch/x86/kernel/cpu/mce/internal.h

arch/x86/kernel/cpu/mce/p5.c renamed from arch/x86/kernel/cpu/mcheck/p5.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/p5.c
rename to arch/x86/kernel/cpu/mce/p5.c

arch/x86/kernel/cpu/mce/severity.c renamed from arch/x86/kernel/cpu/mcheck/mce-severity.c +1 -1

similarity index 99%
rename from arch/x86/kernel/cpu/mcheck/mce-severity.c
rename to arch/x86/kernel/cpu/mce/severity.c
index 44396d521987..dc3e26e905a3 100644
@@ -16,7 +16,7 @@
 #include <asm/mce.h>
 #include <linux/uaccess.h>
 
-#include "mce-internal.h"
+#include "internal.h"
 
 /*
  * Grade an mce by severity. In general the most severe ones are processed

arch/x86/kernel/cpu/mce/therm_throt.c renamed from arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/therm_throt.c
rename to arch/x86/kernel/cpu/mce/therm_throt.c

arch/x86/kernel/cpu/mce/threshold.c renamed from arch/x86/kernel/cpu/mcheck/threshold.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/threshold.c
rename to arch/x86/kernel/cpu/mce/threshold.c

arch/x86/kernel/cpu/mce/winchip.c renamed from arch/x86/kernel/cpu/mcheck/winchip.c +0 -0

similarity index 100%
rename from arch/x86/kernel/cpu/mcheck/winchip.c
rename to arch/x86/kernel/cpu/mce/winchip.c