Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jane Chu <jane.chu@oracle.com>
To:     tony.luck@intel.com, bp@alien8.de, tglx@linutronix.de,
        mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org,
        linux-edac@vger.kernel.org, dan.j.williams@intel.com,
        linux-kernel@vger.kernel.org, hch@lst.de, nvdimm@lists.linux.dev
Subject: [PATCH v5] x86/mce: retrieve poison range from hardware
Date:   Sat, 30 Jul 2022 00:17:57 -0600
Message-Id: <20220730061757.3441537-1-jane.chu@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IilPN7hAiTThnx2jhpcDDyZGfNoydCqJ4PFj3u68t2ETIbz8uMlqwhwfcQ0a?=
 =?us-ascii?Q?e1VXgLcOgfmAw0K4FdGNyT8HL8ji8XbyQt8ABgo5+AUKorv2kkCTcA3ACbfH?=
 =?us-ascii?Q?0ej8lsGsTUxAVNh81+G6VEzJJCGhSkRs9TzppUmf/cLmHRXRWXkHDUIiEZcT?=
 =?us-ascii?Q?qra4OlO7PrT3ygq++8zhFiO2MuKScJEQqGvVGHT2XHvjJZrCjIqjT8DjLMRo?=
 =?us-ascii?Q?bnZ8y7NdessI4y6M7eWfWcb5AKgftjUFcALPqgV86yWvdkkN8Ph95CpaJ18O?=
 =?us-ascii?Q?fXllFDeb7HRNUxEKfhjWGhUSF9x6upVQ7Nz7huTG8q0iwPGyhwmx71HKX/ii?=
 =?us-ascii?Q?ShirN6C86aLGedkKKG2OyMpAoV0intBa8NWdCjOJaOMnkWVrL2BXILIAyUyH?=
 =?us-ascii?Q?lg5grEcYBNtnZmdori/QS6LolrlUSQm3KmqVO7EcuM+k78OYQ6CHYludRI81?=
 =?us-ascii?Q?tKdmYeEvW5lGMj78P5RPKVlXXtyIbLF0DvJ/5dwL74N017k8r1h6od362fA5?=
 =?us-ascii?Q?kMMZtpPSSQK/FU2h5H0IB99xkBvkGunHnu42nWXp3tRkjXKw2rffFY1ACvg6?=
 =?us-ascii?Q?N9xngVHypiJMZVncHASMOi9qrvPvfyxHAeRokpefBIIGdNwbDGe3EcQWqSDo?=
 =?us-ascii?Q?RHC3eDx1xDl3PAFzBWPnSPgA+AAyHPVw6sn88FYyg7ICW3TNNCSbB10mF0RQ?=
 =?us-ascii?Q?y3wpmjA0LIMiEEdNjxIl+/O+pavgbKMZhxADHyYTcSdnTKsukOfPg9xGHvH2?=
 =?us-ascii?Q?ujTdodi81XUOwGI7pcraWVWMaL0jmeBr8je2LIQnmBbnS2S2dKrv67SqIe/+?=
 =?us-ascii?Q?J4BC4mMcwOnbfYkOoRrCrKj7kL2fR3BlLX5Xk7NXESkPN0KI/D3DIF/5+3WC?=
 =?us-ascii?Q?fMzl4cFB54K+RS29yxS3aczFrP26xrGsnkQR1Kl8Z1N3XHbMil/6m9uvMLlK?=
 =?us-ascii?Q?DiTPXquHFq1WQPrSTeh/XzjB6E21748zJdrG/KAz/At+vZ1eJbrhoUSJfvH/?=
 =?us-ascii?Q?UEf4X910qwIv5OdaJPUY/ZNIzqww2JlMVnsZU8yMy3jaKlr44bYGmE9lZeV5?=
 =?us-ascii?Q?8MV9ie6IaNxQT74QYDC6UlDZrnA0bXUOu8dE5Yn722Hm3aX5zub0e4fZvWFA?=
 =?us-ascii?Q?u2hQDacUOegQoVDPOryFzCWhwLpSNsmDBQrxmT3bjQ3vZBKOBH25uvgIQAhi?=
 =?us-ascii?Q?23VU07kBcjZuKf39PxhTOhPe7/SlT8gCtymfClhw3QvjqbtHd90+iAcvG3Ck?=
 =?us-ascii?Q?DUPriHUCdtfEvitbFlPJeCmGUQDv+hnVDEBNd4yIpf9+WYDtSTAR3vU662SI?=
 =?us-ascii?Q?S0SCbRujwaqXGdQEaOjeBg0vW2/LCrB4ruKHVEFTkohOYiQ+V/HFyUyW2UWH?=
 =?us-ascii?Q?osXnKz9td2lJbhDCJAWA9AUZMdVtNO/syg7QngSSgLEmkoMHxsyqgJwXANxa?=
 =?us-ascii?Q?vquQitaLBycmxck/i7f8Mzrf2o9cKr3w1c4vd0OM6ntlWx2Ylh7rYiv2GDxU?=
 =?us-ascii?Q?bcdK9WmoKa7sqdmtiRlMSpDATN5eaBNPs/0H5cxhvIfOQLNIIbTlPUQnejGJ?=
 =?us-ascii?Q?XshdiBIvt6Q7UfYEhk6j0qZZzwg7+lFCZqp4HP/GMAJGZZ24oCnq2xZcywXp?=
 =?us-ascii?Q?rQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 991b9366-6182-40f1-160a-08da71f3484b
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2022 06:18:13.1936
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: imsmqcFY8ey4iB60kw+kpNGVUZNcEtrdtIVW/dlvCqioSHYJHdNW7v4Db101wOZh2cliht7cf3g2y+2peFbtnw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5677
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-30_03,2022-07-28_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0
 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207300033
