From patchwork Fri Feb 24 07:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 61172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp761583wrd; Thu, 23 Feb 2023 23:45:15 -0800 (PST) X-Google-Smtp-Source: AK7set+0DeMH258Fk7k2vJSfwx6HxCo2C68lqvPqEMRtvZHYvFN6PdYE/tlVeEXZ+g7Esx6m+dXz X-Received: by 2002:a17:902:ebd0:b0:19a:e617:381d with SMTP id p16-20020a170902ebd000b0019ae617381dmr11503278plg.65.1677224715467; Thu, 23 Feb 2023 23:45:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677224715; cv=none; d=google.com; s=arc-20160816; b=AB6ai8dfDR6DqKUCqi28l9019zBFGAjVMryLFj++144FegLKhBVV1zfy2Ky9KXHPgz Mix7MnQyEUULqzymmJ6I/mc611u+k1DVYZF6ORXciTTy/DntSYPJT4Q/3UHaC1Ffhu4l 2tpY9ESHPoEVifrjn2OUYo3aEHixBRFyOIDdj4glox8TPKe/nXYNkA10u2QFp6olD81i 2ESq5ebL2w9+Rud00MQwlybB5cLUU2GC9tv7abZPcVXGvgAzsLhOj71V89yFSi9z1k7Q 7XLNFGuxtEbpZR8BnswEHOQikK0+0eGHsGYcuIEsayh8BQhWS1otmiUZhSFwKozEO9er MJ/g== 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=F0ZXS+xaHEBWtzysrCeGmTWagJqmnmfYjkV9G7yKRyI=; b=ZpMgr7tPf680kGc+DYThSCxPQz/+S1r2ClqHXVJDwFQ346lzxVFNGj6+pKpovU9R8L 8zxjp0OSt/wvUwaW0PNLau9ll5kouWI0Q794WHWWNoQuKfiY3wf44I+6RAgQopTakulQ yh8WO1W9BnFtuHZRrSFP4GKH0Og4fot5QKG2BMxyMIYofg0TOS342DrrBqzmEBZ0mP9l HA7ugh3GOLu/h/s/wrDFD7RxnYebbTspQQc/d3MVxvd8CoOPiwKL5D2o47jihHUH5aN0 QM+C9r2WmojiL2EvT7acw3d9sk4Y+ohFcyIc0Fk/csKOKfp7LC7Mu5XKC/O7cFIEsDtY cGYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HENWigI6; 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 kl8-20020a170903074800b0019cd6fdef15si783527plb.547.2023.02.23.23.45.02; Thu, 23 Feb 2023 23:45:15 -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=HENWigI6; 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 S229712AbjBXH36 (ORCPT + 99 others); Fri, 24 Feb 2023 02:29:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbjBXH3b (ORCPT ); Fri, 24 Feb 2023 02:29:31 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E35FC63DE2; Thu, 23 Feb 2023 23:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677223710; x=1708759710; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JFgGgK1UiImaF1he4az5OO5OcUrrSSoji4V3Q7e0Ou0=; b=HENWigI6OocZmtzS48CF///m0o6droz+Zur3LZ1GnFIpBQmUmD63KKcx YX+vr7wNMNxQSzUYXvpVgMVlJNXuP4tXWuIz4YvcLU1xCQ2Vkw5SJGu1+ +ZCXElpgrqeveq8GtN7/Jhlodn6Vrj1Sk4xfDr+GX0AcjJpXeiVHLZbUK aB7K6bqOQBY9HJNIprWJtCP/bxLl/NIrY/11uw4Oa+uznz48mJc58P1j4 7qHAM2YHcVW8ryKICk5ng84PjS5ivIxbv8yyDytMrhT077ZJDPTudbpxQ gj5S3pbbj2ggAfbvxq0VOe1fe97bqJTVWpKeU7KjeP7m88jSjtKRHuVqw g==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="334836160" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="334836160" 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:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815639278" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="815639278" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2023 23:27:25 -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 28/32] x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user Date: Thu, 23 Feb 2023 23:01:41 -0800 Message-Id: <20230224070145.3572-29-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?1758697583157280787?= X-GMAIL-MSGID: =?utf-8?q?1758697583157280787?= If the stack frame contains an invalid user context (e.g. due to invalid SS, a non-canonical RIP, etc.) the ERETU instruction will trap (#SS or #GP). From a Linux point of view, this really should be considered a user space failure, so use the standard fault fixup mechanism to intercept the fault, fix up the exception frame, and redirect execution to fred_entrypoint_user. The end result is that it appears just as if the hardware had taken the exception immediately after completing the transition to user space. Suggested-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/entry/entry_64_fred.S | 8 +++++-- arch/x86/include/asm/extable_fixup_types.h | 4 +++- arch/x86/mm/extable.c | 28 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S index 1fb765fd3871..027ef8f1e600 100644 --- a/arch/x86/entry/entry_64_fred.S +++ b/arch/x86/entry/entry_64_fred.S @@ -5,8 +5,10 @@ * The actual FRED entry points. */ #include -#include +#include #include +#include +#include #include #include "calling.h" @@ -38,7 +40,9 @@ SYM_CODE_START_NOALIGN(fred_entrypoint_user) call fred_entry_from_user SYM_INNER_LABEL(fred_exit_user, SYM_L_GLOBAL) FRED_EXIT - ERETU +1: ERETU + + _ASM_EXTABLE_TYPE(1b, fred_entrypoint_user, EX_TYPE_ERETU) SYM_CODE_END(fred_entrypoint_user) /* diff --git a/arch/x86/include/asm/extable_fixup_types.h b/arch/x86/include/asm/extable_fixup_types.h index 991e31cfde94..1585c798a02f 100644 --- a/arch/x86/include/asm/extable_fixup_types.h +++ b/arch/x86/include/asm/extable_fixup_types.h @@ -64,6 +64,8 @@ #define EX_TYPE_UCOPY_LEN4 (EX_TYPE_UCOPY_LEN | EX_DATA_IMM(4)) #define EX_TYPE_UCOPY_LEN8 (EX_TYPE_UCOPY_LEN | EX_DATA_IMM(8)) -#define EX_TYPE_ZEROPAD 20 /* longword load with zeropad on fault */ +#define EX_TYPE_ZEROPAD 20 /* longword load with zeropad on fault */ + +#define EX_TYPE_ERETU 21 #endif diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 60814e110a54..31542a2507ae 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -195,6 +196,29 @@ static bool ex_handler_ucopy_len(const struct exception_table_entry *fixup, return ex_handler_uaccess(fixup, regs, trapnr); } +#ifdef CONFIG_X86_FRED +static bool ex_handler_eretu(const struct exception_table_entry *fixup, + struct pt_regs *regs, unsigned long error_code) +{ + struct pt_regs *uregs = (struct pt_regs *)(regs->sp - offsetof(struct pt_regs, ip)); + unsigned short ss = uregs->ss; + unsigned short cs = uregs->cs; + + fred_info(uregs)->edata = fred_event_data(regs); + uregs->ssl = regs->ssl; + uregs->ss = ss; + uregs->csl = regs->csl; + uregs->current_stack_level = 0; + uregs->cs = cs; + + /* Copy error code to uregs and adjust stack pointer accordingly */ + uregs->orig_ax = error_code; + regs->sp -= 8; + + return ex_handler_default(fixup, regs); +} +#endif + int ex_get_fixup_type(unsigned long ip) { const struct exception_table_entry *e = search_exception_tables(ip); @@ -272,6 +296,10 @@ int fixup_exception(struct pt_regs *regs, int trapnr, unsigned long error_code, return ex_handler_ucopy_len(e, regs, trapnr, reg, imm); case EX_TYPE_ZEROPAD: return ex_handler_zeropad(e, regs, fault_addr); +#ifdef CONFIG_X86_FRED + case EX_TYPE_ERETU: + return ex_handler_eretu(e, regs, error_code); +#endif } BUG(); }