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 v3] x86/mce: retrieve poison range from hardware
Date:   Sun, 17 Jul 2022 17:48:05 -0600
Message-Id: <20220717234805.1084386-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?htRNCr1SiyrzcVx0j3Ds5RWgnWRhSi3lod+rID07nav27ugCCVmpQfO2bE5q?=
 =?us-ascii?Q?jp3tsH+x3YW8TGjY6Tms9HEDDxo1Ios4h/ecVl8eleLOUlTV4Llql9pRlCax?=
 =?us-ascii?Q?Wlfruj07Me3A3jlZ0h2ZcTyX5Slw4peEF4chFmcNvTV/Xh+aOWgO4+jLVY6m?=
 =?us-ascii?Q?I71bkX9FMuug2dXKvnptHKz/3ULaJK64N1tXy3tqiR+zHgjQFAzjYppzvaVo?=
 =?us-ascii?Q?Kyg8V1qw0DwePQD2YEd9iVWVBYaiUHEMBsZ+VF1xgWW6RJypEVpAzxHawc3c?=
 =?us-ascii?Q?OWw4r6DODX4AuV4gul5QvGI+cUU1qmJEnulzQbnRgC9/Hd3fZ3XVUzoId8c9?=
 =?us-ascii?Q?fM+EcE5NDbl8z4GB/tpbM8tYyHJo886YEnJsIV5UXFKLd+uzusJXtjI47eIh?=
 =?us-ascii?Q?rbmSUatJK967NWTnZ+d3SaXNY8ymxLAT6zVfc32xrcujf91guBtJltp2nNwh?=
 =?us-ascii?Q?VtMospRlNkZCDceQX6oXNnl78ABnxIxiK0js3uUDhU0Xo9Sh00Gq9+VXR+wQ?=
 =?us-ascii?Q?LhVrzjaj8gFLRqGLIEpE1H+gOkv4AKiHSoneOJNh6FoERzu0/76YI1gztzP0?=
 =?us-ascii?Q?p+Brkf5RkfH9NV75mhPIT4tPWn/j/AfYt7LuJUaIinXeEodENfs+3nX2t8hy?=
 =?us-ascii?Q?xXyifVyF9g38cWiGFnrg7YujIzvCofW8RxC/ZIAN8qZnwWuX1Tv3t+6TkCZF?=
 =?us-ascii?Q?gv0jNQxYYhqkLrmcKMHSBRFkGmPSmmA8fWiZfoF/Y4tfghc3oDZPdQ7Gf9e1?=
 =?us-ascii?Q?pR1w4LT50N9vVDYjutUgzViF9c6Rkcrkgy8vE3rC0QsK9JpOXCoYde5bCOH9?=
 =?us-ascii?Q?SZ+fp/uwLYSakPMXGoS057XwQQfNnLltgUEJNAUYnhauFY/x6bUnAwZMWq8A?=
 =?us-ascii?Q?TEXb1xi4fsf1B+kExhwwJR0CHwz1jjZ6ndW/WqekJM8iRRY1wXwsU3/wlLvs?=
 =?us-ascii?Q?ge11dyH1FsPzJSe7DlXAqlrqJR17Xa2z13isBIMR/8oKUD5SHXa+H7zwz8Xo?=
 =?us-ascii?Q?MsTqQpHb4UPpNU6+hZAp3+2IwVme7fLAp+UHP6Q+19ISTszc3XUnh8ejK+6N?=
 =?us-ascii?Q?U1ngSLcsvlULq3SEknyT5zmH1AErNHFFyTs3nOqc6/lamzXUB3UsnuzcruWx?=
 =?us-ascii?Q?MuRygdXe3AjopjK4g5fCvWFbRpxyfD8S1S8ttzNXve7mqEvinBG0hqO1iIgF?=
 =?us-ascii?Q?Hj1EbHGKXd4jVoMVE4eFtY1aE10hs6eVOqcvfl5g2toNJvifvjwIzQmpf4In?=
 =?us-ascii?Q?lZgd7bG1P6wYRYQVD6A++5nX3CTayF7Lcent70hr/y8k8nNfufm2oqckTLMA?=
 =?us-ascii?Q?te0y2B09aE67WE7WeHUTS+XxXRBLjriPCM55n5CD0bwwYbyW9h+TyH7RAiR6?=
 =?us-ascii?Q?lVmkKpi/KJLWbH8+sBWlS6+oV+yrpnkyjOP//RGfkr3L4Zj1A3L5TVr1sttc?=
 =?us-ascii?Q?CrVdZ7saFthjuizouwLvyc5puKuDte6gZDFW+XUM68klSRxVzC0H5Jp8co1I?=
 =?us-ascii?Q?xXVHHyC9DFvJ266FQ3sMZ3wbhfomqSpWcukP5iBr2zTjZMAh/p43q66PdHQd?=
 =?us-ascii?Q?F+rk+eijWk8rPUlB09IUFX8Mdna/RieBRXR29tieFbtYgoBOWAat6FLq+fdV?=
 =?us-ascii?Q?5A=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 32e6051e-0b56-4518-b888-08da684ed67c
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2022 23:48:24.3144
 (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: ret1Sec4293Aril4hWwMKC81GuhTEcZSIGRqNsJterIetYZq5VKATl94aS84fDTh41hP/GUFHklilK5A6WVydg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4961
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-17_17,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0
 mlxlogscore=999 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2206140000 definitions=main-2207170113
X-Proofpoint-GUID: Qn2k2y3xVeG4TTpwXstYbzBQAyHhILre
X-Proofpoint-ORIG-GUID: Qn2k2y3xVeG4TTpwXstYbzBQAyHhILre
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c
index 717192915f28..a8274fd57add 100644
--- a/arch/x86/kernel/cpu/mce/apei.c
+++ b/arch/x86/kernel/cpu/mce/apei.c
@@ -37,7 +37,7 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
 	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) | __ffs64(mem_err->physical_addr_mask);
 
 	if (severity >= GHES_SEV_RECOVERABLE)
 		m.status |= MCI_STATUS_UC;
-- 
2.18.4