From patchwork Tue Nov 15 17:17:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenXiaoSong X-Patchwork-Id: 20456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2818368wru; Tue, 15 Nov 2022 08:17:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf715F09iuPR0qH25Bb+Zpi7GAbMF8VqlFIPbTzWDRY83q2pkZulKSNadR7e2EVWdszSz/ER X-Received: by 2002:a17:906:7a11:b0:7ad:84c7:502d with SMTP id d17-20020a1709067a1100b007ad84c7502dmr14147369ejo.177.1668529066044; Tue, 15 Nov 2022 08:17:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668529066; cv=none; d=google.com; s=arc-20160816; b=fMcRufMpGbScSf+8x3rgCsh3vwaTzhnFg+H6bKg0FFZDjiRkHUsi+ZojWxDLfkzHva bGJnTTwwpFO+gVyEVQtumqJpi/aMktCxaIZ7NLPDI+owWJTuReiTtaOC5/HJ1qUa6q2K 5esZliJxoLvebCVWHND/+qqJhjSijbLesz8HB9c7HGdtolOtC81EYIDud1c7T7Uj/Zk9 Y6czw4Uu2p0Xb/FXSiUzoq71+YjGG/G5zFk5JjusXplvASD0WpxJQrzsV2ppV49JHQuJ eJlOFpFm5Tq9b9r3foLhYrEZkjrFuzdwd5YbKDEj+uwJlacsjuNIDIAAE4D6KORAJabl mcZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jItK0oqLNfGEkkN2DvQvMV3up2IvpJhARVksJ+H4an0=; b=j6dOsqAAKPOrpqXvsZZmh4SAZaFR0jVRuVXcPAyg7uf96bF5uyh+AQi6rWuwkJgj8i qlM0giMCkcNMbtAW3/UeFZ7yB7yz4LzFfG5qvnhsPucZk0wz6PRcsWHUmWiivj09PEVz eeflFosRkiuQODmXqBXb1dnSU4w0wtbRZ1tQFwzUJ8XOSIOqfQpuWBNiewB29qLHF+se fTtsAkN2qaML+zG6ecC0rP9tE48FgE+Lzunjld8P9IlBb/2uO/m7R8GRMajb6xRD3ba5 qGMotJeGWTNNcXumS2j8RoTXBpUh1vPFKoD+RWaS8HtEsKsCoMW9wHa+lPizjtauaiQ3 1MFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds5-20020a170907724500b00770872942d8si12768351ejc.958.2022.11.15.08.17.21; Tue, 15 Nov 2022 08:17:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237952AbiKOQMh (ORCPT + 99 others); Tue, 15 Nov 2022 11:12:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232114AbiKOQMf (ORCPT ); Tue, 15 Nov 2022 11:12:35 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6951B1DF3E; Tue, 15 Nov 2022 08:12:34 -0800 (PST) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NBWR15ZtrzRpGL; Wed, 16 Nov 2022 00:12:13 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:32 +0800 Received: from huawei.com (10.175.101.6) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:30 +0800 From: ChenXiaoSong To: , , CC: , , , , , , Subject: [PATCH v4 1/3] btrfs: add might_sleep() to some places in update_qgroup_limit_item() Date: Wed, 16 Nov 2022 01:17:07 +0800 Message-ID: <20221115171709.3774614-2-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221115171709.3774614-1-chenxiaosong2@huawei.com> References: <20221115171709.3774614-1-chenxiaosong2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749579534007096249?= X-GMAIL-MSGID: =?utf-8?q?1749579534007096249?= As the potential sleeping under spin lock is hard to spot, we should add might_sleep() to some places. Signed-off-by: ChenXiaoSong Reviewed-by: Qu Wenruo --- fs/btrfs/ctree.c | 2 ++ fs/btrfs/qgroup.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index a9543f01184c..809053e9cfde 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1934,6 +1934,8 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root, int min_write_lock_level; int prev_cmp; + might_sleep(); + lowest_level = p->lowest_level; WARN_ON(lowest_level && ins_len > 0); WARN_ON(p->nodes[0] != NULL); diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 9334c3157c22..d0480b9c6c86 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -779,6 +779,8 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans, int ret; int slot; + might_sleep(); + key.objectid = 0; key.type = BTRFS_QGROUP_LIMIT_KEY; key.offset = qgroup->qgroupid; From patchwork Tue Nov 15 17:17:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenXiaoSong X-Patchwork-Id: 20457 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2818388wru; Tue, 15 Nov 2022 08:17:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+zevtddwC3eLYBseb76omALE1MZPS190a8Ldebs/U3EPgCneu6o0EiiZsMbbJ0M4T/7t2 X-Received: by 2002:a17:906:7ac6:b0:7ae:6746:f26b with SMTP id k6-20020a1709067ac600b007ae6746f26bmr14458998ejo.171.1668529068116; Tue, 15 Nov 2022 08:17:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668529068; cv=none; d=google.com; s=arc-20160816; b=m5i3O5TT9eOJc8VzIJcXwpkHhzqtBIzNv3UdqUk5KoVGT/YUQgd0hznKmLGKkgM3b1 P/dIYuz2kIGKuKkENS/RRK2QTZsyEtyPkJI9F7H9xHCJ5aer1fSCJHkFjrj6PCrhoVxq 8sdMLQosURKz8Q4w4KCSUahLVE9p+SvhpTTmirMCX79hYKjPqTcKBF83x0kNt590YZyu 5RkioV4Y4e5+laNAnKaLjaoD3TSAlsHyOaUTpB5UYyEpMppoPUyBN2xliPVxyOS5Wdxi xRFXhPge8TV+T1xuWLe0aNNhubTDFC/nD6bGbebwjsH7CR8/PlEp2Y0j4FhJjN+4BF2s AeCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=rNWNAbPekMbbJocfs9OOVAxpphMNdqOhT6ziQ+iZ00c=; b=HRaRR6zijPAkyKfqE7hbF6NL1Ndui+TcHqqnHRWdBuSI0ArYYd1h28v+aVRA5pylrx KMJS9RUcxEWJrFCwhHBb3c3a5il86dcwjFOMd6/1tsWYocyabPfx+8YHnvFsW/+phZYB ktvag4Le7xZXwhjlHaAHnR3s6uBI+Qj/iSVRo54j5MBF2x4xUM4UyLqxzd105tjrNQgR ok2+1Ymvzy9R51rVFbII4Ehab29+z0tUqxRCTagEiiuOb4MJ2Xg6bp2D0RocxbiVwD3L ovXSFcNsJe8AAMAeG78i2ojKIePox3tBUNin4pSGDCUUSGKYl+g71BAM5s+yllMhzzNw XhWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh15-20020a1709076e8f00b007ad902cd1b2si11735622ejc.921.2022.11.15.08.17.22; Tue, 15 Nov 2022 08:17:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238339AbiKOQMl (ORCPT + 99 others); Tue, 15 Nov 2022 11:12:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232405AbiKOQMg (ORCPT ); Tue, 15 Nov 2022 11:12:36 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31301D65A; Tue, 15 Nov 2022 08:12:34 -0800 (PST) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NBWM20HbjzqSMt; Wed, 16 Nov 2022 00:08:46 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:33 +0800 Received: from huawei.com (10.175.101.6) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:32 +0800 From: ChenXiaoSong To: , , CC: , , , , , , Subject: [PATCH v4 2/3] btrfs: qgroup: introduce btrfs_update_quoto_limit() helper Date: Wed, 16 Nov 2022 01:17:08 +0800 Message-ID: <20221115171709.3774614-3-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221115171709.3774614-1-chenxiaosong2@huawei.com> References: <20221115171709.3774614-1-chenxiaosong2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749579536524735037?= X-GMAIL-MSGID: =?utf-8?q?1749579536524735037?= No functional changed. Just simplify the code. Signed-off-by: ChenXiaoSong --- fs/btrfs/qgroup.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index d0480b9c6c86..ca609a70d067 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1677,6 +1677,19 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) return ret; } +static int btrfs_update_quoto_limit(struct btrfs_trans_handle *trans, + struct btrfs_qgroup *qgroup, + struct btrfs_fs_info *fs_info) +{ + int ret = update_qgroup_limit_item(trans, qgroup); + if (ret) { + qgroup_mark_inconsistent(fs_info); + btrfs_info(fs_info, "unable to update quota limit for %llu", + qgroup->qgroupid); + } + return ret; +} + int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid, struct btrfs_qgroup_limit *limit) { @@ -1742,13 +1755,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid, spin_unlock(&fs_info->qgroup_lock); - ret = update_qgroup_limit_item(trans, qgroup); - if (ret) { - qgroup_mark_inconsistent(fs_info); - btrfs_info(fs_info, "unable to update quota limit for %llu", - qgroupid); - } - + ret = btrfs_update_quoto_limit(trans, qgroup, fs_info); out: mutex_unlock(&fs_info->qgroup_ioctl_lock); return ret; @@ -2824,9 +2831,7 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans) ret = update_qgroup_info_item(trans, qgroup); if (ret) qgroup_mark_inconsistent(fs_info); - ret = update_qgroup_limit_item(trans, qgroup); - if (ret) - qgroup_mark_inconsistent(fs_info); + ret = btrfs_update_quoto_limit(trans, qgroup, fs_info); spin_lock(&fs_info->qgroup_lock); } if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) @@ -2953,14 +2958,9 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, dstgroup->rsv_rfer = inherit->lim.rsv_rfer; dstgroup->rsv_excl = inherit->lim.rsv_excl; - ret = update_qgroup_limit_item(trans, dstgroup); - if (ret) { - qgroup_mark_inconsistent(fs_info); - btrfs_info(fs_info, - "unable to update quota limit for %llu", - dstgroup->qgroupid); + ret = btrfs_update_quoto_limit(trans, dstgroup, fs_info); + if (ret) goto unlock; - } } if (srcid) { From patchwork Tue Nov 15 17:17:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenXiaoSong X-Patchwork-Id: 20461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2819492wru; Tue, 15 Nov 2022 08:19:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf4cx1gbV4e5uEnoInUPM9seQBIwRVBidUNKZL+xzNmju7x6kneFIbZ0qPdD5t/VQlSOrlfq X-Received: by 2002:a17:906:4d58:b0:781:bc28:f455 with SMTP id b24-20020a1709064d5800b00781bc28f455mr14295161ejv.170.1668529190434; Tue, 15 Nov 2022 08:19:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668529190; cv=none; d=google.com; s=arc-20160816; b=tEum+8PBvzqr/FghFwTOD75XzwFW4npWSx4opGZ1WtvsVmpE414GpI9LYRKxUA/ppt 2/t0eWz/9R/ePWvlacJ0JWbCqcGq1u8Yj/0zMbkPZcIuFaCuezYutAM7133XkJEROFsW j9XM8ijVCafBU/c3EbAR/xl9j3At+OUXqQ2nc5bzGuCd+yjozgtz3JhFsduZ650V1xyS hsDO91q7BFWlE0P3oiaIy/B/AMwjdUvKRrIdZ6WvU8yZ8pQE0LerkOe669pl+fA7GMPb fbJRngyuOE4NZZ9xbFqp1AITtKXvijhhBXO9Hs4wRm+/I1qzzUmqLgYsBqMRU5/aAW6X Dplg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Prj5yc69E/4s6WK2ZdbEMBmaQP1Vw7swPeVtvLWP0Rs=; b=WXh0TtYq7sYVUgt5S8AGWZpKpKS8jVFRKcU4BT/jNRcuK2RrDZ/uQDWQk6XEi7/Qpr 2Cj+XdpQOWQYlJs9tuJ6MD93VpZ8wA/SWBJiHSnDMUaZmWGmMr7A7EMV3MqyWnGMt70K ZC6A7beWj1RrR28zTZtlT1Sr+bDT4vQuRh8qvJQ3hcwPP8zMvr5GVWXDfv7z0BmPYGns oDgdw627nVwCcA7KB2DQYyNduZBfWTLLiutRkz8mCDoc9ozajNukhyZ+/IcRgtU50aFf OIBtGksrafYq2E2GG34v3d0ta71MpZy6HvP32AAyaFTW/DcicyRRTQd8EVN5tEAMlf18 I9Qw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q21-20020a50cc95000000b00462af00c12bsi10717629edi.398.2022.11.15.08.19.25; Tue, 15 Nov 2022 08:19:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238376AbiKOQMn (ORCPT + 99 others); Tue, 15 Nov 2022 11:12:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238109AbiKOQMi (ORCPT ); Tue, 15 Nov 2022 11:12:38 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE0B2264AE; Tue, 15 Nov 2022 08:12:36 -0800 (PST) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NBWMp0BVszJnlH; Wed, 16 Nov 2022 00:09:26 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:33 +0800 Received: from huawei.com (10.175.101.6) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 00:12:32 +0800 From: ChenXiaoSong To: , , CC: , , , , , , Subject: [PATCH v4 3/3] btrfs: qgroup: fix sleep from invalid context bug in update_qgroup_limit_item() Date: Wed, 16 Nov 2022 01:17:09 +0800 Message-ID: <20221115171709.3774614-4-chenxiaosong2@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221115171709.3774614-1-chenxiaosong2@huawei.com> References: <20221115171709.3774614-1-chenxiaosong2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749579664370045726?= X-GMAIL-MSGID: =?utf-8?q?1749579664370045726?= Syzkaller reported BUG as follows: BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274 Call Trace: dump_stack_lvl+0xcd/0x134 __might_resched.cold+0x222/0x26b kmem_cache_alloc+0x2e7/0x3c0 update_qgroup_limit_item+0xe1/0x390 btrfs_qgroup_inherit+0x147b/0x1ee0 create_subvol+0x4eb/0x1710 btrfs_mksubvol+0xfe5/0x13f0 __btrfs_ioctl_snap_create+0x2b0/0x430 btrfs_ioctl_snap_create_v2+0x25a/0x520 btrfs_ioctl+0x2a1c/0x5ce0 __x64_sys_ioctl+0x193/0x200 do_syscall_64+0x35/0x80 Fix this by delaying the limit item updates until unlock the spin lock. Signed-off-by: ChenXiaoSong --- fs/btrfs/qgroup.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index ca609a70d067..f84507ca3b99 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -2867,6 +2867,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, bool need_rescan = false; u32 level_size = 0; u64 nums; + bool update_limit = false; + int err; /* * There are only two callers of this function. @@ -2957,10 +2959,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, dstgroup->max_excl = inherit->lim.max_excl; dstgroup->rsv_rfer = inherit->lim.rsv_rfer; dstgroup->rsv_excl = inherit->lim.rsv_excl; - - ret = btrfs_update_quoto_limit(trans, dstgroup, fs_info); - if (ret) - goto unlock; + update_limit = true; } if (srcid) { @@ -2987,6 +2986,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, dstgroup->max_excl = srcgroup->max_excl; dstgroup->rsv_rfer = srcgroup->rsv_rfer; dstgroup->rsv_excl = srcgroup->rsv_excl; + update_limit = false; qgroup_dirty(fs_info, dstgroup); qgroup_dirty(fs_info, srcgroup); @@ -3055,6 +3055,11 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, unlock: spin_unlock(&fs_info->qgroup_lock); + if (update_limit) { + err = btrfs_update_quoto_limit(trans, dstgroup, fs_info); + if (err) + ret = err; + } if (!ret) ret = btrfs_sysfs_add_one_qgroup(fs_info, dstgroup); out: