Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2641812pxa; Mon, 17 Aug 2020 15:14:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw5r0cGV21KsHbaWR9cvkSwfXgqAEfyXs02wsWQMU22S16sys04OMpIWN2wSgTfSMUH0Mi X-Received: by 2002:a17:906:37d2:: with SMTP id o18mr16730098ejc.162.1597702491649; Mon, 17 Aug 2020 15:14:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597702491; cv=none; d=google.com; s=arc-20160816; b=cBnLmEPvZWW/dlcgXQ8uTULhJae45wPmpswhLY8NCfAS+cr2XialW8l5Svh9xJcAXe RFtgtQgtM3ODo/a81lJmv92D190B+tf5YgvgE/FcZQSKGJJAHQv2PZs3R4sQWxmSKGZN yInolW/QJqKuIn8VSbvGnMcm1ySaHfvCaSQQ0P//L0FHf7zGOTj9hecgR3YYKf/GsZ7R ofdR4WRupUHrqzpk+rXsVjbTBxLOtX5Zg0LfLiekStAYf31QxTqBcXTxyL4EG7HiFGIg tmEp+E7uc89GEg2b4ARL9UjpeMAWjgDZJQ+OvwmQIXVF+cBCMma4M7KDkBLXcx64t+p+ F7LA== 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=H8OtTiOvJYN1ZWVceG21QfqJcMZl6ynjhe3fz5mhdNI=; b=QSm6V/1kh+R72/Ma/x6On3JYU8Lv6tPxTbZvaIxWd17WfLY5xsyIx4bFi4wUDKXF/n Q8gBaYwvZAor1QatTYOJaZXkHTdhzMe5sx3+knDcYm9dsMvIqBKCkLtsmGEWyLpcBqm+ bGG8a24DThAteE4V2LLIR1iIBkeZiKZx5m/Ai8YuMT0OqSI7vSXgYK0LTeak8Ckh8Cff b68ElLwq7sW61hna5BkSUvmTtEKTIonxm/U8hR3BVegCaXqvZ24xc0ki/1tLXUhTZYUE /BTV6xUKRgCHnQeZF1BofNV22lJF9ES2jzPu0qrk85MaVBGcF3OITDPFAzDxocisG8Ty V4Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OrztZBBT; 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 b6si13039610eja.559.2020.08.17.15.14.28; Mon, 17 Aug 2020 15:14:51 -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=OrztZBBT; 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 S1730891AbgHQQxY (ORCPT + 99 others); Mon, 17 Aug 2020 12:53:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:50764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731049AbgHQQDL (ORCPT ); Mon, 17 Aug 2020 12:03:11 -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 34D44206FA; Mon, 17 Aug 2020 16:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680190; bh=0KCuedF5IwSPpgVmEADeAoFPz+KDtv2XwTadQMp7KdM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OrztZBBTlEf7yvcvXiSGAagON9Vrb0LaItridpbbMt7nltW9CPHFKcURZ+sINcy71 j7GlSPVxJ6xhCYbPNe+Zu1omf7UfzVyo9CWnbJFxIpOYKuSrAy91S2ZNAO6Aw5b1vD YgpH9TnU6zQwBsS9vJSYx4G0+Shaune5R0wlJFTU= 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.4 087/270] bcache: fix super block seq numbers comparision in register_cache_set() Date: Mon, 17 Aug 2020 17:14:48 +0200 Message-Id: <20200817143800.098075807@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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 68901745eb203..168d647078591 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2091,7 +2091,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