From patchwork Mon Apr 10 08:14:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 81401 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1757917vqo; Mon, 10 Apr 2023 01:44:10 -0700 (PDT) X-Google-Smtp-Source: AKy350YkGTPi7F27IX1r8ZEDxS/P1BgerNx5ddEYXq6BlaWivADH8ykjmoytOAbowE8yJTFusqAN X-Received: by 2002:a17:902:f683:b0:1a2:76b6:c26a with SMTP id l3-20020a170902f68300b001a276b6c26amr13992342plg.28.1681116250468; Mon, 10 Apr 2023 01:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681116250; cv=none; d=google.com; s=arc-20160816; b=eR6KS0ZjCBQlclRcZ5x7FWYa4vTWqak0hDGga+HQpg7P1wYB8Qz1XAUqtRXPQ6YYvf CB/8c9OKnAruCXjyZuLSeQis9byRHPAhUuW4nr0j+YI5s9yE6uoW/TpSAf2JOYB/ndcy flUIYMQ141jxA7VXDuQXnBD3fLGMLopPYEkIqKLAQ5ZKQPgkgTt+I1qUiBsGz8XJG7ny EiNjnON7iAR8Tvy/A5Pk9r7lsifswBXCmt8bnvIela20KpHy/NYHSHMa4iqF0JMaMy54 xX0Po4J2dNYvTQGeq6rhu2Yqm5ifXNNA6Ntv/RbLm718p6eryaCY+HaoRuZDzIMlqhdb uJjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=noHnDU6HVdIEvG2vFbd/tjfbHM4UcQUOqh8bLYYP0WE=; b=sico9CI7Nc33iYuwxhZqMkQtdZmtZ2VFYr/t54018Ma2PcbiV0XXABoKuIAabz8K0D u9o+CYsoKOW7i9lPRy5bYMsjGSURu7prRLzGVM6c6FnYlwb2ODb/Z4tvaevbL673FJVF +m8tVYYyhO8rb5ty2x9Q3mCbvHobRHi5enqaYYHyGphItm6UF0qBiS5UmG7xDSOqhjBL JACCUO7Dxbhnw5OWv/jsiGQu8OLHUXSL+16wBv9sd51fZUwXZ1Td0+BBilz46S9YPQXu u6HDD1IfWeplv9qYByqOGi1N4w3gGIFeXdlb6teaw9E4Zgb+DIbViA4MI83c4zecMLCw aYxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QNEa48xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j3-20020a170903028300b001a52dd0195csi5078116plr.549.2023.04.10.01.43.58; Mon, 10 Apr 2023 01:44:10 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QNEa48xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbjDJImI (ORCPT + 99 others); Mon, 10 Apr 2023 04:42:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbjDJIlK (ORCPT ); Mon, 10 Apr 2023 04:41:10 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0539540D9; Mon, 10 Apr 2023 01:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681116068; x=1712652068; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CKPdbZePoSn8pAkjI3IJ+p0apbz+y9vUOwaC2M88CbM=; b=QNEa48xuXVShKlXTtrOpI3V/yV3Mg+Funib0bM1/+kkHydBGNe/8oIQI zGw5Eao2vixIlIH959HxFRdhOGlo3mZOMu9eIAzFgLBxf+OB6NKP9855x QC7uBP9bjj921Qna8vPSZ1U9X+Fyfxi26pkBc6mKNcldtVmsCGCeoIhjp h3Rc8qX09EHuYY+k/BJk/BzMb/d/S9jGHGAPD9570wHeBjO5xTewOJrUP kgiPk9m6bwY1sAmpOpv7QmX8AZfQEIWTv6JXN1B+7ByyP6Vbe6QdFtEd/ CH65Umi9+JJtbIg3hKKlhBX9FIsPS//ZkYXlwPuQCppysJV5iVj6rZdTB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="342078068" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="342078068" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 01:41:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="799436315" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="799436315" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga002.fm.intel.com with ESMTP; 10 Apr 2023 01:41:05 -0700 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com, jiangshanlai@gmail.com, shan.kang@intel.com Subject: [PATCH v8 19/33] x86/fred: add a machine check entry stub for FRED Date: Mon, 10 Apr 2023 01:14:24 -0700 Message-Id: <20230410081438.1750-20-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410081438.1750-1-xin3.li@intel.com> References: <20230410081438.1750-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762778153201384953?= X-GMAIL-MSGID: =?utf-8?q?1762778153201384953?= Add a machine check entry stub for FRED. Tested-by: Shan Kang Signed-off-by: Xin Li --- Changes since v5: * Disallow #DB inside #MCE for robustness sake (Peter Zijlstra). --- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/cpu/mce/core.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index 9ce2a6439091..61048aa4e01d 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -102,6 +102,7 @@ typedef DECLARE_FRED_HANDLER((*fred_handler)); DECLARE_FRED_HANDLER(fred_exc_nmi); DECLARE_FRED_HANDLER(fred_exc_debug); DECLARE_FRED_HANDLER(fred_exc_page_fault); +DECLARE_FRED_HANDLER(fred_exc_machine_check); #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 2eec60f50057..859331a6a7ad 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -52,6 +52,7 @@ #include #include #include +#include #include "internal.h" @@ -2111,6 +2112,20 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check) exc_machine_check_user(regs); local_db_restore(dr7); } + +#ifdef CONFIG_X86_FRED +DEFINE_FRED_HANDLER(fred_exc_machine_check) +{ + unsigned long dr7; + + dr7 = local_db_save(); + if (user_mode(regs)) + exc_machine_check_user(regs); + else + exc_machine_check_kernel(regs); + local_db_restore(dr7); +} +#endif #else /* 32bit unified entry point */ DEFINE_IDTENTRY_RAW(exc_machine_check)