aer_recover_queue() now copies the input aer_regs instead of
storing a pointer to the struct. Use a local variable to pass
aer_regs in ghes_handle_aer() and remove the memory allocation
introduced by:
commit e2abc47a5a1a ("ACPI: APEI: Fix AER info corruption when error
status data has multiple sections")

No functional change intended.

Signed-off-by: Pierre Gondois <[email protected]>
---
 drivers/acpi/apei/ghes.c | 25 +++----------------------
 drivers/pci/pcie/aer.c   | 17 +++++------------
 include/acpi/ghes.h      |  4 ----
 include/linux/aer.h      |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 444d8e82353a7..3aecd3f828e58 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -228,20 +228,6 @@ int ghes_estatus_pool_init(unsigned int num_ghes)
        return -ENOMEM;
 }
 
-/**
- * ghes_estatus_pool_region_free - free previously allocated memory
- *                                from the ghes_estatus_pool.
- * @addr: address of memory to free.
- * @size: size of memory to free.
- *
- * Returns none.
- */
-void ghes_estatus_pool_region_free(unsigned long addr, u32 size)
-{
-       gen_pool_free(ghes_estatus_pool, addr, size);
-}
-EXPORT_SYMBOL_GPL(ghes_estatus_pool_region_free);
-
 static int map_gen_v2(struct ghes *ghes)
 {
        return apei_map_generic_address(&ghes->generic_v2->read_ack_register);
@@ -666,7 +652,7 @@ static void ghes_handle_aer(struct acpi_hest_generic_data 
*gdata)
 
        if (pcie_err->validation_bits & CPER_PCIE_VALID_DEVICE_ID &&
            pcie_err->validation_bits & CPER_PCIE_VALID_AER_INFO) {
-               struct aer_capability_regs *aer_info;
+               struct aer_capability_regs aer_info;
                unsigned int devfn;
                int aer_severity;
 
@@ -682,16 +668,11 @@ static void ghes_handle_aer(struct acpi_hest_generic_data 
*gdata)
                if (gdata->flags & CPER_SEC_RESET)
                        aer_severity = AER_FATAL;
 
-               aer_info = (void *)gen_pool_alloc(ghes_estatus_pool,
-                                                 sizeof(struct 
aer_capability_regs));
-               if (!aer_info)
-                       return;
-
-               aer_cap_regs_unpack(aer_info, pcie_err->aer_info, 
sizeof(pcie_err->aer_info));
+               aer_cap_regs_unpack(&aer_info, pcie_err->aer_info, 
sizeof(pcie_err->aer_info));
 
                aer_recover_queue(pcie_err->device_id.segment,
                                  pcie_err->device_id.bus,
-                                 devfn, aer_severity, aer_info);
+                                 devfn, aer_severity, &aer_info);
        }
 #endif
 }
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 57406494ec1f7..d7ef84e3b988e 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/vmcore_info.h>
 #include <acpi/apei.h>
-#include <acpi/ghes.h>
 #include <ras/ras_event.h>
 
 #include "../pci.h"
@@ -1413,18 +1412,15 @@ static DECLARE_WORK(aer_recover_work, 
aer_recover_work_func);
  * @severity: AER_CORRECTABLE, AER_NONFATAL or AER_FATAL
  * @aer_regs: snapshot of the device's AER Capability registers
  *
- * Queue an error record received from firmware through APEI GHES.  The
- * record is processed later from a workqueue, which logs the error and,
+ * Queue an error record received from firmware. The record is processed
+ * later from a workqueue, which logs the error and,
  * for uncorrectable errors, attempts recovery of the device.
  *
- * Takes ownership of @aer_regs, which must have been allocated from
- * ghes_estatus_pool with a size of sizeof(struct aer_capability_regs).
- * Copies the registers into the queue entry and frees the supplied buffer
- * before returning, including when the queue is full. The caller must not
- * access or free @aer_regs after this call.
+ * Copies @aer_regs into the recovery queue. The caller retains ownership of
+ * the supplied snapshot and may reuse it after this function returns.
  */
 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-                      int severity, struct aer_capability_regs *aer_regs)
+                      int severity, const struct aer_capability_regs *aer_regs)
 {
        struct aer_recover_entry entry = {
                .bus            = bus,
@@ -1434,9 +1430,6 @@ void aer_recover_queue(int domain, unsigned int bus, 
unsigned int devfn,
                .regs           = *aer_regs,
        };
 
-       ghes_estatus_pool_region_free((unsigned long)aer_regs,
-                                     sizeof(struct aer_capability_regs));
-
        if (kfifo_in_spinlocked(&aer_recover_ring, &entry, 1,
                                 &aer_recover_ring_lock)) {
                schedule_work(&aer_recover_work);
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h
index 3fdb7ea59f9cc..ef58e2251407e 100644
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
@@ -84,15 +84,11 @@ int devm_ghes_register_vendor_record_notifier(struct device 
*dev,
 
 struct list_head *ghes_get_devices(void);
 
-void ghes_estatus_pool_region_free(unsigned long addr, u32 size);
-
 struct cxl_cper_sec_prot_err;
 void cxl_cper_post_prot_err(struct cxl_cper_sec_prot_err *prot_err,
                            int severity, u32 len);
 #else
 static inline struct list_head *ghes_get_devices(void) { return NULL; }
-
-static inline void ghes_estatus_pool_region_free(unsigned long addr, u32 size) 
{ return; }
 #endif
 
 int ghes_estatus_pool_init(unsigned int num_ghes);
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 043ee76b6f538..0a5ec7956b487 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -79,6 +79,6 @@ void aer_cap_regs_unpack(struct aer_capability_regs *regs, 
const void *raw,
                         size_t raw_len);
 int cper_severity_to_aer(int cper_severity);
 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-                      int severity, struct aer_capability_regs *aer_regs);
+                      int severity, const struct aer_capability_regs 
*aer_regs);
 #endif //_AER_H_
 
-- 
2.43.0


Reply via email to