Skip to contentSkip to conversation

x86/MCE, xen/mcelog: Make /dev/mcelog registration messages more precise

PATCH In review Borislav Petkov 2 participants 3 messages Jun 20, 2017 – Jun 21, 2017

Subsystems (3)
lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/MCE, xen/mcelog: Make /dev/mcelog registration messages more precise

From: Juergen Gross <[email protected]>

When running under Xen as dom0, /dev/mcelog is being provided by Xen instead of the normal mcelog character device of the MCE core. Convert an error message being issued by the MCE core in this case to an informative message that Xen has registered the device.

---
 arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 8 +++++++-
 drivers/xen/mcelog.c                    | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mcheck/dev-mcelog.c +7 -1
index a80427c30c93..10cec43aac38 100644
@@ -415,9 +415,15 @@ static __init int dev_mcelog_init_device(void)
 	/* register character device /dev/mcelog */
 	err = misc_register(&mce_chrdev_device);
 	if (err) {
-		pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+		if (err == -EBUSY)
+			/* Xen dom0 might have registered the device already. */
+			pr_info("Unable to init device /dev/mcelog, already registered");
+		else
+			pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+
 		return err;
 	}
+
 	mce_register_decode_chain(&dev_mcelog_nb);
 	return 0;
 }
drivers/xen/mcelog.c +2 -0
index a493c7315e94..6cc1c15bcd84 100644
@@ -408,6 +408,8 @@ static int __init xen_late_init_mcelog(void)
 	if (ret)
 		goto deregister;
 
+	pr_info("/dev/mcelog registered by Xen\n");
+
 	return 0;
 
 deregister:
Reviewed-by on v1 1/1
#1 lore raw

Borislav,

How about skipping the misc_register() steps and keep silence if
you know it is running as Dom0 ? as it is easy to know.

Quoted 55 lines · Borislav Petkov

From: Juergen Gross <[email protected]>

When running under Xen as dom0, /dev/mcelog is being provided by Xen instead of the normal mcelog character device of the MCE core. Convert an error message being issued by the MCE core in this case to an informative message that Xen has registered the device.

---
 arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 8 +++++++-
 drivers/xen/mcelog.c                    | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mcheck/dev-mcelog.c +7 -1
index a80427c30c93..10cec43aac38 100644
@@ -415,9 +415,15 @@ static __init int dev_mcelog_init_device(void)
        /* register character device /dev/mcelog */
        err = misc_register(&mce_chrdev_device);
        if (err) {
-               pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+               if (err == -EBUSY)
+                       /* Xen dom0 might have registered the device already. */
+                       pr_info("Unable to init device /dev/mcelog, already registered");
+               else
+                       pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+
                return err;
        }
+
        mce_register_decode_chain(&dev_mcelog_nb);
        return 0;
 }
drivers/xen/mcelog.c +2 -1
index a493c7315e94..6cc1c15bcd84 100644
@@ -408,6 +408,8 @@ static int __init xen_late_init_mcelog(void)
        if (ret)
                goto deregister;
 
+       pr_info("/dev/mcelog registered by Xen\n");
+
        return 0;
 
 deregister:
--
Quoted 2 lines

2.13.0

---
To unsubscribe from this list: send the line "unsubscribe linux-edac" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by on v1 1/1
#2 lore raw
In reply to Borislav Petkov

Borislav,

How about skipping the misc_register() steps and keep silence if
you know it is running as Dom0 ? as it is easy to know.

Quoted 55 lines · Borislav Petkov

From: Juergen Gross <[email protected]>

When running under Xen as dom0, /dev/mcelog is being provided by Xen instead of the normal mcelog character device of the MCE core. Convert an error message being issued by the MCE core in this case to an informative message that Xen has registered the device.

---
 arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 8 +++++++-
 drivers/xen/mcelog.c                    | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mcheck/dev-mcelog.c +7 -1
index a80427c30c93..10cec43aac38 100644
@@ -415,9 +415,15 @@ static __init int dev_mcelog_init_device(void)
        /* register character device /dev/mcelog */
        err = misc_register(&mce_chrdev_device);
        if (err) {
-               pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+               if (err == -EBUSY)
+                       /* Xen dom0 might have registered the device already. */
+                       pr_info("Unable to init device /dev/mcelog, already registered");
+               else
+                       pr_err("Unable to init device /dev/mcelog (rc: %d)\n", err);
+
                return err;
        }
+
        mce_register_decode_chain(&dev_mcelog_nb);
        return 0;
 }
drivers/xen/mcelog.c +2 -1
index a493c7315e94..6cc1c15bcd84 100644
@@ -408,6 +408,8 @@ static int __init xen_late_init_mcelog(void)
        if (ret)
                goto deregister;
 
+       pr_info("/dev/mcelog registered by Xen\n");
+
        return 0;
 
 deregister:
--
Quoted 2 lines

2.13.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel