Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp56903ybm; Mon, 20 May 2019 11:47:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5iMQNz92d6QFNUp9e5/+xt4ycdAVvwTunflBpztMVSlhdznNC17dY3uatQVI6RxwwwNrh X-Received: by 2002:a63:754b:: with SMTP id f11mr77105291pgn.32.1558378067898; Mon, 20 May 2019 11:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558378067; cv=none; d=google.com; s=arc-20160816; b=o0/PKo5VqyzkUETj87tB6QKqNmtqMH3Syddhep08vJcQ7ATLBQD2PhzjylzwvRmM29 KZ/HcgqBamvuM2u/gFuwIOtcE8ph092k+s/rih5kZs7+YdY+mVSh0vcmTWW/9HPE1e+R QE2NaikSMIjTbg4ic0eN98a0CNF4ZYim0lT+GmfOQOj9viTv+WdRaCXRvf2A3LqV5gqM OEO4OLZQ6Fu0svAQi6Xfud53cs7bR09/wKXk/0eR8fFnUB64SU8G2acZNy2UZWMEkDU0 IaG2AI8uPTFkxasMHLoZTGD/q39i5Yq1ypsZLQkoLZWjL+HqvNM5MdF7Ip8U+sqsEIJ4 pe1w== 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=/MyG+dJpn2DGeoenemsD4383pd0tGMqGFGaeP8Rx7YM=; b=l6/00pP30QWo4ac/SgO7QaKAhWzVG5T58QtwVU1egLn8KsW0AWvK0WSeCmONnXbkkD nGtLmh4602ZcW2ME1ogwtssT2e5rbgb8s6BU3W2iQZc5OwDtBXBJ4pYuDQI3hzGSbrHk y0+7zKhOOpx25al/Osc//HHna2KFJYQueOouL3s2o1fK07YKgdDIPaGfRiTk5MIrl73M lQpZQ81QH98r+LW6aJzFzQ246yTnDFDcS1NlHYwAuSEIEvVw6oePBn+oL6rxCrqnO+oP C037SAKsdSSa2OQ6lU314w2+ws+0YNmpUPmPzzfENmUrOJ+krXt9HNiIc+gpJkcsR695 qL6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q3iTn7PJ; 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 b8si18582325pla.161.2019.05.20.11.47.33; Mon, 20 May 2019 11:47:47 -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=q3iTn7PJ; 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 S2391071AbfETMfV (ORCPT + 99 others); Mon, 20 May 2019 08:35:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:53434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391057AbfETMfS (ORCPT ); Mon, 20 May 2019 08:35:18 -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 14ACB204FD; Mon, 20 May 2019 12:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355717; bh=gDXp1YTVd1ZDb9dpxjABJtOXO5WdHbIWePTo2Hqkyqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q3iTn7PJ8lz2fTc7q+uYi9DHnGe2yVduKObXg+9kuqA/HbdD1G6ZjRc3WfsJ3jfFc DHdaNFXBz8kvCcWsp1UBckscVtoBMnpOdWxn5CTLXOOKt5Olnytc4a91MLnBZydlK6 CfYPtbLnT2LwZlej418y8LKMDHHVBnhYltLHHwUM= 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 5.1 100/128] bcache: never set KEY_PTRS of journal key to 0 in journal_reclaim() Date: Mon, 20 May 2019 14:14:47 +0200 Message-Id: <20190520115255.957450340@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@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 @@ -540,11 +540,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); @@ -671,6 +671,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);