Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp122014rdh; Sat, 23 Sep 2023 04:15:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuUFGTW9iYYWHA/hra9AtlvYfEQ6VvaHkLpqCKH7wolD8ntq1Rf+0b8DV9LKxr671ydx51 X-Received: by 2002:a17:902:da8e:b0:1bc:1e17:6d70 with SMTP id j14-20020a170902da8e00b001bc1e176d70mr3679422plx.24.1695467746372; Sat, 23 Sep 2023 04:15:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695467746; cv=none; d=google.com; s=arc-20160816; b=Vpp9AKF7xiUNhPqG6y/+Yo5LVS2InpoxObFnSIiqb/juztgppwFk0/v1r8q+Kl64RO 4Z/98MAfChCYvcP8K4rihmCGz4IIjJAmdqozJY/hiumYGdgSr+0jx8d54C40DB/iY5di TYry5eTqqQIcIc+6M7qqxPa3myJd8ddigT3CGh6O3PzU0C0VO0sVPsomJbaT84la+N+4 rx8BMW1SUOGSu8LCAadaEOn9EpSMJLmtM+Tap7aZ381kuRjK8ylWu/Mxae2BCnBdAN1v +QgHMaFVv8KW77tv8c7FgqD5Flh1LGRwpaQ0VxrZPmy4t0QkX0Up1cCXii28BBM0TYKa 25Sg== 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=RYtazmEiUZouwK5sDJ9DS0fjOpmsfVVL+4zG0pg0LkE=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=rp+cZDoIcpDrel8BzCJ27sI+z2W2KG28QXIXpDZUqqsKMQYS8aV0fOlC+Nc/SKULUC l0n3QMg3NOxQdvZMzA15Qri2ZRIkyzeIcBbvkJ2ii3hicm6zySGHgduBoAEd5+LmtFVD hxTZbVJNC26ibbaqWSX05/ZAzmtOWRFrJDKyoJ2V3dO/G0qRilvm6eJgYEmarTM6oNA3 oZQJtj/6z2OLxeVh9GqgD2jP0W9Z6ycOA+AHxTu3DPrY/NvaoEjsNGASglf6qSNpCeTs oGMW4NaTlxxhTo3KcEOu0St0oJheVRkSFgrLvPWtZmj4I0VwwfS3jwIjyAaagudEQr07 cI2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LZ2QO50Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id a17-20020a170902ecd100b001bb95a5cb9fsi6140187plh.522.2023.09.23.04.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 04:15:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LZ2QO50Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id B70FA83B1E9A; Sat, 23 Sep 2023 03:14:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231822AbjIWKNY (ORCPT + 99 others); Sat, 23 Sep 2023 06:13:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231555AbjIWKMD (ORCPT ); Sat, 23 Sep 2023 06:12:03 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 455E5CDF; Sat, 23 Sep 2023 03:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695463912; x=1726999912; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bNtEfhEic2/4eI6U3F6LZD3GtdQN7TZ08d/4AOd+L9I=; b=LZ2QO50YfqdDo8MkxH7jn0cK9EzSuhuOH0Liq8Ra7laGgJV7BFrLvuWl 5ck1IsGyzIYRExmfyAhQ+Np1MkhaCqbwV5hCpRg/4RmtJcKhzewsFR+BQ HvsQMGqpdeutNBdeoLotc22LW+zOBTxNbIdzWRYKUK+sAthn8iil/M8wo oRa4ZMrcRqwnx1/3B5UqTIm73vkbGSDY/FkC7V2rfXftOAf4ukNvTZTDT L+aUA9o3YbVNQ8XlAS/HTEgWI9y1H+H/errtdLfVo5TYuAj1ncCgOxifO SfJ23tBhmkeVnFxQbrAqWqAaQfrtTGCTS7DfVmlIymV9JpAtEHLl3iZFI w==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447492399" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="447492399" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 03:11:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="813388196" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="813388196" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 23 Sep 2023 03:11:49 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v11 27/37] x86/fred: Add a machine check entry stub for FRED Date: Sat, 23 Sep 2023 02:42:02 -0700 Message-Id: <20230923094212.26520-28-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com> References: <20230923094212.26520-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 23 Sep 2023 03:14:23 -0700 (PDT) X-Spam-Level: ** Like #DB, when occurred on different ring level, i.e., from user or kernel context, #MCE needs to be handled on different stack: User #MCE on current task stack, while kernel #MCE on a dedicated stack. This is exactly how FRED event delivery invokes an exception handler: ring 3 event on level 0 stack, i.e., current task stack; ring 0 event on the #MCE dedicated stack specified in the IA32_FRED_STKLVLS MSR. So unlike IDT, the FRED machine check entry stub doesn't do stack switch. Tested-by: Shan Kang Signed-off-by: Xin Li --- Changes since v5: * Disallow #DB inside #MCE for robustness sake (Peter Zijlstra). --- arch/x86/kernel/cpu/mce/core.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 6f35f724cc14..da0a4a102afe 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" @@ -2144,6 +2145,31 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check) exc_machine_check_user(regs); local_db_restore(dr7); } + +#ifdef CONFIG_X86_FRED +/* + * When occurred on different ring level, i.e., from user or kernel + * context, #MCE needs to be handled on different stack: User #MCE + * on current task stack, while kernel #MCE on a dedicated stack. + * + * This is exactly how FRED event delivery invokes an exception + * handler: ring 3 event on level 0 stack, i.e., current task stack; + * ring 0 event on the #MCE dedicated stack specified in the + * IA32_FRED_STKLVLS MSR. So unlike IDT, the FRED machine check entry + * stub doesn't do stack switch. + */ +DEFINE_FREDENTRY_MCE(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) -- 2.34.1