Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp79524yba; Mon, 20 May 2019 05:20:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCCzA0eVsOmpMmp26tPwLA/ooduHwZt+nm17fPB3LCwoQF3AZSS0U+GAnI4CUhmQg+OLw3 X-Received: by 2002:a62:7796:: with SMTP id s144mr22936762pfc.260.1558354849780; Mon, 20 May 2019 05:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558354849; cv=none; d=google.com; s=arc-20160816; b=IsYiSeSXrBH989csi97k+DIpIFH4IXlS9pvRsFTqjSxKnMh3to8Tajdb8qJiSpapH9 cCyugvI7LFrkUXKSLv+9IksI7InEYJFmhnEyr6vTadH7wKNiQC1k4Iwqk7qIuFSFwELi F+G7K2LOIiGmV2SDC6OnwhagmwzY2oD+7TqAZu3QKOcowmXfLoI5sfwMtVzxSYWOg3JK XKSkdv7ViLQSw0mNquSra6UEwaBUO9tUgE9ISJB/xP98vzo1OrkmSwWnVpu6hO2T29oX zpW8D020u3ZL25gLGu+ER/o54s6VyrSOdLfn+wLTDwlGSB4QPSPFmeytwLdcIZWzSAuH aOCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6I0TpIfvHEX0KQV77lWGMzNF43cBeM1jdSftCN97/vE=; b=EKvIaUwGDAcTrZ7RZvToV4hhDSccP5kaAwQzbdUGXIvlndtB3WXnWdbSqWhqIiDQSK LG4zfxlJhTWsdEUATYgVYvAn5vtBDwZ6pmrJkHoDsbKi00geNOybdAalMK26mn6t+eGT V1H7WAgxIgiQP+wsN8rNfFvJ1a+Z/s0YDP+Lf3WYUHh6cXfH3Gsrg9SNFUreeFCt3PQM 62oYqEQE1Q01YXilt2usB6yuCUX6n5LvX+pTUzlGvV2EYBZywbdAk0Q1vSRSGwHatRHb rxyaPxoDCPFO7HxkJJ7SNDGmZtDtQ0wMt+T8wz4/qVB07+AzMauUt3OCOJ8ij3BeGMR9 yJbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="S8sXo/VZ"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8si17024239pgf.3.2019.05.20.05.20.35; Mon, 20 May 2019 05:20:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="S8sXo/VZ"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387508AbfETMRQ (ORCPT + 99 others); Mon, 20 May 2019 08:17:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:58180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733009AbfETMRP (ORCPT ); Mon, 20 May 2019 08:17:15 -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 7AC2521726; Mon, 20 May 2019 12:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558354635; bh=JNwXe8/PAw9GC/ZOpIp3XzXjSTJc3QTx+GwjOa+V2EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8sXo/VZKGe0/2tLEfVBPceFwbSMt4j0esjJX5Fcv07Dh+ghiFo7RJ8QoBaJYD/qp d1W7s8yzTsvtuxfIQnD66D4wv+SdCcnaWSLk9Ne2WOHS4iJ/7yDlIzWt5CjbZJu7A7 BVvjx3yw39myXdIpx4rfnxfNSTJKQCmDZjL0IoAo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Hannes Reinecke , Jens Axboe Subject: [PATCH 4.9 32/44] bcache: never set KEY_PTRS of journal key to 0 in journal_reclaim() Date: Mon, 20 May 2019 14:14:21 +0200 Message-Id: <20190520115235.004211923@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115230.720347034@linuxfoundation.org> References: <20190520115230.720347034@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit 1bee2addc0c8470c8aaa65ef0599eeae96dd88bc upstream. In journal_reclaim() ja->cur_idx of each cache will be update to reclaim available journal buckets. Variable 'int n' is used to count how many cache is successfully reclaimed, then n is set to c->journal.key by SET_KEY_PTRS(). Later in journal_write_unlocked(), a for_each_cache() loop will write the jset data onto each cache. The problem is, if all jouranl buckets on each cache is full, the following code in journal_reclaim(), 529 for_each_cache(ca, c, iter) { 530 struct journal_device *ja = &ca->journal; 531 unsigned int next = (ja->cur_idx + 1) % ca->sb.njournal_buckets; 532 533 /* No space available on this device */ 534 if (next == ja->discard_idx) 535 continue; 536 537 ja->cur_idx = next; 538 k->ptr[n++] = MAKE_PTR(0, 539 bucket_to_sector(c, ca->sb.d[ja->cur_idx]), 540 ca->sb.nr_this_dev); 541 } 542 543 bkey_init(k); 544 SET_KEY_PTRS(k, n); If there is no available bucket to reclaim, the if() condition at line 534 will always true, and n remains 0. Then at line 544, SET_KEY_PTRS() will set KEY_PTRS field of c->journal.key to 0. Setting KEY_PTRS field of c->journal.key to 0 is wrong. Because in journal_write_unlocked() the journal data is written in following loop, 649 for (i = 0; i < KEY_PTRS(k); i++) { 650-671 submit journal data to cache device 672 } If KEY_PTRS field is set to 0 in jouranl_reclaim(), the journal data won't be written to cache device here. If system crahed or rebooted before bkeys of the lost journal entries written into btree nodes, data corruption will be reported during bcache reload after rebooting the system. Indeed there is only one cache in a cache set, there is no need to set KEY_PTRS field in journal_reclaim() at all. But in order to keep the for_each_cache() logic consistent for now, this patch fixes the above problem by not setting 0 KEY_PTRS of journal key, if there is no bucket available to reclaim. Signed-off-by: Coly Li Reviewed-by: Hannes Reinecke Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/md/bcache/journal.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -513,11 +513,11 @@ static void journal_reclaim(struct cache ca->sb.nr_this_dev); } - bkey_init(k); - SET_KEY_PTRS(k, n); - - if (n) + if (n) { + bkey_init(k); + SET_KEY_PTRS(k, n); c->journal.blocks_free = c->sb.bucket_size >> c->block_bits; + } out: if (!journal_full(&c->journal)) __closure_wake_up(&c->journal.wait); @@ -642,6 +642,9 @@ static void journal_write_unlocked(struc ca->journal.seq[ca->journal.cur_idx] = w->data->seq; } + /* If KEY_PTRS(k) == 0, this jset gets lost in air */ + BUG_ON(i == 0); + atomic_dec_bug(&fifo_back(&c->journal.pin)); bch_journal_next(&c->journal); journal_reclaim(c);