Commit 934031a1 authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe

block: move some wbt helpers to blk-wbt.c

A few helpers are only used from blk-wbt.c, so move them there, and put
wbt_track() behind the CONFIG_BLK_WBT typedef. This is in preparation
for changing how the wbt flags are tracked.
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 782f5697
...@@ -29,6 +29,26 @@ ...@@ -29,6 +29,26 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/wbt.h> #include <trace/events/wbt.h>
static inline void wbt_clear_state(struct blk_issue_stat *stat)
{
stat->stat &= ~BLK_STAT_RES_MASK;
}
static inline enum wbt_flags wbt_stat_to_mask(struct blk_issue_stat *stat)
{
return (stat->stat & BLK_STAT_RES_MASK) >> BLK_STAT_RES_SHIFT;
}
static inline bool wbt_is_tracked(struct blk_issue_stat *stat)
{
return (stat->stat >> BLK_STAT_RES_SHIFT) & WBT_TRACKED;
}
static inline bool wbt_is_read(struct blk_issue_stat *stat)
{
return (stat->stat >> BLK_STAT_RES_SHIFT) & WBT_READ;
}
enum { enum {
/* /*
* Default setting, we'll scale up (to 75% of QD max) or down (min 1) * Default setting, we'll scale up (to 75% of QD max) or down (min 1)
......
...@@ -35,31 +35,6 @@ enum { ...@@ -35,31 +35,6 @@ enum {
WBT_STATE_ON_MANUAL = 2, WBT_STATE_ON_MANUAL = 2,
}; };
static inline void wbt_clear_state(struct blk_issue_stat *stat)
{
stat->stat &= ~BLK_STAT_RES_MASK;
}
static inline enum wbt_flags wbt_stat_to_mask(struct blk_issue_stat *stat)
{
return (stat->stat & BLK_STAT_RES_MASK) >> BLK_STAT_RES_SHIFT;
}
static inline void wbt_track(struct blk_issue_stat *stat, enum wbt_flags wb_acct)
{
stat->stat |= ((u64) wb_acct) << BLK_STAT_RES_SHIFT;
}
static inline bool wbt_is_tracked(struct blk_issue_stat *stat)
{
return (stat->stat >> BLK_STAT_RES_SHIFT) & WBT_TRACKED;
}
static inline bool wbt_is_read(struct blk_issue_stat *stat)
{
return (stat->stat >> BLK_STAT_RES_SHIFT) & WBT_READ;
}
struct rq_wait { struct rq_wait {
wait_queue_head_t wait; wait_queue_head_t wait;
atomic_t inflight; atomic_t inflight;
...@@ -113,6 +88,11 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb) ...@@ -113,6 +88,11 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb)
#ifdef CONFIG_BLK_WBT #ifdef CONFIG_BLK_WBT
static inline void wbt_track(struct blk_issue_stat *stat, enum wbt_flags flags)
{
stat->stat |= ((u64)flags) << BLK_STAT_RES_SHIFT;
}
void __wbt_done(struct rq_wb *, enum wbt_flags); void __wbt_done(struct rq_wb *, enum wbt_flags);
void wbt_done(struct rq_wb *, struct blk_issue_stat *); void wbt_done(struct rq_wb *, struct blk_issue_stat *);
enum wbt_flags wbt_wait(struct rq_wb *, struct bio *, spinlock_t *); enum wbt_flags wbt_wait(struct rq_wb *, struct bio *, spinlock_t *);
...@@ -131,6 +111,9 @@ u64 wbt_default_latency_nsec(struct request_queue *); ...@@ -131,6 +111,9 @@ u64 wbt_default_latency_nsec(struct request_queue *);
#else #else
static inline void wbt_track(struct blk_issue_stat *stat, enum wbt_flags flags)
{
}
static inline void __wbt_done(struct rq_wb *rwb, enum wbt_flags flags) static inline void __wbt_done(struct rq_wb *rwb, enum wbt_flags flags)
{ {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment