Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2626568pxa; Mon, 17 Aug 2020 14:47:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZB8FKuzBHYswthvNxnI1d9w6mobkd3+JCtMtLiltG8FrZ2ieSRC+TMRCmIEUPH+SKCCcP X-Received: by 2002:a17:906:a201:: with SMTP id r1mr16890462ejy.432.1597700878588; Mon, 17 Aug 2020 14:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597700878; cv=none; d=google.com; s=arc-20160816; b=sH04Yz41zkT61aNbgR3PMVe5E5XCUdm5v5zjzPQK7zJp+7cHUY3/hOnE3p+EQeVa8n 2XJ2lDrZ2Wl1WPSCWHHeJ4MFoYYuTtCpq7svn3TM2tJLEXV4a6uW6tAIu7CArc1rFQTR 0g+Cy5WTjJfS7/k1iwr0RLw72EHKjhDGzPL7X/pyU3vm0zUFnNKfkmkdXsvhEMcHGeYA FZsN3i4NHzD/RSS6l12DCENFY5qQ3RFj6LFa5FNwtGgfRBGM7UFcyEMS4htkBrutL6JY 8FtoPjWKJokSdp16/vp5RctaO/8VrlaiJoNMYoU2AsTWkJatbc5SBLWWPAtT1O6ZZcYz PYFA== 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=nABAJUcH78iFXDQSQp6Oe/uBNUtKiBsL+3hzu80qjJw=; b=wZwh1T/QAPD3PJaEUIzr+O9Jj5SHcs4Chic0aAxxAJf8hUW1GB7u2WAq7Jui3Mazx1 fay24vqseQ0WQ2G2goAUbJ3jfi6fXflZcnSijtr8l5HvwFd4dMaqocp1BEjBgL5fIy+y miKzwPNvEeguTLSqP99RpprC1WasVUfKcOZQZgHkDBaw2wqn3AYqoIwJ/uxiHR/ePJXB w1SBQ+6HfhTlS/k8J9ilsTl8xvQg8BOPpRMcEXFQQyp4vSCdmm65K7a+1vd29Hw1guLN /w9GQkY0jTTuoZsSklmZ5kGXpfDeu0+/GGY94uMg0OsxE5p0XywL8PjR5cGIj10ajeAS YQog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zEiaFxrh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t19si14248175edi.420.2020.08.17.14.47.34; Mon, 17 Aug 2020 14:47:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zEiaFxrh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729454AbgHQPZu (ORCPT + 99 others); Mon, 17 Aug 2020 11:25:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:53898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729631AbgHQPYN (ORCPT ); Mon, 17 Aug 2020 11:24:13 -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 96E002313B; Mon, 17 Aug 2020 15:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677853; bh=YGP+YkstFN3gOd4TajzXgMtqYNsJ02VYfzwME3k7kY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zEiaFxrhpoSc6yO1FODIBRnfxqzQkHBNFqfa3fKqWqqTn5lcJWJNcI1N4ir2QCq+i 0AO6a7vhleYdZqaTdyOqhcogASPMM5+XmvvRlIpwcJaQ3qNWddR42hfKv/K3lOOIVa vT5iPt1Lq1b/lTMmH6k6LIlnTEROM2KLwbNspQ/0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Coly Li , Hannes Reinecke , Jens Axboe , Sasha Levin Subject: [PATCH 5.8 132/464] bcache: fix super block seq numbers comparision in register_cache_set() Date: Mon, 17 Aug 2020 17:11:25 +0200 Message-Id: <20200817143840.135707528@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@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 [ Upstream commit 117f636ea695270fe492d0c0c9dfadc7a662af47 ] In register_cache_set(), c is pointer to struct cache_set, and ca is pointer to struct cache, if ca->sb.seq > c->sb.seq, it means this registering cache has up to date version and other members, the in- memory version and other members should be updated to the newer value. But current implementation makes a cache set only has a single cache device, so the above assumption works well except for a special case. The execption is when a cache device new created and both ca->sb.seq and c->sb.seq are 0, because the super block is never flushed out yet. In the location for the following if() check, 2156 if (ca->sb.seq > c->sb.seq) { 2157 c->sb.version = ca->sb.version; 2158 memcpy(c->sb.set_uuid, ca->sb.set_uuid, 16); 2159 c->sb.flags = ca->sb.flags; 2160 c->sb.seq = ca->sb.seq; 2161 pr_debug("set version = %llu\n", c->sb.version); 2162 } c->sb.version is not initialized yet and valued 0. When ca->sb.seq is 0, the if() check will fail (because both values are 0), and the cache set version, set_uuid, flags and seq won't be updated. The above problem is hiden for current code, because the bucket size is compatible among different super block version. And the next time when running cache set again, ca->sb.seq will be larger than 0 and cache set super block version will be updated properly. But if the large bucket feature is enabled, sb->bucket_size is the low 16bits of the bucket size. For a power of 2 value, when the actual bucket size exceeds 16bit width, sb->bucket_size will always be 0. Then read_super_common() will fail because the if() check to is_power_of_2(sb->bucket_size) is false. This is how the long time hidden bug is triggered. This patch modifies the if() check to the following way, 2156 if (ca->sb.seq > c->sb.seq || c->sb.seq == 0) { Then cache set's version, set_uuid, flags and seq will always be updated corectly including for a new created cache device. Signed-off-by: Coly Li Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/super.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 2014016f9a60d..445bb84ee27f8 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2100,7 +2100,14 @@ static const char *register_cache_set(struct cache *ca) sysfs_create_link(&c->kobj, &ca->kobj, buf)) goto err; - if (ca->sb.seq > c->sb.seq) { + /* + * A special case is both ca->sb.seq and c->sb.seq are 0, + * such condition happens on a new created cache device whose + * super block is never flushed yet. In this case c->sb.version + * and other members should be updated too, otherwise we will + * have a mistaken super block version in cache set. + */ + if (ca->sb.seq > c->sb.seq || c->sb.seq == 0) { c->sb.version = ca->sb.version; memcpy(c->sb.set_uuid, ca->sb.set_uuid, 16); c->sb.flags = ca->sb.flags; -- 2.25.1