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 v7] x86/mce: retrieve poison range from hardware
Date:   Tue,  2 Aug 2022 13:50:53 -0600
Message-Id: <20220802195053.3882368-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?aSpBt8u8lFGRDYsdSkaXbDhB2YOSQAQVzzKIqN2vM5NuMLE1y57lfUe20/O1?=
 =?us-ascii?Q?MgBqJtNGXzSFqZScZxMDciKJkXW8xNk/rYC5aUBITp8A1mmUJnx8LY8FYijQ?=
 =?us-ascii?Q?urS8IldbhKAp3g9rhjPxIXHadTiOnyYxkmE7I2sIybETvk+Ne0gA6RC++ewn?=
 =?us-ascii?Q?etxx8/ft3awX+8tfKlIpPQC4m2P/M99Uet4k+9URXULp8DyW+oU+4s/R/l82?=
 =?us-ascii?Q?KPfc3eXaTmdONuYqRYqdBNpoe4iOuayzFZ55mCPK02DTkUxGP6NA128Fp0zE?=
 =?us-ascii?Q?SPQLjEqLcWxzfmbkTfbgbzBNvyJip82XJ5lEiIzskuLEONd6RvsbM4UvI4Im?=
 =?us-ascii?Q?QI7ZVJMkuZuFQmf31pYbcI1iW5TTbKSoBncKO4Vx7Wh6GrsjPoBhQ5LnL4KM?=
 =?us-ascii?Q?7gkuLJOvIN99+EUPv+k65Gqh31/a7LFjBU/ERBKaWV5tdBlUJqXa6OChv3Jr?=
 =?us-ascii?Q?wLa7taHyRNQ5wGWOIf/E8G7hdUbBiwHaP/sNZ6rb2wEc1/lM5TKWIDVSii4U?=
 =?us-ascii?Q?Kq7s5kjl+n6PkP9WhPnMkPTCdXk5tVG3Rr1L+xlqm/bCis/y4U1rpzqPWiCf?=
 =?us-ascii?Q?M6TrEzs1apfkBhqHvdjD90Ok3inPwWtEqa6uaruz50ExC5yCWc+ao2IPr6cY?=
 =?us-ascii?Q?JNm41WLbush1CSOj36OyJ0XlCMCbum4Dm3YRhtre1mEiXZe6iW+6AwD5Q61b?=
 =?us-ascii?Q?Gk4kIKPOkYmDt8JLa/H8PLITjwiFKZg/1ZGNELglgwVD3AqznWKo0wKmmip9?=
 =?us-ascii?Q?vwwJcAhzst1xVcfmxuKPo//KJhSVrGINfPH4ru2QdjglTjaUS0cFsuJU5x1l?=
 =?us-ascii?Q?DBGUXOUcpKIKvffqTHxmR3XcQ/UiL/1UvjO9KtPg1bIJbaVzMakS48/1kyjK?=
 =?us-ascii?Q?TSckVPS6enVdnmj2qoIKde2tdbzEYOS0rys6POvizP8V6tMllE6wkkQmRD1v?=
 =?us-ascii?Q?+DelUVdxlCUWqXx8ekaobvfBhvmNX8dtfqIVmu8CxBbRkhQaYhNYIxRoGsEU?=
 =?us-ascii?Q?T17+31CRHBs3CkByOtEuLWrlTwL7hdegaTQbgRlnx3XK64gOmEZAiaiGLZNo?=
 =?us-ascii?Q?vzzAKO8VUoAIL8qAxWa2HQ/W0QmEuBI6LHz3CcdgVkSolX2U7k6xBLkJTHCi?=
 =?us-ascii?Q?TsgvRoXduJ85u/AqbIbqCKOpQJM5ev9SMR5aktXmCMyqz/LcdIk+xBj5pFaS?=
 =?us-ascii?Q?+0k95zNRAoauGaoL0FhgPOzvLu7Zlp4KsSTgMuiq7aRdaB2GQMLOeUZ8tbvW?=
 =?us-ascii?Q?0/PQzCSo5noZWOG8edZY7D9ScID9HksAEx2zo0ekLHjg9Lgkt+Tf4xhPOa7b?=
 =?us-ascii?Q?AJ2pcAbxApfn/gc2LF+1ywSizU7lZR/SffoUqo/IXx6iTRs3jzdYNAllaDw5?=
 =?us-ascii?Q?AqdYBSZ3KDyV5cOMIpJCc1AiJLX96Fye/BwtRTTNtYz+jS+gwg/s4WgG7ztu?=
 =?us-ascii?Q?DB0kS3l8IvUARbmj/2TUgWyutOUM/Ua11KppqjwtKabywHy9doQHiQSI/Ykd?=
 =?us-ascii?Q?B6WYX1DTMyMuwvVgR55Ai6yVcgalmUGT868B1TYgAY4p+5szBpzmt7BR25+b?=
 =?us-ascii?Q?E2eybDvYsbYOFC2JCWR9wYvd1fwbiTyKGEsaMgXPbnQ0d3V0NCZ3CSuN8WGd?=
 =?us-ascii?Q?tQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f10284af-b02c-4012-2fa4-08da74c058d1
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 19:51:10.0399
 (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: Vww/4lPIG4pRgXZ0xSX0jd27g8iip3jJqvvHt//4Uwr8IT8OUxyk5gYk3RbdZV8JhLV6s5pllnQ4bWLyVwedFQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3534
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-08-02_14,2022-08-02_01,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-2208020093
X-Proofpoint-ORIG-GUID: Dbx1rRSnqdVtS12Tqe_qawoWZxK1BkF3
X-Proofpoint-GUID: Dbx1rRSnqdVtS12Tqe_qawoWZxK1BkF3
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>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 arch/x86/kernel/cpu/mce/apei.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c
index 717192915f28..8ed341714686 100644
--- a/arch/x86/kernel/cpu/mce/apei.c
+++ b/arch/x86/kernel/cpu/mce/apei.c
@@ -29,15 +29,26 @@
 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;
 
+	/*
+	 * Even if the ->validation_bits are set for address mask,
+	 * to be extra safe, check and reject an error radius '0',
+	 * and fall back to the default page size.
+	 */
+	if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK)
+		lsb = find_first_bit((void *)&mem_err->physical_addr_mask, PAGE_SHIFT);
+	else
+		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