Skip to contentSkip to conversation

x86/mce: Dynamically size space for machine check records

PATCH Superseded Tony Luck 3 participants 4 messages Mar 7, 2024

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tony Luck

author maintainer
#0 lore raw

PATCH v2 1/1 x86/mce: Dynamically size space for machine check records

Systems with a large number of CPUs may generate a large number of machine check records when things go seriously wrong. But Linux has a fixed buffer that can only capture a few dozen errors.

Allocate space based on the number of CPUs (with a minimum value based on the historical fixed buffer that could store 80 records).

---

Changes since v1: Link: https://lore.kernel.org/all/Zd--PJp-NbXGrb39@agluck-desk3/

Sohil:
Group declaration of "order" with other int's in mce_gen_pool_create() Use #define MCE_MIN_ENTRIES instead of hard-coded inline "80" Missed kfree(mce_pool) in error path.

Yazen:
Use order_base_2() instead of ilog2() as rounded up size of structure is needed.

Avadhut:
Allocate 2 records per CPU

Me:
Add a #define MCE_PER_CPU for number of records per CPU

 arch/x86/kernel/cpu/mce/genpool.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mce/genpool.c +17 -6
index fbe8b61c3413..42ce3dc97ca8 100644
@@ -16,14 +16,14 @@
  * used to save error information organized in a lock-less list.
  *
  * This memory pool is only to be used to save MCE records in MCE context.
- * MCE events are rare, so a fixed size memory pool should be enough. Use
- * 2 pages to save MCE events for now (~80 MCE records at most).
+ * MCE events are rare, so a fixed size memory pool should be enough.
+ * Allocate on a sliding scale based on number of CPUs.
  */
-#define MCE_POOLSZ	(2 * PAGE_SIZE)
+#define MCE_MIN_ENTRIES	80
+#define MCE_PER_CPU	2
 
 static struct gen_pool *mce_evt_pool;
 static LLIST_HEAD(mce_event_llist);
