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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EB40AC76186 for ; Wed, 24 Jul 2019 20:30:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C17F521734 for ; Wed, 24 Jul 2019 20:30:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564000236; bh=MdiaGN8UC4Xnttt9famvGIwedDcd4Ji8SrDssBUZnY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vKUqyXp1FMnijgMVfVHW0aVaSKbVy3fhXm4YU2OX+Bu3tlohRrVVdMBCSmnxiIw/N WQErwsXtlpOzYgbmVbour2ohBsHQIgvR+FwOwcl8rio9wFY0ru5l/eS07oIfbF/4Og pMlcZ7f7kmesU5skTaqnLmX9AoNObVf/XgUh3WfE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388547AbfGXUag (ORCPT ); Wed, 24 Jul 2019 16:30:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:52904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388528AbfGXTbq (ORCPT ); Wed, 24 Jul 2019 15:31:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB179229F4; Wed, 24 Jul 2019 19:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996705; bh=MdiaGN8UC4Xnttt9famvGIwedDcd4Ji8SrDssBUZnY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zwk80CoAJ8RGSP1+BVcOr/BHJV8c9R3spC5CZNhPEmZMVw9fIK0bVceFvxVZtLao3 kW2o8gKENujb1o4NG3ekmJUrz9mZ5jPhJYzhMPetHwE8q+F99pkcev7UJDZqwIO8zr wva6IpZncwO+lwsj/FnEZDmFosJyZr94TdIbwAkw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Jens Axboe , Sasha Levin Subject: [PATCH 5.2 188/413] bcache: check CACHE_SET_IO_DISABLE bit in bch_journal() Date: Wed, 24 Jul 2019 21:17:59 +0200 Message-Id: <20190724191748.160983049@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 4e5fc05720fc..54f8886b6177 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -811,6 +811,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