redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

block-5.7-2020-04-17

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAl6ZxugQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpvGVEACFQ/l7YtzYov9YyffhfFU77QmXoTeaW3M5
 p/Yz3QFphRLROs1w9n9k/DjtFgfYfAlOrWRDss9tuG4Nr/jt3i6g8duAkiQXV7M/
 FJ9urg7Y+766XChGqPL6HhTQmTxbzXp4L6nD9EUG9X/dzl4IpyD8oT4nwbOb022W
 zWZPApDwglZeuD7plrrnrLqpXrIGMyzjob7AQDM+FoqzUAsnsZ4SEheIrNoNqe8f
 m7+ZxYWcAOy8fb9FQJASnA5mj+id03nNVc/DAZQrhzJdwC+3O4QElgXO/KaPic8X
 sUHrmKCLA72WezgsZB1cF4IovANvz+7ANmrORfRQ2Sedsxm2Y+URQ9pB7IMH9mMc
 fsdbwlhoeeqKSQ5JhTvg4QUsD/yhDq/cpAx68y9N3bHNwS6NjnYi1Us1S1yyXH27
 zCK54YsHzpmd/iLi8PbewEFifYRTMGztPNsCeaZnNcqONogZAquboEDXGdv9uypX
 bPqd3i7nYDoLhgSZ93yF++QbW/4KmdiIW3RbrlVNoth6ELnyRjI7TIkwmNo4SnAC
 OG62Q434Jv2A5NxXBeWDmnmBD8Y5JUOAJ2YiPC27i6E8lcko5GPsMwz79+GClnOU
 X+ncjtkRJNzCNuRp4FXrNKCQ/L2mXeKPgcN9XqiH1/VPqxxdA6G0kDdISEKDYOY3
 q97dwpigdw==
 =W4kQ
 -----END PGP SIGNATURE-----

Merge tag 'block-5.7-2020-04-17' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:

 - Fix for a driver tag leak in error handling (John)

 - Remove now defunct Kconfig selection from dasd (Stefan)

 - blk-wbt trace fiexs (Tommi)

* tag 'block-5.7-2020-04-17' of git://git.kernel.dk/linux-block:
  blk-wbt: Drop needless newlines from tracepoint format strings
  blk-wbt: Use tracepoint_string() for wbt_step tracepoint string literals
  s390/dasd: remove IOSCHED_DEADLINE from DASD Kconfig
  blk-mq: Put driver tag in blk_mq_dispatch_rq_list() when no budget
This commit is contained in:
Linus Torvalds 2020-04-17 10:08:08 -07:00
parent 2acbb9e670 3f22037d38
commit bf9196d51f
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block/blk-mq.c
View file

@ -1222,8 +1222,10 @@ bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list,
rq = list_first_entry(list, struct request, queuelist);
hctx = rq->mq_hctx;
if (!got_budget && !blk_mq_get_dispatch_budget(hctx))
if (!got_budget && !blk_mq_get_dispatch_budget(hctx)) {
blk_mq_put_driver_tag(rq);
break;
}
if (!blk_mq_get_driver_tag(rq)) {
/*

4
block/blk-wbt.c
View file

@ -313,7 +313,7 @@ static void scale_up(struct rq_wb *rwb)
calc_wb_limits(rwb);
rwb->unknown_cnt = 0;
rwb_wake_all(rwb);
rwb_trace_step(rwb, "scale up");
rwb_trace_step(rwb, tracepoint_string("scale up"));
}
static void scale_down(struct rq_wb *rwb, bool hard_throttle)
@ -322,7 +322,7 @@ static void scale_down(struct rq_wb *rwb, bool hard_throttle)
return;
calc_wb_limits(rwb);
rwb->unknown_cnt = 0;
rwb_trace_step(rwb, "scale down");
rwb_trace_step(rwb, tracepoint_string("scale down"));
}
static void rwb_arm_timer(struct rq_wb *rwb)

1
drivers/s390/block/Kconfig
View file

@ -26,7 +26,6 @@ config DASD
def_tristate y
prompt "Support for DASD devices"
depends on CCW && BLOCK
select IOSCHED_DEADLINE
help
Enable this option if you want to access DASDs directly utilizing
S/390s channel subsystem commands. This is necessary for running

8
include/trace/events/wbt.h
View file

@ -46,7 +46,7 @@ TRACE_EVENT(wbt_stat,
),
TP_printk("%s: rmean=%llu, rmin=%llu, rmax=%llu, rsamples=%llu, "
"wmean=%llu, wmin=%llu, wmax=%llu, wsamples=%llu\n",
"wmean=%llu, wmin=%llu, wmax=%llu, wsamples=%llu",
__entry->name, __entry->rmean, __entry->rmin, __entry->rmax,
__entry->rnr_samples, __entry->wmean, __entry->wmin,
__entry->wmax, __entry->wnr_samples)
@ -73,7 +73,7 @@ TRACE_EVENT(wbt_lat,
__entry->lat = div_u64(lat, 1000);
),
TP_printk("%s: latency %lluus\n", __entry->name,
TP_printk("%s: latency %lluus", __entry->name,
(unsigned long long) __entry->lat)
);
@ -115,7 +115,7 @@ TRACE_EVENT(wbt_step,
__entry->max = max;
),
TP_printk("%s: %s: step=%d, window=%luus, background=%u, normal=%u, max=%u\n",
TP_printk("%s: %s: step=%d, window=%luus, background=%u, normal=%u, max=%u",
__entry->name, __entry->msg, __entry->step, __entry->window,
__entry->bg, __entry->normal, __entry->max)
);
@ -148,7 +148,7 @@ TRACE_EVENT(wbt_timer,
__entry->inflight = inflight;
),
TP_printk("%s: status=%u, step=%d, inflight=%u\n", __entry->name,
TP_printk("%s: status=%u, step=%d, inflight=%u", __entry->name,
__entry->status, __entry->step, __entry->inflight)
);