Date:   Wed, 22 Apr 2020 13:58:08 +0200
From:   Robert Richter <rrichter@...vell.com>
To:     Borislav Petkov <bp@...en8.de>,
        Mauro Carvalho Chehab <mchehab@...nel.org>,
        Tony Luck <tony.luck@...el.com>
CC:     James Morse <james.morse@....com>,
        Aristeu Rozanski <aris@...hat.com>,
        Robert Richter <rrichter@...vell.com>,
        Matthias Brugger <mbrugger@...e.com>,
        <linux-edac@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: [PATCH v2 04/10] EDAC/ghes: Make SMBIOS handle private data to ghes

To identify a hw error's location, the ghes driver needs to know the
mapping between a DIMM and the used SMBIOS handle. The handle is
stored in struct dimm_info in the smbios_handle field where other
drivers carry it too. Make the SMBIOS handle private and implement an
own SMBIOS handle mapping table that is only used by the ghes
driver. As a consequence, smbios_handle is removed from struct
dimm_info.

The mapping table is implemented as a list. This makes the locking and
the allocation of table entries when adding or removing DIMMs much
easier. Since the list is accessed by the interrupt handler it must be
protected by a spinlock. Thanks to the use of a list, multiple entries
can be prepared in advance without a lock being held. Once ready, the
entries are added to an active list of DIMMs (ghes_dimm_list) by just
a single list operation that needs the locking. The same list entry is
also used for memory allocation, all entries are created at once using
a single array allocation and are put in a pool (ghes_dimm_pool) that
holds unused entries for later use.

While at it, rename struct ghes_edac_dimm_fill to struct dimm_fill.

Signed-off-by: Robert Richter <rrichter@...vell.com>
---
 drivers/edac/ghes_edac.c | 117 ++++++++++++++++++++++++++++++++++-----
 include/linux/edac.h     |   2 -
 2 files changed, 104 insertions(+), 15 deletions(-)

diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index 39efce0df881..23adb7674f9b 100644
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -15,6 +15,12 @@
 #include "edac_module.h"
 #include <ras/ras_event.h>
 
+struct ghes_dimm {
+	struct list_head entry;
+	struct dimm_info *dimm;
+	u16 handle;
+};
+
 struct ghes_mci {
 	struct mem_ctl_info *mci;
 
@@ -42,6 +48,16 @@ static DEFINE_MUTEX(ghes_reg_mutex);
  */
 static DEFINE_SPINLOCK(ghes_lock);
 
+/*
+ * Locking:
+ *
+ *  dimms, ghes_dimm_pool:  ghes_reg_mutex
+ *  ghes_dimm_list:         ghes_lock
+ */
+static struct ghes_dimm *dimms;
+static LIST_HEAD(ghes_dimm_list);
+static LIST_HEAD(ghes_dimm_pool);
+
 /* "ghes_edac.force_load=1" skips the platform check */
 static bool __read_mostly force_load;
 module_param(force_load, bool, 0);
@@ -72,11 +88,63 @@ struct memdev_dmi_entry {
 	u16 conf_mem_clk_speed;
 } __attribute__((__packed__));
 
-struct ghes_edac_dimm_fill {
+struct dimm_fill {
+	struct list_head dimms;
 	struct mem_ctl_info *mci;
 	unsigned int count;
 };
 
+static int ghes_dimm_pool_create(int num_dimm)
+{
+	struct ghes_dimm *ghes_dimm;
+
+	if (!num_dimm)
+		return 0;
+
+	lockdep_assert_held(ghes_reg_mutex);
+
+	dimms = kcalloc(num_dimm, sizeof(*dimms), GFP_KERNEL);
+	if (!dimms)
+		return -ENOMEM;
+
+	for (ghes_dimm = dimms; ghes_dimm < dimms + num_dimm; ghes_dimm++)
+		list_add(&ghes_dimm->entry, &ghes_dimm_pool);
+
+	return 0;
+}
+
+static void ghes_dimm_pool_destroy(void)
+{
+	lockdep_assert_held(ghes_reg_mutex);
+	INIT_LIST_HEAD(&ghes_dimm_pool);
+	kfree(dimms);
+}
+
+static struct ghes_dimm *ghes_dimm_alloc(struct dimm_info *dimm, u16 handle)
+{
+	struct ghes_dimm *ghes_dimm;
+
+	lockdep_assert_held(ghes_reg_mutex);
+
+	ghes_dimm = list_first_entry_or_null(&ghes_dimm_pool,
+					struct ghes_dimm, entry);
+
+	/* should be always non-zero */
+	if (!WARN_ON_ONCE(!ghes_dimm)) {
+		ghes_dimm->dimm = dimm;
+		ghes_dimm->handle = handle;
+		list_del(&ghes_dimm->entry);
+	}
+
+	return ghes_dimm;
+}
+
+static void ghes_dimm_release(struct list_head *dimms)
+{
+	lockdep_assert_held(ghes_reg_mutex);
+	list_splice(dimms, &ghes_dimm_pool);
+}
+
 static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg)
 {
 	int *num_dimm = arg;
@@ -85,13 +153,15 @@ static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg)
 		(*num_dimm)++;
 }
 
