|
|
@@ -6,84 +6,81 @@
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/bio.h>
|
|
|
-#include <linux/blkdev.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/cpu.h>
|
|
|
-#include <linux/blk-iopoll.h>
|
|
|
+#include <linux/irq_poll.h>
|
|
|
#include <linux/delay.h>
|
|
|
|
|
|
-#include "blk.h"
|
|
|
-
|
|
|
-static unsigned int blk_iopoll_budget __read_mostly = 256;
|
|
|
+static unsigned int irq_poll_budget __read_mostly = 256;
|
|
|
|
|
|
static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll);
|
|
|
|
|
|
/**
|
|
|
- * blk_iopoll_sched - Schedule a run of the iopoll handler
|
|
|
+ * irq_poll_sched - Schedule a run of the iopoll handler
|
|
|
* @iop: The parent iopoll structure
|
|
|
*
|
|
|
* Description:
|
|
|
- * Add this blk_iopoll structure to the pending poll list and trigger the
|
|
|
+ * Add this irq_poll structure to the pending poll list and trigger the
|
|
|
* raise of the blk iopoll softirq. The driver must already have gotten a
|
|
|
- * successful return from blk_iopoll_sched_prep() before calling this.
|
|
|
+ * successful return from irq_poll_sched_prep() before calling this.
|
|
|
**/
|
|
|
-void blk_iopoll_sched(struct blk_iopoll *iop)
|
|
|
+void irq_poll_sched(struct irq_poll *iop)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
|
|
|
- __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
|
|
|
+ __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
|
|
|
local_irq_restore(flags);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_iopoll_sched);
|
|
|
+EXPORT_SYMBOL(irq_poll_sched);
|
|
|
|
|
|
/**
|
|
|
- * __blk_iopoll_complete - Mark this @iop as un-polled again
|
|
|
+ * __irq_poll_complete - Mark this @iop as un-polled again
|
|
|
* @iop: The parent iopoll structure
|
|
|
*
|
|
|
* Description:
|
|
|
- * See blk_iopoll_complete(). This function must be called with interrupts
|
|
|
+ * See irq_poll_complete(). This function must be called with interrupts
|
|
|
* disabled.
|
|
|
**/
|
|
|
-void __blk_iopoll_complete(struct blk_iopoll *iop)
|
|
|
+void __irq_poll_complete(struct irq_poll *iop)
|
|
|
{
|
|
|
list_del(&iop->list);
|
|
|
smp_mb__before_atomic();
|
|
|
- clear_bit_unlock(IOPOLL_F_SCHED, &iop->state);
|
|
|
+ clear_bit_unlock(IRQ_POLL_F_SCHED, &iop->state);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(__blk_iopoll_complete);
|
|
|
+EXPORT_SYMBOL(__irq_poll_complete);
|
|
|
|
|
|
/**
|
|
|
- * blk_iopoll_complete - Mark this @iop as un-polled again
|
|
|
+ * irq_poll_complete - Mark this @iop as un-polled again
|
|
|
* @iop: The parent iopoll structure
|
|
|
*
|
|
|
* Description:
|
|
|
* If a driver consumes less than the assigned budget in its run of the
|
|
|
* iopoll handler, it'll end the polled mode by calling this function. The
|
|
|
- * iopoll handler will not be invoked again before blk_iopoll_sched_prep()
|
|
|
+ * iopoll handler will not be invoked again before irq_poll_sched_prep()
|
|
|
* is called.
|
|
|
**/
|
|
|
-void blk_iopoll_complete(struct blk_iopoll *iop)
|
|
|
+void irq_poll_complete(struct irq_poll *iop)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
- __blk_iopoll_complete(iop);
|
|
|
+ __irq_poll_complete(iop);
|
|
|
local_irq_restore(flags);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_iopoll_complete);
|
|
|
+EXPORT_SYMBOL(irq_poll_complete);
|
|
|
|
|
|
-static void blk_iopoll_softirq(struct softirq_action *h)
|
|
|
+static void irq_poll_softirq(struct softirq_action *h)
|
|
|
{
|
|
|
struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
|
|
|
- int rearm = 0, budget = blk_iopoll_budget;
|
|
|
+ int rearm = 0, budget = irq_poll_budget;
|
|
|
unsigned long start_time = jiffies;
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
|
|
while (!list_empty(list)) {
|
|
|
- struct blk_iopoll *iop;
|
|
|
+ struct irq_poll *iop;
|
|
|
int work, weight;
|
|
|
|
|
|
/*
|
|
|
@@ -101,11 +98,11 @@ static void blk_iopoll_softirq(struct softirq_action *h)
|
|
|
* entries to the tail of this list, and only ->poll()
|
|
|
* calls can remove this head entry from the list.
|
|
|
*/
|
|
|
- iop = list_entry(list->next, struct blk_iopoll, list);
|
|
|
+ iop = list_entry(list->next, struct irq_poll, list);
|
|
|
|
|
|
weight = iop->weight;
|
|
|
work = 0;
|
|
|
- if (test_bit(IOPOLL_F_SCHED, &iop->state))
|
|
|
+ if (test_bit(IRQ_POLL_F_SCHED, &iop->state))
|
|
|
work = iop->poll(iop, weight);
|
|
|
|
|
|
budget -= work;
|
|
|
@@ -121,72 +118,72 @@ static void blk_iopoll_softirq(struct softirq_action *h)
|
|
|
* move the instance around on the list at-will.
|
|
|
*/
|
|
|
if (work >= weight) {
|
|
|
- if (blk_iopoll_disable_pending(iop))
|
|
|
- __blk_iopoll_complete(iop);
|
|
|
+ if (irq_poll_disable_pending(iop))
|
|
|
+ __irq_poll_complete(iop);
|
|
|
else
|
|
|
list_move_tail(&iop->list, list);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (rearm)
|
|
|
- __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
|
|
|
+ __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
|
|
|
|
|
|
local_irq_enable();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * blk_iopoll_disable - Disable iopoll on this @iop
|
|
|
+ * irq_poll_disable - Disable iopoll on this @iop
|
|
|
* @iop: The parent iopoll structure
|
|
|
*
|
|
|
* Description:
|
|
|
* Disable io polling and wait for any pending callbacks to have completed.
|
|
|
**/
|
|
|
-void blk_iopoll_disable(struct blk_iopoll *iop)
|
|
|
+void irq_poll_disable(struct irq_poll *iop)
|
|
|
{
|
|
|
- set_bit(IOPOLL_F_DISABLE, &iop->state);
|
|
|
- while (test_and_set_bit(IOPOLL_F_SCHED, &iop->state))
|
|
|
+ set_bit(IRQ_POLL_F_DISABLE, &iop->state);
|
|
|
+ while (test_and_set_bit(IRQ_POLL_F_SCHED, &iop->state))
|
|
|
msleep(1);
|
|
|
- clear_bit(IOPOLL_F_DISABLE, &iop->state);
|
|
|
+ clear_bit(IRQ_POLL_F_DISABLE, &iop->state);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_iopoll_disable);
|
|
|
+EXPORT_SYMBOL(irq_poll_disable);
|
|
|
|
|
|
/**
|
|
|
- * blk_iopoll_enable - Enable iopoll on this @iop
|
|
|
+ * irq_poll_enable - Enable iopoll on this @iop
|
|
|
* @iop: The parent iopoll structure
|
|
|
*
|
|
|
* Description:
|
|
|
* Enable iopoll on this @iop. Note that the handler run will not be
|
|
|
* scheduled, it will only mark it as active.
|
|
|
**/
|
|
|
-void blk_iopoll_enable(struct blk_iopoll *iop)
|
|
|
+void irq_poll_enable(struct irq_poll *iop)
|
|
|
{
|
|
|
- BUG_ON(!test_bit(IOPOLL_F_SCHED, &iop->state));
|
|
|
+ BUG_ON(!test_bit(IRQ_POLL_F_SCHED, &iop->state));
|
|
|
smp_mb__before_atomic();
|
|
|
- clear_bit_unlock(IOPOLL_F_SCHED, &iop->state);
|
|
|
+ clear_bit_unlock(IRQ_POLL_F_SCHED, &iop->state);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_iopoll_enable);
|
|
|
+EXPORT_SYMBOL(irq_poll_enable);
|
|
|
|
|
|
/**
|
|
|
- * blk_iopoll_init - Initialize this @iop
|
|
|
+ * irq_poll_init - Initialize this @iop
|
|
|
* @iop: The parent iopoll structure
|
|
|
* @weight: The default weight (or command completion budget)
|
|
|
* @poll_fn: The handler to invoke
|
|
|
*
|
|
|
* Description:
|
|
|
- * Initialize this blk_iopoll structure. Before being actively used, the
|
|
|
- * driver must call blk_iopoll_enable().
|
|
|
+ * Initialize this irq_poll structure. Before being actively used, the
|
|
|
+ * driver must call irq_poll_enable().
|
|
|
**/
|
|
|
-void blk_iopoll_init(struct blk_iopoll *iop, int weight, blk_iopoll_fn *poll_fn)
|
|
|
+void irq_poll_init(struct irq_poll *iop, int weight, irq_poll_fn *poll_fn)
|
|
|
{
|
|
|
memset(iop, 0, sizeof(*iop));
|
|
|
INIT_LIST_HEAD(&iop->list);
|
|
|
iop->weight = weight;
|
|
|
iop->poll = poll_fn;
|
|
|
- set_bit(IOPOLL_F_SCHED, &iop->state);
|
|
|
+ set_bit(IRQ_POLL_F_SCHED, &iop->state);
|
|
|
}
|
|
|
-EXPORT_SYMBOL(blk_iopoll_init);
|
|
|
+EXPORT_SYMBOL(irq_poll_init);
|
|
|
|
|
|
-static int blk_iopoll_cpu_notify(struct notifier_block *self,
|
|
|
+static int irq_poll_cpu_notify(struct notifier_block *self,
|
|
|
unsigned long action, void *hcpu)
|
|
|
{
|
|
|
/*
|
|
|
@@ -199,26 +196,26 @@ static int blk_iopoll_cpu_notify(struct notifier_block *self,
|
|
|
local_irq_disable();
|
|
|
list_splice_init(&per_cpu(blk_cpu_iopoll, cpu),
|
|
|
this_cpu_ptr(&blk_cpu_iopoll));
|
|
|
- __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
|
|
|
+ __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
|
|
|
local_irq_enable();
|
|
|
}
|
|
|
|
|
|
return NOTIFY_OK;
|
|
|
}
|
|
|
|
|
|
-static struct notifier_block blk_iopoll_cpu_notifier = {
|
|
|
- .notifier_call = blk_iopoll_cpu_notify,
|
|
|
+static struct notifier_block irq_poll_cpu_notifier = {
|
|
|
+ .notifier_call = irq_poll_cpu_notify,
|
|
|
};
|
|
|
|
|
|
-static __init int blk_iopoll_setup(void)
|
|
|
+static __init int irq_poll_setup(void)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
for_each_possible_cpu(i)
|
|
|
INIT_LIST_HEAD(&per_cpu(blk_cpu_iopoll, i));
|
|
|
|
|
|
- open_softirq(BLOCK_IOPOLL_SOFTIRQ, blk_iopoll_softirq);
|
|
|
- register_hotcpu_notifier(&blk_iopoll_cpu_notifier);
|
|
|
+ open_softirq(IRQ_POLL_SOFTIRQ, irq_poll_softirq);
|
|
|
+ register_hotcpu_notifier(&irq_poll_cpu_notifier);
|
|
|
return 0;
|
|
|
}
|
|
|
-subsys_initcall(blk_iopoll_setup);
|
|
|
+subsys_initcall(irq_poll_setup);
|
Christoph Hellwig