From patchwork Thu May 5 14:08:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 94270 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 4D13D100EB1 for ; Fri, 6 May 2011 00:09:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754673Ab1EEOIo (ORCPT ); Thu, 5 May 2011 10:08:44 -0400 Received: from cantor.suse.de ([195.135.220.2]:52230 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754876Ab1EEOIn (ORCPT ); Thu, 5 May 2011 10:08:43 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id CD9E094033; Thu, 5 May 2011 16:08:42 +0200 (CEST) Received: by quack.suse.cz (Postfix, from userid 1000) id E136920514; Thu, 5 May 2011 16:08:40 +0200 (CEST) From: Jan Kara To: linux-ext4@vger.kernel.org Cc: Eric Sandeen , Jan Kara Subject: [PATCH] jbd: Fix forever sleeping process in do_get_write_access() Date: Thu, 5 May 2011 16:08:37 +0200 Message-Id: <1304604517-8759-1-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org In do_get_write_access() we wait on BH_Unshadow bit for buffer to get from shadow state. The waking code in journal_commit_transaction() has a bug because it does not issue a memory barrier after the buffer is moved from the shadow state and before wake_up_bit() is called. Thus a waitqueue check can happen before the buffer is actually moved from the shadow state and waiting process may never be woken. Fix the problem by issuing proper barrier. Reported-by: Tao Ma Signed-off-by: Jan Kara --- fs/jbd/commit.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) This patch is in my tree to be submitted during the next merge window. diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 69b1804..f486ff6 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -722,8 +722,13 @@ wait_for_iobuf: required. */ JBUFFER_TRACE(jh, "file as BJ_Forget"); journal_file_buffer(jh, commit_transaction, BJ_Forget); - /* Wake up any transactions which were waiting for this - IO to complete */ + /* + * Wake up any transactions which were waiting for this + * IO to complete. The barrier must be here so that changes + * by journal_file_buffer() take effect before wake_up_bit() + * does the waitqueue check. + */ + smp_mb(); wake_up_bit(&bh->b_state, BH_Unshadow); JBUFFER_TRACE(jh, "brelse shadowed buffer"); __brelse(bh);