From patchwork Tue Apr 4 10:27:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 78997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2931395vqo; Tue, 4 Apr 2023 03:58:27 -0700 (PDT) X-Google-Smtp-Source: AKy350ZocMOIN3pM0ymsnVCYfeUSNo2+w7JP0AckSTQBKUfCYgnWBImMKpItiKiveqZ2K5hAZ8fc X-Received: by 2002:a17:90b:78b:b0:237:ae98:a47f with SMTP id l11-20020a17090b078b00b00237ae98a47fmr22688207pjz.1.1680605906726; Tue, 04 Apr 2023 03:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680605906; cv=none; d=google.com; s=arc-20160816; b=FcSkWR5miVTy7vaQkBHCKdxCCclgygYAAv0/PEyGXBX6NplQYiqzpOX/ysOnDuDvR6 T6q7f4SrTIvN+bgGX/VxjnJUJOtcUPM8UKLSXQicEASo/IF8F3mB8NFjSVWrvFm8mTjH cy8cccr92pw+f19fVzAfHTE/ruryTqFfK34Prl5v2Zt0mNii3Dc2krLrxXK2905fuhAj rwZRfeGGMBSoK8E9EyW1+jIFjjRhAV0dBGRghe2ogTB0W84kQUixOSm5GvrjuY+Zaepi whIKMzSy8NzglyuR11A/4/Iy/XYZZMW0Z2SwmQtvdc+XxbvIy88ettz1J922aVLVvfMi 1AXA== 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=B4c/g2ohmwvFIHijAqjEkBeFLnjEYc19byJvBu1Ik/b+cC1LWgtTYQ0u3dqK6xff8i WSiYLkV6ZYgRI79SsudFRJ2FaDZ9TnXTjtld8jQdg723XXzHGefc3g3QvCIUoG9VXi8/ K6+x7G6pa2GEDdT2/gbeGB1pejNiSCWos/GOLbK1RWm3979CDcQDeDUo6KRmMabLwpSO feAS8RJPSn0IE+WDXPfc4V3IMDYZ/X4gX3XCdC6SGrOXGJmdomkc8PbatsauR+rf2M2a v2w7fGq7knKhqq2wVGcecthTDwFmxKOre8/duuhLHGCnIJba3fV7wYnE9DvpzKS6dLCh 0w1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NYuiDZfK; 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 lh13-20020a170903290d00b0019d19fb5606si9168542plb.551.2023.04.04.03.58.14; Tue, 04 Apr 2023 03:58:26 -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=NYuiDZfK; 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 S234867AbjDDKz1 (ORCPT + 99 others); Tue, 4 Apr 2023 06:55:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234851AbjDDKym (ORCPT ); Tue, 4 Apr 2023 06:54:42 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D56F4448C; Tue, 4 Apr 2023 03:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680605629; x=1712141629; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CKPdbZePoSn8pAkjI3IJ+p0apbz+y9vUOwaC2M88CbM=; b=NYuiDZfKTpt+q32ltTJRKaFO0j47ls/h3G7rpomY9FgwUO3INz2f/BVi r7BKavSKLtZgw9jdTQxxzTzv2+JWA+ai++KT+DOsBDrtRImvkQtgrVOGB J7s2dCCefoX9MfjKuAc/AlCszDSq10UpYaTMFygDdq6nh2vDtN5nWEww6 Q9GBTKW6VX6970spBtj4wAxAr4mkzbKGZ8MAPCJSnBCj7j+lIzfmuTdI8 fzuvGIKTSR0HrC89wfq8jNlSYasfurCOotnj4bIjq8Tv1KdOWF7FTJdo9 blEq2r5QB6CIc+3FGWu526BH0WTVZwifTBrA/A2thTiKOTx9SIJJikNnl w==; X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="330734113" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="330734113" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2023 03:53:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="775597835" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="775597835" Received: from unknown (HELO fred..) ([172.25.112.68]) by FMSMGA003.fm.intel.com with ESMTP; 04 Apr 2023 03:53:04 -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 v7 19/33] x86/fred: add a machine check entry stub for FRED Date: Tue, 4 Apr 2023 03:27:02 -0700 Message-Id: <20230404102716.1795-20-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404102716.1795-1-xin3.li@intel.com> References: <20230404102716.1795-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?1762243019013921794?= X-GMAIL-MSGID: =?utf-8?q?1762243019013921794?= 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)