-static char gen_pool_buf[MCE_POOLSZ];
 
 /*
  * Compare the record "t" with each of the records on list "l" to see if
@@ -118,16 +118,27 @@ int mce_gen_pool_add(struct mce *mce)
 
 static int mce_gen_pool_create(void)
 {
+	int mce_numrecords, mce_poolsz, order;
 	struct gen_pool *tmpp;
 	int ret = -ENOMEM;
+	void *mce_pool;
 
-	tmpp = gen_pool_create(ilog2(sizeof(struct mce_evt_llist)), -1);
+	order = order_base_2(sizeof(struct mce_evt_llist));
+	tmpp = gen_pool_create(order, -1);
 	if (!tmpp)
 		goto out;
 
-	ret = gen_pool_add(tmpp, (unsigned long)gen_pool_buf, MCE_POOLSZ, -1);
+	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
+	mce_poolsz = mce_numrecords * (1 << order);
+	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
+	if (!mce_pool) {
+		gen_pool_destroy(tmpp);
+		goto out;
+	}
+	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
 		gen_pool_destroy(tmpp);
+		kfree(mce_pool);
 		goto out;
 	}
 

base-commit: d206a76d7d2726f3b096037f2079ce0bd3ba329b

Signature · 1 line
2.43.0
maintainer
#1 lore raw

Review

Quoted 13 lines · Tony Luck
(quoted diff) +9 -1
-	ret = gen_pool_add(tmpp, (unsigned long)gen_pool_buf, MCE_POOLSZ, -1);
+	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
+	mce_poolsz = mce_numrecords * (1 << order);
+	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
+	if (!mce_pool) {
+		gen_pool_destroy(tmpp);
+		goto out;
+	}
+	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
 		gen_pool_destroy(tmpp);
+		kfree(mce_pool);
 		goto out;

Might as well get rid of the out label too since you're not doing the error handling pattern of jumping to err* labels and then unwinding. See diff below.

Otherwise, patch looks ok to me, if we can test it quickly with all possible scenarios and Linus does a -rc8, I probably can take it even now...

Thx.

arch/x86/kernel/cpu/mce/genpool.c +3 -4
index 42ce3dc97ca8..cadf28662a70 100644
@@ -126,25 +126,24 @@ static int mce_gen_pool_create(void)
 	order = order_base_2(sizeof(struct mce_evt_llist));
 	tmpp = gen_pool_create(order, -1);
 	if (!tmpp)
-		goto out;
+		return ret;
 
 	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
 	mce_poolsz = mce_numrecords * (1 << order);
 	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
 	if (!mce_pool) {
 		gen_pool_destroy(tmpp);
-		goto out;
+		return ret;
 	}
 	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
 		gen_pool_destroy(tmpp);
 		kfree(mce_pool);
-		goto out;
+		return ret;
 	}
 
 	mce_evt_pool = tmpp;
 
-out:
 	return ret;
 }
 
Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
Reviewed-by
#2 lore raw

Hi Tony,

Overall, the patch looks good to me. Independent of the minor suggestions below, please feel free to add.

Quoted 44 lines · Borislav Petkov

Review

Quoted 13 lines · Tony Luck
(quoted diff) +9 -1
-	ret = gen_pool_add(tmpp, (unsigned long)gen_pool_buf, MCE_POOLSZ, -1);
+	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
+	mce_poolsz = mce_numrecords * (1 << order);
+	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
+	if (!mce_pool) {
+		gen_pool_destroy(tmpp);
+		goto out;
+	}
+	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
 		gen_pool_destroy(tmpp);
+		kfree(mce_pool);
 		goto out;

Might as well get rid of the out label too since you're not doing the error handling pattern of jumping to err* labels and then unwinding. See diff below.

arch/x86/kernel/cpu/mce/genpool.c +2 -2
index 42ce3dc97ca8..cadf28662a70 100644
@@ -126,25 +126,24 @@ static int mce_gen_pool_create(void)
 	order = order_base_2(sizeof(struct mce_evt_llist));
 	tmpp = gen_pool_create(order, -1);
 	if (!tmpp)
-		goto out;
+		return ret;
 
 	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
 	mce_poolsz = mce_numrecords * (1 << order);
 	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
 	if (!mce_pool) {
 		gen_pool_destroy(tmpp);
-		goto out;
+		return ret;
 	}
 	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
 		gen_pool_destroy(tmpp);
 		kfree(mce_pool);

arch/x86/kernel/cpu/mce/genpool.c static int mce_gen_pool_create(void) · line 149

Quoted 10 lines
arch/x86/kernel/cpu/mce/genpool.c +1 -2
-		goto out;
+		return ret;
 	}
 
 	mce_evt_pool = tmpp;
 
-out:
 	return ret;
 }
 

I was about the suggest the same thing and maybe slightly more. By initializing ret when really needed, I find the code a bit easier to follow. No strong preference here.

(quoted diff) +0 -0

b/arch/x86/kernel/cpu/mce/genpool.c
index cadf28662a70..83a01d20bbd9 100644

arch/x86/kernel/cpu/mce/genpool.c +3 -4
@@ -118,22 +118,21 @@ int mce_gen_pool_add(struct mce *mce)
 
 static int mce_gen_pool_create(void)
 {
-	int mce_numrecords, mce_poolsz, order;
+	int mce_numrecords, mce_poolsz, order, ret;
 	struct gen_pool *tmpp;
-	int ret = -ENOMEM;
 	void *mce_pool;
 
 	order = order_base_2(sizeof(struct mce_evt_llist));
 	tmpp = gen_pool_create(order, -1);
 	if (!tmpp)
-		return ret;
+		return -ENOMEM;
 
 	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
 	mce_poolsz = mce_numrecords * (1 << order);
 	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
 	if (!mce_pool) {
 		gen_pool_destroy(tmpp);
-		return ret;
+		return -ENOMEM;
 	}
 	ret = gen_pool_add(tmpp, (unsigned long)mce_pool, mce_poolsz, -1);
 	if (ret) {
maintainer
#3 lore raw
Quoted 3 lines · Sohil Mehta

I was about the suggest the same thing and maybe slightly more. By initializing ret when really needed, I find the code a bit easier to follow. No strong preference here.

Except that "really needed" is done this way:

Quoted 6 lines
arch/x86/kernel/cpu/mce/genpool.c +0 -0
index cadf28662a70..83a01d20bbd9 100644

arch/x86/kernel/cpu/mce/genpool.c int mce_gen_pool_add(struct mce *mce) · line 124

Quoted 9 lines
arch/x86/kernel/cpu/mce/genpool.c +1 -2
@@ -118,22 +118,21 @@ int mce_gen_pool_add(struct mce *mce)
 
 static int mce_gen_pool_create(void)
 {
-	int mce_numrecords, mce_poolsz, order;
+	int mce_numrecords, mce_poolsz, order, ret;
 	struct gen_pool *tmpp;
-	int ret = -ENOMEM;
 	void *mce_pool;
 
	ret = -ENOMEM;

arch/x86/kernel/cpu/mce/genpool.c int mce_gen_pool_add(struct mce *mce) · line 129

Quoted 6 lines
arch/x86/kernel/cpu/mce/genpool.c +1 -1
 	order = order_base_2(sizeof(struct mce_evt_llist));
 	tmpp = gen_pool_create(order, -1);
 	if (!tmpp)
-		return ret;
+		return -ENOMEM;
 
	ret = -ENOMEM;

arch/x86/kernel/cpu/mce/genpool.c int mce_gen_pool_add(struct mce *mce) · line 135

Quoted 7 lines
arch/x86/kernel/cpu/mce/genpool.c +1 -1
 	mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
 	mce_poolsz = mce_numrecords * (1 << order);
 	mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
 	if (!mce_pool) {
 		gen_pool_destroy(tmpp);
-		return ret;
+		return -ENOMEM;

before each block, so that it is clear what this particular block is going to return on error.

But those assignments get redundant so the current way is fine, I'd say.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette