From patchwork Tue Apr 4 10:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 79013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2947382vqo; Tue, 4 Apr 2023 04:25:19 -0700 (PDT) X-Google-Smtp-Source: AKy350Yv5Cxoir6QHKX393cf71S/jzDTWnFni5DCgF1opWivq0hmgUJLq7xCupy2PeAaH5f5Oter X-Received: by 2002:a17:90b:4a52:b0:23f:6830:568e with SMTP id lb18-20020a17090b4a5200b0023f6830568emr2610373pjb.8.1680607519311; Tue, 04 Apr 2023 04:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680607519; cv=none; d=google.com; s=arc-20160816; b=W3ZVmzlRnMRpUNSIoI1HRb2i+jS1vrLIR+8nMbgzJhD5FGaM0NODQcnApjG6TpN+yq kj7NNZQ3fMWUUB0H4k0bgk63fzxBo59M93yGwr+KPdkVtTIF2t7V2zdjbW+ne+7TbvnS K1M8nBGmNelGa42mOasR3RznUrVIRRlloJNZAGY2uoORQXckEv6F7qeKCIoVbmqxW8x3 fCc0Brvq7Ux/8ezfCBDGkM9hjq4z2G8S1gKPV7ac673YjeWz1NzQ66S9Fmdx7vBaQyRM 1etRPl4H4wT8hsjTpNQW5XpVd+EPITuGsGjRoi23dArg3pZJuj6ELyoF6Eco6yu2FcIk YnOA== 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=M5bV6szz0XuXm6oCNHc4S7Y0o7foTuWrMoJq3PC0c4s=; b=hQjit6QTaqEJ2uZ38ArLYLKbhxMnT2cnX0bfcpvZKHL3GjKDJ8BHleupTWXkj/1ost chzPS4TrrVfczuAcp9gN8WRW4yzgzOpBzdaLobFOaPfLhZhjsP+tvNEgzYsHBrkEGVvM AcbdxEyALqNmW48CEGcPXQjJXMAE+8DMf27fH584NqX0hJ/dEwwTI12R1duMGQzWaxJp n6mOlwfsL7+S86a+xlpcrVWROGQtvnx84TgRPCtmlqjPgvxb68kidOExlIQ9TjAf9EcQ ZRO/LZ7T3u6wzoltp7FC1Ds5EjKM1pwH82xinIvUx+udVuXnaVfTwcldQ4r0F5zayU/l yzJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kZ+J7VPZ; 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 a11-20020a17090abe0b00b0023d2b3ac7a2si14636881pjs.60.2023.04.04.04.25.07; Tue, 04 Apr 2023 04:25:19 -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=kZ+J7VPZ; 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 S234821AbjDDKzP (ORCPT + 99 others); Tue, 4 Apr 2023 06:55:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234809AbjDDKyL (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 D7226DC; Tue, 4 Apr 2023 03:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680605609; x=1712141609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3h63lm4e6EBF71B+XPLJAYkLnyTMlvSI36lVPpSC6fU=; b=kZ+J7VPZM1r/UokeBHIWmb8S8OOBMS0MQF5nLX8+bqQDE19rXAQIObUe 6WAu0aSFYmiKwLI6ngITtHFMJhTbeYWZknOuizVypgwM45jVNdUjNscY0 pAq2sgoth9YNBxyJGOSSh+eGXiuhWdOzbVOsjDwfzAsODyRgviEBgw6wz moQbuLX0WvuxmhRfvrh/n+iSNR7X3rcQ54CW52yGPGF+dqasczQVd2wi/ U/HDkyA6q0bi9SkMCwi6ZZw1Jr9beuyP6JU/bNtK/w7Nz4LwYCk6w0uvb CEwdKwkyQr08eLMfXTHxhsJwjXARhV5aiJdP61ZN50pdP6DYJh0Drjerp Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="330734083" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="330734083" 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:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="775597826" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="775597826" 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 16/33] x86/fred: add a page fault entry stub for FRED Date: Tue, 4 Apr 2023 03:26:59 -0700 Message-Id: <20230404102716.1795-17-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?1762244710372023764?= X-GMAIL-MSGID: =?utf-8?q?1762244710372023764?= From: "H. Peter Anvin (Intel)" Add a page fault entry stub for FRED. On a FRED system, the faulting address (CR2) is passed on the stack, to avoid the problem of transient state. Thus we get the page fault address from the stack instead of CR2. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/include/asm/fred.h | 2 ++ arch/x86/mm/fault.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index b59397411ab9..4ff05d350066 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -99,6 +99,8 @@ 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_page_fault); + #endif /* __ASSEMBLY__ */ #endif /* CONFIG_X86_FRED */ diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index a498ae1fbe66..0f946121de14 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -33,6 +33,7 @@ #include /* kvm_handle_async_pf */ #include /* fixup_vdso_exception() */ #include +#include /* fred_event_data() */ #define CREATE_TRACE_POINTS #include @@ -1507,9 +1508,10 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code, } } -DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault) +static __always_inline void page_fault_common(struct pt_regs *regs, + unsigned int error_code, + unsigned long address) { - unsigned long address = read_cr2(); irqentry_state_t state; prefetchw(¤t->mm->mmap_lock); @@ -1556,3 +1558,17 @@ DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault) irqentry_exit(regs, state); } + +DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault) +{ + page_fault_common(regs, error_code, read_cr2()); +} + +#ifdef CONFIG_X86_FRED + +DEFINE_FRED_HANDLER(fred_exc_page_fault) +{ + page_fault_common(regs, regs->orig_ax, fred_event_data(regs)); +} + +#endif /* CONFIG_X86_FRED */