From patchwork Fri Jul 2 19:58:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Moyer X-Patchwork-Id: 57766 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8C19E1007D4 for ; Sat, 3 Jul 2010 05:58:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759945Ab0GBT6f (ORCPT ); Fri, 2 Jul 2010 15:58:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44208 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757665Ab0GBT6d (ORCPT ); Fri, 2 Jul 2010 15:58:33 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o62JwSUO030621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Jul 2010 15:58:29 -0400 Received: from segfault.boston.devel.redhat.com (segfault.boston.devel.redhat.com [10.16.60.26]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o62JwRx8004038 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Jul 2010 15:58:28 -0400 Received: from segfault.boston.devel.redhat.com (localhost [127.0.0.1]) by segfault.boston.devel.redhat.com (8.14.4/8.14.4) with ESMTP id o62JwR8b025173; Fri, 2 Jul 2010 15:58:27 -0400 Received: (from jmoyer@localhost) by segfault.boston.devel.redhat.com (8.14.4/8.14.4/Submit) id o62JwRMh025172; Fri, 2 Jul 2010 15:58:27 -0400 From: Jeff Moyer To: linux-ext4@vger.kernel.org Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org, vgoyal@redhat.com, tao.ma@oracle.com, Jeff Moyer Subject: [PATCH 3/6] jbd2: yield the device queue when waiting for journal commits Date: Fri, 2 Jul 2010 15:58:16 -0400 Message-Id: <1278100699-24132-4-git-send-email-jmoyer@redhat.com> In-Reply-To: <1278100699-24132-1-git-send-email-jmoyer@redhat.com> References: <1278100699-24132-1-git-send-email-jmoyer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch gets CFQ back in line with deadline for iozone runs, especially those testing small files + fsync timings. Signed-off-by: Jeff Moyer --- fs/jbd2/journal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index bc2ff59..6b5bf0f 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -41,6 +41,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -192,6 +193,7 @@ loop: should_sleep = 0; if (should_sleep) { spin_unlock(&journal->j_state_lock); + blk_yield(journal->j_dev->bd_disk->queue, NULL); schedule(); spin_lock(&journal->j_state_lock); } @@ -580,6 +582,11 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) while (tid_gt(tid, journal->j_commit_sequence)) { jbd_debug(1, "JBD: want %d, j_commit_sequence=%d\n", tid, journal->j_commit_sequence); + /* + * Give up our I/O scheduler time slice to allow the journal + * thread to issue I/O. + */ + blk_yield(journal->j_dev->bd_disk->queue, journal->j_task); wake_up(&journal->j_wait_commit); spin_unlock(&journal->j_state_lock); wait_event(journal->j_wait_done_commit,