openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: replace icq->changed with icq->flags 

icq->changed was used for ICQ_*_CHANGED bits.  Rename it to flags and
access it under ioc->lock instead of using atomic bitops.
ioc_get_changed() is added so that the changed part can be fetched and
cleared as before.

icq->flags will be used to carry other flags.

Signed-off-by: Tejun Heo <tj@kernel.org>
Tested-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Tejun Heo 2012-02-15 09:45:49 +01:00 committed by Jens Axboe
parent 7ada1dd628
commit d705ae6b13
3 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
block/blk-ioc.c
View File

@ -363,13 +363,13 @@ struct io_cq *ioc_create_icq(struct request_queue *q, gfp_t gfp_mask)
return icq; return icq;
} }
void ioc_set_changed(struct io_context *ioc, int which) void ioc_set_icq_flags(struct io_context *ioc, unsigned int flags)
{ {
struct io_cq *icq; struct io_cq *icq;
struct hlist_node *n; struct hlist_node *n;
hlist_for_each_entry(icq, n, &ioc->icq_list, ioc_node) hlist_for_each_entry(icq, n, &ioc->icq_list, ioc_node)
set_bit(which, &icq->changed); icq->flags |= flags;
} }
/** /**
@ -387,7 +387,7 @@ void ioc_ioprio_changed(struct io_context *ioc, int ioprio)
spin_lock_irqsave(&ioc->lock, flags); spin_lock_irqsave(&ioc->lock, flags);
ioc->ioprio = ioprio; ioc->ioprio = ioprio;
ioc_set_changed(ioc, ICQ_IOPRIO_CHANGED); ioc_set_icq_flags(ioc, ICQ_IOPRIO_CHANGED);
spin_unlock_irqrestore(&ioc->lock, flags); spin_unlock_irqrestore(&ioc->lock, flags);
} }
@ -404,11 +404,33 @@ void ioc_cgroup_changed(struct io_context *ioc)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ioc->lock, flags); spin_lock_irqsave(&ioc->lock, flags);
ioc_set_changed(ioc, ICQ_CGROUP_CHANGED); ioc_set_icq_flags(ioc, ICQ_CGROUP_CHANGED);
spin_unlock_irqrestore(&ioc->lock, flags); spin_unlock_irqrestore(&ioc->lock, flags);
} }
EXPORT_SYMBOL(ioc_cgroup_changed); EXPORT_SYMBOL(ioc_cgroup_changed);
/**
* icq_get_changed - fetch and clear icq changed mask
* @icq: icq of interest
*
* Fetch and clear ICQ_*_CHANGED bits from @icq. Grabs and releases
* @icq->ioc->lock.
*/
unsigned icq_get_changed(struct io_cq *icq)
{
unsigned int changed = 0;
unsigned long flags;
if (unlikely(icq->flags & ICQ_CHANGED_MASK)) {
spin_lock_irqsave(&icq->ioc->lock, flags);
changed = icq->flags & ICQ_CHANGED_MASK;
icq->flags &= ~ICQ_CHANGED_MASK;
spin_unlock_irqrestore(&icq->ioc->lock, flags);
}
return changed;
}
EXPORT_SYMBOL(icq_get_changed);
static int __init blk_ioc_init(void) static int __init blk_ioc_init(void)
{ {
iocontext_cachep = kmem_cache_create("blkdev_ioc", iocontext_cachep = kmem_cache_create("blkdev_ioc",

12
block/cfq-iosched.c
View File

@ -3470,20 +3470,20 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
const int rw = rq_data_dir(rq); const int rw = rq_data_dir(rq);
const bool is_sync = rq_is_sync(rq); const bool is_sync = rq_is_sync(rq);
struct cfq_queue *cfqq; struct cfq_queue *cfqq;
unsigned int changed;
might_sleep_if(gfp_mask & __GFP_WAIT); might_sleep_if(gfp_mask & __GFP_WAIT);
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
/* handle changed notifications */ /* handle changed notifications */
if (unlikely(cic->icq.changed)) { changed = icq_get_changed(&cic->icq);
if (test_and_clear_bit(ICQ_IOPRIO_CHANGED, &cic->icq.changed)) if (unlikely(changed & ICQ_IOPRIO_CHANGED))
changed_ioprio(cic); changed_ioprio(cic);
#ifdef CONFIG_CFQ_GROUP_IOSCHED #ifdef CONFIG_CFQ_GROUP_IOSCHED
if (test_and_clear_bit(ICQ_CGROUP_CHANGED, &cic->icq.changed)) if (unlikely(changed & ICQ_CGROUP_CHANGED))
changed_cgroup(cic); changed_cgroup(cic);
#endif #endif
}
new_queue: new_queue:
cfqq = cic_to_cfqq(cic, is_sync); cfqq = cic_to_cfqq(cic, is_sync);

9
include/linux/iocontext.h
View File

@ -6,8 +6,10 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
enum { enum {
ICQ_IOPRIO_CHANGED, ICQ_IOPRIO_CHANGED = 1 << 0,
ICQ_CGROUP_CHANGED, ICQ_CGROUP_CHANGED = 1 << 1,
ICQ_CHANGED_MASK = ICQ_IOPRIO_CHANGED | ICQ_CGROUP_CHANGED,
}; };
/* /*
@ -88,7 +90,7 @@ struct io_cq {
struct rcu_head __rcu_head; struct rcu_head __rcu_head;
}; };
unsigned long changed; unsigned int flags;
}; };
/* /*
@ -139,6 +141,7 @@ struct io_context *get_task_io_context(struct task_struct *task,
gfp_t gfp_flags, int node); gfp_t gfp_flags, int node);
void ioc_ioprio_changed(struct io_context *ioc, int ioprio); void ioc_ioprio_changed(struct io_context *ioc, int ioprio);
void ioc_cgroup_changed(struct io_context *ioc); void ioc_cgroup_changed(struct io_context *ioc);
unsigned int icq_get_changed(struct io_cq *icq);
#else #else
struct io_context; struct io_context;
static inline void put_io_context(struct io_context *ioc) { } static inline void put_io_context(struct io_context *ioc) { }