From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757287Ab0GGP4Y (ORCPT ); Wed, 7 Jul 2010 11:56:24 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:44528 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757065Ab0GGP4W (ORCPT ); Wed, 7 Jul 2010 11:56:22 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=UhfJlfi8CaPmXrCgymzBLBGu9ryvLZjLCLxh1vzvdyjZTTd6GmICP6Mq/Cc2SnoEng /LajRr8ui5H0YJej8jQu90/cCi6x3q2Ofi7yGzJBORmsKvYl2bLsnooSf+Cl+yp73SME 1vYZ/0ZzBNLmW1zqrNTXeN3DBTdolqnZJpk70= From: Corrado Zoccolo To: Jens Axboe Cc: Linux-Kernel , Jeff Moyer , Vivek Goyal , Shaohua Li , Gui Jianfeng , Corrado Zoccolo Subject: [PATCH 2/2] cfq-iosched: RQ_NOIDLE enabled for SYNC_WORKLOAD Date: Wed, 7 Jul 2010 17:55:45 +0200 Message-Id: <1278518145-6021-2-git-send-email-czoccolo@gmail.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1278518145-6021-1-git-send-email-czoccolo@gmail.com> References: <1278518145-6021-1-git-send-email-czoccolo@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org RQ_NOIDLE flag is meaningful and should be honored for SYNC_WORKLOAD, without further checks. RQ_NOIDLE can be used to mark the last request of a sequence for which - we want to idle between the requests of the sequence, to keep locality - we don't want to idle after the sequence, because we know that no new nearby requests will follow, so we should switch servicing other queues. This patch fixes this behaviour, making it similar to how it behaved before 8e55063, but still fixing the corner cases that were the motivation for it. Signed-off-by: Corrado Zoccolo --- block/cfq-iosched.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 596b747..bc5c0f9 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3428,13 +3428,17 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq) cfqd->noidle_tree_requires_idle |= bitmask; /* - * Idling is enabled for SYNC_WORKLOAD. - * SYNC_NOIDLE_WORKLOAD idles at the end of the tree - * only if at least one queue sent !RQ_NOIDLE requests - * not followed by at least one RQ_NOIDLE request. + * Idling is enabled for: + * - the last sync queue of a group + * - SYNC_WORKLOAD queues, for !RQ_NOIDLE requests + * - SYNC_NOIDLE_WORKLOAD "at the end of the tree" + * if at least one queue sent !RQ_NOIDLE requests + * not followed by at least one RQ_NOIDLE request. */ - if (cfqd->serving_type == SYNC_WORKLOAD - || cfqd->noidle_tree_requires_idle + if ((cfqd->serving_type == SYNC_WORKLOAD + && !(rq->cmd_flags & REQ_NOIDLE)) + || (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD + && cfqd->noidle_tree_requires_idle) || cfqq->cfqg->nr_cfqq == 1) cfq_arm_slice_timer(cfqd); } -- 1.6.4.4