The patch below does not apply to the 4.19-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 stable@vger.kernel.org.
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-4.19.y git checkout FETCH_HEAD git cherry-pick -x edbbaae42a56f9a2b39c52ef2504dfb3fb0a7858 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024081244-luminous-french-8b11@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
edbbaae42a56 ("genirq/irqdesc: Honor caller provided affinity in alloc_desc()") c410abbbacb9 ("genirq/affinity: Add is_managed to struct irq_affinity_desc") bec04037e4e4 ("genirq/core: Introduce struct irq_affinity_desc") c2899c3470de ("genirq/affinity: Remove excess indentation") 6da4b3ab9a6e ("genirq/affinity: Add support for allocating interrupt sets") 060746d9e394 ("genirq/affinity: Pass first vector to __irq_build_affinity_masks()") 5c903e108d0b ("genirq/affinity: Move two stage affinity spreading into a helper function") b82592199032 ("genirq/affinity: Spread IRQs to all available NUMA nodes") 4c1ef72e9b71 ("PCI/MSI: Warn and return error if driver enables MSI/MSI-X twice")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From edbbaae42a56f9a2b39c52ef2504dfb3fb0a7858 Mon Sep 17 00:00:00 2001 From: Shay Drory shayd@nvidia.com Date: Tue, 6 Aug 2024 10:20:44 +0300 Subject: [PATCH] genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Currently, whenever a caller is providing an affinity hint for an interrupt, the allocation code uses it to calculate the node and copies the cpumask into irq_desc::affinity.
If the affinity for the interrupt is not marked 'managed' then the startup of the interrupt ignores irq_desc::affinity and uses the system default affinity mask.
Prevent this by setting the IRQD_AFFINITY_SET flag for the interrupt in the allocator, which causes irq_setup_affinity() to use irq_desc::affinity on interrupt startup if the mask contains an online CPU.
[ tglx: Massaged changelog ]
Fixes: 45ddcecbfa94 ("genirq: Use affinity hint in irqdesc allocation") Signed-off-by: Shay Drory shayd@nvidia.com Signed-off-by: Thomas Gleixner tglx@linutronix.de Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20240806072044.837827-1-shayd@nvidia.com
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 07e99c936ba5..1dee88ba0ae4 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -530,6 +530,7 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node, flags = IRQD_AFFINITY_MANAGED | IRQD_MANAGED_SHUTDOWN; } + flags |= IRQD_AFFINITY_SET; mask = &affinity->mask; node = cpu_to_node(cpumask_first(mask)); affinity++;