ACPI, APEI, GHES: Cleanup ghes memory error handling (ca104edc) · Commits · 戴 / test

drivers/acpi/apei/ghes.c

+20 −16

Original line number	Diff line number	Diff line
		@@ -413,27 +413,31 @@ static void ghes_handle_memory_failure(struct acpi_generic_data *gdata, int sev)
		{
		#ifdef CONFIG_ACPI_APEI_MEMORY_FAILURE
		unsigned long pfn;
		int flags = -1;
		int sec_sev = ghes_severity(gdata->error_severity);
		struct cper_sec_mem_err *mem_err;
		mem_err = (struct cper_sec_mem_err *)(gdata + 1);

		if (sec_sev == GHES_SEV_CORRECTED &&
		(gdata->flags & CPER_SEC_ERROR_THRESHOLD_EXCEEDED) &&
		(mem_err->validation_bits & CPER_MEM_VALID_PA)) {
		if (!(mem_err->validation_bits & CPER_MEM_VALID_PA))
		return;

		pfn = mem_err->physical_addr >> PAGE_SHIFT;
		if (pfn_valid(pfn))
		memory_failure_queue(pfn, 0, MF_SOFT_OFFLINE);
		else if (printk_ratelimit())
		pr_warn(FW_WARN GHES_PFX
		if (!pfn_valid(pfn)) {
		pr_warn_ratelimited(FW_WARN GHES_PFX
		"Invalid address in generic error data: %#llx\n",
		mem_err->physical_addr);
		return;
		}
		if (sev == GHES_SEV_RECOVERABLE &&
		sec_sev == GHES_SEV_RECOVERABLE &&
		mem_err->validation_bits & CPER_MEM_VALID_PA) {
		pfn = mem_err->physical_addr >> PAGE_SHIFT;
		memory_failure_queue(pfn, 0, 0);
		}

		/* iff following two events can be handled properly by now */
		if (sec_sev == GHES_SEV_CORRECTED &&
		(gdata->flags & CPER_SEC_ERROR_THRESHOLD_EXCEEDED))
		flags = MF_SOFT_OFFLINE;
		if (sev == GHES_SEV_RECOVERABLE && sec_sev == GHES_SEV_RECOVERABLE)
		flags = 0;

		if (flags != -1)
		memory_failure_queue(pfn, 0, flags);
		#endif
		}