Received: by 2002:a05:6358:f14:b0:e5:3b68:ec04 with SMTP id b20csp3656844rwj; Mon, 19 Dec 2022 23:25:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf5JH6bAa12itLTf7fzS9eZ39NwZySg1zDdB/kWwCTqbEQSZ+7HRLjzihsJGq+C3Fo9BxJMf X-Received: by 2002:a17:902:f211:b0:189:8f0c:d314 with SMTP id m17-20020a170902f21100b001898f0cd314mr41387790plc.39.1671521117471; Mon, 19 Dec 2022 23:25:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671521117; cv=none; d=google.com; s=arc-20160816; b=cRqIsAdt8PXerZcbNfCpV8lOZx8SS444mk6wHh2xTxYLDwxa9RNlT7RvyS68M27EDs ExnNkUXNjkmPFxANAStiaSRjPITZpjQalMp/+CvR+Isc5FLjUXoeLblBGSSgIalWim/o 72c4Tpmt27WtIFQcfZDxMfQkJC6w8Rn+CPmpOFeP1vFPi5W72p097T+illcU4tq1LbFc h1GiampqFEGFf3OoE52U1quLPYRYlfA8a1+da4qAAkykcEHdPnd3qAd5sOchWOLdwWQi ZqaoR+tPw+UhxV3Ljh23yMchFrbU7mdXWFJJjC6iYNxMpWaKV4oXhF+dt+3nF3tqs7ct o0Ig== 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=PcMvfcKatmCthk3wAsR6fQfapCx0812l/5bFD2C5sK0=; b=YQRVS7lZOpW37koTmofwPTxKgG0qn2wFHE9m7C+KktazNXUH+aIsrzb08cmTqXx2gz xg3fgVEnZguaC/VS0XrSTX2Th1f/k8yG3Qp1bGSHbzEaFB6///4UOI1OTy5PN8IB/zM6 fYkpdoa8ZNEjDiVfBITa1MYaXW1A7q0Rh65kq0Ja8lUDgY8PVudM0xAmr2F6iAuRlvWc PMdT6PcdiMqVOhbBJInst3byUxDWBGjL02DegL5RaHAItvl+Gq9pGRVXX15PR7pqvklx MKgjDO2RPSf6abvDpqHR4NUFPc28a0qlhwmFRULLob2MXUSa1zFdKe5eEe1BDd2uo4lu jcag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=k7i3JM+n; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a8-20020a170902b58800b00191191fe7absi6523301pls.448.2022.12.19.23.25.08; Mon, 19 Dec 2022 23:25:17 -0800 (PST) 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=k7i3JM+n; 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 S233610AbiLTHDM (ORCPT + 70 others); Tue, 20 Dec 2022 02:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233253AbiLTHBj (ORCPT ); Tue, 20 Dec 2022 02:01:39 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B469813D4E; Mon, 19 Dec 2022 23:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519697; x=1703055697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SHEDrPLJu3KGjUhs/QSp7RJL1HsF029t/QfkfJr+3aI=; b=k7i3JM+nxRRxBzUXH410RKTO16WPvdVyP4CR+zFbOr6bYFuSnHSEowpN p/G/FP6ZReC1b1pksK9HlQb/ORsVdWWfoNnqQbgLZYkbe7RnCyGnb1K8O IYjOB/1MgJ3VJdF77DdQhex10Nrc0JHTKCPXRWLozFs77UlOlHpMg1IfK V2a5RKwI7STVDq3WuzggGeycUbt7/n7rB1J/3cSpgoFEZQ5/xL2SF7//+ GFGmKO4gk5Rp1XfFw6VwJ1Yf95Nruje9jdS/4lTOL3lIWPvB7AqGr3SJP kJWOrHtRcH4NHRm3ZV+cnsWArnM9fDHHJvzYG9XLlCg/inLFzwRA9fKf1 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302972080" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302972080" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326509" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326509" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:15 -0800 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 Subject: [RFC PATCH 20/32] x86/fred: add a machine check entry stub for FRED Date: Mon, 19 Dec 2022 22:36:46 -0800 Message-Id: <20221220063658.19271-21-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: X-Mailing-List: linux-kernel@vger.kernel.org Add a machine check entry stub for FRED. Unlike IDT, no need to save/restore dr7 in FRED machine check handler. Signed-off-by: Xin Li --- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/cpu/mce/core.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index 66c274a12e26..01678ced5451 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -95,6 +95,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 2c8ec5c71712..0186c9b39f5f 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" @@ -2121,6 +2122,16 @@ 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) +{ + if (user_mode(regs)) + exc_machine_check_user(regs); + else + exc_machine_check_kernel(regs); +} +#endif #else /* 32bit unified entry point */ DEFINE_IDTENTRY_RAW(exc_machine_check) -- 2.34.1