On Sat, 15 May 2021 13:37:51 +0100, Sasha Levin <sashal@xxxxxxxxxx> wrote: > > On Sat, May 15, 2021 at 11:40:45AM +0100, Marc Zyngier wrote: > > Hi Sasha, > > > > On Sat, 15 May 2021 03:18:25 +0100, > > Sasha Levin <sashal@xxxxxxxxxx> wrote: > >> > >> This is a note to let you know that I've just added the patch titled > >> > >> arm64: entry: factor irq triage logic into macros > >> > >> to the 5.12-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-entry-factor-irq-triage-logic-into-macros.patch > >> and it can be found in the queue-5.12 subdirectory. > >> > >> If you, or anyone else, feels it should not be added to the stable tree, > >> please let <stable@xxxxxxxxxxxxxxx> know about it. > >> > >> > >> > >> commit ec301e4d131aad1648e28305c8d02ae8265a50d7 > >> Author: Marc Zyngier <maz@xxxxxxxxxx> > >> Date: Mon Mar 15 11:56:27 2021 +0000 > >> > >> arm64: entry: factor irq triage logic into macros > >> > >> [ Upstream commit 9eb563cdabe1d583c262042d5d44cc256f644543 ] > >> > >> In subsequent patches we'll allow an FIQ handler to be registered, and > >> FIQ exceptions will need to be triaged very similarly to IRQ exceptions. > >> So that we can reuse the existing logic, this patch factors the IRQ > >> triage logic out into macros that can be reused for FIQ. > >> > >> The macros are named to follow the elX_foo_handler scheme used by the C > >> exception handlers. For consistency with other top-level exception > >> handlers, the kernel_entry/kernel_exit logic is not moved into the > >> macros. As FIQ will use a different C handler, this handler name is > >> provided as an argument to the macros. > >> > >> There should be no functional change as a result of this patch. > >> > >> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> > >> [Mark: rework macros, commit message, rebase before DAIF rework] > >> Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx> > >> Tested-by: Hector Martin <marcan@xxxxxxxxx> > >> Cc: James Morse <james.morse@xxxxxxx> > >> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > >> Cc: Will Deacon <will@xxxxxxxxxx> > >> Acked-by: Will Deacon <will@xxxxxxxxxx> > >> Link: https://lore.kernel.org/r/20210315115629.57191-5-mark.rutland@xxxxxxx > >> Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> > >> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > > I don't think there is any reason for backporting this patch at this > > stage. It isn't a fix, and we don't plan to support the feature it > > subsequently enables in anything older than 5.13. > > > > Unless there is a another pressing reason for adding this patch, I > > suggest it is dropped from 5.10, 5.11 and 5.12 stable branches. > > Actually, looks like I took it to make 4d6a38da8e79 ("arm64: entry: > always set GIC_PRIO_PSR_I_SET during entry") apply easier, does it make > sense to keep it in this scenario? Ah, right. In this case, it indeed makes sense to keep it. Thanks for the clarification, M. -- Without deviation from the norm, progress is not possible.