Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp4094264pxb; Wed, 13 Oct 2021 20:52:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjdQoL6tathncZBm6ZSBmZUKeK06vNiUuJBIjx4BiLxbLBPZKIskCpzrCSdDZWnVuxRR9H X-Received: by 2002:a17:903:41c9:b0:13e:e11e:cde7 with SMTP id u9-20020a17090341c900b0013ee11ecde7mr2965331ple.19.1634183533929; Wed, 13 Oct 2021 20:52:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634183533; cv=none; d=google.com; s=arc-20160816; b=NBXdezCxD6AqDxb9eP5ZNS2J8sDALZrS4v2eRhlvIyI0BAC74xtL/SFW4p+7KPuF+B isnlLHAQj1QXevr2F70mVlqvufgfAS2eh8h+98ounrhAMmT+7uXRccVnUTMjwD9/Oo/h xG4SzQjx8NSz0rz/bXNUYr+IHW2evpHc6yvZj1PITqNVg0fvIXP150VYg9Sb85zVj3f8 dsUVXNjsPjupbbL4RofywVnrI7NZBr1Ckzj187lWYct9l/MGC506bAaw+IHXPLqG5wf/ Z08aGFUnpjaYhZ+Ihn+e4Y1qOyzbmovLFM2ZBvQBQ3zeFz09qEF5fPWRW3w2V8XCsG8w JgoA== 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=eOQEzHsfDUG5a6fEo5SBK49peF0X2Nq6aI7qLYd8X1s=; b=ewz0B7zDX1PGxZ1tfgPC7xuV2FBNrl7/uZ7IX908Tuyk90qJBlXOk2/FeKMoJAwr0P P/0XPIVd2ru5Ni+4Ce6iIxiHk7bd231Vr96QhMJEn2cZ8o/4+UlyqibMUxLhHa7HJoZH 8CmmfQVmVf/JZCIsjvPAKYNuxoa8muD76fog5gTVTGt+pxkvPV4s/utokY6NIfg/ttHi FJHmbtzCGh08JdIOI9EWe4GXVvoEopAfkETAFThsBrIO37mWCsXYv3RGdtSqFq0H11Hs jvwU6qP/IhQmTgEHKpOSzOdzAurS+qyAOXl8djap7aeldS7EKNVEM62ksYtTEaPhkcpF 4Sow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkEomEpH; 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 v1si2332628pfb.272.2021.10.13.20.52.00; Wed, 13 Oct 2021 20:52:13 -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=IkEomEpH; 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 S229949AbhJNDwz (ORCPT + 99 others); Wed, 13 Oct 2021 23:52:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbhJNDww (ORCPT ); Wed, 13 Oct 2021 23:52:52 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAC19C061570; Wed, 13 Oct 2021 20:50:48 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id d13-20020a17090ad3cd00b0019e746f7bd4so5990695pjw.0; Wed, 13 Oct 2021 20:50:48 -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=eOQEzHsfDUG5a6fEo5SBK49peF0X2Nq6aI7qLYd8X1s=; b=IkEomEpHpKQPEE7loYIYYuvhS3BQiWVzFrNYvh+pSvPDaJAJ+71l0KSJWumzrXOTlA tCS0uuS9LBmTIQ+daINNeZSv4EHTDf+T1MHlEwg348Xh2ZqvFNCJyPkoqP5ifa9Ckb4X Yom6GMPJhrllAaJJmFejHZ0BMBiYLgzelrAVWPwjIypdk7dZFtFqBnJPuyrLr1QojKwa G+V1z1GuwFi4YWIckumlxY2yu5R+I+9MNLaDF8yw1qzZJWfTZRFnXwpjX2ezVBRXHV+v TFIHO2Q40oO9Q8/IA5ZIoQBPSEmYbNhcRy/FaCNVjqpXhMjEhs1farxVHl88xEch5viD XoGA== 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=eOQEzHsfDUG5a6fEo5SBK49peF0X2Nq6aI7qLYd8X1s=; b=09IDk2RrZHfZhW/I2EhIXoKXryoK0o5psp/bBP4CNrLFxXcIXgkoKk24ZJpw2MbVlf sgmkl2SNRSPpIeR3DKt73J7McX73cZY+Mopn9GCIgqnULENz+BkVJVeswGDaYi6jg7Rp FF1tXYgQAo44s3TWBPJzPbEB8hxmnLXE9lIwunyQFK8bLDYXDv6AUwt54YcfArFx521o TSIY1tdvTPzXZJ2GPd1e1rB5LPoLtWXVOIvhYBzbd0Or4iMQpj2cemz62Kf77KMZV9QY 62nJLA3EbMWSOiJFbStey6ekTLq58+7uaLHMXIckF2nqbNkcq/iKIS24bM6NqtZjXLvt 1DyQ== X-Gm-Message-State: AOAM531UBbmr8fbUhEjqjwDUbB9bc4YvydJ4rEGtJH7rEb5iYaGc8W12 NkGmba3dymDA+Gm8z3Li121d3T4Fr0M= X-Received: by 2002:a17:90b:2349:: with SMTP id ms9mr3725137pjb.45.1634183448246; Wed, 13 Oct 2021 20:50:48 -0700 (PDT) Received: from localhost ([47.88.5.130]) by smtp.gmail.com with ESMTPSA id k17sm903722pfk.16.2021.10.13.20.50.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Oct 2021 20:50:47 -0700 (PDT) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Lai Jiangshan , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Tony Luck , Juergen Gross , "Peter Zijlstra (Intel)" , Joerg Roedel , linux-edac@vger.kernel.org Subject: [PATCH V3 38/49] x86/debug, mce: Use C entry code Date: Thu, 14 Oct 2021 11:50:15 +0800 Message-Id: <20211014035027.17681-3-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20211014031413.14471-1-jiangshanlai@gmail.com> References: <20211014031413.14471-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 + arch/x86/kernel/cpu/mce/Makefile | 3 +++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index c9ee58e8e6d1..7c994bcde1b0 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -466,16 +466,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 0f615943a460..d0fd32288442 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -358,6 +358,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) /** diff --git a/arch/x86/kernel/cpu/mce/Makefile b/arch/x86/kernel/cpu/mce/Makefile index 015856abdbb1..555963416ec3 100644 --- a/arch/x86/kernel/cpu/mce/Makefile +++ b/arch/x86/kernel/cpu/mce/Makefile @@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 + +CFLAGS_core.o += -fno-stack-protector + obj-y = core.o severity.o genpool.o obj-$(CONFIG_X86_ANCIENT_MCE) += winchip.o p5.o -- 2.19.1.6.gb485710b