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

blk-cgroup: turn on psi memstall stuff 

With the psi stuff in place we can use the memstall flag to indicate
pressure that happens from throttling.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Josef Bacik 2019-07-09 14:41:29 -07:00 committed by Jens Axboe
parent b554db147f
commit fd112c7465
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/blk-cgroup.c
View File

@ -29,6 +29,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/blk-cgroup.h> #include <linux/blk-cgroup.h>
#include <linux/tracehook.h> #include <linux/tracehook.h>
#include <linux/psi.h>
#include "blk.h" #include "blk.h"
#define MAX_KEY_LEN 100 #define MAX_KEY_LEN 100
@ -1587,6 +1588,7 @@ static void blkcg_scale_delay(struct blkcg_gq *blkg, u64 now)
*/ */
static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay) static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay)
{ {
unsigned long pflags;
u64 now = ktime_to_ns(ktime_get()); u64 now = ktime_to_ns(ktime_get());
u64 exp; u64 exp;
u64 delay_nsec = 0; u64 delay_nsec = 0;
@ -1613,11 +1615,8 @@ static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay)
*/ */
delay_nsec = min_t(u64, delay_nsec, 250 * NSEC_PER_MSEC); delay_nsec = min_t(u64, delay_nsec, 250 * NSEC_PER_MSEC);
/* if (use_memdelay)
* TODO: the use_memdelay flag is going to be for the upcoming psi stuff psi_memstall_enter(&pflags);
* that hasn't landed upstream yet. Once that stuff is in place we need
* to do a psi_memstall_enter/leave if memdelay is set.
*/
exp = ktime_add_ns(now, delay_nsec); exp = ktime_add_ns(now, delay_nsec);
tok = io_schedule_prepare(); tok = io_schedule_prepare();
@ -1627,6 +1626,9 @@ static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay)
break; break;
} while (!fatal_signal_pending(current)); } while (!fatal_signal_pending(current));
io_schedule_finish(tok); io_schedule_finish(tok);
if (use_memdelay)
psi_memstall_leave(&pflags);
} }
/** /**