TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blk-wbt: pass in enum wbt_flags to get_rq_wait()

Browse Source 
This is in preparation for having more write queues, in which
case we would have needed to pass in more information than just
a simple 'is_kswapd' boolean.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2018-05-07 09:57:08 -06:00
parent 825843b0ad
commit 8bea609019
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
block/blk-wbt.c
View File

@@ -101,9 +101,13 @@ static bool wb_recent_wait(struct rq_wb *rwb)
return time_before(jiffies, wb->dirty_sleep + HZ); return time_before(jiffies, wb->dirty_sleep + HZ);
} }
static inline struct rq_wait *get_rq_wait(struct rq_wb *rwb, bool is_kswapd) static inline struct rq_wait *get_rq_wait(struct rq_wb *rwb,
enum wbt_flags wb_acct)
{ {
return &rwb->rq_wait[is_kswapd]; if (wb_acct & WBT_KSWAPD)
return &rwb->rq_wait[WBT_RWQ_KSWAPD];
return &rwb->rq_wait[WBT_RWQ_BG];
} }
static void rwb_wake_all(struct rq_wb *rwb) static void rwb_wake_all(struct rq_wb *rwb)
@@ -126,7 +130,7 @@ void __wbt_done(struct rq_wb *rwb, enum wbt_flags wb_acct)
if (!(wb_acct & WBT_TRACKED)) if (!(wb_acct & WBT_TRACKED))
return; return;
rqw = get_rq_wait(rwb, wb_acct & WBT_KSWAPD); rqw = get_rq_wait(rwb, wb_acct);
inflight = atomic_dec_return(&rqw->inflight); inflight = atomic_dec_return(&rqw->inflight);
/* /*
@@ -529,11 +533,12 @@ static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,
* Block if we will exceed our limit, or if we are currently waiting for * Block if we will exceed our limit, or if we are currently waiting for
* the timer to kick off queuing again. * the timer to kick off queuing again.
*/ */
static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock) static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct,
unsigned long rw, spinlock_t *lock)
__releases(lock) __releases(lock)
__acquires(lock) __acquires(lock)
{ {
struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd()); struct rq_wait *rqw = get_rq_wait(rwb, wb_acct);
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
if (may_queue(rwb, rqw, &wait, rw)) if (may_queue(rwb, rqw, &wait, rw))
@@ -584,7 +589,7 @@ static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio)
*/ */
enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock) enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock)
{ {
unsigned int ret = 0; enum wbt_flags ret = 0;
if (!rwb_enabled(rwb)) if (!rwb_enabled(rwb))
return 0; return 0;
@@ -598,14 +603,14 @@ enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock)
return ret; return ret;
} }
__wbt_wait(rwb, bio->bi_opf, lock); if (current_is_kswapd())
ret |= WBT_KSWAPD;
__wbt_wait(rwb, ret, bio->bi_opf, lock);
if (!blk_stat_is_active(rwb->cb)) if (!blk_stat_is_active(rwb->cb))
rwb_arm_timer(rwb); rwb_arm_timer(rwb);
if (current_is_kswapd())
ret |= WBT_KSWAPD;
return ret | WBT_TRACKED; return ret | WBT_TRACKED;
} }

4
block/blk-wbt.h
View File

@@ -19,7 +19,9 @@ enum wbt_flags {
}; };
enum { enum {
WBT_NUM_RWQ = 2, WBT_RWQ_BG = 0,
WBT_RWQ_KSWAPD,
WBT_NUM_RWQ,
}; };
/* /*