Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2752443lqp; Mon, 25 Mar 2024 08:17:57 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV2K3ozkHLi6ZyeqtwTiccoqoKg07Kdad2VJ0uCMBHC0fgzv4N28W0SejSpdT1cCHJFIH1cfQIDzhbEUssj3lpjaKZ+4SDALQUnrODnMg== X-Google-Smtp-Source: AGHT+IE+pd4fBhVivgEr0FAHutHsIDf9nnbqyN7ykdB4/ItwQQrFb/cSTK/AX/eVol46nHod1hp1 X-Received: by 2002:a17:90a:d70b:b0:29b:b478:b900 with SMTP id y11-20020a17090ad70b00b0029bb478b900mr5350993pju.35.1711379876871; Mon, 25 Mar 2024 08:17:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711379876; cv=pass; d=google.com; s=arc-20160816; b=LmOQ0yAQwE4Ks26gZaNnPtg3Kt4xZb+OOOcISuAi1TyfW0UXOH7v1CBhXQWiCClpec nqOBtA/PSiOsBvv8tawSQ9gWZ+lkXiytvs7gPqx4GcK1ico2Pdv+WHj1xDkNJIYAdLqw tiVLhYAzImPN5ZWmhxq0k6iBW8bzzROUcGCiTZbIfDUO0/SMO7JadT+W8GyKqMfA2uQT fveX/qaf10xiYNwcwzO54ss803fpSJbNrZS4UqpclIv0DvgpwjA8PfXrW1BPhmQCUC4c r1fAQe6os84jws3I+aI6TbFzB3aKAakN2PvLM60DYbkoEVlThwl3A5dluwuEQeE/ODFn /9Mw== 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=VeQQ0Pm3W2ninPodvqJc1K3B6xV6wzZ9sHTLTRwFlbs=; fh=gztaZlEV/IhaCTI9OXrOTx7G3T0xX7o1SJxZFm84PTI=; b=VHYrdKg7I7WnWhmfuQ6Qd8Ssu2Fm8KDl/qdtY/Ti2atjmF3AkhEfBbCfDOjAOqs8S3 TCeFeE9a9uaGX2o9bT1txlo9NmoFFvy7Kd/JtRPFpeJmx58sjvSJpwUbixzIYSIMf0Fg o4KElN6s1ckam3pSHOGN2+mIp5ijqts9WEWIc6Fs0tK+LelbWcD8uzv4MFV8cCapgom0 n1JnyShRL72VXhPvOyTQtIk/lkPUCXKqGLa6wSCgvNoDjErO6HfjCqyYX8ExFGKmmBVC uMoqIK72TDDhyajw+0ZCaDDZFFCAD9Umzt8V64LsSGsOtE7PdeLCRjMDm07tC939xeyg bqWA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=N+99+fm2; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116323-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116323-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id i2-20020a17090ad34200b002a041630ff8si6487657pjx.134.2024.03.25.08.17.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 08:17:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116323-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=N+99+fm2; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116323-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116323-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 08ED4B37304 for ; Mon, 25 Mar 2024 12:05:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B79293D52BA; Mon, 25 Mar 2024 03:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N+99+fm2" 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 7BC33184324; Sun, 24 Mar 2024 23:51:29 +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=1711324290; cv=none; b=VEqnkDzcp/zTS+k/bfD5ueAvbyu7nLfXTJ2gAx/rJo7/iSracEL/15CpTiK8j0lOQF0iTEMQ/x0LboTH5pyHU73sI40rw1ojH6tDkVOW4x3DLN3YF1htgnmcxZXOUs5Ia489z6vZBg+fQuh5/tGcMjPPWk7BjwKEVm0D7OqR64M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324290; c=relaxed/simple; bh=3gtvXEiYEiuX+EOiBlHvzbZHrs+XWTEwGzX1WEO+EBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3wt1MgNmnUVQKAk9uYQNOjhbEfwdlr3tZ4gk7gulkyc7Ktck9cJsMl5GA/6ksN21yf+j7KRua7g/2o5bZyzxTmx+U19IAuGtFFbgEtZAkwKt01WjOX6brpxVJCIn6W8AMgXHhC+eDeXzfFjTEpiNV5niY8QHtKu7GSnrEd8O0M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N+99+fm2; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA615C433C7; Sun, 24 Mar 2024 23:51:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324289; bh=3gtvXEiYEiuX+EOiBlHvzbZHrs+XWTEwGzX1WEO+EBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N+99+fm2/0A9bUr0OhB4F3znVlBRYv+dgLEMBt8H4P2R+cGRXGavNEVENyHxAOadd p8NGTRQZsJsBMfgAc+2Ylh8/YwBhO8e3Ww+cueJXdKMJJPOkVcrm6cq1N8ivGmwp2k VC7mQc8kaPp5HWtMi6gWQ+URN8HTXEPkghJqOZL+cUg2TwTxKdq3Qx0fNZlSE7tjIz jPSw1Q1nrgToTfd6TLz+lSQamx+LQ/ODgw02wUELZa9mzZLOM5NvdmZuI4JAeZ6zzd 9GpDgNSi8Ea+bPVwP48thUcKEyw/rykLDhKAtEIrgO9WNn/6yKIKLqjy7HhIoU2MTL 6gGao/N+lMgZw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 4.19 065/148] dm: call the resume method on internal suspend Date: Sun, 24 Mar 2024 19:48:49 -0400 Message-ID: <20240324235012.1356413-66-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-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 9a9b2adcf39e3..50dcda27144eb 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2849,6 +2849,9 @@ static void __dm_internal_suspend(struct mapped_device *md, unsigned suspend_fla 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) @@ -2857,12 +2860,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