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 v4] x86/mce: retrieve poison range from hardware
Date:   Wed, 27 Jul 2022 12:46:44 -0600
Message-Id: <20220727184644.2685405-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?4yzLETFoEvpZMJW0rhTDNXaXt+QOQG+4jVSEwwzoyB/9wxEu7S3qgLrQ4REA?=
 =?us-ascii?Q?A+WIp8oj47rheVxbqAQoX8duQwC2a5+z/Fn2KdLD5HZoRWZkwdK5t1Kc8dua?=
 =?us-ascii?Q?wpOV36MZeuLGX3A3j6oa/swxV/lO69jTfNhHrWiIEk6ccD/99I1bXc0qd2wf?=
 =?us-ascii?Q?hHa2LjUotFaQe7lYly9gP4hIq5/NQw2+vBsoYRpoQKdfW/ggDIUfsWuFyILV?=
 =?us-ascii?Q?zn/Yk1S1rDdlAU+OjIvy8gX/Csge5HMRsnKNLJcG/BrI8Jh4D2TbiMgrswZ0?=
 =?us-ascii?Q?p6ez0j/jnrua+abQxyksyGUwWrNgR0oUg3KP8fKI0IEabyheQ0w5XYdnQHFE?=
 =?us-ascii?Q?pAdYkRY8g/1NahZKqZ6YvTLur33z2Xu8m8JXWYkUHmWpYn/0TVy9QjqL3HWt?=
 =?us-ascii?Q?hAzEYaLK3J+WS5Y0D4TBUCtDwBxR8uhQEsaL9FgAM7erYQKRHXxuoA1Wnctz?=
 =?us-ascii?Q?GPv4lwIsdA7TFfjQsltURStlK/BhoLkEYOvnTShDKul8ZBqAjGvSFw0TgpJK?=
 =?us-ascii?Q?AFIB6RY33qzLwH6uL87MBqUc/Kysje6Cj4ZVML2quunC08OjOLRTBTrXphe9?=
 =?us-ascii?Q?uI//8USxUVh/4jsMOf5RjYALfuYj80m9zixStiQAJaeKjygzDHRvptJKj5rA?=
 =?us-ascii?Q?JiAHPNGFfa22QPkpXHMS7dG+8fqcQlk5O7TX5sYzrJ7Ero9BCf/TaM2piJ8g?=
 =?us-ascii?Q?aw07cvm/I4q1vTEZDZhmiuNd7ZF07XAMHHGxQwAUwE3Ho6x2NvumhkXmyqSC?=
 =?us-ascii?Q?N8iOOd379V1SHGzm2r1MfbrY4rWK9xcQVMACSU4RQjlmRxVFp5iknHF6UlUV?=
 =?us-ascii?Q?3qCEt2KMqYWmoMWp5iZv4dZh6GKRsWaxW8Zkz/QgEuj6rNft0PK6z4NJPSJ0?=
 =?us-ascii?Q?6eDXqFTf6EpW/9srcp4+N7Hp1DFyQ5gURPq7vHbZVoZb2m0IO3CYjxP/SQaq?=
 =?us-ascii?Q?8AgL0IzFmhjL4PesikTSUyHCpC+NqdTb5qDRZ4nyboyusZaws+mk+ry9D4M9?=
 =?us-ascii?Q?avOB0rv64ZAYPGx0djcw7X8YK6KjhcF7QPyAVApPqUPrlzeu3Ym29yTYxdd3?=
 =?us-ascii?Q?hY5XaAxnRfNAkHMuIzCiXa8sWqRXB4XtzjBLA2UTXr/rRi3k7vJW2H2qOkvI?=
 =?us-ascii?Q?3g0iJB0M15TKmoGVu9KxFjLEg2SBP2zIbxKu10Cl04tLkOJFjkdnQKOCxnYS?=
 =?us-ascii?Q?FtJtDBPRGCFhTa2sUywATI3TVlEjLAafCLuwX4+xehjJSnuBFUCjd3LU6iQC?=
 =?us-ascii?Q?tGqKhlQRFXDoqcjAs06CPvTixmPqwwzwDLnyjt4aQPR6L0xUDAr//5RWPicl?=
 =?us-ascii?Q?6z5PHHPOP62ywz+AK+vXfd5liTpxnpVvd6rhC0cc0hMAlcBubt4qlvmUrEE8?=
 =?us-ascii?Q?rJU1RqyVvsZhDN7n4eBvi2N9DYD4G7lGhYpooMnCRoNaPo1/kTg94qvVS9PH?=
 =?us-ascii?Q?zE9C6t9+oODkATb7vFrgIEcLuW9IKllfc36cMVvZi2ZI5mbKNRVoMxVJoUPt?=
 =?us-ascii?Q?Yje2a/xzQetcBTymS2YDaGMmw6jNBcnlqM1BdIF8Bg5Adn5j2u8lLEyx+vMs?=
 =?us-ascii?Q?PtUcFgblBkU0eDb8Kz8BZefaEVXTTefL+T6IupSNqqUxMsKI8WoQszhkucnX?=
 =?us-ascii?Q?yqdGyoQbz0a4HuOSfLHe1Yw=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 93ac4834-3c81-4449-8b9c-08da70006038
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2022 18:46:54.3757
 (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: UDZ9cInUDFlQOzoRyQiqMalbCt7xJcZEvSvTCUCPnYc7jJWzGKW7sbhYgPlMc0Ww3GfaAiU71y5zCbPAV/kjrA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3423
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-27_08,2022-07-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 mlxscore=0 suspectscore=0 adultscore=0 bulkscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2206140000 definitions=main-2207270080
X-Proofpoint-GUID: 2m0Km5-oD6rOswvGJP78xdVmCGjBbji8
X-Proofpoint-ORIG-GUID: 2m0Km5-oD6rOswvGJP78xdVmCGjBbji8
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..26d63818b2de 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 grain = 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) {
+		grain = ~mem_err->physical_addr_mask + 1;
+		if (grain == 1)
+			grain = 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) | grain;
 
 	if (severity >= GHES_SEV_RECOVERABLE)
 		m.status |= MCI_STATUS_UC;
-- 
2.18.4