From: Robert Richter <rrichter@marvell.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Tony Luck <tony.luck@intel.com>,
James Morse <james.morse@arm.com>,
Aristeu Rozanski <aris@redhat.com>,
"linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 05/10] EDAC/mc: Create new function edac_inc_csrow()
Date: Fri, 14 Feb 2020 13:40:28 +0100 [thread overview]
Message-ID: <20200214124028.d5tqr4zxke5elaxf@rric.localdomain> (raw)
In-Reply-To: <20200213124708.GJ31799@zn.tnic>
On 13.02.20 13:47:08, Borislav Petkov wrote:
> On Thu, Jan 23, 2020 at 09:02:58AM +0000, Robert Richter wrote:
> > Have a separate function to count errors in csrow/channel. This better
> > separates code and reduces the indentation level. No functional
> > changes.
> >
> > Signed-off-by: Robert Richter <rrichter@marvell.com>
> > Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > Acked-by: Aristeu Rozanski <aris@redhat.com>
> > ---
> > drivers/edac/edac_mc.c | 40 +++++++++++++++++++++++++---------------
> > 1 file changed, 25 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> > index 3c00c046acc9..e75cb7a9c454 100644
> > --- a/drivers/edac/edac_mc.c
> > +++ b/drivers/edac/edac_mc.c
> > @@ -1091,6 +1091,26 @@ static void edac_ue_error(struct mem_ctl_info *mci,
> > edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
> > }
> >
> > +static void edac_inc_csrow(struct edac_raw_error_desc *e, int row, int chan)
> > +{
> > + struct mem_ctl_info *mci = error_desc_to_mci(e);
> > + u16 count = e->error_count;
> > + enum hw_event_mc_err_type type = e->type;
>
> Please sort function local variables declaration in a reverse christmas
> tree order:
>
> <type A> longest_variable_name;
> <type B> shorter_var_name;
> <type C> even_shorter;
> <type D> i;
I can change this. Does variable name length include the assignment?
Generally I prefer to sort it by size_of() to avoid holes due to
padding, though the compiler uses probably registers here anyway.
It's just a flavor.
If it's just this change, could you edit the patch to avoid respin?
>
> > +
> > + if (row < 0)
> > + return;
> > +
> > + edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan);
> > +
> > + if (type == HW_EVENT_ERR_CORRECTED) {
> > + mci->csrows[row]->ce_count += count;
> > + if (chan >= 0)
> > + mci->csrows[row]->channels[chan]->ce_count += count;
> > + } else {
> > + mci->csrows[row]->ue_count += count;
> > + }
> > +}
> > +
> > void edac_raw_mc_handle_error(struct edac_raw_error_desc *e)
> > {
> > struct mem_ctl_info *mci = error_desc_to_mci(e);
> > @@ -1258,22 +1278,12 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
> > chan = -2;
> > }
> >
> > - if (!e->enable_per_layer_report) {
> > + if (!e->enable_per_layer_report)
> > strcpy(e->label, "any memory");
> > - } else {
> > - edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan);
> > - if (p == e->label)
> > - strcpy(e->label, "unknown memory");
> > - if (type == HW_EVENT_ERR_CORRECTED) {
> > - if (row >= 0) {
> > - mci->csrows[row]->ce_count += error_count;
> > - if (chan >= 0)
> > - mci->csrows[row]->channels[chan]->ce_count += error_count;
> > - }
> > - } else
> > - if (row >= 0)
> > - mci->csrows[row]->ue_count += error_count;
> > - }
> > + else if (!*e->label)
> > + strcpy(e->label, "unknown memory");
> > +
> > + edac_inc_csrow(e, row, chan);
>
> Err, but this has functional changes: the !e->enable_per_layer_report
> case sets only the e->label and the else branch only does increment
> ->ce_count.
>
> Your change gets ->ce_count incremented in both cases.
No, there is a check in edac_inc_csrow(): if (row < 0) ... In the case
of "any memory", row is also < 0, so nothing is counted. This is
reasonable since no dimm is found and row/channel is still set to the
setup value of -1.
-Robert
next prev parent reply other threads:[~2020-02-14 12:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 9:02 [PATCH v3 00/10] EDAC: Rework core and ghes drivers, part two Robert Richter
2020-01-23 9:02 ` [PATCH v3 01/10] EDAC/mc: Split edac_mc_alloc() into smaller functions Robert Richter
2020-01-23 9:02 ` [PATCH v3 02/10] EDAC/mc: Reorder functions edac_mc_alloc*() Robert Richter
2020-01-23 19:02 ` Matthias Brugger
2020-01-30 18:49 ` Robert Richter
2020-01-23 9:02 ` [PATCH v3 03/10] EDAC: Store error type in struct edac_raw_error_desc Robert Richter
2020-01-23 9:02 ` [PATCH v3 04/10] EDAC/mc: Determine mci pointer from the error descriptor Robert Richter
2020-01-23 9:02 ` [PATCH v3 05/10] EDAC/mc: Create new function edac_inc_csrow() Robert Richter
2020-02-13 12:47 ` Borislav Petkov
2020-02-14 12:40 ` Robert Richter [this message]
2020-02-14 14:17 ` [PATCH v2] " Robert Richter
2020-01-23 9:03 ` [PATCH v3 06/10] EDAC/mc: Report "unknown memory" on too many DIMM labels found Robert Richter
2020-01-23 9:03 ` [PATCH v3 07/10] EDAC/mc: Remove enable_per_layer_report function arguments Robert Richter
2020-01-23 9:03 ` [PATCH v3 08/10] EDAC/mc: Pass the error descriptor to error reporting functions Robert Richter
2020-01-23 9:03 ` [PATCH v3 09/10] EDAC/mc: Remove detail[] string and cleanup error string generation Robert Richter
2020-01-23 9:03 ` [PATCH v3 10/10] EDAC/mc: Remove per layer counters Robert Richter
2020-02-17 15:49 ` [PATCH v3 00/10] EDAC: Rework core and ghes drivers, part two Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214124028.d5tqr4zxke5elaxf@rric.localdomain \
--to=rrichter@marvell.com \
--cc=aris@redhat.com \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).