| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200311092431.29749-1-manashuk@cisco.com>
Date: Wed, 11 Mar 2020 02:24:32 -0700
From: Manali K Shukla <manashuk@...co.com>
To: bp@...en8.de, linux-edac@...r.kernel.org, mchehab@...nel.org,
linux-kernel@...r.kernel.org, gregkh@...uxfoundation.org
Cc: xe-linux-external@...co.com, Borislav Petkov <bp@...e.de>,
Aristeu Rozanski Filho <arozansk@...hat.com>,
Justin Ernst <justin.ernst@....com>,
Russ Anderson <rja@....com>, Tony Luck <tony.luck@...el.com>,
Manali K Shukla <manashuk@...co.com>
Subject: [ PATCH stable v4.9] EDAC: Drop per-memory controller buses
From: Borislav Petkov <bp@...e.de>
upstream 861e6ed667c83d64a42b0db41a22d6b4de4e913f commit
... and use the single edac_subsys object returned from
subsys_system_register(). The idea is to have a single bus
and multiple devices on it.
Signed-off-by: Borislav Petkov <bp@...e.de>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
CC: Aristeu Rozanski Filho <arozansk@...hat.com>
CC: Greg KH <gregkh@...uxfoundation.org>
CC: Justin Ernst <justin.ernst@....com>
CC: linux-edac <linux-edac@...r.kernel.org>
CC: Mauro Carvalho Chehab <mchehab@...nel.org>
CC: Russ Anderson <rja@....com>
Cc: Tony Luck <tony.luck@...el.com>
Link: https://lkml.kernel.org/r/20180926152752.GG5584@zn.tnic
[Manali: backport to v4.9 -stable :
- removing per-MC bus, this enables to get rid of memory controllers
maximum number notion
- value of max number of memory controllers is 2 * MAX_NUMNODES. On two nodes system MAX_NUMNODES value is ‘1’ and
so value of max number of memory controller becomes ‘2’, this patch fixes this issue when there are only 2 nodes on the system
and number of memory controllers are more than ‘2’]
(cherry picked from commit 861e6ed667c83d64a42b0db41a22d6b4de4e913f)
Signed-off-by: Manali K Shukla <manashuk@...co.com>
---
drivers/edac/edac_mc.c | 9 +--------
drivers/edac/edac_mc_sysfs.c | 30 ++----------------------------
include/linux/edac.h | 6 ------
3 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index c3ee3ad98a63..ea44c2859b6e 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -50,8 +50,6 @@ static LIST_HEAD(mc_devices);
*/
static void const *edac_mc_owner;
-static struct bus_type mc_bus[EDAC_MAX_MCS];
-
unsigned edac_dimm_info_location(struct dimm_info *dimm, char *buf,
unsigned len)
{
@@ -681,11 +679,6 @@ int edac_mc_add_mc_with_groups(struct mem_ctl_info *mci,
int ret = -EINVAL;
edac_dbg(0, "\n");
- if (mci->mc_idx >= EDAC_MAX_MCS) {
- pr_warn_once("Too many memory controllers: %d\n", mci->mc_idx);
- return -ENODEV;
- }
-
#ifdef CONFIG_EDAC_DEBUG
if (edac_debug_level >= 3)
edac_mc_dump_mci(mci);
@@ -725,7 +718,7 @@ int edac_mc_add_mc_with_groups(struct mem_ctl_info *mci,
/* set load time so that error rate can be tracked */
mci->start_time = jiffies;
- mci->bus = &mc_bus[mci->mc_idx];
+ mci->bus = edac_get_sysfs_subsys();
if (edac_create_sysfs_mci_device(mci, groups)) {
edac_mc_printk(mci, KERN_WARNING,
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index d59641194860..1bf8283e8bbe 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -904,27 +904,8 @@ static struct device_type mci_attr_type = {
int edac_create_sysfs_mci_device(struct mem_ctl_info *mci,
const struct attribute_group **groups)
{
- char *name;
int i, err;
- /*
- * The memory controller needs its own bus, in order to avoid
- * namespace conflicts at /sys/bus/edac.
- */
- name = kasprintf(GFP_KERNEL, "mc%d", mci->mc_idx);
- if (!name)
- return -ENOMEM;
-
- mci->bus->name = name;
-
- edac_dbg(0, "creating bus %s\n", mci->bus->name);
-
- err = bus_register(mci->bus);
- if (err < 0) {
- kfree(name);
- return err;
- }
-
/* get the /sys/devices/system/edac subsys reference */
mci->dev.type = &mci_attr_type;
device_initialize(&mci->dev);
@@ -940,7 +921,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci,
err = device_add(&mci->dev);
if (err < 0) {
edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev));
- goto fail_unregister_bus;
+ goto out;
}
/*
@@ -988,10 +969,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci,
device_unregister(&dimm->dev);
}
device_unregister(&mci->dev);
-fail_unregister_bus:
- bus_unregister(mci->bus);
- kfree(name);
+out:
return err;
}
@@ -1022,13 +1001,8 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
void edac_unregister_sysfs(struct mem_ctl_info *mci)
{
- struct bus_type *bus = mci->bus;
- const char *name = mci->bus->name;
-
edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev));
device_unregister(&mci->dev);
- bus_unregister(bus);
- kfree(name);
}
static void mc_attr_release(struct device *dev)
diff --git a/include/linux/edac.h b/include/linux/edac.h
index c6233227720c..f69085294d69 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -775,10 +775,4 @@ struct mem_ctl_info {
bool fake_inject_ue;
u16 fake_inject_count;
};
-
-/*
- * Maximum number of memory controllers in the coherent fabric.
- */
-#define EDAC_MAX_MCS 2 * MAX_NUMNODES
-
#endif
--
2.19.1
Powered by blists - more mailing lists