Skip to contentSkip to conversation

x86: cpu_debug.c prepare report if files are less or more then expected

PATCH In review Jaswinder Singh Rajput 2 participants 4 messages Apr 14, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: cpu_debug.c prepare report if files are less or more then expected

This will prepare the report to update cpu_debug

---
 arch/x86/include/asm/cpu_debug.h |    1 +
 arch/x86/kernel/cpu/cpu_debug.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpu_debug.h +1 -0
index 2228020..b64da5d 100644
@@ -187,6 +187,7 @@ enum cpu_processor_bit {
 #define	CPU_ALL			(CPU_INTEL_ALL | CPU_AMD_ALL)
 
 #define MAX_CPU_FILES		512
+#define MIN_CPU_FILES		10
 
 struct cpu_private {
 	unsigned		cpu;
arch/x86/kernel/cpu/cpu_debug.c +12 -0
index 46e29ab..1c3ebd4 100644
@@ -838,6 +838,14 @@ static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
 	return err;
 }
 
+/* Send Report to maintainer if files are less or more then expected */ 
+static void send_report(int files, struct cpuinfo_x86 *cpui)
+{
+	pr_info("Please report \"cpu_debug files %d for %x:%x:%x:%x\" to"
+		" [email protected]\n", files, cpui->x86_vendor,
+		cpui->x86, cpui->x86_model, cpui->x86_mask);
+}
+
 static int cpu_init_cpu(void)
 {
 	struct dentry *cpu_dentry = NULL;
@@ -861,9 +869,13 @@ static int cpu_init_cpu(void)
 
 		pr_info("cpu%d(%d) debug files %d\n",
 			cpu, nr_cpu_ids, per_cpu(cpu_priv_count, cpu));
+		if ((per_cpu(cpu_priv_count, cpu) < MIN_CPU_FILES) && !cpu)
+			send_report(per_cpu(cpu_priv_count, cpu), cpui);
+
 		if (per_cpu(cpu_priv_count, cpu) > MAX_CPU_FILES) {
 			pr_err("Register files count %d exceeds limit %d\n",
 				per_cpu(cpu_priv_count, cpu), MAX_CPU_FILES);
+			send_report(per_cpu(cpu_priv_count, cpu), cpui);
 			per_cpu(cpu_priv_count, cpu) = MAX_CPU_FILES;
 			err = -ENFILE;
 		}
Signature · 1 line
1.6.0.6
#1 lore raw
Quoted 25 lines · Jaswinder Singh Rajput

This will prepare the report to update cpu_debug

---
 arch/x86/include/asm/cpu_debug.h |    1 +
 arch/x86/kernel/cpu/cpu_debug.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpu_debug.h +1 -0
index 2228020..b64da5d 100644
@@ -187,6 +187,7 @@ enum cpu_processor_bit {
 #define	CPU_ALL			(CPU_INTEL_ALL | CPU_AMD_ALL)
 
 #define MAX_CPU_FILES		512
+#define MIN_CPU_FILES		10
 
 struct cpu_private {
 	unsigned		cpu;
arch/x86/kernel/cpu/cpu_debug.c +0 -0
index 46e29ab..1c3ebd4 100644

arch/x86/kernel/cpu/cpu_debug.c static int cpu_init_allreg(unsigned cpu, struct dentry *dentry) · line 846

Quoted 9 lines
arch/x86/kernel/cpu/cpu_debug.c +6 -0
@@ -838,6 +838,14 @@ static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
 	return err;
 }
 
+/* Send Report to maintainer if files are less or more then expected */ 
+static void send_report(int files, struct cpuinfo_x86 *cpui)
+{
+	pr_info("Please report \"cpu_debug files %d for %x:%x:%x:%x\" to"
+		" [email protected]\n", files, cpui->x86_vendor,
+		cpui->x86, cpui->x86_model, cpui->x86_mask);

i'd rather see this reported to [email protected], plus please use a WARN_ONCE() instead of a pr_info(). Hitting this is a bug we want to fix.

Ingo

#2 lore raw
Quoted 30 lines · Ingo Molnar
Quoted 28 lines · Jaswinder Singh Rajput

This will prepare the report to update cpu_debug

---
 arch/x86/include/asm/cpu_debug.h |    1 +
 arch/x86/kernel/cpu/cpu_debug.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpu_debug.h +1 -0
index 2228020..b64da5d 100644
@@ -187,6 +187,7 @@ enum cpu_processor_bit {
 #define	CPU_ALL			(CPU_INTEL_ALL | CPU_AMD_ALL)
 
 #define MAX_CPU_FILES		512
+#define MIN_CPU_FILES		10
 
 struct cpu_private {
 	unsigned		cpu;
arch/x86/kernel/cpu/cpu_debug.c +0 -0
index 46e29ab..1c3ebd4 100644
@@ -838,6 +838,14 @@ static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
 	return err;
 }
 
Quoted 11 lines

arch/x86/kernel/cpu/cpu_debug.c static int cpu_init_allreg(unsigned cpu, struct dentry *dentry) · line 846

Quoted 6 lines
arch/x86/kernel/cpu/cpu_debug.c +6 -0
+/* Send Report to maintainer if files are less or more then expected */ 
+static void send_report(int files, struct cpuinfo_x86 *cpui)
+{
+	pr_info("Please report \"cpu_debug files %d for %x:%x:%x:%x\" to"
+		" [email protected]\n", files, cpui->x86_vendor,
+		cpui->x86, cpui->x86_model, cpui->x86_mask);

i'd rather see this reported to [email protected], plus please use a WARN_ONCE() instead of a pr_info(). Hitting this is a bug we want to fix.

Subject: [PATCH] x86: cpu_debug.c prepare report if files are less or more then expected

This will prepare the report to update cpu_debug

---
 arch/x86/include/asm/cpu_debug.h |    1 +
 arch/x86/kernel/cpu/cpu_debug.c  |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpu_debug.h +1 -0
index 2228020..b64da5d 100644
@@ -187,6 +187,7 @@ enum cpu_processor_bit {
 #define	CPU_ALL			(CPU_INTEL_ALL | CPU_AMD_ALL)
 
 #define MAX_CPU_FILES		512
+#define MIN_CPU_FILES		10
 
 struct cpu_private {
 	unsigned		cpu;
arch/x86/kernel/cpu/cpu_debug.c +14 -0
index 46e29ab..71e7f57 100644
@@ -30,6 +30,8 @@
 #include <asm/apic.h>
 #include <asm/desc.h>
 
+#define EMAIL	"<[email protected]>, <[email protected]>"
+
 static DEFINE_PER_CPU(struct cpu_cpuX_base, cpu_arr[CPU_REG_ALL_BIT]);
 static DEFINE_PER_CPU(struct cpu_private *, priv_arr[MAX_CPU_FILES]);
 static DEFINE_PER_CPU(unsigned, cpu_modelflag);
@@ -838,6 +840,14 @@ static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
 	return err;
 }
 
+/* Prepare report for LKML and maintainer if files count are inappropriate */
+static void send_report(int files, struct cpuinfo_x86 *cpui)
+{
+	WARN_ONCE(1, "Please report \"cpu_debug files %d for %x:%x:%x:%x\" to"
+		  " %s\n", files, cpui->x86_vendor, cpui->x86, cpui->x86_model,
+		  cpui->x86_mask, EMAIL);
+}
+
 static int cpu_init_cpu(void)
 {
 	struct dentry *cpu_dentry = NULL;
@@ -861,9 +871,13 @@ static int cpu_init_cpu(void)
 
 		pr_info("cpu%d(%d) debug files %d\n",
 			cpu, nr_cpu_ids, per_cpu(cpu_priv_count, cpu));
+		if ((per_cpu(cpu_priv_count, cpu) < MIN_CPU_FILES))
+			send_report(per_cpu(cpu_priv_count, cpu), cpui);
+
 		if (per_cpu(cpu_priv_count, cpu) > MAX_CPU_FILES) {
 			pr_err("Register files count %d exceeds limit %d\n",
 				per_cpu(cpu_priv_count, cpu), MAX_CPU_FILES);
+			send_report(per_cpu(cpu_priv_count, cpu), cpui);
 			per_cpu(cpu_priv_count, cpu) = MAX_CPU_FILES;
 			err = -ENFILE;
 		}
Signature · 1 line
1.6.0.6
#3 lore raw
Quoted 43 lines · Jaswinder Singh Rajput
Quoted 30 lines · Ingo Molnar
Quoted 28 lines · Jaswinder Singh Rajput

This will prepare the report to update cpu_debug

---
 arch/x86/include/asm/cpu_debug.h |    1 +
 arch/x86/kernel/cpu/cpu_debug.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
arch/x86/include/asm/cpu_debug.h +1 -0
index 2228020..b64da5d 100644
@@ -187,6 +187,7 @@ enum cpu_processor_bit {
 #define	CPU_ALL			(CPU_INTEL_ALL | CPU_AMD_ALL)
 
 #define MAX_CPU_FILES		512
+#define MIN_CPU_FILES		10
 
 struct cpu_private {
 	unsigned		cpu;
arch/x86/kernel/cpu/cpu_debug.c +0 -0
index 46e29ab..1c3ebd4 100644
@@ -838,6 +838,14 @@ static int cpu_init_allreg(unsigned cpu, struct dentry *dentry)
 	return err;
 }
 
Quoted 11 lines

arch/x86/kernel/cpu/cpu_debug.c static int cpu_init_allreg(unsigned cpu, struct dentry *dentry) · line 846

Quoted 6 lines
arch/x86/kernel/cpu/cpu_debug.c +6 -0
+/* Send Report to maintainer if files are less or more then expected */ 
+static void send_report(int files, struct cpuinfo_x86 *cpui)
+{
+	pr_info("Please report \"cpu_debug files %d for %x:%x:%x:%x\" to"
+		" [email protected]\n", files, cpui->x86_vendor,
+		cpui->x86, cpui->x86_model, cpui->x86_mask);

i'd rather see this reported to [email protected], plus please use a WARN_ONCE() instead of a pr_info(). Hitting this is a bug we want to fix.

Quoted 6 lines

Subject: [PATCH] x86: cpu_debug.c prepare report if files are less or more then expected

This will prepare the report to update cpu_debug

---

I send better version of this patch:
[PATCH -tip] x86: cpu_debug.c prepare report if files are inappropriate or CPU is not supported

Thanks,

--
JSR