FAILED: patch "[PATCH] irqdomain: Look for existing mapping only once" failed to apply to 5.15-stable tree

PATCH [email protected] 2 participants 5 messages Mar 6, 2023 – Mar 13, 2023

Subsystems (3)

Stable branch IRQ IRQ domains (IRQ number mapping library)

lore

Share & tools

lore

[email protected]

author maintainer

2023-03-06 18:48 UTC #0 lore raw

The patch below does not apply to the 5.15-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 <[email protected]>.

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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

6e6f75c9c98d ("irqdomain: Look for existing mapping only once")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 13 Feb 2023 11:42:46 +0100
Subject: [PATCH] irqdomain: Look for existing mapping only once

Avoid looking for an existing mapping twice when creating a new mapping using irq_create_fwspec_mapping() by factoring out the actual allocation which is shared with irq_create_mapping_affinity().

The new helper function will also be used to fix a shared-interrupt mapping race, hence the Fixes tag.

Fixes b62b2cf5759b ("irqdomain: Fix handling of type settings for existing mappings")

Cc [email protected] # 4.8

Tested-by Hsin-Yi Wang <[email protected]>

Tested-by Mark-PK Tsai <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Signed-off-by Marc Zyngier <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

kernel/irq/irqdomain.c +33 ~~-27~~

index 9f5b96cf6c5c..9f95047e4bc7 100644
@@ -682,6 +682,34 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain)
 EXPORT_SYMBOL_GPL(irq_create_direct_mapping);
 #endif
 
+static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain,
+						  irq_hw_number_t hwirq,
+						  const struct irq_affinity_desc *affinity)
+{
+	struct device_node *of_node = irq_domain_get_of_node(domain);
+	int virq;
+
+	pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq);
+
+	/* Allocate a virtual interrupt number */
+	virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node),
+				      affinity);
+	if (virq <= 0) {
+		pr_debug("-> virq allocation failed\n");
+		return 0;
+	}
+
+	if (irq_domain_associate(domain, virq, hwirq)) {
+		irq_free_desc(virq);
+		return 0;
+	}
+
+	pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
+		hwirq, of_node_full_name(of_node), virq);
+
+	return virq;
+}
+
 /**
  * irq_create_mapping_affinity() - Map a hardware interrupt into linux irq space
  * @domain: domain owning this hardware interrupt or NULL for default domain

@@ -694,14 +722,11 @@ EXPORT_SYMBOL_GPL(irq_create_direct_mapping);
  * on the number returned from that call.
  */
 unsigned int irq_create_mapping_affinity(struct irq_domain *domain,
-				       irq_hw_number_t hwirq,
-				       const struct irq_affinity_desc *affinity)
+					 irq_hw_number_t hwirq,
+					 const struct irq_affinity_desc *affinity)
 {
-	struct device_node *of_node;
 	int virq;
 
-	pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq);
-
 	/* Look for default domain if necessary */
 	if (domain == NULL)
 		domain = irq_default_domain;

@@ -709,34 +734,15 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain,
 		WARN(1, "%s(, %lx) called with NULL domain\n", __func__, hwirq);
 		return 0;
 	}
-	pr_debug("-> using domain @%p\n", domain);
-
-	of_node = irq_domain_get_of_node(domain);
 
 	/* Check if mapping already exists */
 	virq = irq_find_mapping(domain, hwirq);
 	if (virq) {
-		pr_debug("-> existing mapping on virq %d\n", virq);
+		pr_debug("existing mapping on virq %d\n", virq);
 		return virq;
 	}
 
-	/* Allocate a virtual interrupt number */
-	virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node),
-				      affinity);
-	if (virq <= 0) {
-		pr_debug("-> virq allocation failed\n");
-		return 0;
-	}
-
-	if (irq_domain_associate(domain, virq, hwirq)) {
-		irq_free_desc(virq);
-		return 0;
-	}
-
-	pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
-		hwirq, of_node_full_name(of_node), virq);
-
-	return virq;
+	return __irq_create_mapping_affinity(domain, hwirq, affinity);
 }
 EXPORT_SYMBOL_GPL(irq_create_mapping_affinity);

@@ -841,7 +847,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec)
 			return 0;
 	} else {
 		/* Create mapping */
-		virq = irq_create_mapping(domain, hwirq);
+		virq = __irq_create_mapping_affinity(domain, hwirq, NULL);
 		if (!virq)
 			return virq;
 	}

Johan Hovold

