From: Paul Mundt <lethal@linux-sh.org>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH 2/2] irqdomain: Support one-shot tear down of domain mappings.
Date: Wed, 13 Jun 2012 07:34:01 +0000 [thread overview]
Message-ID: <1339572841-26175-2-git-send-email-lethal@linux-sh.org> (raw)
In-Reply-To: <1339572841-26175-1-git-send-email-lethal@linux-sh.org>
This implements a sledgehammer approach for batched domain unmapping
regardless of domain type. In the linear revmap case it's fairly easy to
track state and iterate over the IRQs disposing of them one at a time,
but it's not always so straightforward in the radix tree case.
A new irq_domain_dispose_mappings() is added to ensure all of the
mappings are appropriately discarded, and is to be used prior to domain
removal. Gang lookups are batched, presently 16 at a time, for no reason
other than it seemed like a good number at the time.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
include/linux/irqdomain.h | 1 +
kernel/irq/irqdomain.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 58defd5..6f27c55 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -149,6 +149,7 @@ static inline int irq_domain_associate(struct irq_domain *domain, unsigned int i
extern unsigned int irq_create_mapping(struct irq_domain *host,
irq_hw_number_t hwirq);
extern void irq_dispose_mapping(unsigned int virq);
+extern void irq_domain_dispose_mappings(struct irq_domain *domain);
extern unsigned int irq_find_mapping(struct irq_domain *host,
irq_hw_number_t hwirq);
extern unsigned int irq_create_direct_mapping(struct irq_domain *host);
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 8591cb6..40c9ba1 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -546,6 +546,49 @@ void irq_dispose_mapping(unsigned int virq)
}
EXPORT_SYMBOL_GPL(irq_dispose_mapping);
+#define IRQ_DOMAIN_BATCH_IRQS 16
+
+/**
+ * irq_domain_dispose_mappings() - Dispose of all mappings in a domain
+ * @domain: domain to tear down
+ */
+void irq_domain_dispose_mappings(struct irq_domain *domain)
+{
+ if (domain->revmap_type = IRQ_DOMAIN_MAP_NOMAP)
+ return;
+
+ if (domain->linear_size) {
+ int i;
+
+ for (i = 0; i < domain->linear_size; i++)
+ irq_dispose_mapping(domain->linear_revmap[i]);
+ } else {
+ struct irq_data *irq_data_batch[IRQ_DOMAIN_BATCH_IRQS];
+ unsigned int nr_found;
+ unsigned long index = 0;
+
+ rcu_read_lock();
+
+ for (;;) {
+ int i;
+
+ nr_found = radix_tree_gang_lookup(&domain->radix_tree,
+ (void **)irq_data_batch, index,
+ ARRAY_SIZE(irq_data_batch));
+ if (!nr_found)
+ break;
+
+ for (i = 0; i < nr_found; i++)
+ irq_dispose_mapping(irq_data_batch[i]->irq);
+
+ index += nr_found;
+ }
+
+ rcu_read_unlock();
+ }
+}
+EXPORT_SYMBOL_GPL(irq_domain_dispose_mappings);
+
/**
* irq_find_mapping() - Find a linux irq from an hw irq number.
* @domain: domain owning this hardware interrupt
--
1.7.9.rc0.28.g0e1cf
next prev parent reply other threads:[~2012-06-13 7:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 7:34 [PATCH 1/2] irqdomain: Fix up linear revmap for non-zero hwirq displacement Paul Mundt
2012-06-13 7:34 ` Paul Mundt [this message]
2012-06-15 18:35 ` [PATCH 2/2] irqdomain: Support one-shot tear down of domain mappings Grant Likely
2012-06-15 22:34 ` Paul Mundt
2012-06-17 23:48 ` Grant Likely
2012-06-15 18:25 ` [PATCH 1/2] irqdomain: Fix up linear revmap for non-zero hwirq displacement Grant Likely
2012-06-15 23:14 ` Paul Mundt
2012-06-21 1:19 ` Paul Mundt
2012-07-11 15:22 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339572841-26175-2-git-send-email-lethal@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).