From patchwork Thu Mar 2 05:24:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 63225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4063548wrd; Wed, 1 Mar 2023 21:53:25 -0800 (PST) X-Google-Smtp-Source: AK7set/+HKYW7CoUi6LjjSy7w38DA2C8exyPHfkhBy2o5hQmlZkHU3U3O83fbH73stf+im6kYP/p X-Received: by 2002:a17:906:e14:b0:861:4671:a834 with SMTP id l20-20020a1709060e1400b008614671a834mr8677677eji.71.1677736405810; Wed, 01 Mar 2023 21:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677736405; cv=none; d=google.com; s=arc-20160816; b=F4O27TrL9k0ooHJhY3GrbJYolpjx1TFKA4EgSjHsD+zb3TJvBfzwL3frhGvaT+wmbD CoLF/a9vRuwWhcKKw5kBpMYcIzALV3tfguJ1rIJXVBb5JDnlHRB+bhSsPCEuetRnRweF jzpiTYU+TPnoAgDY0wYQgWQTIE8VCsdh2xEmJHIlWJcAIjrzakg3snDedS5HzMnE2QpN QJZ+WPHaMjyxboF0xHLyn+p/cUJ/vGSpVQYuFrAi7yW0kOAY2W5+UHvq3F8R77AnW4j5 /ezb1bT+TMGi9Ly8d8/OutblrXWYaZJCDfph/0uCt7wOTGiGqNIbHMNnvFTONycximkJ DElg== 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=5faTauMQSF6A1INgRvw37EaNuyfpbr4ubN9CGI+xwAg=; b=x9gCjdOpkSCQyr317dZRB8BcpJgfJGqpOlKHGAjsATu2oc0iw+cjyRbHSxF0VYsW6G p9IvihubvzF6bC3mZtg+7R0iWaFBhGMGg3ED+A9C/qQ4m1fdOkoOSllGb5VQLIyv1ki7 TowPmxmjbDn0M8bbZaj2PoZeMNqBkbXXSjddozG9IsWTDqxj5V65XLCVjvFJpcBTHMh9 k3e7u6TBwJx0RnKi875VrnbjsH2OMd7hklX9Gi/GacZr3d06sU97bmGJPu43yB9IES5o c3UA0MW5+JX0q8hl5MWzuwKjfVqYy02ugMa2/XoMuwEjj2pNXXSk3K3Yf1/tjFhp/TOZ sZqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Lbz4xAm1; 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 sa26-20020a1709076d1a00b008b79a5e7440si100076ejc.117.2023.03.01.21.53.02; Wed, 01 Mar 2023 21:53:25 -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=Lbz4xAm1; 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 S230071AbjCBFwB (ORCPT + 99 others); Thu, 2 Mar 2023 00:52:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjCBFvd (ORCPT ); Thu, 2 Mar 2023 00:51:33 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C64D4DE0A; Wed, 1 Mar 2023 21:51:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677736261; x=1709272261; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4MOmv1ssbPQB1T3aYHisX8wUlNtj7mFGaUC5mOSwjmE=; b=Lbz4xAm1+SYo5/758WHbUY0/x9tD4P1IN7CJqvlmEUn8xK0YViLZgyD8 CIEdg8K/culhaPFd39PoyroTw3Wt9DuWGsOblmFUoQHQNqCnmvq+mVTne TGdLwhnlptz+dg4EtOj52Kg/DLE5qLdAXTFfBVy0Sbq/O6YHkdxZdNztD k2Lxj39Z5gvhzkZ4HkOL6Iisp5OlAQZqRVtOcdcZ9TD9PeItlfrJyva3y ZTp/E0L1SI4pN9hneblfNzGy3oRyiFkH0wj08oa57TKYrOCPYPjLXA4FL sdsrPijgT4DfSA0OcGeH5zTUyoOtrcFM9XZXkncn8sffrpOrUO4cTPDVs w==; X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="420887204" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="420887204" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 21:50:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="920530927" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="920530927" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2023 21:50:49 -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: [PATCH v4 18/34] x86/fred: add a debug fault entry stub for FRED Date: Wed, 1 Mar 2023 21:24:55 -0800 Message-Id: <20230302052511.1918-19-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230302052511.1918-1-xin3.li@intel.com> References: <20230302052511.1918-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, 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?1759234129185552885?= X-GMAIL-MSGID: =?utf-8?q?1759234129185552885?= From: "H. Peter Anvin (Intel)" Add a debug fault entry stub for FRED. On a FRED system, the debug trap status information (DR6) is passed on the stack, to avoid the problem of transient state. Furthermore, FRED transitions avoid a lot of ugly corner cases the handling of which can, and should be, skipped. The FRED debug trap status information saved on the stack differs from DR6 in both stickiness and polarity; it is exactly what debug_read_clear_dr6() returns, and exc_debug_user()/exc_debug_kernel() expect. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- Changes since v1: * call irqentry_nmi_{enter,exit}() in both IDT and FRED debug fault kernel handler (Peter Zijlstra). --- arch/x86/include/asm/fred.h | 1 + arch/x86/kernel/traps.c | 56 +++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index 57affbf80ced..633dd9e6a68e 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_debug); DECLARE_FRED_HANDLER(fred_exc_page_fault); #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index cebba1f49e19..4b0f63344526 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -1020,21 +1021,9 @@ static bool notify_debug(struct pt_regs *regs, unsigned long *dr6) return false; } -static __always_inline void exc_debug_kernel(struct pt_regs *regs, - unsigned long dr6) +static __always_inline void debug_kernel_common(struct pt_regs *regs, + unsigned long dr6) { - /* - * Disable breakpoints during exception handling; recursive exceptions - * are exceedingly 'fun'. - * - * Since this function is NOKPROBE, and that also applies to - * HW_BREAKPOINT_X, we can't hit a breakpoint before this (XXX except a - * HW_BREAKPOINT_W on our stack) - * - * Entry text is excluded for HW_BP_X and cpu_entry_area, which - * includes the entry stack is excluded for everything. - */ - unsigned long dr7 = local_db_save(); irqentry_state_t irq_state = irqentry_nmi_enter(regs); instrumentation_begin(); @@ -1062,7 +1051,8 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs, * Catch SYSENTER with TF set and clear DR_STEP. If this hit a * watchpoint at the same time then that will still be handled. */ - if ((dr6 & DR_STEP) && is_sysenter_singlestep(regs)) + if (!cpu_feature_enabled(X86_FEATURE_FRED) && + (dr6 & DR_STEP) && is_sysenter_singlestep(regs)) dr6 &= ~DR_STEP; /* @@ -1090,7 +1080,25 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs, out: instrumentation_end(); irqentry_nmi_exit(regs, irq_state); +} +static __always_inline void exc_debug_kernel(struct pt_regs *regs, + unsigned long dr6) +{ + /* + * Disable breakpoints during exception handling; recursive exceptions + * are exceedingly 'fun'. + * + * Since this function is NOKPROBE, and that also applies to + * HW_BREAKPOINT_X, we can't hit a breakpoint before this (XXX except a + * HW_BREAKPOINT_W on our stack) + * + * Entry text is excluded for HW_BP_X and cpu_entry_area, which + * includes the entry stack is excluded for everything. + */ + unsigned long dr7 = local_db_save(); + + debug_kernel_common(regs, dr6); local_db_restore(dr7); } @@ -1179,6 +1187,24 @@ DEFINE_IDTENTRY_DEBUG_USER(exc_debug) { exc_debug_user(regs, debug_read_clear_dr6()); } + +# ifdef CONFIG_X86_FRED +DEFINE_FRED_HANDLER(fred_exc_debug) +{ + /* + * The FRED debug information saved onto stack differs from + * DR6 in both stickiness and polarity; it is exactly what + * debug_read_clear_dr6() returns. + */ + unsigned long dr6 = fred_event_data(regs); + + if (user_mode(regs)) + exc_debug_user(regs, dr6); + else + debug_kernel_common(regs, dr6); +} +# endif /* CONFIG_X86_FRED */ + #else /* 32 bit does not have separate entry points. */ DEFINE_IDTENTRY_RAW(exc_debug)