Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp101886yba; Mon, 20 May 2019 05:44:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNPRfL7kJjfkEgqubsPXTE1stKghL+9gDeXnrUAniu2NGbEZOlZaLC2lF7DR2/W4exlM1s X-Received: by 2002:a17:902:46a:: with SMTP id 97mr47677488ple.66.1558356276352; Mon, 20 May 2019 05:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558356276; cv=none; d=google.com; s=arc-20160816; b=DTA4WERCjCw8XI7bQiyRismGuo9wOAm6A3lZbjOI0aHMaQVtQDUgwq+4cSpXzRP7B2 AC4raUOkeeGNfFRfxV4cGnr8pWvXEhwOMBOmQsO1J1yStOUP6hqfMDOAhQ1M0xhS0QxZ Udr7LE/aa+elTyidNntcCGro+exLAm1mbLvkqJ3q3d9Rd/A+IC7oHjtdgB5d4RdgABbU mQLSH52PH80Km1ScMwFFdWgO0Qc+6MNCBtue8I78HCp5iDSCEaax4evn9Fr3EfKwP8Ik tSMad88Ua50AjAdJSvv2qGqbmxwzR82QPZi7YpnEjruYwO6gD8+maDHoOMwKUvf/alkg bFPg== 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=pE+LBkGWeTIlTlCTqLN9LmTFU8We81pfPaNl9CrNlpd0IAt4Tv8kYoIfPnDi0m1Cjw NL7Q7O0NXmMbVuF/3g2/2jBwXxsSI9+tuaVTDiKhcM1RKpxa/DjxXwLbssjBFpltTb+i N9HWiXnAXyRlwBf5HcaAOaU923/Gb+TIa05Ixbnr2SmEQj3sNyEtivY6tZjYFkJqHzbo b5IBcY6dBxY/Hg/YbIQO+LeJq/qZvIDx/3EpQAed+EQE5CKQXa9PoxR0ZViPC6p7vgqP S4ZfIajoMjdrZc4XbLT38mt3e0oB3EzAuVCs1CSl90VTcjP1lugniXwdFr+2FcmP03LQ TCkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=M2SxiAqJ; 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 n12si17693834plp.114.2019.05.20.05.44.21; Mon, 20 May 2019 05:44:36 -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=M2SxiAqJ; 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 S2389976AbfETM3t (ORCPT + 99 others); Mon, 20 May 2019 08:29:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:45920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389959AbfETM3r (ORCPT ); Mon, 20 May 2019 08:29:47 -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 8429A20675; Mon, 20 May 2019 12:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355386; bh=gDXp1YTVd1ZDb9dpxjABJtOXO5WdHbIWePTo2Hqkyqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M2SxiAqJXyrYn+9h66uAtI/hcQ7davda2Akk1ajGbrxvrWLzUyehD6xB913AJYTZg nx5GLGb1Yl55DC63oxeiqn0YQJrTauU0jrHkl2XhyxSf+cXXNd4x0YKvWcxGFGL7v4 ZGIUjBog2yADSZnYsALzlEJPYYxx7XztQkS0izdM= 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.0 097/123] bcache: never set KEY_PTRS of journal key to 0 in journal_reclaim() Date: Mon, 20 May 2019 14:14:37 +0200 Message-Id: <20190520115251.461190489@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@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);