From patchwork Mon Mar 27 07:58:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 75287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1358639vqo; Mon, 27 Mar 2023 01:41:31 -0700 (PDT) X-Google-Smtp-Source: AKy350ZAr0pdPLQWH/zJoLSsC+FBe5vpC/8AHQFOkARRxJtAFZNHYiUxgld6ceUtl5zmT+BQJdvP X-Received: by 2002:a62:1791:0:b0:625:e5dd:7506 with SMTP id 139-20020a621791000000b00625e5dd7506mr8449969pfx.25.1679906490875; Mon, 27 Mar 2023 01:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906490; cv=none; d=google.com; s=arc-20160816; b=pMiNkGj5aAo9ImdFISq+tXriuUkwTUUNJq8Cyp9TxytPqNLJHPHy5l2Dg7xp8sm1MN CY4VJBD/1a40XeqqJEsqDdecC2ZolN43e8Oj1smGjgzSwTOZnIFn88+e38KuuMBzEHij guFy0Ec4b2QO0rBpCpmYo35SuUZxCBf8RjLpUuZZ5zkvsJJYNbKX7D54LL3+2iOT/eLd F+Zs5PUQ3uYwvmtH4Lda73IK8U/xyA9R+GKVsO2wfS9wo8kIERKye5Qlm7APAJVOeq4I dlpKR2XtDA86Rkk0iGctcox+N8pFo0ucwplrcp56led8fSUiH6M7x1WHEegJ2nX0oqfX wSqw== 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=+SuZP6smnd+vDHomyKsXXMZGp6L/A1/ICIRgZXNkN5g=; b=fL7zPsUgkmJMPrNBzD014Hp8+X/1WljHen2f7B10XCvtAfVLZRwyO2++cXdsoNVxo1 v9z7aWHr1nsaooiOUDGQzEyTA1H8GbMsAdx99zv/qPA5ExP3QJWTy6d1sExTmUtOpiV3 LiXbFI1LsQI4nJujqFd2qDJDAoFXF+sxQv3V7ZFEw4eNnmfoodJQ2RarQszwDJ/ONLz6 Y5M6KOnie/fxGUhdOs53vw/yU4ryXNigoh7uq2P8+z7go3SvqEXPfqJkbx6ipE9nfnur 96KDgGt+1McMSt43KnPfOijj8HOoq4xmqOOmL8oMg7gvV8vX8WGKbVYT3ZbHcy8iJG7G iyLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Z7oLudKy; 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 b6-20020a63d306000000b004d422660ffesi25818842pgg.393.2023.03.27.01.41.18; Mon, 27 Mar 2023 01:41:30 -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=Z7oLudKy; 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 S233291AbjC0IZv (ORCPT + 99 others); Mon, 27 Mar 2023 04:25:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233102AbjC0IYx (ORCPT ); Mon, 27 Mar 2023 04:24:53 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C20449D7; Mon, 27 Mar 2023 01:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905477; x=1711441477; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z2X5VK9fQIUiWFOXZ/Z/uPBIrWUORMITtKdHy89L3Wo=; b=Z7oLudKy5gVHckeP44adoQ7ZTo+YnBF3t5Oo1ih6KQDnlWkJvQfN9Vvh 3eMXTfySEJPgx4wP17+JwbdfeiXpn9CLxb65fcrY9meH5moAjZsqCu9px 6DUjuBeRr4evLnUrQ3Meta1lZUWr3yvata5WRbV9O4f+o8KERpxXI+Sv4 aOp8bTTA0Q5RNwrk9g73FajYOOATvGU5co0lZjgmRBwK9CGBPx8DS/1eA RfMDuyTNleZNdMOk4gbeZyIoHhq0uZlA1rVVs+rVu78Go6UZuIY2sYUYa kM2XGyAe0O8xdIegWdOVwvslmHXnHCtHi/BE+X0AfRg0ZXptDopoqp1hv g==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930273" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930273" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 01:24:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787101" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787101" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:36 -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 v6 18/33] x86/fred: add a NMI entry stub for FRED Date: Mon, 27 Mar 2023 00:58:23 -0700 Message-Id: <20230327075838.5403-19-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com> References: <20230327075838.5403-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?1761509628193527327?= X-GMAIL-MSGID: =?utf-8?q?1761509628193527327?= 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) Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/nmi.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index 633dd9e6a68e..f928a03082af 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 776f4b1e395b..e7b2abe42583 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 @@ -643,6 +644,24 @@ void nmi_backtrace_stall_check(const struct cpumask *btp) #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); + + inc_irq_stat(__nmi_count); + default_do_nmi(regs); + + irqentry_nmi_exit(regs, irq_state); +} +#endif + void stop_nmi(void) { ignore_nmis++;