-static int get_dimm_smbios_index(struct mem_ctl_info *mci, u16 handle)
+static int get_dimm_smbios_index(u16 handle)
 {
-	struct dimm_info *dimm;
+	struct ghes_dimm *ghes_dimm;
 
-	mci_for_each_dimm(mci, dimm) {
-		if (dimm->smbios_handle == handle)
-			return dimm->idx;
+	lockdep_assert_held(&ghes_lock);
+
+	list_for_each_entry(ghes_dimm, &ghes_dimm_list, entry) {
+		if (ghes_dimm->handle == handle)
+			return ghes_dimm->dimm->idx;
 	}
 
 	return -1;
@@ -99,8 +169,9 @@ static int get_dimm_smbios_index(struct mem_ctl_info *mci, u16 handle)
 
 static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg)
 {
-	struct ghes_edac_dimm_fill *dimm_fill = arg;
+	struct dimm_fill *dimm_fill = arg;
 	struct mem_ctl_info *mci = dimm_fill->mci;
+	struct ghes_dimm *ghes_dimm;
 
 	if (dh->type == DMI_ENTRY_MEM_DEVICE) {
 		struct memdev_dmi_entry *entry = (struct memdev_dmi_entry *)dh;
@@ -191,7 +262,10 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg)
 				entry->total_width, entry->data_width);
 		}
 
-		dimm->smbios_handle = entry->handle;
+
+		ghes_dimm = ghes_dimm_alloc(dimm, entry->handle);
+		if (ghes_dimm)
+			list_add_tail(&ghes_dimm->entry, &dimm_fill->dimms);
 
 		dimm_fill->count++;
 	}
@@ -352,7 +426,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
 			p += sprintf(p, "DIMM DMI handle: 0x%.4x ",
 				     mem_err->mem_dev_handle);
 
-		index = get_dimm_smbios_index(mci, mem_err->mem_dev_handle);
+		index = get_dimm_smbios_index(mem_err->mem_dev_handle);
 		if (index >= 0)
 			e->top_layer = index;
 	}
@@ -457,7 +531,7 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 	struct mem_ctl_info *mci;
 	struct ghes_mci *pvt;
 	struct edac_mc_layer layers[1];
-	struct ghes_edac_dimm_fill dimm_fill;
+	struct dimm_fill dimm_fill;
 	unsigned long flags;
 	int idx = -1;
 
@@ -482,6 +556,10 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 	/* Get the number of DIMMs */
 	dmi_walk(ghes_edac_count_dimms, &num_dimm);
 
+	rc = ghes_dimm_pool_create(num_dimm);
+	if (rc < 0)
+		goto unlock;
+
 	/* Check if we've got a bogus BIOS */
 	if (num_dimm == 0) {
 		fake = true;
@@ -494,7 +572,6 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 
 	mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
 	if (!mci) {
-		pr_info("Can't allocate memory for EDAC data\n");
 		rc = -ENOMEM;
 		goto unlock;
 	}
@@ -523,6 +600,8 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 		pr_info("This system has %d DIMM sockets.\n", num_dimm);
 	}
 
+	INIT_LIST_HEAD(&dimm_fill.dimms);
+
 	if (!fake) {
 		dimm_fill.count = 0;
 		dimm_fill.mci = mci;
@@ -539,7 +618,7 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 
 	rc = edac_mc_add_mc(mci);
 	if (rc < 0) {
-		pr_info("Can't register at EDAC core\n");
+		ghes_dimm_release(&dimm_fill.dimms);
 		edac_mc_free(mci);
 		rc = -ENODEV;
 		goto unlock;
@@ -547,12 +626,18 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev)
 
 	spin_lock_irqsave(&ghes_lock, flags);
 	ghes_pvt = pvt;
+	list_splice_tail(&dimm_fill.dimms, &ghes_dimm_list);
 	spin_unlock_irqrestore(&ghes_lock, flags);
 
 	/* only set on success */
 	refcount_set(&ghes_refcount, 1);
 
 unlock:
+	if (rc < 0) {
+		ghes_dimm_pool_destroy();
+		pr_err("Can't register at EDAC core: %d\n", rc);
+	}
+
 	mutex_unlock(&ghes_reg_mutex);
 
 	return rc;
@@ -562,6 +647,7 @@ void ghes_edac_unregister(struct ghes *ghes)
 {
 	struct mem_ctl_info *mci;
 	unsigned long flags;
+	LIST_HEAD(dimm_list);
 
 	mutex_lock(&ghes_reg_mutex);
 
@@ -574,14 +660,19 @@ void ghes_edac_unregister(struct ghes *ghes)
 	spin_lock_irqsave(&ghes_lock, flags);
 	mci = ghes_pvt ? ghes_pvt->mci : NULL;
 	ghes_pvt = NULL;
+	list_splice_init(&ghes_dimm_list, &dimm_list);
 	spin_unlock_irqrestore(&ghes_lock, flags);
 
+	ghes_dimm_release(&dimm_list);
+
 	if (!mci)
 		goto unlock;
 
 	mci = edac_mc_del_mc(mci->pdev);
-	if (mci)
+	if (mci) {
 		edac_mc_free(mci);
+		ghes_dimm_pool_destroy();
+	}
 
 unlock:
 	mutex_unlock(&ghes_reg_mutex);
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 0f20b986b0ab..6b7f594782c0 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -382,8 +382,6 @@ struct dimm_info {
 
 	unsigned int csrow, cschannel;	/* Points to the old API data */
 
-	u16 smbios_handle;              /* Handle for SMBIOS type 17 */
-
 	u32 ce_count;
 	u32 ue_count;
 };
-- 
2.20.1

Powered by blists - more mailing lists