diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 17:21:58 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-31 17:21:58 -0400 |
| commit | a5a42ccdd1de9640cb301123c2e9d4c28cb1e881 (patch) | |
| tree | bc7e3e20695443c3b203cef3e67be8ef143b923b | |
| parent | a85b1aa5c074bd7c0ce71d05fbec95b6e9030602 (diff) | |
| download | longterm-queue-5.2-a5a42ccdd1de9640cb301123c2e9d4c28cb1e881.tar.gz | |
blk: bfq: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/bfq-fix-blkio-cgroup-leakage-v4.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/bfq-fix-blkio-cgroup-leakage-v4.patch b/queue/bfq-fix-blkio-cgroup-leakage-v4.patch index bf1caaff..54961abd 100644 --- a/queue/bfq-fix-blkio-cgroup-leakage-v4.patch +++ b/queue/bfq-fix-blkio-cgroup-leakage-v4.patch @@ -1,4 +1,4 @@ -From 2de791ab4918969d8108f15238a701968375f235 Mon Sep 17 00:00:00 2001 +From c4c9d25f3bae68740b2e80baa941a092e47075d5 Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru> Date: Tue, 11 Aug 2020 06:43:40 +0000 Subject: [PATCH] bfq: fix blkio cgroup leakage v4 @@ -87,10 +87,10 @@ Signed-off-by: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru> Signed-off-by: Jens Axboe <axboe@kernel.dk> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c -index 68882b9b8f11..b791e2041e49 100644 +index 52c2ab6c9d14..a1b4821bc103 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c -@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg) +@@ -256,7 +256,7 @@ static void bfqg_put(struct bfq_group *bfqg) kfree(bfqg); } @@ -100,10 +100,10 @@ index 68882b9b8f11..b791e2041e49 100644 /* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ bfqg_get(bfqg); diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h -index cd224aaf9f52..703895224562 100644 +index 5e5e922b23bc..54d2e5cc9b52 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h -@@ -986,7 +986,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd, +@@ -949,7 +949,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd, struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg); struct bfq_group *bfqq_group(struct bfq_queue *bfqq); struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node); @@ -112,10 +112,10 @@ index cd224aaf9f52..703895224562 100644 #ifdef CONFIG_BFQ_GROUP_IOSCHED diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c -index eb0e2a6daabe..26776bdbdf36 100644 +index 3be22faa4c01..c9ba225081ce 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c -@@ -533,9 +533,7 @@ static void bfq_get_entity(struct bfq_entity *entity) +@@ -536,9 +536,7 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++; bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d", bfqq, bfqq->ref); @@ -126,9 +126,9 @@ index eb0e2a6daabe..26776bdbdf36 100644 } /** -@@ -649,14 +647,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st, +@@ -652,14 +650,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st, - entity->on_st_or_in_serv = false; + entity->on_st = false; st->wsum -= entity->weight; - if (is_in_service) - return; |