If the firmware indicates in GHES error data entry that the error threshold has exceeded for a corrected error event, then we try to soft-offline the page. This could be called in interrupt context, so we queue this up similar to how we handle memory failure scenarios.
Signed-off-by: Naveen N. Rao <[email protected]> --- drivers/acpi/apei/ghes.c | 12 ++++++++++ include/linux/mm.h | 1 + mm/memory-failure.c | 53 ++++++++++++++++++++++++++++++---------------- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index fcd7d91..5a630ed 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -429,6 +429,18 @@ static void ghes_do_proc(struct ghes *ghes, mem_err); #endif #ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE + if (sec_sev == GHES_SEV_CORRECTED && + (gdata->flags & CPER_SEC_ERROR_THRESHOLD_EXCEEDED) && + (mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS)) { + unsigned long pfn; + pfn = mem_err->physical_addr >> PAGE_SHIFT; + if (pfn_valid(pfn)) + soft_memory_failure_queue(pfn, 0, 0); + else + pr_warning(FW_WARN GHES_PFX + "Invalid address in generic error data: %#lx\n", + mem_err->physical_addr); + } if (sev == GHES_SEV_RECOVERABLE && sec_sev == GHES_SEV_RECOVERABLE && mem_err->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS) { diff --git a/include/linux/mm.h b/include/linux/mm.h index e0c8528..f9907d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1787,6 +1787,7 @@ enum mf_flags { }; extern int memory_failure(unsigned long pfn, int trapno, int flags); extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); +extern void soft_memory_failure_queue(unsigned long pfn, int trapno, int flags); extern int unpoison_memory(unsigned long pfn); extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ceb0c7f..50caefd 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1222,6 +1222,7 @@ struct memory_failure_entry { unsigned long pfn; int trapno; int flags; + bool soft_offline; }; struct memory_failure_cpu { @@ -1233,6 +1234,28 @@ struct memory_failure_cpu { static DEFINE_PER_CPU(struct memory_failure_cpu, memory_failure_cpu); +void __memory_failure_queue(unsigned long pfn, int trapno, int flags, int soft_offline) +{ + struct memory_failure_cpu *mf_cpu; + unsigned long proc_flags; + struct memory_failure_entry entry = { + .pfn = pfn, + .trapno = trapno, + .flags = flags, + .soft_offline = soft_offline + }; + + mf_cpu = &get_cpu_var(memory_failure_cpu); + spin_lock_irqsave(&mf_cpu->lock, proc_flags); + if (kfifo_put(&mf_cpu->fifo, &entry)) + schedule_work_on(smp_processor_id(), &mf_cpu->work); + else + pr_err("Memory failure: buffer overflow when queuing memory failure at 0x%#lx\n", + pfn); + spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); + put_cpu_var(memory_failure_cpu); +} + /** * memory_failure_queue - Schedule handling memory failure of a page. * @pfn: Page Number of the corrupted page @@ -1250,28 +1273,19 @@ static DEFINE_PER_CPU(struct memory_failure_cpu, memory_failure_cpu); * * Can run in IRQ context. */ + void memory_failure_queue(unsigned long pfn, int trapno, int flags) { - struct memory_failure_cpu *mf_cpu; - unsigned long proc_flags; - struct memory_failure_entry entry = { - .pfn = pfn, - .trapno = trapno, - .flags = flags, - }; - - mf_cpu = &get_cpu_var(memory_failure_cpu); - spin_lock_irqsave(&mf_cpu->lock, proc_flags); - if (kfifo_put(&mf_cpu->fifo, &entry)) - schedule_work_on(smp_processor_id(), &mf_cpu->work); - else - pr_err("Memory failure: buffer overflow when queuing memory failure at 0x%#lx\n", - pfn); - spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); - put_cpu_var(memory_failure_cpu); + __memory_failure_queue(pfn, trapno, flags, false); } EXPORT_SYMBOL_GPL(memory_failure_queue); +void soft_memory_failure_queue(unsigned long pfn, int trapno, int flags) +{ + __memory_failure_queue(pfn, trapno, flags, true); +} +EXPORT_SYMBOL_GPL(soft_memory_failure_queue); + static void memory_failure_work_func(struct work_struct *work) { struct memory_failure_cpu *mf_cpu; @@ -1286,7 +1300,10 @@ static void memory_failure_work_func(struct work_struct *work) spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); if (!gotten) break; - memory_failure(entry.pfn, entry.trapno, entry.flags); + if (entry.soft_offline) + soft_offline_page(pfn_to_page(entry.pfn), entry.flags); + else + memory_failure(entry.pfn, entry.trapno, entry.flags); } } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
