From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB715C4332F for ; Tue, 18 Jan 2022 02:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245224AbiARCmz (ORCPT ); Mon, 17 Jan 2022 21:42:55 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:54188 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344518AbiARCgq (ORCPT ); Mon, 17 Jan 2022 21:36:46 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BC8E961278; Tue, 18 Jan 2022 02:36:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28460C36AF3; Tue, 18 Jan 2022 02:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473405; bh=KqJWQTmFk9FLzV5wiYGqRA933hMUNPXcAJjCtVK8aWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=myNI62RaPpKz5f2lS/j9HjF5Zv6/I2Iy9iMni6T1PHXhx2T2VnO/cuDnVoKcC4Z4p 9sJ3r3/1ggnWqOYhi4erC0trMitAg0z/H0qhis2FyII41Fc6klPtoB+dTaPZqqdWHh mm4NpvvXBDVittGIXl2Mljt3im/61GiLOXng/xAkjoTlDgXUV/kafbbpZwKv/8sUz8 t7hsN17FKT5b9xzpf/wPy6wkw8TGPCAAOBu5gIuAI63dBBvD4lkaO5mfHHLq9BqUhy klQkWDnXcx2Dp8TzP/hVyI9gG7i0NpS7J6/UZ+BO7qOp3l117QrOqSq1FxiFUwppIm l3FhU3RnKCN9Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Sasha Levin , bp@alien8.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, linux-edac@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 106/188] x86/mce: Mark mce_end() noinstr Date: Mon, 17 Jan 2022 21:30:30 -0500 Message-Id: <20220118023152.1948105-106-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Borislav Petkov [ Upstream commit b4813539d37fa31fed62cdfab7bd2dd8929c5b2e ] It is called by the #MC handler which is noinstr. Fixes vmlinux.o: warning: objtool: do_machine_check()+0xbd6: call to memset() leaves .noinstr.text section Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/20211208111343.8130-9-bp@alien8.de Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mce/core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index c5a1022463bcc..c37a0bcf2744b 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1081,10 +1081,13 @@ static int mce_start(int *no_way_out) * Synchronize between CPUs after main scanning loop. * This invokes the bulk of the Monarch processing. */ -static int mce_end(int order) +static noinstr int mce_end(int order) { - int ret = -1; u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC; + int ret = -1; + + /* Allow instrumentation around external facilities. */ + instrumentation_begin(); if (!timeout) goto reset; @@ -1128,7 +1131,8 @@ static int mce_end(int order) /* * Don't reset anything. That's done by the Monarch. */ - return 0; + ret = 0; + goto out; } /* @@ -1144,6 +1148,10 @@ static int mce_end(int order) * Let others run again. */ atomic_set(&mce_executing, 0); + +out: + instrumentation_end(); + return ret; } -- 2.34.1