From patchwork Tue Apr 4 10:27:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 79031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2955414vqo; Tue, 4 Apr 2023 04:37:58 -0700 (PDT) X-Google-Smtp-Source: AKy350b1yuAohYoi/XyXpGjGrSbnSj4u4lmJiNxqEi5owgr9HqaDKSvP2uKHSd3lO7bc7CmeMQ3V X-Received: by 2002:aa7:9ad3:0:b0:625:e3c0:8a58 with SMTP id x19-20020aa79ad3000000b00625e3c08a58mr1886420pfp.4.1680608278180; Tue, 04 Apr 2023 04:37:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680608278; cv=none; d=google.com; s=arc-20160816; b=DN5SINb9YcbI97If+B1Zi9egvVsa32ywm4CqB1nj5fYNrVyzDmBxpaUD1GKQ+ynchD HY6Eg5R+0GtDbiWwZCnLfzt3CKyecZfQd70wJO3qovtWY8NyZmAWvQj/F7KTIIKhpr+O CjrwnfMCT6MxRppO1zgRiqIVChPHpLGh44AD2OMISiXAcHeZCi9x6jFexEHTa8TsBr5N ck4ksDR8uCcv4J7WeYGrAQ1BxxGWZ8IyoqskqQ7OOygUD0xRQmh6YMW/HolhanavtWDg UkkyRBDzeEDCPo0v8LSN1m0xA+wFy4uquqG3L8pApgcR7soOweWXlfBZ5E9rBYdUfjUm 9RSg== 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=6Z0IE2XqP9vwd8ByVTpsUWrJgdNXimuX8wyggK0V93I=; b=rP5T7Z5kAE6+fUr4ioOe7YwwoGbHTjZRbzpBN97C8J5oMsYpkITcyhGdjsvJKfDnP1 30CUxwVksIV7YhcymxONQo4c9vqKFhIv3c4khLu8pfSN7ML8fAPpz4TbdmOSpmgBLuQ1 lYJIiJxWDiyYClNdmaonVsnRDymMvHG3XwXxi+/mMfDfqUvVMMABtvwQ+/ZzpmlAW6Gd fUU/NYjNVO5RPE9d+Nz40Yx/blLlilBw+tu6mxmH9JCEjqpiSFQ5a4+wxdj6WdN2jTLN E0zd2/Rd1D1p+oYqcrQKAuZVoes1k44my/shJ1cqsonU5jCXfHmRmmZ2hvOd+YhsiMOE iESA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bieQ+DI9; 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 r194-20020a632bcb000000b005074cff89b9si10223804pgr.250.2023.04.04.04.37.44; Tue, 04 Apr 2023 04:37:58 -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=bieQ+DI9; 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 S234863AbjDDKzY (ORCPT + 99 others); Tue, 4 Apr 2023 06:55:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234447AbjDDKyL (ORCPT ); Tue, 4 Apr 2023 06:54:11 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A35BE74; Tue, 4 Apr 2023 03:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680605611; x=1712141611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AvdDrUuw1vqZ65Zb2UmH3skaRlzxRNLvEln+YufnpOQ=; b=bieQ+DI9e/ZgkXFIlvB4VcRrblt9iZ+LlnYWlOXPe77kesXqkDsvaFY+ 2iCWBRqYjbLG1kfspyF0952WnQQD44sT4mT5SxDV0knZpygH9QSloUOvV FMwqQUugYlA1z3oFr8+hLIrGNIfjQ2gnsg6gjeeoK/U3yAtBwvkvhWDPI HHbOvsPJ95xn3Kcv4ziGVRTLJxWzKmnBAjFirO/rUMvu0w+wKAfctsyQk dB75cMMpelZ/A0uC3LrpMpvzFCFCn6LWNhil3SjlGOhRJK/pmD1jz3fK+ 9WfC/aIR6MlsiggrjpEBFCQPReH6VpWghoHrRy8v5XWNeOUfMc6mKqHgC A==; X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="330734093" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="330734093" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2023 03:53:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="775597829" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="775597829" Received: from unknown (HELO fred..) ([172.25.112.68]) by FMSMGA003.fm.intel.com with ESMTP; 04 Apr 2023 03:53:03 -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 v7 17/33] x86/fred: add a debug fault entry stub for FRED Date: Tue, 4 Apr 2023 03:27:00 -0700 Message-Id: <20230404102716.1795-18-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404102716.1795-1-xin3.li@intel.com> References: <20230404102716.1795-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?1762245505761067273?= X-GMAIL-MSGID: =?utf-8?q?1762245505761067273?= 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 4ff05d350066..f670430aaa54 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -99,6 +99,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 f86cd233b00b..549f7f962f8f 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)