Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp627810img; Fri, 22 Mar 2019 05:27:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3gkjt6y2qKpx8osBb/ly6VaYJBUGTGqLFp4lzwwlj+9Pv+5lPIZEaZft5AlbJJv8r1mHu X-Received: by 2002:a63:c64c:: with SMTP id x12mr8672930pgg.285.1553257669159; Fri, 22 Mar 2019 05:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553257669; cv=none; d=google.com; s=arc-20160816; b=DGr1PoFeP8arvDWxZYCYVddyNzByUFl+6SAyo/ZKjHyOEqDUkdC43khLXKlrqcFYiZ NPmdZk6sbXpg0YvJpON/juU6HlB6rt6c46EECSAS8B+wzr0D70F9+BAu+4ZNRZJACmCy 09kTePs+Tpp+oWs6kXTwu1DUF4O+ZGog4CWn3yyj+l3R2vDFYNR9KcxKr4Lj5D0UH5F4 7c6dyldQWE0mFRq7cUIK97TLT9xR2xVwOd84vEtZTJPsdM9E9WpGwwDLFPsIw6xiLmON g5Lg89dkPwG1DL5BqULmmC9mrU0DSxQq9schW8ry53gn8iOyOZvj7mrcAHEobkOJ0C5U BSBA== 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=6JJWaBT9nuUTbR0h0OZco4kH5ZHLoTPU3kWkUvQU6y4=; b=pB6A1nHeXvIdGrS/1f6fY8Dj68fufd2g3kL6DNJs7NPeRGTMTW3KfbqczC+91RoQZK bs1qSp1Gu7FqofxrwLloDyQWZfptPPDEwLxvNAR2zuIQguI+1M+ujglECon1ApYgswOg 9/WWEApmW107QND99XG0cjCwdXPRk3H6JHLfqpFkdFpYhv20BIrzP0Mg4+U0LLxYPX/g QYnr+8SWWXmKX4PG/I0umw4PGBMQ69kdhbkbx17uxxNbDM9ImN/ioE/+mAindhwduvVI Ca+VxmGbF8HY6U7tEqqOTOzeXTyOYogvBJGxlPPz7e6jVCSk9At5lkD8v7xj+w6nYTVD ydwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qHlLo9BE; 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 u31si6491444pgm.352.2019.03.22.05.27.33; Fri, 22 Mar 2019 05:27: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=qHlLo9BE; 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 S2390835AbfCVMZm (ORCPT + 99 others); Fri, 22 Mar 2019 08:25:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391159AbfCVMXq (ORCPT ); Fri, 22 Mar 2019 08:23: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 399AE2054F; Fri, 22 Mar 2019 12:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257425; bh=BfWoab1GxUKbYRVoo6RMhS0zjKSq+2dF9hH500xPp9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qHlLo9BE7s5JuvXWRB5QUZ7z5sEuEELKV3WwHhNIi81/PfXkvXteP+U14vS/Xa6wS hwQdsspneAox8sNiV6huyIpTCbkCKX7l8sdytPRJ3OagBXbsCLzkxksoY5Rlsfj8Bn DLhb3lk+g/AAv2Tz4kHX+Vj0iWqYBj7lSFNEEbcw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tang Junhui , Coly Li , Jens Axboe Subject: [PATCH 5.0 195/238] bcache: treat stale && dirty keys as bad keys Date: Fri, 22 Mar 2019 12:16:54 +0100 Message-Id: <20190322111309.699373791@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tang Junhui commit 58ac323084ebf44f8470eeb8b82660f9d0ee3689 upstream. Stale && dirty keys can be produced in the follow way: After writeback in write_dirty_finish(), dirty keys k1 will replace by clean keys k2 ==>ret = bch_btree_insert(dc->disk.c, &keys, NULL, &w->key); ==>btree_insert_fn(struct btree_op *b_op, struct btree *b) ==>static int bch_btree_insert_node(struct btree *b, struct btree_op *op, struct keylist *insert_keys, atomic_t *journal_ref, Then two steps: A) update k1 to k2 in btree node memory; bch_btree_insert_keys(b, op, insert_keys, replace_key) B) Write the bset(contains k2) to cache disk by a 30s delay work bch_btree_leaf_dirty(b, journal_ref). But before the 30s delay work write the bset to cache device, these things happened: A) GC works, and reclaim the bucket k2 point to; B) Allocator works, and invalidate the bucket k2 point to, and increase the gen of the bucket, and place it into free_inc fifo; C) Until now, the 30s delay work still does not finish work, so in the disk, the key still is k1, it is dirty and stale (its gen is smaller than the gen of the bucket). and then the machine power off suddenly happens; D) When the machine power on again, after the btree reconstruction, the stale dirty key appear. In bch_extent_bad(), when expensive_debug_checks is off, it would treat the dirty key as good even it is stale keys, and it would cause bellow probelms: A) In read_dirty() it would cause machine crash: BUG_ON(ptr_stale(dc->disk.c, &w->key, 0)); B) It could be worse when reads hits stale dirty keys, it would read old incorrect data. This patch tolerate the existence of these stale && dirty keys, and treat them as bad key in bch_extent_bad(). (Coly Li: fix indent which was modified by sender's email client) Signed-off-by: Tang Junhui Cc: stable@vger.kernel.org Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/md/bcache/extents.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) --- a/drivers/md/bcache/extents.c +++ b/drivers/md/bcache/extents.c @@ -538,6 +538,7 @@ static bool bch_extent_bad(struct btree_ { struct btree *b = container_of(bk, struct btree, keys); unsigned int i, stale; + char buf[80]; if (!KEY_PTRS(k) || bch_extent_invalid(bk, k)) @@ -547,19 +548,19 @@ static bool bch_extent_bad(struct btree_ if (!ptr_available(b->c, k, i)) return true; - if (!expensive_debug_checks(b->c) && KEY_DIRTY(k)) - return false; - for (i = 0; i < KEY_PTRS(k); i++) { stale = ptr_stale(b->c, k, i); + if (stale && KEY_DIRTY(k)) { + bch_extent_to_text(buf, sizeof(buf), k); + pr_info("stale dirty pointer, stale %u, key: %s", + stale, buf); + } + btree_bug_on(stale > BUCKET_GC_GEN_MAX, b, "key too stale: %i, need_gc %u", stale, b->c->need_gc); - btree_bug_on(stale && KEY_DIRTY(k) && KEY_SIZE(k), - b, "stale dirty pointer"); - if (stale) return true;