From patchwork Tue Aug 31 01:21:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12466225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CDAAC432BE for ; Tue, 31 Aug 2021 01:22:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EF0160F92 for ; Tue, 31 Aug 2021 01:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239270AbhHaBXX (ORCPT ); Mon, 30 Aug 2021 21:23:23 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:6560 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239271AbhHaBXU (ORCPT ); Mon, 30 Aug 2021 21:23:20 -0400 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 17ULx0oQ021705; Tue, 31 Aug 2021 01:22:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=EX3zh2C6Drw9eXMwn4QjpNyI1t/xpsToYjXn+FvCN8Y=; b=M85pEjqlics7Y+f9BxtT7LZE3ZAHVCReusxGHblseY9xLp8r1/SZx6FUQKAd7wbn+OwJ 1g8Td8VI50fZyAdxxG93qPSKm5PASsf89ZGLARs5lGQCDIdXvElBFf6fu4VcLNUSFK1M UeHzNVaWM9SCu9JL8dri0j417GAyHNO1WZT9TTDlB2p8Mi39gFklnntiMg1XHbau0kGP JUVNYpXahBquyIGiMLmaUpbG9RDd4Sj7hbOPTw/EqmEfDnt/1cuG29Vws1THnQ28IS1I PCandqM6gD+MHmx2Gly6HtVNvIU3oQD30VjJPdiO77dycr1YAkLyxTi/61un4z8o0eH/ /g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=EX3zh2C6Drw9eXMwn4QjpNyI1t/xpsToYjXn+FvCN8Y=; b=A/wNAB/V+4V+wy4XQXCdPOO7ibybPjJ2mD4pzH9cqAfOI6PeKO8Bg4RFsCIE4ZoaYuTd Bd32fhfeGRpAeMCcIwHsT65nXIx4brMeqCRI14eRSADxyqjWt04Xk7orVkKiHUJWs2Jc 7Zak1yUo1imozmEz9FAoLV2On2IDYob2M+u+s+IsVUTqPToFdvI2mr5qQIkeYJ8RiGUv u6NAd3Lo4HBZW10hOfzO0sKp+y+ATBaTyFTw+Y8F43Yx1+KOFW3dl7T3yCfUUEYZPsjo rFtlGV6uzcD9tLJZjEiq44JafQPhktMRh/rC+AuK15orZQyQ7A1oGilVkRcdqJ+cf2II VA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3arcjwb0by-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Aug 2021 01:22:18 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17V1GCQw193706; Tue, 31 Aug 2021 01:22:16 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by userp3030.oracle.com with ESMTP id 3arpf3b5v0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Aug 2021 01:22:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DeAbir/x7ujbXe8JEAU3A/kXF6Z+EwkYdZnUGFZgREjIlw9s46WKxpAZXD3qOkvp9yUEcuU7YM5cfryXt0OU6m1gUBqVYF6rQCB9AcHUa8da7UqgcR7dWYgkS2d92WoPe1zKq4z7rzI8HJsOvpCGWvHfL6wt8p/kaglPuxyw4j+Ov6jfGZJoHZKiyindd3e713X8b+DdooPdAWi6QoMN6I4XKYp1CX2qIzgHy5NPZ8KMhAeIGX0JuLcmXtsT3aYUXP81OI/O0ZqKpFwe/0BpwQ6jBY08sxOyKTHVY64DPzCu9Vh2FjULuZpCTx2NzfVzukYCpk0FCXKgSvu0RR4VlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EX3zh2C6Drw9eXMwn4QjpNyI1t/xpsToYjXn+FvCN8Y=; b=czAQ520zlqtPpEZm0hAMlgE7tri6mzVgPXO0ZyKnLDuwn3cVPaJtnt9jrMcYtccP9KygtgiGqd5MwlInFRhTCBjoh8Tliomzs03jriI9bl+t4eOZdNnIY0jgLEk10zBqgNsdKmrWEHBwGnbalV9kE6q15GnO4vjXagyiGK31Ei4EPun3ZTSSqZPq+4buyUOkycanlZgKN80Jxo+iAlIGSZYKZQYFknhG2PPMvRx7HrdNlP7AcinNhk4htVA9EZrCsDIcr5grh+4dMHGHVKdWXyDWj60G1uIl1poCHk86PYi4jKdcImNc4VdmvwZ8HNNtQ0HkG9DASmBZvtGzvUR9fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EX3zh2C6Drw9eXMwn4QjpNyI1t/xpsToYjXn+FvCN8Y=; b=RtruG3CXcYNKRAYb+k/qKgnq15i3U/pWQNc/sm1gjjWX0zJ86nPf+MiTGGJN03liIkZZi04MxWuWpvZsAp4hWSSRWjUoKiimcAoqMcZ7E+AVMuD3NJyBMqHGc17W7XtLcDaWXbgfEfRZqv+08YsxoakfnwpJr9agITuOI+0S1vE= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by MN2PR10MB4334.namprd10.prod.outlook.com (2603:10b6:208:1d9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Tue, 31 Aug 2021 01:22:15 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a%5]) with mapi id 15.20.4436.024; Tue, 31 Aug 2021 01:22:15 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org, dsterba@suse.com Cc: l@damenly.su Subject: [PATCH V5 1/2] btrfs: fix lockdep warning while mounting sprout fs Date: Tue, 31 Aug 2021 09:21:28 +0800 Message-Id: <215cb0c88d2b84557f8ec27e3f03c1c188df2935.1630370459.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev.sg.oracle.com (203.116.164.13) by SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.8 via Frontend Transport; Tue, 31 Aug 2021 01:22:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ddaf6a4e-9290-4c5a-48f7-08d96c1dc3f0 X-MS-TrafficTypeDiagnostic: MN2PR10MB4334: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:337; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nYRibwlqpgVKbwJnrEDU3+Giq0/t3z2sNodh40frqRwIYf7tZLljo648L3/RZWbUsX0q11MlQShDPmSZrTchwv0FkwZcxnWEbThu5/kNP6A3nVvJ/8D0hCsh3pYpnNr3y30FzZW7NYlAyvvK5Tpcjn+BzC9wGnpDfESTByg/1TkItIqB8Scc40GTINCEUTSVYPrhAu6b5QChIadBkiPVWMJqi5rTOQppQX93a10YS2jouKyv8AZoL2vexHuk6hAqHS4qjO38NUUpvXxNrk5BsR7f8KfixAInY67VPzSqp9riZeASQ21KPBbcNvYFTLEUcwlVH/VBwOYTLfhV3YxjgzfXYHNt9HzxyBrwkLwifRFuSFabbGCus5+NVOLYqwfkR7ssMpE5qfNlo2APQl2b2IN440NvVu8djeuBXVbNbyKOkcki3R8hj1IiFMElVkfeL07OMsej0PA/ZRGwZprWb95+d2epepnZ7XvIPPpdjBaw+8rAvwMy1UlfwYNg4U+7yjsxqCkLaHZ+Hy5IHFUu9a3JOXK3WVOFJxOleofrLD1Uz0zMsPQ1gRRsl9h967woAM32vqSdq48s2U8pcTwm1l8U0M6LHEPbAV3LnIHBUGfsw1lt+8M4JifdU7SGvT9Av8MCU/GeBuisFGfEUAd/fEN5oV4rDANq1I0IPrnUjv3OqqfJxQAN5BZC55nuBJpAwoDIfMcN12iv+Z0/jg3LZw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(36756003)(5660300002)(26005)(7696005)(83380400001)(38100700002)(52116002)(316002)(38350700002)(4326008)(2906002)(8676002)(86362001)(508600001)(44832011)(66476007)(186003)(6666004)(66946007)(956004)(2616005)(66556008)(8936002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ml6FThESUpdsjfvfJb0nwFva89R2zi9qpsoO2h0OSpHNQhGUfYH3EFiUhKeL7SfVbJpBjUe32iIZu5LPju4ZPDUqi+hzlaaMJrqhc58IdhizDcdGIgJjSUNJ33WkZErJFcGrGSGkQ+ncklkwlHRgbytdJGjAY7F0EMIqDMP6s3kZ8FfUWZtXRm4NkfOkc4zbOf0a/LG7gEjnPu6SbDVtu+DEUq52PlTtjuPflel0YaX7yECrlhyTtrKYoRF9Yp1amSPlXMfKmdVGPhcdd0PjAqa07nZw0Zr9BbtBCwoPJo/EJzc26M3JhJpm9If2qu7lnDzxiL0Uk7xz87JJ1aVMJ9khRSR0mBhqBEzWbcrdHWJJmQLT/uwGqwKWihzP8Fld5HSOpfkL+aP6fdsMIh4syPGsAOhcRVAYMaPLh+85St15Xtm9KViW+zgJdVZOfdX1mmFQfPjjLcMbQASr54FXQowWEUBkN+EqcHG1GM/LLxBr3l2KRxxi7KiyBWWQqY3VVscGBGJNfDhqxCabNKxfv+5XOXRXY9ULFRDCwgxniu0OUgmyda6X0sApDBY911knlsiF0VUyl8r3QvUyulqADVhdYViwNIZe5yns3WnXNeMMOaFnkMUdiheeoOpxs3K2jdhoi0d06/77FH1rRgyn2FyVQxwGO6rWLgfgSyipH0V4c5N/KebNtePPk/gfVnGVdhwChE9fFaH9k45IOakTSHCnLun3tMJ/FDxedyapTNEtdUiQO0j1Xq1njhdSQI+p0CKkam10mFNbCU4cOdQtpj/XWD/LaUXLg1kcp3SIBWgTrn2xBU85yMegVsJE4JxkedUSSdC5THXm/zDMxlwD0R5X1TiiEZdYdiwZ6VKw+/KjPX/thJnnptql2P1S0Q3zSy5jf0J+Cwsqg/9GLD3ZgEwOzlYeK/qBTrGCk8IQ5Ewyh7TmoK99TfH/muogNcPtNBKEsmso3UyGXhR3L0e5Z/fkOqTzmdm3Hf+FtT0yCcLmCo4ZZyp+uhfLKDgiCXNZp+QN+QuiXxahl+BGsif8p+DxfykQINimExDxkBLnZPTH9Wx3K5XYrsN3kXHLIJn+iN+rqcaM0thQJYNVpquc6B3Bzn7Eh3qjoVspRDP4RA+7BHr9w+FI0PaGPrG182RFzUUEKjcK6fNG+ImVQUYAkO+KqlUeVU6f0h1ZdxRwCO6Smk7YgTjLsXbK6rwkqeeVxpsM9aCxV7NBmeIBmj5nJTmYSL3HKn9gzJjgGPIwR+RGLc0xqpqnAdvGT/O5xndWLUh0+BgLk2p/v8xCbOxsaDw9unvCCK6bwEeWFDrjHUPyP2y6NYEd3WZ4ifySxkHX X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddaf6a4e-9290-4c5a-48f7-08d96c1dc3f0 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:22:15.0097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0iglG4RJan5mKTQGsvKHr8vlN8NqzqTk5VmBPyOhmTW6YDI4Mh+AB3Ds1i1ZKsis768an8sYrWJ3tBpk/HpA4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4334 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10092 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108310006 X-Proofpoint-ORIG-GUID: 0qNNRRK_qOUY8Hrrp5SHEp_KKlKkfHzo X-Proofpoint-GUID: 0qNNRRK_qOUY8Hrrp5SHEp_KKlKkfHzo Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Following test case reproduces lockdep warning. Test case: $ mkfs.btrfs -f $ btrfstune -S 1 $ mount $ btrfs device add -f $ umount $ mount $ umount The warning claims a possible ABBA deadlock between the threads initiated by [#1] btrfs device add and [#0] the mount. ====================================================== [ 540.743122] WARNING: possible circular locking dependency detected [ 540.743129] 5.11.0-rc7+ #5 Not tainted [ 540.743135] ------------------------------------------------------ [ 540.743142] mount/2515 is trying to acquire lock: [ 540.743149] ffffa0c5544c2ce0 (&fs_devs->device_list_mutex){+.+.}-{4:4}, at: clone_fs_devices+0x6d/0x210 [btrfs] [ 540.743458] but task is already holding lock: [ 540.743461] ffffa0c54a7932b8 (btrfs-chunk-00){++++}-{4:4}, at: __btrfs_tree_read_lock+0x32/0x200 [btrfs] [ 540.743541] which lock already depends on the new lock. [ 540.743543] the existing dependency chain (in reverse order) is: [ 540.743546] -> #1 (btrfs-chunk-00){++++}-{4:4}: [ 540.743566] down_read_nested+0x48/0x2b0 [ 540.743585] __btrfs_tree_read_lock+0x32/0x200 [btrfs] [ 540.743650] btrfs_read_lock_root_node+0x70/0x200 [btrfs] [ 540.743733] btrfs_search_slot+0x6c6/0xe00 [btrfs] [ 540.743785] btrfs_update_device+0x83/0x260 [btrfs] [ 540.743849] btrfs_finish_chunk_alloc+0x13f/0x660 [btrfs] <--- device_list_mutex [ 540.743911] btrfs_create_pending_block_groups+0x18d/0x3f0 [btrfs] [ 540.743982] btrfs_commit_transaction+0x86/0x1260 [btrfs] [ 540.744037] btrfs_init_new_device+0x1600/0x1dd0 [btrfs] [ 540.744101] btrfs_ioctl+0x1c77/0x24c0 [btrfs] [ 540.744166] __x64_sys_ioctl+0xe4/0x140 [ 540.744170] do_syscall_64+0x4b/0x80 [ 540.744174] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 540.744180] -> #0 (&fs_devs->device_list_mutex){+.+.}-{4:4}: [ 540.744184] __lock_acquire+0x155f/0x2360 [ 540.744188] lock_acquire+0x10b/0x5c0 [ 540.744190] __mutex_lock+0xb1/0xf80 [ 540.744193] mutex_lock_nested+0x27/0x30 [ 540.744196] clone_fs_devices+0x6d/0x210 [btrfs] [ 540.744270] btrfs_read_chunk_tree+0x3c7/0xbb0 [btrfs] [ 540.744336] open_ctree+0xf6e/0x2074 [btrfs] [ 540.744406] btrfs_mount_root.cold.72+0x16/0x127 [btrfs] [ 540.744472] legacy_get_tree+0x38/0x90 [ 540.744475] vfs_get_tree+0x30/0x140 [ 540.744478] fc_mount+0x16/0x60 [ 540.744482] vfs_kern_mount+0x91/0x100 [ 540.744484] btrfs_mount+0x1e6/0x670 [btrfs] [ 540.744536] legacy_get_tree+0x38/0x90 [ 540.744537] vfs_get_tree+0x30/0x140 [ 540.744539] path_mount+0x8d8/0x1070 [ 540.744541] do_mount+0x8d/0xc0 [ 540.744543] __x64_sys_mount+0x125/0x160 [ 540.744545] do_syscall_64+0x4b/0x80 [ 540.744547] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 540.744551] other info that might help us debug this: [ 540.744552] Possible unsafe locking scenario: [ 540.744553] CPU0 CPU1 [ 540.744554] ---- ---- [ 540.744555] lock(btrfs-chunk-00); [ 540.744557] lock(&fs_devs->device_list_mutex); [ 540.744560] lock(btrfs-chunk-00); [ 540.744562] lock(&fs_devs->device_list_mutex); [ 540.744564] *** DEADLOCK *** [ 540.744565] 3 locks held by mount/2515: [ 540.744567] #0: ffffa0c56bf7a0e0 (&type->s_umount_key#42/1){+.+.}-{4:4}, at: alloc_super.isra.16+0xdf/0x450 [ 540.744574] #1: ffffffffc05a9628 (uuid_mutex){+.+.}-{4:4}, at: btrfs_read_chunk_tree+0x63/0xbb0 [btrfs] [ 540.744640] #2: ffffa0c54a7932b8 (btrfs-chunk-00){++++}-{4:4}, at: __btrfs_tree_read_lock+0x32/0x200 [btrfs] [ 540.744708] stack backtrace: [ 540.744712] CPU: 2 PID: 2515 Comm: mount Not tainted 5.11.0-rc7+ #5 But the device_list_mutex in clone_fs_devices() is redundant, as explained below. Two threads [1] and [2] (below) could lead to clone_fs_device(). [1] open_ctree <== mount sprout fs btrfs_read_chunk_tree() mutex_lock(&uuid_mutex) <== global lock read_one_dev() open_seed_devices() clone_fs_devices() <== seed fs_devices mutex_lock(&orig->device_list_mutex) <== seed fs_devices [2] btrfs_init_new_device() <== sprouting mutex_lock(&uuid_mutex); <== global lock btrfs_prepare_sprout() lockdep_assert_held(&uuid_mutex) clone_fs_devices(seed_fs_device) <== seed fs_devices Both of these threads hold uuid_mutex which is sufficient to protect getting the seed device(s) freed while we are trying to clone it for sprouting [2] or mounting a sprout [1] (as above). A mounted seed device can not free/write/replace because it is read-only. An unmounted seed device can free by btrfs_free_stale_devices(), but it needs uuid_mutex. So this patch removes the unnecessary device_list_mutex in clone_fs_devices(). And adds a lockdep_assert_held(&uuid_mutex) in clone_fs_devices(). Reported-by: Su Yue Signed-off-by: Anand Jain Reviewed-by: Nikolay Borisov Tested-by: Su Yue --- v5: Vet test case in the changelog. v2: Remove Martin's Reported-by and Tested-by. Add Su's Reported-by. Add lockdep_assert_held check. Update the changelog, make it relevant to the current misc-next fs/btrfs/volumes.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index abdc392f6ef9..fa9fe47b5b68 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -558,6 +558,8 @@ static int btrfs_free_stale_devices(const char *path, struct btrfs_device *device, *tmp_device; int ret = 0; + lockdep_assert_held(&uuid_mutex); + if (path) ret = -ENOENT; @@ -988,11 +990,12 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig) struct btrfs_device *orig_dev; int ret = 0; + lockdep_assert_held(&uuid_mutex); + fs_devices = alloc_fs_devices(orig->fsid, NULL); if (IS_ERR(fs_devices)) return fs_devices; - mutex_lock(&orig->device_list_mutex); fs_devices->total_devices = orig->total_devices; list_for_each_entry(orig_dev, &orig->devices, dev_list) { @@ -1024,10 +1027,8 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig) device->fs_devices = fs_devices; fs_devices->num_devices++; } - mutex_unlock(&orig->device_list_mutex); return fs_devices; error: - mutex_unlock(&orig->device_list_mutex); free_fs_devices(fs_devices); return ERR_PTR(ret); } From patchwork Tue Aug 31 01:21:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12466223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2D93C4320E for ; Tue, 31 Aug 2021 01:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 874BF60FD8 for ; Tue, 31 Aug 2021 01:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239138AbhHaBXW (ORCPT ); Mon, 30 Aug 2021 21:23:22 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:6520 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239270AbhHaBXU (ORCPT ); Mon, 30 Aug 2021 21:23:20 -0400 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 17ULxEwt004133; Tue, 31 Aug 2021 01:22:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=R9pz7RqusfguN4BceR+4u8u23jwFB4d1fH0O5P3CUsY=; b=bWtnQn8e7c7PjauhTbxC0SZzDOdBa1iUMHRF7LiNTf1prAOjIUEm9sxQxKKH4U0gemhX 01h+ltnsoUm+pNuczluZKv9tcTgkSy+8OiuX/4DUGsxMlZAfKab9+REzfdV4qErIlroc NuRAbTZLtpifphqIdOAVR9rFqG1Jg4s3qoSt5qn6MKFJ3P8um5ymJ2EuQRfU0QR+/qHl ktH9n3O8QP/QH+CnKPANwP5CKTZ+COau8kc0zDuvp2yIUiC3dTzHBnwh8VSBGfSpUYLZ +CS3ikJrEw93pGUcl3ZPe0DMdJ0ih2jWsN2fM7Xm44bMM1dUHA671iUqXaKmQva5wyNZ xQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=R9pz7RqusfguN4BceR+4u8u23jwFB4d1fH0O5P3CUsY=; b=Mr8ebIgG91iyFhycc3g6Q3cNPBZqWDCZa2X8/iWTBzS/RaCxkNybAcIeeH/8AlcNaGkQ 5eu3l6O+cnPBSCPE8MEaDQLq+vcVhLOaKO5jtu1CfTRPn/CaML4tstE2I8H6fgyxe5eF RZ8q/BqOVftj4b55K3GWqvjw9+MiiHbFWuD1uhlaMcbtRK45/C6MVVc0BQN8TxNHmaUj 7PC3Pz/Hs2u9r9alNYiuPNMJiP4ytZqw0K0l9mKM43LZzjaTHQNe020WLbjkqHQFWQpR AZUJDHtVVgpy6+TphLyVFDMYga5u6/NIvuKIf4L9fs/IsHMcCCm6SVU+gBZqc6Gs8Cux hQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3arbymjwb9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Aug 2021 01:22:20 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17V1GB1i193631; Tue, 31 Aug 2021 01:22:19 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by userp3030.oracle.com with ESMTP id 3arpf3b5wa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Aug 2021 01:22:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T1TZQfLT0N5WoFUr4puh95HjLctEQxESfZPaPtxv39tW4LAQ3UNCru7Y3OqImbpSKgGYQUdgTtnqRULs3Lp7F7eBDbviIc7fWq9DqWWWKjkcNpFx1F9NsEMnhTK0zQnqF69UiRI2N4PhWL7R6K39/xGpijZNtPCRv1H1nj2wNLLuwDRVug+q8abvx61sbKeR0rnymWlsdP8blbP1py+KoXwbAawiXD9BEVjPYwqr0Yuu4Dy6nbdEFy78MaerxPzEWvo9ZqzljKrKS0cXuk5Xts01cCvavsRqeTf7ghK38Xmu1jMK0t683EU1oIIjWMiXIvv19aaSV/qn2T/FZejK6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R9pz7RqusfguN4BceR+4u8u23jwFB4d1fH0O5P3CUsY=; b=QOzhoSNydSsUIgehSPqlnpSeNrjrIgbf9gzL/YxZ/Xd8eoWypCc826wgqAM2yA2ol1CAF8zft+ATiYkxL71/EnYsFlFG31dfdBO1zSNKRwlwDM44Eq6NZtNVS3KQx1w9RAOw0Wlh9Rxf7hi1tHoIBAHW4/4BQi0SxUuUqJfRfptOQrmQ6teQxyGoV0ptorYHZCUG3cc3EuWY8kNTi7YNJvYnIDWjU2Axz0GAmAhT1Lq4b6oHAoPmPKF9X76qzdle7XLv7oX4mVqsnic7wUw3KZlsOK4BrK6ANMdLYNTYs1sytJWroT5j5s//Grn6r0RRlaB75GKOAP20cmHcajCp4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R9pz7RqusfguN4BceR+4u8u23jwFB4d1fH0O5P3CUsY=; b=jqQWMoH1Aatk4zI2Z+WI2+UZbMZCwwFn0tGBu/VgLEy8tyBHV0SExycmthzk3zywQ7O5GMbhKa+vozmCj91qLwHYe3qdgx7iQMg8CPSxPfC5iCiUHvW/QOC3gSqQ7HWU58k+gR0ooVXQzKj++n8ApQ2czCT7L7T8dR1irxbHE9A= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by MN2PR10MB4350.namprd10.prod.outlook.com (2603:10b6:208:1da::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Tue, 31 Aug 2021 01:22:17 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a%5]) with mapi id 15.20.4436.024; Tue, 31 Aug 2021 01:22:17 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org, dsterba@suse.com Cc: l@damenly.su Subject: [PATCH RFC V5 2/2] btrfs: consolidate device_list_mutex in prepare_sprout to its parent Date: Tue, 31 Aug 2021 09:21:29 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev.sg.oracle.com (203.116.164.13) by SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.8 via Frontend Transport; Tue, 31 Aug 2021 01:22:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7781171c-7416-4528-2863-08d96c1dc54e X-MS-TrafficTypeDiagnostic: MN2PR10MB4350: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aWLphWjE4FY+hKtMHi7aCZQEydpUUVAAY4N4HCfcj8sBE6DUZ+UlxBk72hzTs8hoXIBUOnqszwbPqvewLO8iltzkP+0EIZY1pxRQYX9C9KMAtsRbfkibxpSEJzSLdcC8QE401qrlL9uZPDMRcsuUIqCoAyM/1f6h/3r9u1E7TMqvqj8/4a78JbF4kHEqRhlqzg8GIqMT/45fXOk++MvP9LP6KCihzcsNy5qZawyMliud5j/Gtzwyg57XtcC4jX1sG+r9JPVAfYsrByvIwAGA/slzK4BcihI4Pw983vp8vSXk/vxW8O0S8JoS5TTdZZptnrI1FaZLt0aIh3u0y0kts+wmnzD46jV5jqWdAT+V82T0FD+Qoa5DvwPpkLnTeOa+hfD1/ir1gKpT9tBas7+8TmSbKddJm4iJCWn7noa4YihMz88nwifJ1bgbxk48XpeOCCGrfJ0aT5uXeySAgNK49CkXzzSUE9vl+//6bxuPgTMB3MAhi0ncZeTjgmkyH9n8FzjVmDRBJxi79abn4AZOR/h4rLs5WvD21hZmXo7gzwU3mWsij/mdpfba6YCex7gfPfZu/nuKgRobE4OEqMAEI2Xxi/tewRLhHnvFUqsLn9dB49sciIQp8r+nfqMGdcgQjih78+MY9XEron2ssthifTtGFELpHox6KVTxCj73lVonL1vnOQ7hWOZbjunHT9j/4l5pTpl3lxXTF5jDVVj7yA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(366004)(136003)(376002)(39860400002)(346002)(66946007)(52116002)(956004)(36756003)(186003)(2906002)(44832011)(66476007)(478600001)(6486002)(2616005)(316002)(8936002)(86362001)(4326008)(38350700002)(6666004)(26005)(8676002)(83380400001)(7696005)(5660300002)(66556008)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5+BCtUbJfQxerXTIJiElkc7CbxHO3TDxXWUvXIMqfUEGtYJCnsiQqhyavFjRsJQUuemfmd96SjIcqz3/nLQjsfvgobX9N+SGO+hla6OdMRbAFsnQkIlzKLC5ynkDsC39PRo0bDBFcFX8k1wSt1mqtQFZLEW+rxJgTnwhvB0bJL9iF7UvV689BzA7wukJajDOKIjpt15ApW9ZW9XMuVPs24VvWZ9OAEevTOz1JvRF5ps40MBQJHuE1xuiBip6JnFlgQHntDW3rIiZVzlCVzrEq/ovMpVd75VD5xuovWH4bRpMCeUll/FlMUgeslMJZVz4547pkd1ZtdR6PB13pwMxcucghgE8ton0dV5KcYZINzfzs8ITq911vDQD85BPFjsBdSfb7sEinQqkvKsHl0Hbr5JiQ2A4n0bz7alKDEdrIAq9rwbFVeX7QFxwC186ij9q6UwqXYJUP/T7NV1eioGP9knxRVnmjqnW6x8xF/BaPn3DakAu7d47mh4ptPZZLhW9jyOsLk8Vfg0zs+i1kkKzrm2eC2StstbUs3R6fWTcOYLcuU3IB/BRFYVHqkgZOk/aQWcwKHBeHNCAXTb0wsYyfdkNLdsaIaBk9X1tWDu62iAUyz0ug+btP+MEgRkLkq0IE7vjSvUdpnYgkkOFARRIhV7GpFws5LrtMN+QE9gHuXwoEYY5lABQIuLDdkG5TruO9wbrnTlck3u4uRMvEyhnwUoym36xP7be/O6/Wywx6++1b4xTpcm4Wb5K9Z0lsEwDC6ZmQH58IWoxgAreCiTo+vP4lphEtIMgNshubxSdaS8MxbaWI0/Mw4YpaCuj05zwRdfHMalZuMw/s0QrJc2jgyHWwqEGigD+Q/HJdxxS/1HYuRDGWyiR2Y2sFiKD4hVjW2ehFB2g1/3+oKYW9yrFDadtbXRqAQFcTNhI4jAeKJuTUd9n6Zz6jwBPWOg38bmfiGVscXscZgkVtCgICZILMnIFQrog1uOE81ed68CbWgjM08XYnGqhqrDxbTZ3pT0sesYLuHww+c6yv4Sm++i/oP5mHRednCSW8G0MGrxld7Z/FkFhr8WmOwgvpkVf8TYZ1q+LWMBZ9gXepryIbN+qVYyYr4hrPsUO8wb0QhrrU6dZL4XHsQv5hdmy9xvs0AgkfQSuqBdg0Yzydvuu1sAuXXxP2w/l79rEmqrtlq2pqmmN0tggucmiCqUk3Yrpi4g5nNh/eB4iHiQzT1sdo8Bc5ITQgFJrYPl5u11UMXk8VC6F3LdpgCfKxdhRJ2zhber8GLRzHFmAdFhjZ0DWxSFn17j6cLSXVQLpchUePg6xDWs/I6C3fGXII7GiD/g8OhdU X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7781171c-7416-4528-2863-08d96c1dc54e X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:22:17.0477 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m312FPY2soQ+hN2pCSjcqgQyLvgPR4fy0bSq59ynGirKpdaU5zetTsUrRf28ELZh8pGagtLXLd8HygjdizmXkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4350 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10092 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108310006 X-Proofpoint-ORIG-GUID: XF_fE0FygWnipNsFc5XlSXSotV6ZhUlL X-Proofpoint-GUID: XF_fE0FygWnipNsFc5XlSXSotV6ZhUlL Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org btrfs_prepare_sprout() moves seed devices into its own struct fs_devices, so that its parent function btrfs_init_new_device() can add the new sprout device to fs_info->fs_devices. Both btrfs_prepare_sprout() and btrfs_init_new_device() needs device_list_mutex. But they are holding it sequentially, thus creates a small window to an opportunity to race. Close this opportunity and hold device_list_mutex common to both btrfs_init_new_device() and btrfs_prepare_sprout(). Signed-off-by: Anand Jain --- RFC because IMO the cleanup of device_list_mutex makes sense even though there isn't another thread that could race potentially race as of now. Depends on [PATCH v2] btrfs: fix lockdep warning while mounting sprout fs which removed the device_list_mutex from clone_fs_devices() otherwise this patch will cause a double mutex error. v2: fix the missing mutex_unlock in the error return v3: - v4: - v5: - (Except for the change in below SO comments) fs/btrfs/volumes.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index fa9fe47b5b68..53ead67b625c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2369,6 +2369,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags; lockdep_assert_held(&uuid_mutex); + lockdep_assert_held(&fs_devices->device_list_mutex); + if (!fs_devices->seeding) return -EINVAL; @@ -2400,7 +2402,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) INIT_LIST_HEAD(&seed_devices->alloc_list); mutex_init(&seed_devices->device_list_mutex); - mutex_lock(&fs_devices->device_list_mutex); list_splice_init_rcu(&fs_devices->devices, &seed_devices->devices, synchronize_rcu); list_for_each_entry(device, &seed_devices->devices, dev_list) @@ -2416,7 +2417,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) generate_random_uuid(fs_devices->fsid); memcpy(fs_devices->metadata_uuid, fs_devices->fsid, BTRFS_FSID_SIZE); memcpy(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE); - mutex_unlock(&fs_devices->device_list_mutex); super_flags = btrfs_super_flags(disk_super) & ~BTRFS_SUPER_FLAG_SEEDING; @@ -2591,10 +2591,12 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->dev_stats_valid = 1; set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE); + mutex_lock(&fs_devices->device_list_mutex); if (seeding_dev) { btrfs_clear_sb_rdonly(sb); ret = btrfs_prepare_sprout(fs_info); if (ret) { + mutex_unlock(&fs_devices->device_list_mutex); btrfs_abort_transaction(trans, ret); goto error_trans; } @@ -2604,7 +2606,6 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->fs_devices = fs_devices; - mutex_lock(&fs_devices->device_list_mutex); mutex_lock(&fs_info->chunk_mutex); list_add_rcu(&device->dev_list, &fs_devices->devices); list_add(&device->dev_alloc_list, &fs_devices->alloc_list);