EDAC/mc: Use kzalloc_flex()
PATCH 1/1 EDAC/mc: Use kzalloc_flex()
Change kzalloc + kcalloc to just kzalloc with a flexible array member.
Add __counted_by for extra runtime analysis when requested.
Move counting assignment immediately after allocation as required by __counted_by.
--- drivers/edac/edac_mc.c | 9 ++------- include/linux/edac.h | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-)
drivers/edac/edac_mc.c +2 -7
@@ -203,7 +203,6 @@ static void mci_release(struct device *dev)kfree (mci->csrows); }kfree (mci->pvt_info); -kfree (mci->layers);kfree (mci); }
@@ -361,25 +360,21 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, per_rank = true; } - mci = kzalloc_obj(struct mem_ctl_info); + mci =kzalloc_flex (*mci, layers, n_layers);if (!mci)return NULL ; - mci->layers = kzalloc_objs(struct edac_mc_layer, n_layers); -if (!mci->layers) - goto error; - mci->pvt_info =kzalloc (sz_pvt,GFP_KERNEL );if (!mci->pvt_info) goto error; + mci->n_layers = n_layers; mci->dev.release = mci_release;device_initialize (&mci->dev);/* setup index and various internal pointers */ mci->mc_idx = mc_num; mci->tot_dimms = tot_dimms; - mci->n_layers = n_layers;memcpy (mci->layers, layers,sizeof (*layer) * n_layers); mci->nr_csrows = tot_csrows; mci->num_cschannel = tot_channels;
include/linux/edac.h +12 -11
@@ -541,17 +541,6 @@ struct mem_ctl_info {struct csrow_info **csrows;unsigned int nr_csrows, num_cschannel; -/* -* Memory Controller hierarchy -* -* There are basically two types of memory controller: the ones that -* sees memory sticks ("dimms"), and the ones that sees memory ranks. -* All old memory controllers enumerate memories per rank, but most -* of the recent drivers enumerate memories per DIMM, instead. -* When the memory controller is per rank, csbased is true. -*/ -unsigned int n_layers; -struct edac_mc_layer *layers;bool csbased;/*
@@ -609,6 +598,18 @@ struct mem_ctl_info {u8 fake_inject_layer[EDAC_MAX_LAYERS ];bool fake_inject_ue;u16 fake_inject_count; + +/* +* Memory Controller hierarchy +* +* There are basically two types of memory controller: the ones that +* sees memory sticks ("dimms"), and the ones that sees memory ranks. +* All old memory controllers enumerate memories per rank, but most +* of the recent drivers enumerate memories per DIMM, instead. +* When the memory controller is per rank, csbased is true. +*/ +unsigned int n_layers; + struct edac_mc_layer layers[] __counted_by(n_layers); };#define mci_for_each_dimm (mci, dimm) \
Signature · 1 line
2.53.0
Quoted 7 lines · Rosen Penev
Change kzalloc + kcalloc to just kzalloc with a flexible array member.
Add
__counted_byfor extra runtime analysis when requested.Move counting assignment immediately after allocation as required by
__counted_by.
[...]
Quoted 1 line
include/linux/edac.h +0
-0
[...]
Quoted 10 lines
include/linux/edac.h +1
-2-unsigned int n_layers; -struct edac_mc_layer *layers;bool csbased;/* @@ -609,6 +598,18 @@ struct mem_ctl_info {u8 fake_inject_layer[EDAC_MAX_LAYERS ];bool fake_inject_ue;u16 fake_inject_count; +
[...]
include/linux/edac.h struct mem_ctl_info { · line 613
Quoted 4 lines
include/linux/edac.h +2
-0+unsigned int n_layers; + struct edac_mc_layer layers[] __counted_by(n_layers); };
So this is not a just an in-place macro conversion, correct?
You're redefining 'struct mem_ctl_info' to have a flexible array member. I see this was done with the SB and i7 modules.
I'd prefer if this was explicitly stated in the commit message.
"Convert struct mem_ctl_info to use flex array...and use the new flex array helpers to simplify initialization..."
Just an example of some highlights ^^^.
Otherwise, looks good to me.
Thanks,
Yazen