2023-03-13 11:18 UTC #1 lore raw

Quoted 15 lines · Greg Kroah-Hartman

The patch below does not apply to the 5.15-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 <[email protected]>.
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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..

Quoted 3 lines

Possible dependencies:
6e6f75c9c98d ("irqdomain: Look for existing mapping only once")

Both the below commit and the dependency were ultimately included in 5.15.y, but the initial failure to add them appears to have prevented the subsequent fixes from being applied.

Specifically, 5.15.y is now missing

	d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()")
	601363cc08da ("irqdomain: Fix mapping-creation race")

both which apply fine to the 5.15 stable tree.

Johan

Quoted 21 lines

------------------ original commit in Linus's tree ------------------
From 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 13 Feb 2023 11:42:46 +0100
Subject: [PATCH] irqdomain: Look for existing mapping only once
Avoid looking for an existing mapping twice when creating a new mapping using irq_create_fwspec_mapping() by factoring out the actual allocation which is shared with irq_create_mapping_affinity().
The new helper function will also be used to fix a shared-interrupt mapping race, hence the Fixes tag.
Fixes b62b2cf5759b ("irqdomain: Fix handling of type settings for existing mappings")
Cc [email protected] # 4.8
Tested-by Hsin-Yi Wang <[email protected]>
Tested-by Mark-PK Tsai <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Signed-off-by Marc Zyngier <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here

Greg KH

author maintainer Applied

2023-03-13 11:25 UTC #2 lore raw

Quoted 20 lines · Johan Hovold

Quoted 15 lines · Greg Kroah-Hartman
The patch below does not apply to the 5.15-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 <[email protected]>.
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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..
Quoted 3 lines
Possible dependencies:
6e6f75c9c98d ("irqdomain: Look for existing mapping only once")

Quoted 7 lines

Both the below commit and the dependency were ultimately included in 5.15.y, but the initial failure to add them appears to have prevented the subsequent fixes from being applied.
Specifically, 5.15.y is now missing
	d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()")

THis commit does not apply to 5.15.y, even with:

Quoted 1 line

	601363cc08da ("irqdomain: Fix mapping-creation race")

This one applied.

I've applied this one to 5.15.y only, it doesn't apply to 5.10.y or older.

thanks,

greg k-h

Johan Hovold

2023-03-13 11:40 UTC #3 lore raw

Quoted 29 lines · Greg Kroah-Hartman

Quoted 20 lines · Johan Hovold
Quoted 15 lines · Greg Kroah-Hartman
The patch below does not apply to the 5.15-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 <[email protected]>.
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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..
Quoted 3 lines
Possible dependencies:
6e6f75c9c98d ("irqdomain: Look for existing mapping only once")
Quoted 7 lines
Both the below commit and the dependency were ultimately included in 5.15.y, but the initial failure to add them appears to have prevented the subsequent fixes from being applied.
Specifically, 5.15.y is now missing
	d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()")

Quoted 8 lines

THis commit does not apply to 5.15.y, even with:
Quoted 1 line
	601363cc08da ("irqdomain: Fix mapping-creation race")
This one applied.
I've applied this one to 5.15.y only, it doesn't apply to 5.10.y or older.

They need to be applied in order. Let me post backports then. Cherry picking them worked just fine, but I did not try git am which may be more picky.

Johan

Greg KH

author maintainer

2023-03-13 12:16 UTC #4 lore raw

In reply to Greg KH

Quoted 29 lines · Greg KH

Quoted 20 lines · Johan Hovold
Quoted 15 lines · Greg Kroah-Hartman
The patch below does not apply to the 5.15-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 <[email protected]>.
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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f75c9c98d2d246d90411ff2b6f0cd271f4cba
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..
Quoted 3 lines
Possible dependencies:
6e6f75c9c98d ("irqdomain: Look for existing mapping only once")
Quoted 7 lines
Both the below commit and the dependency were ultimately included in 5.15.y, but the initial failure to add them appears to have prevented the subsequent fixes from being applied.
Specifically, 5.15.y is now missing
	d55f7f4c58c0 ("irqdomain: Refactor __irq_domain_alloc_irqs()")

Quoted 8 lines

THis commit does not apply to 5.15.y, even with:
Quoted 1 line
	601363cc08da ("irqdomain: Fix mapping-creation race")
This one applied.
I've applied this one to 5.15.y only, it doesn't apply to 5.10.y or older.

Oops, I applied it and it broke the build, so I've now dropped it :(