From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6403171A4 for ; Fri, 24 Nov 2023 12:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ub+k6MYz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05C9BC433C8; Fri, 24 Nov 2023 12:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700830568; bh=t89G0NWTgeq1vzgsV01N1M6JwhbXduDP809u+MuPRts=; h=Subject:To:Cc:From:Date:From; b=ub+k6MYz2+/8Em47adQTGP/ktY5/SjzunEJBQDGsZlLeF121tGX35knLdcf1Q6c64 W0i3mXdzTuxVyXK5PvoxhfQCVGsmsvFGutYuuwD0Bj6/yCc054e7uAOhoez5sH3bjf 3ag8enDUm3PrX7fK9gMmdZFmoN9KW9RDpHssihXI= Subject: FAILED: patch "[PATCH] riscv: put interrupt entries into .irqentry.text" failed to apply to 5.4-stable tree To: namcaov@gmail.com,palmer@rivosinc.com Cc: From: Date: Fri, 24 Nov 2023 12:56:05 +0000 Message-ID: <2023112403-outlying-sagging-2d49@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 87615e95f6f9ccd36d4a3905a2d87f91967ea9d2 # git commit -s git send-email --to '' --in-reply-to '2023112403-outlying-sagging-2d49@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 87615e95f6f9 ("riscv: put interrupt entries into .irqentry.text") f0bddf50586d ("riscv: entry: Convert to generic entry") c3ec1e8964fb ("Merge patch series "RISC-V: Align the shadow stack"") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 87615e95f6f9ccd36d4a3905a2d87f91967ea9d2 Mon Sep 17 00:00:00 2001 From: Nam Cao Date: Mon, 21 Aug 2023 16:57:09 +0200 Subject: [PATCH] riscv: put interrupt entries into .irqentry.text The interrupt entries are expected to be in the .irqentry.text section. For example, for kprobes to work properly, exception code cannot be probed; this is ensured by blacklisting addresses in the .irqentry.text section. Fixes: 7db91e57a0ac ("RISC-V: Task implementation") Signed-off-by: Nam Cao Link: https://lore.kernel.org/r/20230821145708.21270-1-namcaov@gmail.com Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 143a2bb3e697..d7dd9030df3f 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -14,6 +14,8 @@ #include #include + .section .irqentry.text, "ax" + SYM_CODE_START(handle_exception) /* * If coming from userspace, preserve the user thread pointer and load