X-Proofpoint-ORIG-GUID: CvZsVHj-KKj-DzkY_xTV-5RTjAXiIGNd
X-Proofpoint-GUID: CvZsVHj-KKj-DzkY_xTV-5RTjAXiIGNd
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

With Commit 7917f9cdb503 ("acpi/nfit: rely on mce->misc to determine
poison granularity") that changed nfit_handle_mce() callback to report
badrange according to 1ULL << MCI_MISC_ADDR_LSB(mce->misc), it's been
discovered that the mce->misc LSB field is 0x1000 bytes, hence injecting
2 back-to-back poisons and the driver ends up logging 8 badblocks,
because 0x1000 bytes is 8 512-byte.

Dan Williams noticed that apei_mce_report_mem_error() hardcode
the LSB field to PAGE_SHIFT instead of consulting the input
struct cper_sec_mem_err record.  So change to rely on hardware whenever
support is available.

Link: https://lore.kernel.org/r/7ed50fd8-521e-cade-77b1-738b8bfb8502@oracle.com

Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 arch/x86/kernel/cpu/mce/apei.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c
index 717192915f28..2c7ea0ba9dd7 100644
--- a/arch/x86/kernel/cpu/mce/apei.c
+++ b/arch/x86/kernel/cpu/mce/apei.c
@@ -29,15 +29,27 @@
 void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
 {
 	struct mce m;
+	int lsb = PAGE_SHIFT;
 
 	if (!(mem_err->validation_bits & CPER_MEM_VALID_PA))
 		return;
 
+	/*
+	 * Even if the ->validation_bits are set for address mask,
+	 * to be extra safe, check and reject an error radius '0',
+	 * and fallback to the default page size.
+	 */
+	if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK) {
+		lsb = __ffs64(mem_err->physical_addr_mask);
+		if (lsb == 1)
+			lsb = PAGE_SHIFT;
+	}
+
 	mce_setup(&m);
 	m.bank = -1;
 	/* Fake a memory read error with unknown channel */
 	m.status = MCI_STATUS_VAL | MCI_STATUS_EN | MCI_STATUS_ADDRV | MCI_STATUS_MISCV | 0x9f;
-	m.misc = (MCI_MISC_ADDR_PHYS << 6) | PAGE_SHIFT;
+	m.misc = (MCI_MISC_ADDR_PHYS << 6) | lsb;
 
 	if (severity >= GHES_SEV_RECOVERABLE)
 		m.status |= MCI_STATUS_UC;
-- 
2.18.4