From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F4BACDB465 for ; Mon, 16 Oct 2023 08:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:From:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=SiF3N652sVA6rJsSsTDfdAJ4aWnfwne1PdWREV8i4CA=; b=FZ3Tm8lwNHgfUb kepPl5Pv4MDMm/kZbC381v6I3wukjE2N6QZORbca530CRskbAKiyAdBzf3F4xwVV7EpGACsM7fYhK fGYiRWD2rmB4ETVSAMU9MsfGVpHyQnssZHJXRnbrYD8jROFGXjmBACPcaELr9bFWqq5TA4lvFP4J8 VI9A/M2XgQ8lqeEwZUvdafbbE/maCabsPv1ipEFen0GP8W6wbTiljHDVv8jMqNWwwjHO9uaGgs3fi mMQThlHbZcfzCKMJycmKRbDT65/O35Odm6P8pywYfn5VCW0OWbPVhgptcY/c3QyklPvTJiraN/XkT exKn5G290UhD8rMFFbbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsIaR-008lHs-1H; Mon, 16 Oct 2023 08:04:27 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsIa1-008l1M-30 for linux-arm-kernel@lists.infradead.org; Mon, 16 Oct 2023 08:04:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 3F9C2CE11FD; Mon, 16 Oct 2023 08:04:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3D8AC433CB; Mon, 16 Oct 2023 08:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1697443439; bh=b1W58kZ2/PnVrC3qfZAQXVEvRTr4kBVqrHSBsVk803A=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=XrOaA+iKlgTcSjNqbfHf3w46Yr+UY1EoaTbbvqkaMcPbsRE+0drDLipVS1pGc4k5w NoP9SllOdYeaYjmr3sjaX3o0mVzb7nvqFG062XDRCyfQv8zRScc5qA0EMLQoTXjE4Z TPOyKrVLxx0/O9qoQ0DLS3PdDAYq7gEfnfX1Uo70= Subject: Patch "arm64: allow kprobes on EL0 handlers" has been added to the 5.15-stable tree To: alexandru.elisei@arm.com,anshuman.khandual@arm.com,broonie@kernel.org,catalin.marinas@arm.com,ebiederm@xmission.com,gregkh@linuxfoundation.org,haibinzhang@tencent.com,hewenliang4@huawei.com,james.morse@arm.com,joey.gouly@arm.com,linux-arm-kernel@lists.infradead.org,mark.rutland@arm.com,maz@kernel.org,pcc@google.com,peterz@infradead.org,ruanjinjie@huawei.com,sashal@kernel.org,scott@os.amperecomputing.com,stable@kernel.org,will@kernel.org Cc: From: Date: Mon, 16 Oct 2023 10:03:55 +0200 In-Reply-To: <20231011100655.979626-7-ruanjinjie@huawei.com> Message-ID: <2023101655-outreach-overstate-fddd@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231016_010402_387747_665AE1C3 X-CRM114-Status: GOOD ( 14.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled arm64: allow kprobes on EL0 handlers to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm64-allow-kprobes-on-el0-handlers.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From ruanjinjie@huawei.com Wed Oct 11 12:07:43 2023 From: Jinjie Ruan Date: Wed, 11 Oct 2023 10:06:46 +0000 Subject: arm64: allow kprobes on EL0 handlers To: , , , , , , , , , , , , , , , , , Cc: Message-ID: <20231011100655.979626-7-ruanjinjie@huawei.com> From: Mark Rutland commit b3a0c010e900a9f89dcd99f10bd8f7538d21b0a9 upstream. Currently do_sysinstr() and do_cp15instr() are marked with NOKPROBE_SYMBOL(). However, these are only called for exceptions taken from EL0, and there is no risk of recursion in kprobes, so this is not necessary. Remove the NOKPROBE_SYMBOL() annotation, and rename the two functions to more clearly indicate that these are solely for exceptions taken from EL0, better matching the names used by the lower level entry points in entry-common.c. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: James Morse Cc: Joey Gouly Cc: Peter Zijlstra Cc: Will Deacon Link: https://lore.kernel.org/r/20221019144123.612388-2-mark.rutland@arm.com Signed-off-by: Will Deacon Signed-off-by: Jinjie Ruan Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/exception.h | 4 ++-- arch/arm64/kernel/entry-common.c | 4 ++-- arch/arm64/kernel/traps.c | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) --- a/arch/arm64/include/asm/exception.h +++ b/arch/arm64/include/asm/exception.h @@ -66,10 +66,10 @@ void do_debug_exception(unsigned long ad void do_fpsimd_acc(unsigned long esr, struct pt_regs *regs); void do_sve_acc(unsigned long esr, struct pt_regs *regs); void do_fpsimd_exc(unsigned long esr, struct pt_regs *regs); -void do_sysinstr(unsigned long esr, struct pt_regs *regs); +void do_el0_sys(unsigned long esr, struct pt_regs *regs); void do_sp_pc_abort(unsigned long addr, unsigned long esr, struct pt_regs *regs); void bad_el0_sync(struct pt_regs *regs, int reason, unsigned long esr); -void do_cp15instr(unsigned long esr, struct pt_regs *regs); +void do_el0_cp15(unsigned long esr, struct pt_regs *regs); void do_el0_svc(struct pt_regs *regs); void do_el0_svc_compat(struct pt_regs *regs); void do_el0_fpac(struct pt_regs *regs, unsigned long esr); --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -541,7 +541,7 @@ static void noinstr el0_sys(struct pt_re { enter_from_user_mode(regs); local_daif_restore(DAIF_PROCCTX); - do_sysinstr(esr, regs); + do_el0_sys(esr, regs); exit_to_user_mode(regs); } @@ -728,7 +728,7 @@ static void noinstr el0_cp15(struct pt_r { enter_from_user_mode(regs); local_daif_restore(DAIF_PROCCTX); - do_cp15instr(esr, regs); + do_el0_cp15(esr, regs); exit_to_user_mode(regs); } --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -742,7 +742,7 @@ static const struct sys64_hook cp15_64_h {}, }; -void do_cp15instr(unsigned long esr, struct pt_regs *regs) +void do_el0_cp15(unsigned long esr, struct pt_regs *regs) { const struct sys64_hook *hook, *hook_base; @@ -780,10 +780,9 @@ void do_cp15instr(unsigned long esr, str */ do_undefinstr(regs, esr); } -NOKPROBE_SYMBOL(do_cp15instr); #endif -void do_sysinstr(unsigned long esr, struct pt_regs *regs) +void do_el0_sys(unsigned long esr, struct pt_regs *regs) { const struct sys64_hook *hook; @@ -800,7 +799,6 @@ void do_sysinstr(unsigned long esr, stru */ do_undefinstr(regs, esr); } -NOKPROBE_SYMBOL(do_sysinstr); static const char *esr_class_str[] = { [0 ... ESR_ELx_EC_MAX] = "UNRECOGNIZED EC", Patches currently in stable-queue which might be from ruanjinjie@huawei.com are queue-5.15/arm64-factor-insn-read-out-of-call_undef_hook.patch queue-5.15/arm64-rework-el0-mrs-emulation.patch queue-5.15/arm64-die-pass-err-as-long.patch queue-5.15/arm64-armv8_deprecated-rework-deprected-instruction-handling.patch queue-5.15/arm64-armv8_deprecated-fix-unused-function-error.patch queue-5.15/arm64-armv8_deprecated-move-aarch32-helper-earlier.patch queue-5.15/arm64-consistently-pass-esr_elx-to-die.patch queue-5.15/arm64-factor-out-el1-ssbs-emulation-hook.patch queue-5.15/arm64-report-el1-undefs-better.patch queue-5.15/arm64-armv8_deprecated-fold-ops-into-insn_emulation.patch queue-5.15/arm64-rework-bti-exception-handling.patch queue-5.15/arm64-rework-fpac-exception-handling.patch queue-5.15/arm64-split-el0-el1-undef-handlers.patch queue-5.15/arm64-allow-kprobes-on-el0-handlers.patch queue-5.15/arm64-armv8_deprecated-move-emulation-functions.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel