diff options
| -rw-r--r-- | overrides/kpatches/bfqsched-3.15.patch | 82 | ||||
| -rw-r--r-- | overrides/kpatches/bfqsched.nix | 15 |
2 files changed, 7 insertions, 90 deletions
diff --git a/overrides/kpatches/bfqsched-3.15.patch b/overrides/kpatches/bfqsched-3.15.patch deleted file mode 100644 index 42eeb99b..00000000 --- a/overrides/kpatches/bfqsched-3.15.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c -index de911a9..b7edce0 100644 ---- a/block/bfq-cgroup.c -+++ b/block/bfq-cgroup.c -@@ -402,7 +402,7 @@ static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic) - BUG_ON(bfqd == NULL); - - rcu_read_lock(); -- css = task_css(current, bfqio_subsys_id); -+ css = task_css(current, bfqio_cgrp_id); - bfqg = __bfq_bic_change_cgroup(bfqd, bic, css); - rcu_read_unlock(); - -@@ -765,7 +765,7 @@ static int bfqio_can_attach(struct cgroup_subsys_state *css, - struct io_context *ioc; - int ret = 0; - -- cgroup_taskset_for_each(task, css, tset) { -+ cgroup_taskset_for_each(task, tset) { - /* - * task_lock() is needed to avoid races with - * exit_io_context() -@@ -799,7 +799,7 @@ static void bfqio_attach(struct cgroup_subsys_state *css, - * IMPORTANT NOTE: The move of more than one process at a time to a - * new group has not yet been tested. - */ -- cgroup_taskset_for_each(task, css, tset) { -+ cgroup_taskset_for_each(task, tset) { - ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE); - if (ioc) { - /* -@@ -859,15 +859,13 @@ static void bfqio_css_offline(struct cgroup_subsys_state *css) - mutex_unlock(&bfqio_mutex); - } - --struct cgroup_subsys bfqio_subsys = { -- .name = "bfqio", -+struct cgroup_subsys bfqio_cgrp_subsys = { - .css_alloc = bfqio_create, - .css_online = bfqio_css_online, - .css_offline = bfqio_css_offline, - .can_attach = bfqio_can_attach, - .attach = bfqio_attach, - .css_free = bfqio_destroy, -- .subsys_id = bfqio_subsys_id, - .base_cftypes = bfqio_files, - }; - #else -diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c -index bd0d99a..225cf01 100644 ---- a/block/bfq-iosched.c -+++ b/block/bfq-iosched.c -@@ -901,9 +901,9 @@ static void bfq_merged_requests(struct request_queue *q, struct request *rq, - * Reposition in fifo if next is older than rq. - */ - if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && -- time_before(rq_fifo_time(next), rq_fifo_time(rq))) { -+ time_before(next->fifo_time, rq->fifo_time)) { - list_move(&rq->queuelist, &next->queuelist); -- rq_set_fifo_time(rq, rq_fifo_time(next)); -+ rq->fifo_time = next->fifo_time; - } - - if (bfqq->next_rq == next) -@@ -1504,7 +1504,7 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq) - - rq = rq_entry_fifo(bfqq->fifo.next); - -- if (time_before(jiffies, rq_fifo_time(rq))) -+ if (time_before(jiffies, rq->fifo_time)) - return NULL; - - return rq; -@@ -3047,7 +3047,7 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq) - */ - if (bfqq->bic != NULL) - bfqq->bic->wr_time_left = 0; -- rq_set_fifo_time(rq, jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]); -+ rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; - list_add_tail(&rq->queuelist, &bfqq->fifo); - - bfq_rq_enqueued(bfqd, bfqq, rq); diff --git a/overrides/kpatches/bfqsched.nix b/overrides/kpatches/bfqsched.nix index 7c7295e5..ce09fb9b 100644 --- a/overrides/kpatches/bfqsched.nix +++ b/overrides/kpatches/bfqsched.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "3.14.0-v7r4"; + version = "3.15.0-v7r4"; baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches"; @@ -12,18 +12,17 @@ let allPatches = [ (fetchPatch { - name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r4-3.14"; - sha256 = "06flwmri6svjamjliv9zh23vfa3acydix23bljs294zhfd9gg3mk"; + name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r4-3.15"; + sha256 = "1l5yxplk1zxi87ckk89fh5cif0bc5k5wdaw99h23yhkq614ibajs"; }) (fetchPatch { - name = "0002-block-introduce-the-BFQ-v7r4-I-O-sched-for-3.14"; - sha256 = "1mjcr45hr1i6s8sdhd0g83wy638jbvv6z33g93xiyndw4idkggs4"; + name = "0002-block-introduce-the-BFQ-v7r4-I-O-sched-for-3.15"; + sha256 = "1n0qjzvwhc7ng5xxki9cl4dn6pwfm2dirwjihfp9v1y9b9p9rxcp"; }) (fetchPatch { - name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r4-for-3.14.0"; - sha256 = "1857x7m9m33yvrzd19fzj49zjll93adjis9xw6rnmvxr5m6m3wq9"; + name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r4-for-3.15.0"; + sha256 = "1ag8k4wy877zpyxhiwmrd5v1p0cvql3lv8xjppqby7hbx5rba3pp"; }) - ./bfqsched-3.15.patch ]; patch = stdenv.mkDerivation { |