mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block
Pull followup block layer updates from Jens Axboe:
"I ended up splitting the main pull request for this series into two,
mainly because of clashes between NVMe fixes that went into 4.13 after
the for-4.14 branches were split off. This pull request is mostly
NVMe, but not exclusively. In detail, it contains:
- Two pull request for NVMe changes from Christoph. Nothing new on
the feature front, basically just fixes all over the map for the
core bits, transport, rdma, etc.
- Series from Bart, cleaning up various bits in the BFQ scheduler.
- Series of bcache fixes, which has been lingering for a release or
two. Coly sent this in, but patches from various people in this
area.
- Set of patches for BFQ from Paolo himself, updating both
documentation and fixing some corner cases in performance.
- Series from Omar, attempting to now get the 4k loop support
correct. Our confidence level is higher this time.
- Series from Shaohua for loop as well, improving O_DIRECT
performance and fixing a use-after-free"
* 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block: (74 commits)
bcache: initialize dirty stripes in flash_dev_run()
loop: set physical block size to logical block size
bcache: fix bch_hprint crash and improve output
bcache: Update continue_at() documentation
bcache: silence static checker warning
bcache: fix for gc and write-back race
bcache: increase the number of open buckets
bcache: Correct return value for sysfs attach errors
bcache: correct cache_dirty_target in __update_writeback_rate()
bcache: gc does not work when triggering by manual command
bcache: Don't reinvent the wheel but use existing llist API
bcache: do not subtract sectors_to_gc for bypassed IO
bcache: fix sequential large write IO bypass
bcache: Fix leak of bdev reference
block/loop: remove unused field
block/loop: fix use after free
bfq: Use icq_to_bic() consistently
bfq: Suppress compiler warnings about comparisons
bfq: Check kstrtoul() return value
bfq: Declare local functions static
...
This commit is contained in:
Linus Torvalds
commit
126e76ffbf
35 changed files with 1143 additions and 817 deletions
|
|
@ -239,7 +239,7 @@ static int T_slow[2];
|
|||
static int T_fast[2];
|
||||
static int device_speed_thresh[2];
|
||||
|
||||
#define RQ_BIC(rq) ((struct bfq_io_cq *) (rq)->elv.priv[0])
|
||||
#define RQ_BIC(rq) icq_to_bic((rq)->elv.priv[0])
|
||||
#define RQ_BFQQ(rq) ((rq)->elv.priv[1])
|
||||
|
||||
struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync)
|
||||
|
|
@ -720,7 +720,7 @@ static void bfq_updated_next_req(struct bfq_data *bfqd,
|
|||
entity->budget = new_budget;
|
||||
bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu",
|
||||
new_budget);
|
||||
bfq_requeue_bfqq(bfqd, bfqq);
|
||||
bfq_requeue_bfqq(bfqd, bfqq, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2563,7 +2563,7 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
|
|||
|
||||
bfq_del_bfqq_busy(bfqd, bfqq, true);
|
||||
} else {
|
||||
bfq_requeue_bfqq(bfqd, bfqq);
|
||||
bfq_requeue_bfqq(bfqd, bfqq, true);
|
||||
/*
|
||||
* Resort priority tree of potential close cooperators.
|
||||
*/
|
||||
|
|
@ -3780,6 +3780,7 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
|
|||
default:
|
||||
dev_err(bfqq->bfqd->queue->backing_dev_info->dev,
|
||||
"bfq: bad prio class %d\n", ioprio_class);
|
||||
/* fall through */
|
||||
case IOPRIO_CLASS_NONE:
|
||||
/*
|
||||
* No prio set, inherit CPU scheduling settings.
|
||||
|
|
@ -4801,13 +4802,15 @@ static ssize_t bfq_var_show(unsigned int var, char *page)
|
|||
return sprintf(page, "%u\n", var);
|
||||
}
|
||||
|
||||
static void bfq_var_store(unsigned long *var, const char *page)
|
||||
static int bfq_var_store(unsigned long *var, const char *page)
|
||||
{
|
||||
unsigned long new_val;
|
||||
int ret = kstrtoul(page, 10, &new_val);
|
||||
|
||||
if (ret == 0)
|
||||
*var = new_val;
|
||||
if (ret)
|
||||
return ret;
|
||||
*var = new_val;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \
|
||||
|
|
@ -4848,12 +4851,16 @@ static ssize_t \
|
|||
__FUNC(struct elevator_queue *e, const char *page, size_t count) \
|
||||
{ \
|
||||
struct bfq_data *bfqd = e->elevator_data; \
|
||||
unsigned long uninitialized_var(__data); \
|
||||
bfq_var_store(&__data, (page)); \
|
||||
if (__data < (MIN)) \
|
||||
__data = (MIN); \
|
||||
else if (__data > (MAX)) \
|
||||
__data = (MAX); \
|
||||
unsigned long __data, __min = (MIN), __max = (MAX); \
|
||||
int ret; \
|
||||
\
|
||||
ret = bfq_var_store(&__data, (page)); \
|
||||
if (ret) \
|
||||
return ret; \
|
||||
if (__data < __min) \
|
||||
__data = __min; \
|
||||
else if (__data > __max) \
|
||||
__data = __max; \
|
||||
if (__CONV == 1) \
|
||||
*(__PTR) = msecs_to_jiffies(__data); \
|
||||
else if (__CONV == 2) \
|
||||
|
|
@ -4876,12 +4883,16 @@ STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 2);
|
|||
static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)\
|
||||
{ \
|
||||
struct bfq_data *bfqd = e->elevator_data; \
|
||||
unsigned long uninitialized_var(__data); \
|
||||
bfq_var_store(&__data, (page)); \
|
||||
if (__data < (MIN)) \
|
||||
__data = (MIN); \
|
||||
else if (__data > (MAX)) \
|
||||
__data = (MAX); \
|
||||
unsigned long __data, __min = (MIN), __max = (MAX); \
|
||||
int ret; \
|
||||
\
|
||||
ret = bfq_var_store(&__data, (page)); \
|
||||
if (ret) \
|
||||
return ret; \
|
||||
if (__data < __min) \
|
||||
__data = __min; \
|
||||
else if (__data > __max) \
|
||||
__data = __max; \
|
||||
*(__PTR) = (u64)__data * NSEC_PER_USEC; \
|
||||
return count; \
|
||||
}
|
||||
|
|
@ -4893,9 +4904,12 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
|
|||
const char *page, size_t count)
|
||||
{
|
||||
struct bfq_data *bfqd = e->elevator_data;
|
||||
unsigned long uninitialized_var(__data);
|
||||
unsigned long __data;
|
||||
int ret;
|
||||
|
||||
bfq_var_store(&__data, (page));
|
||||
ret = bfq_var_store(&__data, (page));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (__data == 0)
|
||||
bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd);
|
||||
|
|
@ -4918,9 +4932,12 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
|
|||
const char *page, size_t count)
|
||||
{
|
||||
struct bfq_data *bfqd = e->elevator_data;
|
||||
unsigned long uninitialized_var(__data);
|
||||
unsigned long __data;
|
||||
int ret;
|
||||
|
||||
bfq_var_store(&__data, (page));
|
||||
ret = bfq_var_store(&__data, (page));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (__data < 1)
|
||||
__data = 1;
|
||||
|
|
@ -4938,9 +4955,12 @@ static ssize_t bfq_strict_guarantees_store(struct elevator_queue *e,
|
|||
const char *page, size_t count)
|
||||
{
|
||||
struct bfq_data *bfqd = e->elevator_data;
|
||||
unsigned long uninitialized_var(__data);
|
||||
unsigned long __data;
|
||||
int ret;
|
||||
|
||||
bfq_var_store(&__data, (page));
|
||||
ret = bfq_var_store(&__data, (page));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (__data > 1)
|
||||
__data = 1;
|
||||
|
|
@ -4957,9 +4977,12 @@ static ssize_t bfq_low_latency_store(struct elevator_queue *e,
|
|||
const char *page, size_t count)
|
||||
{
|
||||
struct bfq_data *bfqd = e->elevator_data;
|
||||
unsigned long uninitialized_var(__data);
|
||||
unsigned long __data;
|
||||
int ret;
|
||||
|
||||
bfq_var_store(&__data, (page));
|
||||
ret = bfq_var_store(&__data, (page));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (__data > 1)
|
||||
__data = 1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue