From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758810AbZEEUAd (ORCPT ); Tue, 5 May 2009 16:00:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754946AbZEEUAU (ORCPT ); Tue, 5 May 2009 16:00:20 -0400 Received: from mx2.redhat.com ([66.187.237.31]:33196 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752216AbZEEUAT (ORCPT ); Tue, 5 May 2009 16:00:19 -0400 From: Vivek Goyal To: nauman@google.com, dpshah@google.com, lizf@cn.fujitsu.com, mikew@google.com, fchecconi@gmail.com, paolo.valente@unimore.it, jens.axboe@oracle.com, ryov@valinux.co.jp, fernando@oss.ntt.co.jp, s-uchida@ap.jp.nec.com, taka@valinux.co.jp, guijianfeng@cn.fujitsu.com, jmoyer@redhat.com, dhaval@linux.vnet.ibm.com, balbir@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, containers@lists.linux-foundation.org, righi.andrea@gmail.com, agk@redhat.com, dm-devel@redhat.com, snitzer@redhat.com, m-ikeda@ds.jp.nec.com Cc: vgoyal@redhat.com, akpm@linux-foundation.org Subject: [PATCH 12/18] io-controller: deadline changes for hierarchical fair queuing Date: Tue, 5 May 2009 15:58:39 -0400 Message-Id: <1241553525-28095-13-git-send-email-vgoyal@redhat.com> In-Reply-To: <1241553525-28095-1-git-send-email-vgoyal@redhat.com> References: <1241553525-28095-1-git-send-email-vgoyal@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch changes deadline to use queue scheduling code from elevator layer. One can go back to old deadline by selecting CONFIG_IOSCHED_DEADLINE_HIER. Signed-off-by: Nauman Rafique Signed-off-by: Vivek Goyal --- block/Kconfig.iosched | 11 +++++++++++ block/deadline-iosched.c | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index 9da6657..3a9e7d7 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -55,6 +55,17 @@ config IOSCHED_DEADLINE a disk at any one time, its behaviour is almost identical to the anticipatory I/O scheduler and so is a good choice. +config IOSCHED_DEADLINE_HIER + bool "Deadline Hierarchical Scheduling support" + depends on IOSCHED_DEADLINE && CGROUPS + select ELV_FAIR_QUEUING + select GROUP_IOSCHED + default n + ---help--- + Enable hierarhical scheduling in deadline. In this mode deadline keeps + one IO queue per cgroup instead of a global queue. Elevator + fair queuing logic ensures fairness among various queues. + config IOSCHED_CFQ tristate "CFQ I/O scheduler" select ELV_FAIR_QUEUING diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 5e65041..27b77b9 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -477,6 +477,9 @@ static struct elevator_type iosched_deadline = { .elevator_alloc_sched_queue_fn = deadline_alloc_deadline_queue, .elevator_free_sched_queue_fn = deadline_free_deadline_queue, }, +#ifdef CONFIG_IOSCHED_DEADLINE_HIER + .elevator_features = ELV_IOSCHED_NEED_FQ | ELV_IOSCHED_SINGLE_IOQ, +#endif .elevator_attrs = deadline_attrs, .elevator_name = "deadline", .elevator_owner = THIS_MODULE, -- 1.6.0.1