Skip to content

Commit 108c649

Browse files
aeglbp3tk0v
authored andcommitted
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-size 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). [ bp: Rename local var from tmpp to something more telling: gpool. ] Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Sohil Mehta <sohil.mehta@intel.com> Reviewed-by: Avadhut Naik <avadhut.naik@amd.com> Link: https://lore.kernel.org/r/20240307192704.37213-1-tony.luck@intel.com
1 parent 4cece76 commit 108c649

File tree

1 file changed

+25
-15
lines changed

1 file changed

+25
-15
lines changed

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

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
* used to save error information organized in a lock-less list.
1717
*
1818
* This memory pool is only to be used to save MCE records in MCE context.
19-
* MCE events are rare, so a fixed size memory pool should be enough. Use
20-
* 2 pages to save MCE events for now (~80 MCE records at most).
19+
* MCE events are rare, so a fixed size memory pool should be enough.
20+
* Allocate on a sliding scale based on number of CPUs.
2121
*/
22-
#define MCE_POOLSZ (2 * PAGE_SIZE)
22+
#define MCE_MIN_ENTRIES 80
23+
#define MCE_PER_CPU 2
2324

2425
static struct gen_pool *mce_evt_pool;
2526
static LLIST_HEAD(mce_event_llist);
26-
static char gen_pool_buf[MCE_POOLSZ];
2727

2828
/*
2929
* Compare the record "t" with each of the records on list "l" to see if
@@ -118,22 +118,32 @@ int mce_gen_pool_add(struct mce *mce)
118118

119119
static int mce_gen_pool_create(void)
120120
{
121-
struct gen_pool *tmpp;
121+
int mce_numrecords, mce_poolsz, order;
122+
struct gen_pool *gpool;
122123
int ret = -ENOMEM;
123-
124-
tmpp = gen_pool_create(ilog2(sizeof(struct mce_evt_llist)), -1);
125-
if (!tmpp)
126-
goto out;
127-
128-
ret = gen_pool_add(tmpp, (unsigned long)gen_pool_buf, MCE_POOLSZ, -1);
124+
void *mce_pool;
125+
126+
order = order_base_2(sizeof(struct mce_evt_llist));
127+
gpool = gen_pool_create(order, -1);
128+
if (!gpool)
129+
return ret;
130+
131+
mce_numrecords = max(MCE_MIN_ENTRIES, num_possible_cpus() * MCE_PER_CPU);
132+
mce_poolsz = mce_numrecords * (1 << order);
133+
mce_pool = kmalloc(mce_poolsz, GFP_KERNEL);
134+
if (!mce_pool) {
135+
gen_pool_destroy(gpool);
136+
return ret;
137+
}
138+
ret = gen_pool_add(gpool, (unsigned long)mce_pool, mce_poolsz, -1);
129139
if (ret) {
130-
gen_pool_destroy(tmpp);
131-
goto out;
140+
gen_pool_destroy(gpool);
141+
kfree(mce_pool);
142+
return ret;
132143
}
133144

134-
mce_evt_pool = tmpp;
145+
mce_evt_pool = gpool;
135146

136-
out:
137147
return ret;
138148
}
139149

0 commit comments

Comments
 (0)