From patchwork Fri Feb 24 07:01:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 61159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp756511wrd; Thu, 23 Feb 2023 23:30:13 -0800 (PST) X-Google-Smtp-Source: AK7set8I1qEB8ZnItH8kIjcWvqH1lBJyLm+P98Md5JeW4jsCyDRUWQV6CEnthqtYfcwS8uP+pHAx X-Received: by 2002:a17:906:b29a:b0:883:3c6e:23eb with SMTP id q26-20020a170906b29a00b008833c6e23ebmr22559222ejz.42.1677223813198; Thu, 23 Feb 2023 23:30:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677223813; cv=none; d=google.com; s=arc-20160816; b=ioVaL2C2uixF3vG+iANHUIBUvUBM/Sq3jUlcninQ69aQshLk4QA6sEms2BTEHyANwl CyM6aULcpirOmpZrNzyKrso2svKXxRwYQ4Pq4QtD6ZIqjMr5E0iSACF7304J95BEkw2n 4yqrPE39aiIZOBxucYrAmMVeyGH84vK+qHXoSdO7EC13yOBXfXnTfLU0T4zSueVyx70F gMIXUYtLhTswueSrYqTvkxN8hDSeVjX3KxzWpH54rjyr1szL8JJoBvblCGmrDxVpHe7t 2RbRjlJP/dfbttMA4nMgw9EwG9XQQWs2EELwX+JAaTnmMUqmqBaU+Bt6mqJNVUo2OMvR uo8Q== 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=s3U21CDIAGG7yZnjl535XkUfpV/T6qyq/fsOdBFei60=; b=j04PQZibDKXsEdhB4sufhpLdVnLXuNbEeYYA5mZh4ECLPtgDbquCY/F7aejfWHsYOO I07nXcpfuUgfZwVPSO6iIbsPfwB/0sJS52EFx/6dfv3cPLPM3IjmNOJs5Wow9aUCC1fL srEDwazaPSg6E6l39lxaeOjPGaMm+Vgtn6kHBG3WGfArScAO+ifpXrasvGwyh2y+KGPg vPbHmfE8dMVZyCTTUklD/x74+RDBXo16H5ilewKJ6C5IDRafGjWpLjAm4DOobnCmVKvL 4VjGaj9KuSATOIR7ONQNEfsqyU83t/v8Rn4XoQGR/EFmIdL9QqjItQbUf/HrCX19kSqU uT9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BcMwbxtM; 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 ds7-20020a170907724700b008efcce72ba4si5640499ejc.377.2023.02.23.23.29.50; Thu, 23 Feb 2023 23:30:13 -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=BcMwbxtM; 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 S230020AbjBXH2x (ORCPT + 99 others); Fri, 24 Feb 2023 02:28:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229865AbjBXH2Q (ORCPT ); Fri, 24 Feb 2023 02:28:16 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A429C3CE08; Thu, 23 Feb 2023 23:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677223684; x=1708759684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EaKofp4ivx0Pf/jBUb85CotBkxU7/n1s/fvnBgy99zs=; b=BcMwbxtMxM+hYb97XUyWc7PkusVVpgjwlhmFbZ1JzfmGzip92KBL/wWz t+zjYRYbZY/IV3y9Cma2QLTdqU/6bnEGIHUWZfPqCMBs7K45EBZreiiL/ yxPA92az3Ee90OB15jiTdYc7zDHwuSGRhfhkFIBVVi7f7gF54tvnqYCC/ N2+dgrLMjPD1flS49hQG7LGbCWUdzYTeQlDRQBiB2HWkQfwH9PNwFwkbV G1tgdZUNO6UMOo3gMBsxWAMchQrSxDnKxCz3BOFI1dan9cMqE/Lo9XdE8 jKpmLFvRYlLWdkH5/uTwIV4lNGdw6M4G5REvLx3X4A95lTge6kDT9e5FW w==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="334836066" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="334836066" 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:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815639244" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="815639244" 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 18/32] x86/fred: add a debug fault entry stub for FRED Date: Thu, 23 Feb 2023 23:01:31 -0800 Message-Id: <20230224070145.3572-19-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?1758696637100623962?= X-GMAIL-MSGID: =?utf-8?q?1758696637100623962?= 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) 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 de300bda60ee..def4b3455c1f 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)