From patchwork Sun Dec 29 17:19:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182536 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5443137ild; Sun, 29 Dec 2019 09:25:32 -0800 (PST) X-Google-Smtp-Source: APXvYqwwzIm56SXfLSoo3pQfXxI5pqKqjOpM2fMF5qfW/8/3uCqTOnufcymm6FIX7v/ibmcjgvJd X-Received: by 2002:a9d:74c8:: with SMTP id a8mr66374771otl.57.1577640332499; Sun, 29 Dec 2019 09:25:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577640332; cv=none; d=google.com; s=arc-20160816; b=SfTt08VJdClhYwzdAExmc1g1Aix5GvJ2a1DrssCcakOMYAwAfD8uKP3dsrL7/cGzWD mXr+/XHwD34WcAFD9bbqW8FYRCYz1y6433XIbfTmgn0pnR5EUfiTfO+fEVfhAFV5lrCw gOZ201DDZWCgyennWsihp1sE8cPwFfbPLIqv5Z2h7+3NfuVKvhhrFCjQdqJje/VFxOdn B1NCYG+I1rea7M3i15Rh44pDlO94CNqSSf7RftrQEg00UI7/idQzhQ8ZbF394/L65e/P W5zKaYow8aUsVbByBy/GefNScdV95W3Jm2Rb2aGfBrXckdNQQWC8dl+NcZEhKjA/Hic2 D8JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YbW3dMR63hUMm8s2W+Bu8GpWj6uwVbWTJP7ACrUBOTI=; b=pEg5SDJVUj5M/UMxfZUjPZazr6j0+Ow3P9GP97jHV0/OPg6NW0p0JLjq5oBeuK6qaQ p0c0gcFO9xILawSIQpWkC7wrXY0AC0hO91vPLB/wQ0+2KP3cQQWzdrkkFJGTvazmUhzA Dw+JqkjMefRB9OHnC2W6Hb2JYbKhFyP3XHp9Cx2MrGpcab2wGmAVBx2Kgv4/DQy85jFW h2wAS8jpX8rCgoaPv3xwRyYeuCFPg1EWG6M2AlOSbXMdqV93Zi0Ndk2Pd7fjG2Hs33ku qY1fegXxqY6k1wVS/T3aknsLYbVjmJ8CtX5824MSsq6ly2xCXNrMNPQVFpT7REZNMGM0 CdZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lCPqqlz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 92si22016276otr.25.2019.12.29.09.25.32; Sun, 29 Dec 2019 09:25:32 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lCPqqlz+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbfL2RZb (ORCPT + 27 others); Sun, 29 Dec 2019 12:25:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:45332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727474AbfL2RZ2 (ORCPT ); Sun, 29 Dec 2019 12:25:28 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26FF620409; Sun, 29 Dec 2019 17:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640327; bh=UtjqdOVa/KZHKY7sXd8vUgrnNeXDFcZoscPGOtTCDYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lCPqqlz+t+xZ4SeaVsHDqbotOI6V36x2PrwKRUo4BXFhTOS9yxO5DfytQeRni1mEL XLzPWz36bloEHf4ZJdNwXAoa6aOlECq3+pi/V3nIrgwVgqlph73pNGId/4Gn840PiS CpksaEjBM1lTSAHJyACyrDRhCVseytqtmR5LPe8Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Morse , Robert Richter , Borislav Petkov , Mauro Carvalho Chehab , "linux-edac@vger.kernel.org" , Tony Luck , Sasha Levin Subject: [PATCH 4.14 111/161] EDAC/ghes: Fix grain calculation Date: Sun, 29 Dec 2019 18:19:19 +0100 Message-Id: <20191229162430.774697006@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Richter [ Upstream commit 7088e29e0423d3195e09079b4f849ec4837e5a75 ] The current code to convert a physical address mask to a grain (defined as granularity in bytes) is: e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK); This is broken in several ways: 1) It calculates to wrong grain values. E.g., a physical address mask of ~0xfff should give a grain of 0x1000. Without considering PAGE_MASK, there is an off-by-one. Things are worse when also filtering it with ~PAGE_MASK. This will calculate to a grain with the upper bits set. In the example it even calculates to ~0. 2) The grain does not depend on and is unrelated to the kernel's page-size. The page-size only matters when unmapping memory in memory_failure(). Smaller grains are wrongly rounded up to the page-size, on architectures with a configurable page-size (e.g. arm64) this could round up to the even bigger page-size of the hypervisor. Fix this with: e->grain = ~mem_err->physical_addr_mask + 1; The grain_bits are defined as: grain = 1 << grain_bits; Change also the grain_bits calculation accordingly, it is the same formula as in edac_mc.c now and the code can be unified. The value in ->physical_addr_mask coming from firmware is assumed to be contiguous, but this is not sanity-checked. However, in case the mask is non-contiguous, a conversion to grain_bits effectively converts the grain bit mask to a power of 2 by rounding it up. Suggested-by: James Morse Signed-off-by: Robert Richter Signed-off-by: Borislav Petkov Reviewed-by: Mauro Carvalho Chehab Cc: "linux-edac@vger.kernel.org" Cc: Tony Luck Link: https://lkml.kernel.org/r/20191106093239.25517-11-rrichter@marvell.com Signed-off-by: Sasha Levin --- drivers/edac/ghes_edac.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 6f80eb65c26c..acae39278669 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -187,6 +187,7 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, /* Cleans the error report buffer */ memset(e, 0, sizeof (*e)); e->error_count = 1; + e->grain = 1; strcpy(e->label, "unknown label"); e->msg = pvt->msg; e->other_detail = pvt->other_detail; @@ -282,7 +283,7 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, /* Error grain */ if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK) - e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK); + e->grain = ~mem_err->physical_addr_mask + 1; /* Memory error location, mapped on e->location */ p = e->location; @@ -389,8 +390,13 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, if (p > pvt->other_detail) *(p - 1) = '\0'; + /* Sanity-check driver-supplied grain value. */ + if (WARN_ON_ONCE(!e->grain)) + e->grain = 1; + + grain_bits = fls_long(e->grain - 1); + /* Generate the trace event */ - grain_bits = fls_long(e->grain); snprintf(pvt->detail_location, sizeof(pvt->detail_location), "APEI location: %s %s", e->location, e->other_detail); trace_mc_event(type, e->msg, e->label, e->error_count,