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 v2] x86/mce: retrieve poison range from hardware whenever supported
Date:   Fri, 15 Jul 2022 21:31:04 -0600
Message-Id: <20220716033104.903163-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?E9NiN0iWPu+hzoAqOPDxj0xDUD3kIr3ZWrDp1VgECZqckyum3IVPaqME/CBH?=
 =?us-ascii?Q?OQWK9Ox4Dq9ijZ0TuLkrRH+GXohaD9HtH/xAHb6h2s0BLsalRSuCM9jIIuW3?=
 =?us-ascii?Q?lgZI++7hXh2x0STgUro28I6YDmP15aF/9vMPQDDCXc/V0G/mnKcYSpSrhqeO?=
 =?us-ascii?Q?PEmChVmYBdVH3kzrR1JTiRDyq4TJohXp1zoRpKj5KgHIudyX7+ppkMj6gg4P?=
 =?us-ascii?Q?g4Bxm9c5zMtxs8I9JBuDhJuW5WbpktXqpKyWwncsMPh/NFamWe0+pRcyZyBJ?=
 =?us-ascii?Q?e4KcVyKA/kaAjkeZYgf9ayC030IeaUSeTbnOQ8pqekz5xm/WHQJf3Dxe0D6+?=
 =?us-ascii?Q?dMhgNQm+pIjNdzMKVfAMFUO+aehwiZ+ZFI7SaMfU741AmsSFQ5ZrsX9KClaO?=
 =?us-ascii?Q?LmMgC0iRdyxkKY0w/9hcxHXpky5ynC1lL03DikRrdy/1A8XmYlS6XN44Bljl?=
 =?us-ascii?Q?H+pek4+s5ZROgGFx9tkcibdWMb52GqBa6Nfd4cmLldLIJEzolsBPz7z0Kt3B?=
 =?us-ascii?Q?TuaD+7o9giUnTvAPLc20lmpdduwgCilpdCKE+FgQLhhj7sh8F8RTXbnAFnWx?=
 =?us-ascii?Q?6xCbRol6CgV9JsHm2oBM0w/LRLn5jBJNkOzGABC4f2INS8F4BiZUo9S/VKDa?=
 =?us-ascii?Q?rzJNjAr+IgI6pdLc6UMryHWjEzjvrBhQR9svz0XqgDjy8Xq8FGAPK47aewBH?=
 =?us-ascii?Q?9OtaumdDHMiB7v4172YtxKqyXIM8BX9Yow7aRjVZoqzXayHnQ5l8BVIsPldu?=
 =?us-ascii?Q?Uc3vxH09N5XAOyQU5k41heMd2b2z34+DsAh8KeOMnP7fC30hc+QdH0hWhNNl?=
 =?us-ascii?Q?ku0xAu387LMY5f2QsXQIyGLYQiowObo8bbK5mIB4Jtp3S6Ki712k6LH0ZXpj?=
 =?us-ascii?Q?BR51hmb4DHVX7EfeA/qLaE6UmllRwxDdqd6Vd+94ZODR8IJ83uqf33N3Qtq5?=
 =?us-ascii?Q?c9Eodno0zJDt+Lj2gaOlt/ZrtCvPOVPL7LMZLMh8SNhf9KjBt7nMA4/pykq9?=
 =?us-ascii?Q?iuqC9vBlZ9J7vFQjVd0T9l6RapHCsPwOkhOE4/UghieJxLN1pSnVsw3v87Oc?=
 =?us-ascii?Q?AzQFutFB/qeJn9/ItxLNF+AX8cyB0w8iMA7imA5vMNi/ULzf0YvaRTwytK2x?=
 =?us-ascii?Q?d38QQfJ5x+9lchzJ7/izp0DYJ69A4Kkhgg/Mujy+dyoR/CI2QaDfYzyFssYU?=
 =?us-ascii?Q?O24jctYLSFQ3Ge86quJmkrFkCKQBzVW4yf8UUbHh1cc8PUfnMGbT0SDubbDI?=
 =?us-ascii?Q?iApzubr4SZQAjDvongG2AD4v9DJXy1I6gEKvqdvSlQploYZt0eyNaKPMpyyA?=
 =?us-ascii?Q?sZ695ve0u7u0Miz19AfmBUCsh6inv+tjtK/fsEymUAE98SRgOxny0UKEXsAS?=
 =?us-ascii?Q?DhynMfnuhdKQtuflEyXtkRrmvyaNi7xYZQUUqTqiAF+zWY4/ByMf/84fiRbG?=
 =?us-ascii?Q?rgSUQJbWU+itZYDuSxLDh7ZvnyboE0HPnzuYEYMCAZ4urzS6EatfWw5jtg4Y?=
 =?us-ascii?Q?OFrqYayte0sOVB+DGdrOXL/GBD+sLRjv7GCYXpxtRKGB62iJx32/ewdMPLxX?=
 =?us-ascii?Q?/OLH6LPS68HcXlrD9XzsNGK99wF/k8Voo5Iw4cMNWnyWFW/Qof8v7JuGMng7?=
 =?us-ascii?Q?bg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a588b70b-714a-4fbc-84b1-08da66dba51e
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2022 03:31:18.1552
 (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: 5FFcS5Uu7QB3ZIL0HV7Zu1f9H/MQaxjN1kEWRJOPwaTN8SvhXsYyTlnXHbd/f2nIslxrv5atIj5PDV3lDaxKYg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5724
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-07-16_02:2022-07-14,2022-07-16 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 phishscore=0
 adultscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207160014
X-Proofpoint-ORIG-GUID: EAT_q41K-K4raXivI22RYD6DMGqGdOkb
X-Proofpoint-GUID: EAT_q41K-K4raXivI22RYD6DMGqGdOkb
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.

v1: https://lkml.org/lkml/2022/7/15/1040
Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 arch/x86/kernel/cpu/mce/apei.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c
index 717192915f28..a4d5893632e0 100644
--- a/arch/x86/kernel/cpu/mce/apei.c
+++ b/arch/x86/kernel/cpu/mce/apei.c
@@ -29,6 +29,7 @@
 void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
 {
 	struct mce m;
+	int lsb;
 
 	if (!(mem_err->validation_bits & CPER_MEM_VALID_PA))
 		return;
@@ -37,7 +38,10 @@ 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;
+	lsb = __builtin_ffs(mem_err->physical_addr_mask) - 1;
+	if (lsb <= 0)
+		lsb = PAGE_SHIFT;
+	m.misc = (MCI_MISC_ADDR_PHYS << 6) | lsb;
 
 	if (severity >= GHES_SEV_RECOVERABLE)
 		m.status |= MCI_STATUS_UC;
-- 
2.18.4