Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2594024lqp; Mon, 25 Mar 2024 03:58:41 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXV8+W13K04kfi+KsnvJhhfn40noGlGZ7Y7/jaB1YlMaJQUwurulY8/q/qg8h0yKDgekzHJKz7k3NLixFsLy/siv5ibfmlJLwl5y4zBsg== X-Google-Smtp-Source: AGHT+IGfOphDGocXqV2irjnpGRn4lvqBP1pkv/VEGs/MYZ38WLqyU2+NcXXLBVsQe+shWWPlr/pU X-Received: by 2002:a05:620a:90e:b0:789:e3bd:97d6 with SMTP id v14-20020a05620a090e00b00789e3bd97d6mr7021179qkv.67.1711364321629; Mon, 25 Mar 2024 03:58:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711364321; cv=pass; d=google.com; s=arc-20160816; b=O3Ra0qyO6lfLRLZJNwolSb8PZE0CgwGtM0U/fz4ESN9t80ttcZwtBiHxaGTteTmD4X DZiOvafjD35GBAHbEHsNX11y7ZnveHiAREzZhDC6sFZyeA2JtDwYHuGlrWeBkN5uKzrh w+y0QDrNWLvpclm1Ixg+a/AnueT+Sz8DyhmdtbQ7HIBmP+ljjvDkz0Xth3+RkaYZxV9f AWXla8QbsDN1G6qvtf7uwkDcf18hel0lm3d03ftFJNG3l+xlFMCT385gB1gdMKRgpA78 WWcaKW7WPqzRoiHY6EnWddrH2DtGqrlfIk8/c2YFfkmRU/ytHam7lHC+ZYPBDeFY5QNz M3qw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fTTgd4GdSAEk+dtHuUDE6z0qebDi7ilmYy1+YEUhEWI=; fh=gztaZlEV/IhaCTI9OXrOTx7G3T0xX7o1SJxZFm84PTI=; b=Qu5mXsTU+TDst4Tu/IJVwOA+MrmANGUvV9Dh61g3PU3yi8/pQvq9+Gv55dwcAIlnJL M3NR+kn5FawWCOkxNMSB8skiyeZdrrGRtgToHHrMI+OSqGSw48AY/KD1xovZ/TdKEgvZ 3Sh9z7RiO9dZjeu3VHnA1QwNM2AmiiID1kEGlSuZOxJ5SlI+sTU2fo68TSzI7Kgn0gUP rxLG+XZ3pG0hkGelbH3QNJTS8xmFty0ygAwXJLRvKg+JvGU4p/3g6Mkr3hoyHGMy9qbs Mg8wlx6QDVF2hjFWxmDb3YKqw+vUnLrqefnsIdghKlqT14K3Rv1epjEBby5cH6ZpKE9N OHVg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EiLubYF7; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115451-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115451-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id a16-20020a05620a067000b00789e7ad77d5si4931078qkh.95.2024.03.25.03.58.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:58:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115451-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EiLubYF7; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115451-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115451-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 5C29E1C26B76 for ; Mon, 25 Mar 2024 10:58:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9D74A217338; Mon, 25 Mar 2024 02:38:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EiLubYF7" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8650146D69; Sun, 24 Mar 2024 22:53:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320825; cv=none; b=TjPx3Iy7JyI/ZXf8SZ0HSbqQ0KFCZZDgfoNSiLdYEUMDQg8zGii495C+Yh9N8kGwlUmhZ/CHhzZKeyRW3V7eko9+3vzwrQHu0JnrP5tIT3Aztm+U+2Z7U+9gilH1E519vq1tTLt1s1HqKGDTUd8HvFQVTFDALQt7ROwUbO3aXig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320825; c=relaxed/simple; bh=1hojjrskATgievWWd4UEDME6Xz0+KX5VKU0JHzpTgL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B6K3uoVhT1E9SyKbS0WFInM9Xrx5i+dwrk+wALxl8O4FrgOKgT3OlDuz6LofACx0G4Bne6cfVxErOSxYl12CdZQOxxr6f/TPyQZp2CV9TFiXy1PirAIpXENQFSOjtmwzf3qlFE/jIEZ5DwVw1N4ocpsRPP0h4doIQeyJUtc/UUw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EiLubYF7; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30C64C43390; Sun, 24 Mar 2024 22:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320823; bh=1hojjrskATgievWWd4UEDME6Xz0+KX5VKU0JHzpTgL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EiLubYF7ktS3spqtmSeAnqgZCGfNHMkY9nHgUb23odf625KLMCVJYipM9Nhz0cd1Z ZB2apiJPaX0eMRfjhesjeX4BP6B1bnnvpLVR+nMAy+hd/Yhv+EvcuPPuX3l4Iw4f8F PCDUiIaEA6vJcvbURETyyptmwOzhp2wXxcLxIue3niCF3FNe2n1IahZNlCCLGJzyUS IEkzJV/FbSEDGlLavVJ+d4BP4HGcV+kDcHxgXpl1bqQhCOwFO2gY4zyOEUldmlCmuG vR5jg404xKuYLX4bo/3JHa2c8Mya46fAHHMWMhJA3kl+hFNRAGwDIIhurRYa91FKew zxyIR1fTeyeCg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 6.7 388/713] dm: call the resume method on internal suspend Date: Sun, 24 Mar 2024 18:41:54 -0400 Message-ID: <20240324224720.1345309-389-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Mikulas Patocka [ Upstream commit 65e8fbde64520001abf1c8d0e573561b4746ef38 ] There is this reported crash when experimenting with the lvm2 testsuite. The list corruption is caused by the fact that the postsuspend and resume methods were not paired correctly; there were two consecutive calls to the origin_postsuspend function. The second call attempts to remove the "hash_list" entry from a list, while it was already removed by the first call. Fix __dm_internal_resume so that it calls the preresume and resume methods of the table's targets. If a preresume method of some target fails, we are in a tricky situation. We can't return an error because dm_internal_resume isn't supposed to return errors. We can't return success, because then the "resume" and "postsuspend" methods would not be paired correctly. So, we set the DMF_SUSPENDED flag and we fake normal suspend - it may confuse userspace tools, but it won't cause a kernel crash. ------------[ cut here ]------------ kernel BUG at lib/list_debug.c:56! invalid opcode: 0000 [#1] PREEMPT SMP CPU: 1 PID: 8343 Comm: dmsetup Not tainted 6.8.0-rc6 #4 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 RIP: 0010:__list_del_entry_valid_or_report+0x77/0xc0 RSP: 0018:ffff8881b831bcc0 EFLAGS: 00010282 RAX: 000000000000004e RBX: ffff888143b6eb80 RCX: 0000000000000000 RDX: 0000000000000001 RSI: ffffffff819053d0 RDI: 00000000ffffffff RBP: ffff8881b83a3400 R08: 00000000fffeffff R09: 0000000000000058 R10: 0000000000000000 R11: ffffffff81a24080 R12: 0000000000000001 R13: ffff88814538e000 R14: ffff888143bc6dc0 R15: ffffffffa02e4bb0 FS: 00000000f7c0f780(0000) GS:ffff8893f0a40000(0000) knlGS:0000000000000000 CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 CR2: 0000000057fb5000 CR3: 0000000143474000 CR4: 00000000000006b0 Call Trace: ? die+0x2d/0x80 ? do_trap+0xeb/0xf0 ? __list_del_entry_valid_or_report+0x77/0xc0 ? do_error_trap+0x60/0x80 ? __list_del_entry_valid_or_report+0x77/0xc0 ? exc_invalid_op+0x49/0x60 ? __list_del_entry_valid_or_report+0x77/0xc0 ? asm_exc_invalid_op+0x16/0x20 ? table_deps+0x1b0/0x1b0 [dm_mod] ? __list_del_entry_valid_or_report+0x77/0xc0 origin_postsuspend+0x1a/0x50 [dm_snapshot] dm_table_postsuspend_targets+0x34/0x50 [dm_mod] dm_suspend+0xd8/0xf0 [dm_mod] dev_suspend+0x1f2/0x2f0 [dm_mod] ? table_deps+0x1b0/0x1b0 [dm_mod] ctl_ioctl+0x300/0x5f0 [dm_mod] dm_compat_ctl_ioctl+0x7/0x10 [dm_mod] __x64_compat_sys_ioctl+0x104/0x170 do_syscall_64+0x184/0x1b0 entry_SYSCALL_64_after_hwframe+0x46/0x4e RIP: 0033:0xf7e6aead ---[ end trace 0000000000000000 ]--- Fixes: ffcc39364160 ("dm: enhance internal suspend and resume interface") Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 23c32cd1f1d88..4ff9bebb81ad5 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2945,6 +2945,9 @@ static void __dm_internal_suspend(struct mapped_device *md, unsigned int suspend static void __dm_internal_resume(struct mapped_device *md) { + int r; + struct dm_table *map; + BUG_ON(!md->internal_suspend_count); if (--md->internal_suspend_count) @@ -2953,12 +2956,23 @@ static void __dm_internal_resume(struct mapped_device *md) if (dm_suspended_md(md)) goto done; /* resume from nested suspend */ - /* - * NOTE: existing callers don't need to call dm_table_resume_targets - * (which may fail -- so best to avoid it for now by passing NULL map) - */ - (void) __dm_resume(md, NULL); - + map = rcu_dereference_protected(md->map, lockdep_is_held(&md->suspend_lock)); + r = __dm_resume(md, map); + if (r) { + /* + * If a preresume method of some target failed, we are in a + * tricky situation. We can't return an error to the caller. We + * can't fake success because then the "resume" and + * "postsuspend" methods would not be paired correctly, and it + * would break various targets, for example it would cause list + * corruption in the "origin" target. + * + * So, we fake normal suspend here, to make sure that the + * "resume" and "postsuspend" methods will be paired correctly. + */ + DMERR("Preresume method failed: %d", r); + set_bit(DMF_SUSPENDED, &md->flags); + } done: clear_bit(DMF_SUSPENDED_INTERNALLY, &md->flags); smp_mb__after_atomic(); -- 2.43.0