From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F9A8C76191 for ; Mon, 15 Jul 2019 14:14:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 345D921537 for ; Mon, 15 Jul 2019 14:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200055; bh=TfVJwqEhKVcrhrXorGrG1M0YxCr2T8aqpxLOONU0Ry8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BiL4gJxhGLoQi/2bykpYniDYIThOsExnlPG/4Oges4k2rnAEd8u/xDXNMHD1Yu1E/ LIh4U2BZwBJHdI4Q9CiOSNpX0W7te1ABYgeRZX4OkUlz1+AOs3MfPn5SWJYGX/71dq aVHlZCHPGTt7qE+bdOt4E+G6X5J5v+YwIsAPVJ4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389058AbfGOOOO (ORCPT ); Mon, 15 Jul 2019 10:14:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:55222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388947AbfGOOOG (ORCPT ); Mon, 15 Jul 2019 10:14:06 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8BE592081C; Mon, 15 Jul 2019 14:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200045; bh=TfVJwqEhKVcrhrXorGrG1M0YxCr2T8aqpxLOONU0Ry8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NnVekSI5uzDF/uNeL0ayeA17UZzHaziK0JLyiFhEz5qww5OUAz+j/rPlO6LN9FMui MJqsEv5B2+de1mApEAB389/tTMVAEK60Y7jmeD+eKCSqRuynqNFphF7xoYMJkOrRgu Q8UakOVRxYcV0aSS8deqSQ/3oyJqs7bIVA5PPOFE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Coly Li , Jens Axboe , Sasha Levin , linux-bcache@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 169/219] bcache: check CACHE_SET_IO_DISABLE bit in bch_journal() Date: Mon, 15 Jul 2019 10:02:50 -0400 Message-Id: <20190715140341.6443-169-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715140341.6443-1-sashal@kernel.org> References: <20190715140341.6443-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Coly Li [ Upstream commit 383ff2183ad16a8842d1fbd9dd3e1cbd66813e64 ] When too many I/O errors happen on cache set and CACHE_SET_IO_DISABLE bit is set, bch_journal() may continue to work because the journaling bkey might be still in write set yet. The caller of bch_journal() may believe the journal still work but the truth is in-memory journal write set won't be written into cache device any more. This behavior may introduce potential inconsistent metadata status. This patch checks CACHE_SET_IO_DISABLE bit at the head of bch_journal(), if the bit is set, bch_journal() returns NULL immediately to notice caller to know journal does not work. Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/journal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 6c94fa007796..ac3cec56ec19 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -810,6 +810,10 @@ atomic_t *bch_journal(struct cache_set *c, struct journal_write *w; atomic_t *ret; + /* No journaling if CACHE_SET_IO_DISABLE set already */ + if (unlikely(test_bit(CACHE_SET_IO_DISABLE, &c->flags))) + return NULL; + if (!CACHE_SYNC(&c->sb)) return NULL; -- 2.20.1