Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp3208227pxb; Sun, 26 Sep 2021 08:16:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/RXosHbgLfzp9U/YWWJaAr0yiiZukkNfPilOeB2V9dyuZUW7RwahwRSSGXSEJ3OfITRrU X-Received: by 2002:a05:6402:19a9:: with SMTP id o9mr9008598edz.233.1632669392000; Sun, 26 Sep 2021 08:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632669391; cv=none; d=google.com; s=arc-20160816; b=nTo0n+azpoZRl8z5Tdj5WcPfkPZl4pxA4UIHgnjVGSPdgNe5qNNKF55Y2us47M6y5J x3LEBmKc9y+DpWi7srAT5djIJyCtYlZLC8UohO26eoiCgKXeGoswjlTPmXYlYFqRYapM WD7l7j8YT/6QQ4tevcbwEFZByRG/CrGocCM13DhSz07YTAw9Kkls70RWS+xVT9+pxOFy TIlwV8hAVUbphZ7HW5oqFTMyRg0jS87D3HpkMY4s1PXMlRO4qE2Z9LLtGjnvWXMdpKnI qPJcAsxgn3XWTs9xmWrUQNlJVQGRDMZZNM1gqbjfsqZsYxqEBtE57E0kkEHA7Qxsqq8H n5Yw== 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=DT+e9M2eK0NHomO+EEj3+9HCUC38iBv51he10nC9V1Q=; b=r/xthOobKzB9x0faRQQj3jC5oZstFv5t1b97qkIZ5DvPCmjReAlaAe59RNY2KKW0kU /Wa2NZZULd6+F6QQVOaWO6B9sAjGuu0v1BvauTmbs3BEjo4E266FvodhlHzsie/EoIj7 gigyQmIfZVIAt+bDr3z4mgSuXxKaFAg3JRqGfJevXZAViRH1nJMl9Gt7dYfQ+LIFql0Q P2AeojN7XHxBGTPk7sxCd9yXcxSWaicOlpJ6B95GWoCPMHI0owFnzBaQtl4KG+UIMXSx 3EiIOT2qSQ3ME0oen8jZl1VBdVmBlmjcsyrH22rHa5FHwBYIMj0fOh4X47y+vsxU2Elb P2cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ThQgUryI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g23si15599636ejk.552.2021.09.26.08.16.08; Sun, 26 Sep 2021 08:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ThQgUryI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232276AbhIZPNt (ORCPT + 99 others); Sun, 26 Sep 2021 11:13:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232148AbhIZPNY (ORCPT ); Sun, 26 Sep 2021 11:13:24 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3804FC061575 for ; Sun, 26 Sep 2021 08:11:47 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id t1so15312898pgv.3 for ; Sun, 26 Sep 2021 08:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DT+e9M2eK0NHomO+EEj3+9HCUC38iBv51he10nC9V1Q=; b=ThQgUryISb41xRJpkZAp2G2ZzA/f3yvTXRk2tEIx+XkkTrY2GuemTZTfh6lAnFPMS7 Fkn8m0yTq83pwFDC8CdEQ5cqPyoLffvBSyB+22Zw9DD6kQZ5rb7Ud1yLudJJW1+CYgyk Gv5mrNYyviZ9BiJmadJBIdASmQkU2LTVfDeUSzByYxhCHQSCCnXXtjWH2/B7FZHmSoUU Z8iTgx0zd76osaGuYCiywSLSemwh6B4n2looW1D49gjXxINQRqA85ejkPoJkK79OzAFS EyxafXS49Oda8dDqvwbTNrVyjUzNxljgUNVz9wg9ZhPdepNIzwTMJ2ZTaw6a82bkdmh/ kU8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DT+e9M2eK0NHomO+EEj3+9HCUC38iBv51he10nC9V1Q=; b=y80pMMld2LLdbZQ8R92FmlDVvwvdh5p6mWXJljcizAvB7rvbog7qkhnA4wSerEMF77 yb1f2/5Fl+ZglQnQSLtqP8VQe55nSMnxNjEWy6w4S8cn0OG0o3xxuorwULKUwSLW0389 uTQtSvu6Ue07DPp7DbMBemm9V6PRmVevSnMNC46WErBUo+aDvqVCflB2sOBoECT8GrzZ HIAbVA9SCptSCySH/qfSKxaOcPqBTpHRBhEs3L2u14yJcGBTFjbn3RLz+8uIsYQA5xd0 6PNFTBSgIQAU+Pmfoo2XlwvcEhdYKtIG7Lwu5m9YYrDtciiHvZI1lcttEGX1WloEANEJ 1wPA== X-Gm-Message-State: AOAM531H3tz3WKIxaN1gKzzdYbgjCsNoaUZJwBFyDlJv4g8KVxTA4otw Ss51TCZRUPr5I++Ts7u+trHxk8DSHUN2sA== X-Received: by 2002:a63:ea58:: with SMTP id l24mr12766254pgk.334.1632669106670; Sun, 26 Sep 2021 08:11:46 -0700 (PDT) Received: from localhost ([47.88.60.64]) by smtp.gmail.com with ESMTPSA id b13sm13379929pfp.82.2021.09.26.08.11.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Sep 2021 08:11:46 -0700 (PDT) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Juergen Gross , "Peter Zijlstra (Intel)" , Joerg Roedel , Mike Travis Subject: [PATCH V2 28/41] x86/debug, mce: Use C entry code Date: Sun, 26 Sep 2021 23:08:25 +0800 Message-Id: <20210926150838.197719-29-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20210926150838.197719-1-jiangshanlai@gmail.com> References: <20210926150838.197719-1-jiangshanlai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lai Jiangshan Use DEFINE_IDTENTRY_IST_ETNRY to emit C entry function and use the function directly in entry_64.S. Signed-off-by: Lai Jiangshan --- arch/x86/entry/entry_64.S | 10 +--------- arch/x86/include/asm/idtentry.h | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index bd6bce341360..0ba788bb9857 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -437,16 +437,8 @@ SYM_CODE_START(\asmsym) testb $3, CS(%rsp) jnz .Lfrom_usermode_switch_stack_\@ - /* paranoid_entry returns GS information for paranoid_exit in EBX. */ - call paranoid_entry - - UNWIND_HINT_REGS - movq %rsp, %rdi /* pt_regs pointer */ - - call \cfunc - - call paranoid_exit + call ist_\cfunc jmp restore_regs_and_return_to_kernel /* Switch to the regular task stack and use the noist entry point */ diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index b33e96e983c0..babe530cfa77 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -344,6 +344,7 @@ __visible __entry_text void ist_##func(struct pt_regs *regs) \ * Maps to DEFINE_IDTENTRY_RAW */ #define DEFINE_IDTENTRY_IST(func) \ + DEFINE_IDTENTRY_IST_ETNRY(func) \ DEFINE_IDTENTRY_RAW(func) /** -- 2.19.1.6.gb485710b