Ira Weiny wrote: > BIOS can configure memory devices as firmware first. This will send CXL > events to the firmware instead of the OS. The firmware can then inform > the OS of these events via UEFI. > > UEFI v2.10 section N.2.14 defines a Common Platform Error Record (CPER) > format for CXL Component Events. The format is mostly the same as the > CXL Common Event Record Format. The difference lies in the use of a > GUID as the CPER Section Type which matches the UUID defined in CXL 3.1 > Table 8-43. > > Currently a configuration such as this will trace a non standard event > in the log omitting useful details of the event. In addition the CXL > sub-system contains additional region and HPA information useful to the > user.[0] > > Add GHES support to detect CXL CPER records. Add the ability for the > CXL sub-system to register a callback to receive the events. > > The CXL code is required to be called from process context as it needs > to take a device lock. The GHES code may be in interrupt context. This > complicated the use of a callback. Dan Williams suggested the use of > work items as an atomic way of switching between the callback execution > and a default handler.[1] > > This patch adds back the functionality which was removed to fix the > report by Dan Carpenter[2]. > > [0] > Link: https://lore.kernel.org/all/cover.1711598777.git.alison.schofield@xxxxxxxxx/ > [1] > Link: https://lore.kernel.org/all/65d111eb87115_6c745294ac@xxxxxxxxxxxxxxxxxxxxxxxxx.notmuch/ > [2] > Link: https://lore.kernel.org/all/b963c490-2c13-4b79-bbe7-34c6568423c7@moroto.mountain/ Minor, but this can be reformatted a bit cleaner: Link: http://lore.kernel.org/r/cover.1711598777.git.alison.schofield@xxxxxxxxx [0] Link: http://lore.kernel.org/r/65d111eb87115_6c745294ac@xxxxxxxxxxxxxxxxxxxxxxxxx.notmuch [1] Link: http://lore.kernel.org/r/b963c490-2c13-4b79-bbe7-34c6568423c7@moroto.mountain [2] > > Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> > Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx> > Cc: Tony Luck <tony.luck@xxxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxxxx> > Suggested-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > Suggested-by: Dan Williams <dan.j.williams@xxxxxxxxx> > Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx> > > --- > Changes: > [iweiny: clarify commit message] > [djbw: remove local wt] > --- > drivers/acpi/apei/ghes.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/cxl-event.h | 18 +++++++ > 2 files changed, 142 insertions(+) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 512067cac170..cdcfdf6ebe81 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -26,6 +26,8 @@ > #include <linux/interrupt.h> > #include <linux/timer.h> > #include <linux/cper.h> > +#include <linux/cleanup.h> > +#include <linux/cxl-event.h> > #include <linux/platform_device.h> > #include <linux/mutex.h> > #include <linux/ratelimit.h> > @@ -33,6 +35,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> > @@ -673,6 +676,112 @@ static void ghes_defer_non_standard_event(struct acpi_hest_generic_data *gdata, > schedule_work(&entry->work); > } > > +/* CXL Event record UUIDs are formated as GUIDs and reported in section type */ > + > +/* > + * General Media Event Record > + * CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43 > + */ > +#define CPER_SEC_CXL_GEN_MEDIA_GUID \ > + GUID_INIT(0xfbcd0a77, 0xc260, 0x417f, \ > + 0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6) > + > +/* > + * DRAM Event Record > + * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44 > + */ > +#define CPER_SEC_CXL_DRAM_GUID \ > + GUID_INIT(0x601dcbb3, 0x9c06, 0x4eab, \ > + 0xb8, 0xaf, 0x4e, 0x9b, 0xfb, 0x5c, 0x96, 0x24) > + > +/* > + * Memory Module Event Record > + * CXL rev 3.0 section 8.2.9.2.1.3; Table 8-45 > + */ > +#define CPER_SEC_CXL_MEM_MODULE_GUID \ > + GUID_INIT(0xfe927475, 0xdd59, 0x4339, \ > + 0xa5, 0x86, 0x79, 0xba, 0xb1, 0x13, 0xb7, 0x74) > + > +struct cxl_cper_work_data { > + enum cxl_event_type event_type; > + struct cxl_cper_event_rec rec; > +}; > + > +DEFINE_KFIFO(cxl_cper_fifo, struct cxl_cper_work_data, 32); Any comment on where that "32" comes from? > +static DEFINE_SPINLOCK(cxl_cper_work_lock); Needs a comment on what it is specifically protecting. > +static cxl_cper_callback cper_callback; > +static void cxl_cper_cb_fn(struct work_struct *work) > +{ > + struct cxl_cper_work_data wd; > + > + while (kfifo_get(&cxl_cper_fifo, &wd)) > + cper_callback(wd.event_type, &wd.rec); > +} > +static DECLARE_WORK(cxl_cb_work, cxl_cper_cb_fn); > +struct work_struct *cxl_cper_work = NULL; Initializing global data to NULL is redundant, however this feels like one too many dynamic things registered. cxl_cper_work and cper_callback are dynamic, but from the GHES perspective all it cares about is checking if work is registered and if so put the data in the kfifo and trigger that work func. It need not care about what happens after the work is queued. So, lets just have the CXL driver register its own cxl_cper_work instance and skip defining one locally here. Export cxl_cper_fifo for the driver to optionally reference. > + > +static void cxl_cper_post_event(enum cxl_event_type event_type, > + struct cxl_cper_event_rec *rec) > +{ > + struct cxl_cper_work_data wd; > + > + if (rec->hdr.length <= sizeof(rec->hdr) || > + rec->hdr.length > sizeof(*rec)) { > + pr_err(FW_WARN "CXL CPER Invalid section length (%u)\n", > + rec->hdr.length); > + return; > + } > + > + if (!(rec->hdr.validation_bits & CPER_CXL_COMP_EVENT_LOG_VALID)) { > + pr_err(FW_WARN "CXL CPER invalid event\n"); > + return; > + } > + > + guard(spinlock_irqsave)(&cxl_cper_work_lock); > + > + if (!cxl_cper_work) > + return; > + > + wd.event_type = event_type; > + memcpy(&wd.rec, rec, sizeof(wd.rec)); > + > + if (!kfifo_put(&cxl_cper_fifo, wd)) { > + pr_err_ratelimited("CXL CPER kfifo overflow\n"); > + return; > + } > + > + schedule_work(cxl_cper_work); > +} > + > +int cxl_cper_register_callback(cxl_cper_callback callback) > +{ > + if (cper_callback) > + return -EINVAL; > + > + guard(spinlock)(&cxl_cper_work_lock); > + cper_callback = callback; > + cxl_cper_work = &cxl_cb_work; Per above this would just become cxl_cper_register_work(), and then the lock makes more sense as a cxl_cper_register_lock. > + return 0; > +} > +EXPORT_SYMBOL_NS_GPL(cxl_cper_register_callback, CXL); > + > +int cxl_cper_unregister_callback(cxl_cper_callback callback) > +{ > + if (callback != cper_callback) > + return -EINVAL; > + > + /* Avoid guard() because cancel_work_sync() can sleep */ > + spin_lock(&cxl_cper_work_lock); > + cxl_cper_work = NULL; > + spin_unlock(&cxl_cper_work_lock); > + > + cancel_work_sync(&cxl_cb_work); Also per above, moving the responsibility of cancel_work_sync() to caller also brings guard() back in play here.
