Presently the vendor drivers are unable to do the recovery for the
vendor specific recoverable HW errors because APEI driver does not
support reporting the error to the vendor drivers.
patch set
1. add new interface to the APEI driver for reporting the
vendor specific non-fatal HW errors to the drivers.
2. add driver to handle HiSilicon hip PCIe controller's errors.
V10:
1. Changes for Bjorn's comments on HIP PCIe error handler driver
and APEI patch.
2. Changes in the HIP PCIe error handler driver
for the feedbacks by Andy Shevchenko.
V9:
1. Fixed 2 improvements suggested by the kbuild test robot.
1.1 Change ghes_gdata_pool_init() as static function.
1.2. Removed using buffer to store the error data for
logging in the hisi_pcie_handle_error()
V8:
1. Removed reporting the standard errors through the interface
because of the conflict with the recent patches in the
memory error handling path.
2. Fix comments by Dan Carpenter.
V7:
1. Add changes in the APEI driver suggested by Borislav Petkov, for
queuing up all the non-fatal HW errors to the work queue and
notify the registered kernel drivers from the bottom half using
blocking notifier, common interface for both standard and
vendor-spcific errors.
2. Fix for further feedbacks in v5 HIP PCIe error handler driver
by Bjorn Helgaas.
V6:
1. Fix few changes in the patch subject line suggested by Bjorn Helgaas.
V5:
1. Fix comments from James Morse.
1.1 Changed the notification method to use the atomic_notifier_chain.
1.2 Add the error handled status for the user space.
V4:
1. Fix for the following smatch warning in the PCIe error driver,
reported by kbuild test robot<[email protected]>:
warn: should '((((1))) << (9 + i))' be a 64 bit type?
if (err->val_bits & BIT(HISI_PCIE_LOCAL_VALID_ERR_MISC + i))
^^^ This should be BIT_ULL() because it goes up to 9 + 32.
V3:
1. Fix the comments from Bjorn Helgaas.
V2:
1. Changes in the HiSilicon PCIe controller's error handling driver
for the comments from Bjorn Helgaas.
2. Changes in the APEI interface to support reporting the vendor error
for module with multiple devices, but use the same section type.
In the error handler will use socket id/sub module id etc to distinguish
the device.
V1:
1. Fix comments from James Morse.
2. add driver to handle HiSilicon hip08 PCIe controller's errors,
which is an application of the above interface.
Shiju Jose (1):
ACPI / APEI: Add support to notify the vendor specific HW errors
Yicong Yang (1):
PCI: hip: Add handling of HiSilicon HIP PCIe controller errors
drivers/acpi/apei/ghes.c | 123 +++++++++
drivers/pci/controller/Kconfig | 8 +
drivers/pci/controller/Makefile | 1 +
drivers/pci/controller/pcie-hisi-error.c | 327 +++++++++++++++++++++++
include/acpi/ghes.h | 29 ++
5 files changed, 488 insertions(+)
create mode 100644 drivers/pci/controller/pcie-hisi-error.c
--
2.17.1
Add support to report the vendor specific non-fatal HW errors
to the drivers for the error recovery.
The interface functions ghes_register_event_notifier() and
ghes_unregister_event_notifier() enables the drivers to register and
unregister the vendor specific error handlers. The interface uses
work queue for queuing each vendor-specific error record and uses
blocking notifier chain, in the work function, to report the error to
the registered drivers.
The drivers should match the section type of the error record before
processing the error data.
Signed-off-by: Shiju Jose <[email protected]>
Reviewed-by: Bjorn Helgaas <[email protected]>
---
drivers/acpi/apei/ghes.c | 123 +++++++++++++++++++++++++++++++++++++++
include/acpi/ghes.h | 29 +++++++++
2 files changed, 152 insertions(+)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 81bf71b10d44..b6dc4eaa6345 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -33,6 +33,7 @@
#include <linux/irq_work.h>
#include <linux/llist.h>
#include <linux/genalloc.h>
+#include <linux/kfifo.h>
#include <linux/pci.h>
#include <linux/pfn.h>
#include <linux/aer.h>
@@ -64,6 +65,7 @@
#define GHES_ESTATUS_CACHES_SIZE 4
#define GHES_ESTATUS_IN_CACHE_MAX_NSEC 10000000000ULL
+
/* Prevent too many caches are allocated because of RCU */
#define GHES_ESTATUS_CACHE_ALLOCED_MAX (GHES_ESTATUS_CACHES_SIZE * 3 / 2)
@@ -88,6 +90,10 @@
#define FIX_APEI_GHES_SDEI_CRITICAL __end_of_fixed_addresses
#endif
+#define GHES_EVENT_RING_SIZE 256
+#define GHES_EVENT_GDATA_POOL_MIN_ALLOC_ORDER 3
+#define GHES_EVENT_GDATA_POOL_MIN_SIZE 65536
+
static inline bool is_hest_type_generic_v2(struct ghes *ghes)
{
return ghes->generic->header.type == ACPI_HEST_TYPE_GENERIC_ERROR_V2;
@@ -123,6 +129,19 @@ static DEFINE_MUTEX(ghes_list_mutex);
*/
static DEFINE_SPINLOCK(ghes_notify_lock_irq);
+struct ghes_event_entry {
+ struct acpi_hest_generic_data *gdata;
+ int error_severity;
+};
+
+static DEFINE_KFIFO(ghes_event_ring, struct ghes_event_entry,
+ GHES_EVENT_RING_SIZE);
+
+static DEFINE_SPINLOCK(ghes_event_ring_lock);
+
+static struct gen_pool *ghes_event_gdata_pool;
+static unsigned long ghes_event_gdata_pool_size_request;
+
static struct gen_pool *ghes_estatus_pool;
static unsigned long ghes_estatus_pool_size_request;
@@ -183,6 +202,38 @@ int ghes_estatus_pool_init(int num_ghes)
return -ENOMEM;
}
+static int ghes_event_gdata_pool_init(void)
+{
+ unsigned long addr, len;
+ int rc;
+
+ ghes_event_gdata_pool = gen_pool_create(GHES_EVENT_GDATA_POOL_MIN_ALLOC_ORDER, -1);
+ if (!ghes_event_gdata_pool)
+ return -ENOMEM;
+
+ if (ghes_event_gdata_pool_size_request < GHES_EVENT_GDATA_POOL_MIN_SIZE)
+ ghes_event_gdata_pool_size_request = GHES_EVENT_GDATA_POOL_MIN_SIZE;
+
+ len = ghes_event_gdata_pool_size_request;
+ addr = (unsigned long)vmalloc(PAGE_ALIGN(len));
+ if (!addr)
+ goto err_pool_alloc;
+
+ rc = gen_pool_add(ghes_event_gdata_pool, addr, PAGE_ALIGN(len), -1);
+ if (rc)
+ goto err_pool_add;
+
+ return 0;
+
+err_pool_add:
+ vfree((void *)addr);
+
+err_pool_alloc:
+ gen_pool_destroy(ghes_event_gdata_pool);
+
+ return -ENOMEM;
+}
+
static int map_gen_v2(struct ghes *ghes)
{
return apei_map_generic_address(&ghes->generic_v2->read_ack_register);
@@ -242,6 +293,10 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
goto err_unmap_status_addr;
}
+ ghes_event_gdata_pool_size_request += generic->records_to_preallocate *
+ generic->max_sections_per_record *
+ generic->max_raw_data_length;
+
return ghes;
err_unmap_status_addr:
@@ -511,6 +566,69 @@ static void ghes_handle_aer(struct acpi_hest_generic_data *gdata)
#endif
}
+static BLOCKING_NOTIFIER_HEAD(ghes_event_notify_list);
+
+/**
+ * ghes_register_event_notifier - register an event notifier
+ * for the non-fatal HW errors.Presently supported to notify
+ * the vendor-specific HW errors only, though it can be used to
+ * notify the standard errors also.
+ * @nb: pointer to the notifier_block structure of the event handler.
+ *
+ * return 0 : SUCCESS, non-zero : FAIL
+ */
+int ghes_register_event_notifier(struct notifier_block *nb)
+{
+ return blocking_notifier_chain_register(&ghes_event_notify_list, nb);
+}
+EXPORT_SYMBOL_GPL(ghes_register_event_notifier);
+
+/**
+ * ghes_unregister_event_notifier - unregister the previously
+ * registered event notifier.
+ * @nb: pointer to the notifier_block structure of the event handler.
+ */
+void ghes_unregister_event_notifier(struct notifier_block *nb)
+{
+ blocking_notifier_chain_unregister(&ghes_event_notify_list, nb);
+}
+EXPORT_SYMBOL_GPL(ghes_unregister_event_notifier);
+
+static void ghes_event_work_func(struct work_struct *work)
+{
+ struct ghes_event_entry entry;
+ u32 len;
+
+ while (kfifo_get(&ghes_event_ring, &entry)) {
+ blocking_notifier_call_chain(&ghes_event_notify_list,
+ entry.error_severity,
+ entry.gdata);
+ len = acpi_hest_get_record_size(entry.gdata);
+ gen_pool_free(ghes_event_gdata_pool, (unsigned long)entry.gdata, len);
+ }
+}
+
+static DECLARE_WORK(ghes_event_work, ghes_event_work_func);
+
+static void ghes_handle_non_standard_event(struct acpi_hest_generic_data *gdata,
+ int sev)
+{
+ u32 len;
+ struct ghes_event_entry event_entry;
+
+ len = acpi_hest_get_record_size(gdata);
+ event_entry.gdata = (void *)gen_pool_alloc(ghes_event_gdata_pool, len);
+ if (!event_entry.gdata)
+ return;
+
+ memcpy(event_entry.gdata, gdata, len);
+ event_entry.error_severity = sev;
+ if (kfifo_in_spinlocked(&ghes_event_ring, &event_entry, 1, &ghes_event_ring_lock))
+ schedule_work(&ghes_event_work);
+ else
+ pr_warn(GHES_PFX "event notify queue full\n");
+}
+
static bool ghes_do_proc(struct ghes *ghes,
const struct acpi_hest_generic_status *estatus)
{
@@ -549,6 +667,7 @@ static bool ghes_do_proc(struct ghes *ghes,
} else {
void *err = acpi_hest_get_payload(gdata);
+ ghes_handle_non_standard_event(gdata, sev);
log_non_standard_event(sec_type, fru_id, fru_text,
sec_sev, err,
gdata->error_data_length);
@@ -1385,6 +1504,10 @@ static int __init ghes_init(void)
else
pr_info(GHES_PFX "Failed to enable APEI firmware first mode.\n");
+ rc = ghes_event_gdata_pool_init();
+ if (rc)
+ pr_warn(GHES_PFX "non-fatal vendor-specific errors not being notified\n");
+
return 0;
err:
return rc;
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h
index 517a5231cc1b..37a48ce13499 100644
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
@@ -53,6 +53,35 @@ enum {
GHES_SEV_PANIC = 0x3,
};
+#ifdef CONFIG_ACPI_APEI_GHES
+/**
+ * ghes_register_event_notifier - register an event notifier
+ * for the non-fatal HW errors.Presently supported to notify
+ * the vendor-specific HW errors only, though it can be used to notify
+ * the standard errors also.
+ * @nb: pointer to the notifier_block structure of the event notifier.
+ *
+ * Return : 0 - SUCCESS, non-zero - FAIL.
+ */
+int ghes_register_event_notifier(struct notifier_block *nb);
+
+/**
+ * ghes_unregister_event_notifier - unregister the previously
+ * registered event notifier.
+ * @nb: pointer to the notifier_block structure of the event notifier.
+ */
+void ghes_unregister_event_notifier(struct notifier_block *nb);
+#else
+static inline int ghes_register_event_notifier(struct notifier_block *nb)
+{
+ return -ENODEV;
+}
+
+static inline void ghes_unregister_event_notifier(struct notifier_block *nb)
+{
+}
+#endif
+
int ghes_estatus_pool_init(int num_ghes);
/* From drivers/edac/ghes_edac.c */
--
2.17.1