From patchwork Fri Feb 24 07:01:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 61160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp756570wrd; Thu, 23 Feb 2023 23:30:18 -0800 (PST) X-Google-Smtp-Source: AK7set8WmVruXJtmd55zn9GD/gB3OhffBfCAMzlp5JSldtIUw7F9vx9p0fqBfbKET5sp+ak4ZahR X-Received: by 2002:aa7:df8f:0:b0:4ad:5950:3f53 with SMTP id b15-20020aa7df8f000000b004ad59503f53mr13915726edy.7.1677223818150; Thu, 23 Feb 2023 23:30:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677223818; cv=none; d=google.com; s=arc-20160816; b=GCe0HR006uzB/9++HnVx+pp6ZR/xBTktXtW7/hEFWAkQNPjbHallC0jRu6IYP3OtIG PNXhrY3EqHLMCzRNJ0Tmy3Oul4DOOW8zTLzdLFSfClrVY4F/ghDJNGn2IpTC/U7O6AHk ihV+bMkqvOyt2NYLlGB1KSgxXrjK37Ei5ccS4B2aOwzfXiawYxavARX1gj108MzyIFL0 azcOB2H2jA/Y30FXofeI1n5t9Yx/YHN4Z0V0u4JykW50qJiq2WC3BIU0atb7+wfkVIO+ mM5WgzfyxtlOzdVGR1WCExV4NjE4mhoKbl7eASGnh3mevc2bI6JbPNzAKNeaLiqZqN4s 4bCQ== 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=rPUHssJsZ+izjJUBf4h5djZzqloe0F59juqMD/2lTWM=; b=QpMz/w/mb8rH4tNJnvj3vd0NDOe2Ue9Cwzf5Rdy+UXcBISxajN8lRkUUvGhfxAJo5L b+GWqAOhZ5Z1iP9IuMf6bzsAhslceyKeWRDw3Eb/y9j4rJoW5TrtDuRqYEmMTjJ/PtEx 86m4TJHu4eE0utfwhLobZ5v5bkd7gtnY9BleZf2Zz2lkOqmVbFUt87bjJT1hrRMdIRvY 26CWGlz8tS9vxMaIKhVkmzml9/vuQDZP4u0ENxTDPiXwMeEE4V/RHXQqtkat/3OB8VHP 20dplMpOhlZiOyfBuijPVt46V6TuNWwYQqU/A+tgVjVTobGQfdaHhkrQoWRO0761WoOf 05Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QCQhjcTB; 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 d22-20020a50fb16000000b004accf1f8965si3104873edq.56.2023.02.23.23.29.55; Thu, 23 Feb 2023 23:30:18 -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=QCQhjcTB; 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 S229889AbjBXH24 (ORCPT + 99 others); Fri, 24 Feb 2023 02:28:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229879AbjBXH2R (ORCPT ); Fri, 24 Feb 2023 02:28:17 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0D7C410A8; Thu, 23 Feb 2023 23:28:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677223685; x=1708759685; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AmI4CVrrpson0KuyKSQFz12EZ8608BBLxIPOHAFvgP0=; b=QCQhjcTBjz5E6UsJL3EzuYgEs/2g6xWZ8LbQr3qjVvVOrji01eF9VnCq bwqvQ87BFSQsY6QFca07/031VcMyEPA+8kaMW5ly22WiE5KdTKAGt7qBb IAL6RBQfgb4pYdWCRUIFtDcv8y2UQeZSJYBIb/0LmBHKChFLEB6UDPFCg 3AblL7gS636qzLwxZZINzYzpdcYnZ9WEXhaD/Auzddg6CpQwbQZ5+xrBF DGi0hbrtB/tL6Gq8gpeA+JPaKIaN8VUOKbIS2t8DfZOf1z8olXlMDIjvX YbxjerX8+aDkX62ZhGQExD1psMgBnW9RKz4jozUFSFy1aRHNdu68yBQJe Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="334836077" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="334836077" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 23:27:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815639248" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="815639248" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2023 23:27:23 -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 v3 19/32] x86/fred: add a NMI entry stub for FRED Date: Thu, 23 Feb 2023 23:01:32 -0800 Message-Id: <20230224070145.3572-20-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224070145.3572-1-xin3.li@intel.com> References: <20230224070145.3572-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,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=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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758696642065621868?= X-GMAIL-MSGID: =?utf-8?q?1758696642065621868?= From: "H. Peter Anvin (Intel)" On a FRED system, NMIs nest both with themselves and faults, transient information is saved into the stack frame, and NMI unblocking only happens when the stack frame indicates that so should happen. Thus, the NMI entry stub for FRED is really quite small... Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/nmi.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index def4b3455c1f..753ae2adf422 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -94,6 +94,7 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs) #define DEFINE_FRED_HANDLER(f) noinstr DECLARE_FRED_HANDLER(f) 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); diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index cec0bfa3bc04..b8f0357e4663 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -34,6 +34,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -537,6 +538,33 @@ DEFINE_IDTENTRY_RAW(exc_nmi_noist) EXPORT_SYMBOL_GPL(asm_exc_nmi_noist); #endif +#ifdef CONFIG_X86_FRED +DEFINE_FRED_HANDLER(fred_exc_nmi) +{ + /* + * With FRED, CR2 and DR6 are pushed atomically on faults, + * so we don't have to worry about saving and restoring them. + * Breakpoint faults nest, so assume it is OK to leave DR7 + * enabled. + */ + irqentry_state_t irq_state = irqentry_nmi_enter(regs); + + /* + * VM exits induced by NMIs keep NMI blocked, and we do + * "int $2" to reinject the NMI w/ NMI kept being blocked. + * However "int $2" doesn't set the nmi bit in the FRED + * stack frame, so we explicitly set it to make sure a + * later ERETS will unblock NMI immediately. + */ + regs->nmi = 1; + + inc_irq_stat(__nmi_count); + default_do_nmi(regs); + + irqentry_nmi_exit(regs, irq_state); +} +#endif + void stop_nmi(void) { ignore_nmis++;