From patchwork Tue Aug 1 08:33: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: 129145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2567762vqg; Tue, 1 Aug 2023 03:17:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlGKZMIgIDRMnPkZLc5BLKiOH8sd22uDm/J5uE1MIRp2FFa3UNf0t13xT5mHSv3hMRuIHQ79 X-Received: by 2002:a05:6a20:938a:b0:133:8784:15f7 with SMTP id x10-20020a056a20938a00b00133878415f7mr13806106pzh.14.1690885056326; Tue, 01 Aug 2023 03:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690885056; cv=none; d=google.com; s=arc-20160816; b=0BIShO6IrKWYJMdWiU2bP/0gT7GahwE5SrWHzfZXI0N2gOaex1lgtSR5DNywWA6ZqN DW5y9l6bqzdDc34IvxFhiAZBI3fsFxZs7hsWRJ5XqT6fhnU/kfrmJbkoVHiRWNj9IbcY 2rftyMV+cQys1NVuWzggz5BPcKPLd8xiF0Wg/29ZxgvaAoH2rlPTowG8f46ITQeHG79e 3fbhB8gz4y3tYUiKxXXwOpuwi0WXAJgJO+/2yh9dclB0G4J/hkLPfgMOJh2+HayqBUHA YoxDFUWrcZWr0gTp7kqjjk0UZ1fszH2dD1uExJht3xai/SH8ubPfccVhONnYVoGpUTBJ lkJA== 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=72NtTsEXFeG+8m6Kv3do2Og9a/8rHXAb74rXp8xrH3A=; fh=nYO9ukkM7JnAAJZcChGC8UWBlCLXeJxIDT82cxoIaf0=; b=gbFmOSBvcYHaHyfjaQaR4JfQCiFbJfwpGjK6pI0Kqm5VCt3y6wBDyu2N6V+d9u4Pc+ vvLquY69AwFFjlqYaz+GsYz3JU0FQUTZvA9iZ50uEkm9u5IuChN4RgrmwAxrsA6GWAMl 7RI5O5vYYqzV/d8KncoweEqZOUOxOEdJuEE6PDvdIt1hglpXl+v2d+3JjSRCnNO2CGpZ 9bluuIFi7luutrGR39KQ47YtWRQA7sXpnou/yzYVnwIdrheG2yerGbHAX5C0QPpX5BaF LG/VPmjMWarjTdQcMTcE2UWEbXwSGbp+Tshu46Upabql+CqjlazPrrJ4WWZ8wcj95PrM es2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kN3A0OL7; 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 t33-20020a634461000000b00553ebb05d25si8831524pgk.80.2023.08.01.03.17.23; Tue, 01 Aug 2023 03:17:36 -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=kN3A0OL7; 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 S230008AbjHAJF5 (ORCPT + 99 others); Tue, 1 Aug 2023 05:05:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232592AbjHAJFX (ORCPT ); Tue, 1 Aug 2023 05:05:23 -0400 Received: from mgamail.intel.com (unknown [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05C413591; Tue, 1 Aug 2023 02:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690880631; x=1722416631; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=61pP2ZrTnfM4AWC4LzTY02SWj0Yo4OSnGRh0vm8RTJ0=; b=kN3A0OL75txmGfrNHHLWvcTb70UlZxAA+K57MCdEnKOK8I2+OWsuGE1k gfdYQuJ3wP8T7WhH41XEUk5znfr9gqkkDLhGJ+B7LLjuDrU9rlGw1ybAB YJjv6BlQQ8ecks7z48oUXIQNZLQbGZPq3wo1FGI5DOhPWTQb8EjXucZJA 7sSDOlyGg5wvi5WGy+I5cGmpDd9WhAixwVnO/2ljd1f8MFPmhT+Qe2BQk CDfciAohiWJDLnXZPaZsetO1897W9HCc5SiZnGueb0sA2bNifep7i1adS 8NbYxh+N8qfHv35gV2htD8UarK9Onu3hK7nUp1Z2aOhy5cjdl7YueJc5Z w==; X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="433082653" X-IronPort-AV: E=Sophos;i="6.01,246,1684825200"; d="scan'208";a="433082653" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 02:02:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="975217060" X-IronPort-AV: E=Sophos;i="6.01,246,1684825200"; d="scan'208";a="975217060" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 01 Aug 2023 02:02:06 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , Andy Lutomirski , Oleg Nesterov , Tony Luck , "K . Y . Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Paolo Bonzini , Wanpeng Li , Vitaly Kuznetsov , Sean Christopherson , Peter Zijlstra , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Josh Poimboeuf , "Paul E . McKenney" , Catalin Marinas , Randy Dunlap , Steven Rostedt , Kim Phillips , Xin Li , Hyeonggon Yoo <42.hyeyoo@gmail.com>, "Liam R . Howlett" , Sebastian Reichel , "Kirill A . Shutemov" , Suren Baghdasaryan , Pawan Gupta , Babu Moger , Jim Mattson , Sandipan Das , Lai Jiangshan , Hans de Goede , Reinette Chatre , Daniel Sneddon , Breno Leitao , Nikunj A Dadhania , Brian Gerst , Sami Tolvanen , Alexander Potapenko , Andrew Morton , Arnd Bergmann , "Eric W . Biederman" , Kees Cook , Masami Hiramatsu , Masahiro Yamada , Ze Gao , Fei Li , Conghui , Ashok Raj , "Jason A . Donenfeld" , Mark Rutland , Jacob Pan , Jiapeng Chong , Jane Malalane , David Woodhouse , Boris Ostrovsky , Arnaldo Carvalho de Melo , Yantengsi , Christophe Leroy , Sathvika Vasireddy Subject: [PATCH RESEND v9 18/36] x86/fred: Add a page fault entry stub for FRED Date: Tue, 1 Aug 2023 01:33:00 -0700 Message-Id: <20230801083318.8363-19-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230801083318.8363-1-xin3.li@intel.com> References: <20230801083318.8363-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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773021488687369584 X-GMAIL-MSGID: 1773021488687369584 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 | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h index b45c1bea5b7f..fb8e7b4f2d38 100644 --- a/arch/x86/include/asm/fred.h +++ b/arch/x86/include/asm/fred.h @@ -112,6 +112,8 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs) 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 e8711b2cafaf..dd3df092d0f2 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -34,6 +34,7 @@ #include /* kvm_handle_async_pf */ #include /* fixup_vdso_exception() */ #include +#include #define CREATE_TRACE_POINTS #include @@ -1495,9 +1496,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); @@ -1544,3 +1546,15 @@ 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