Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Robert Richter <rrichter@marvell.com>
To:     Borislav Petkov <bp@alien8.de>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Tony Luck <tony.luck@intel.com>
CC:     James Morse <james.morse@arm.com>,
        Aristeu Rozanski <aris@redhat.com>,
        Robert Richter <rrichter@marvell.com>,
        "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 06/10] EDAC/mc: Report "unknown memory" on too many DIMM
 labels found
Thread-Topic: [PATCH v3 06/10] EDAC/mc: Report "unknown memory" on too many
 DIMM labels found
Thread-Index: AQHV0cvpAjtm7u086USRplIay6mVRg==
Date:   Thu, 23 Jan 2020 09:03:00 +0000
Message-ID: <20200123090210.26933-7-rrichter@marvell.com>
References: <20200123090210.26933-1-rrichter@marvell.com>
In-Reply-To: <20200123090210.26933-1-rrichter@marvell.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.20.1
x-originating-ip: [31.208.96.227]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 4f9ec508-3c2e-4ee6-8a68-08d79fe30c16
x-ms-traffictypediagnostic: MN2PR18MB3247:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MN2PR18MB324709EADF619AE46B572B83D90F0@MN2PR18MB3247.namprd18.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:8273;
x-forefront-prvs: 029174C036
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(136003)(346002)(366004)(396003)(39850400004)(376002)(199004)(189003)(110136005)(66946007)(6666004)(52116002)(6512007)(66476007)(66556008)(64756008)(66446008)(54906003)(478600001)(1076003)(5660300002)(956004)(2616005)(6486002)(6506007)(36756003)(2906002)(81156014)(8676002)(86362001)(26005)(81166006)(8936002)(71200400001)(4326008)(186003)(316002)(16526019);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR18MB3247;H:MN2PR18MB3408.namprd18.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: marvell.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: thqJWqfnOPZMA70Jm0zC6y/+iyMhg/V3E4Ko2WDQCXXedAWhKRsjuL4gusKob/Jb07t+AHFBXAqLJ4zJh9NGqNdN6XSAfv84+3dqg/kH+J5LHr3zBY00+/BmoTkCzT6RDia0NwL9aVF4HP240EkEPQtThf2WlzAfw8Rvzx8yGxz6ba+xfjpkI+9gDNohTZmgPWIbxbTMpjYhqOH+zrkPFv3pUBUcbASXbIq8AMbvwMFZGtVjhNtQV9Pf8Ze+oEXkp5E2juNFCVVtDlL87wxDuZTwWmA4Lvvj5KfPkwtzHL3J4cmuCZiyox7Du94XhlUoUlkoieVhd6OsDtqZkVF0FT5AwrZlbGC6v8A+PVF/+6YhQp2qr+w4x3CwzchblRyzfEh96y3z0pKPl3YKhOCSPD04JYvJkEWnbleqOsjn1Vbt6tGAcQy2UY/Lj1biI/1H
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f9ec508-3c2e-4ee6-8a68-08d79fe30c16
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2020 09:03:00.7349
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Ti1k0aLIIYHo/cqFdc+/v66u+E+ub3v/VymrSrrWTDcgCcoAsp89Q2V+RDU4x4lyviLrdaKsMMlSODvGOasK4w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3247
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572
 definitions=2020-01-22_08:2020-01-22,2020-01-22 signatures=0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There is a limitation to report only EDAC_MAX_LABELS in e->label of
the error descriptor. This is to prevent a possible string overflow.
Current implementation falls back to "any memory" in this case and
also stops all further processing to find a unique row and channel of
the possible error location. Reporting "any memory" is wrong as the
memory controller reported an error location for one of the layers.
Instead, report "unknown memory" and also do not break early in the
loop to further check row and channel for uniqueness.

Signed-off-by: Robert Richter <rrichter@marvell.com>
Acked-by: Aristeu Rozanski <aris@redhat.com>
---
 drivers/edac/edac_mc.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index e75cb7a9c454..aa94152777fe 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -1245,20 +1245,21 @@ void edac_mc_handle_error(const enum hw_event_mc_er=
r_type type,
 		 * channel/memory controller/...  may be affected.
 		 * Also, don't show errors for empty DIMM slots.
 		 */
-		if (!e->enable_per_layer_report || !dimm->nr_pages)
+		if (!dimm->nr_pages)
 			continue;
=20
-		if (n_labels >=3D EDAC_MAX_LABELS) {
-			e->enable_per_layer_report =3D false;
-			break;
-		}
 		n_labels++;
-		if (p !=3D e->label) {
-			strcpy(p, OTHER_LABEL);
-			p +=3D strlen(OTHER_LABEL);
+		if (n_labels > EDAC_MAX_LABELS) {
+			p =3D e->label;
+			*p =3D '\0';
+		} else {
+			if (p !=3D e->label) {
+				strcpy(p, OTHER_LABEL);
+				p +=3D strlen(OTHER_LABEL);
+			}
+			strcpy(p, dimm->label);
+			p +=3D strlen(p);
 		}
-		strcpy(p, dimm->label);
-		p +=3D strlen(p);
=20
 		/*
 		 * get csrow/channel of the DIMM, in order to allow
--=20
2.20.1