Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECD77C433EF for ; Tue, 1 Feb 2022 15:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239531AbiBAPgL (ORCPT ); Tue, 1 Feb 2022 10:36:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233563AbiBAPgL (ORCPT ); Tue, 1 Feb 2022 10:36:11 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC118C061714 for ; Tue, 1 Feb 2022 07:36:10 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id e28so16200286pfj.5 for ; Tue, 01 Feb 2022 07:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kkt4IR8vPBVsWvBhWtZYGrVtrRev1YK2M4njAbq1PQo=; b=ALvvPSmWUzi9DJJSr31RFizw4Ooa+8s+KFaFAxrLO3EW2tUms8pBsUcEffb7OOhavL 0JrxdlxIJf9vBuYcJfLYSFzgoe2yfbh+3GBfiKUZSgb3r/wM7icIoPBrDsj9Etb4Qdpb kvnOfF0psp8WyrO9UGWvIc/RiFZuKUgElM/FTYsLPPpysXav5ZWbMGCwmcTqd7Op+L+S jNcw42cexPCPBvO+IfVLivOXAq6vhey6mooVsijvlL5TSs5VpVbFZNNEBacfsQiClyYd SXtPjh+p3cnZXmAWLVMILH0sXRpBOY0JdUI3j0PSqm8ZMHQ8RkD2HQDp5TRLjME8hX05 CPqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kkt4IR8vPBVsWvBhWtZYGrVtrRev1YK2M4njAbq1PQo=; b=Zycnvbk3Z3GLKsxJTqZxe20awt9zwLuAQmyPBULapuN3jU1qGK7SBeuojKw93hlSLC D04oyPB7XXl5TPt0ZSs7Qwba7vlFNEFtsphUprGHeCGADj9ZB2otZX7arwEtuBXYSL7M qyNTKdwaxgNgeda2YRnyghUrlyDOLHZyv962puahGEDkvb74EkXZfLse/L4qts5pKSmv CuifjxIiCq43skuUUU5k9GCZG5mnDH6xX8wVS16CxoaFUj46AtgdpJ93JmF5zuBaVjRi nhGA7leQBWTZ6THAGgjL7miRq7TbtnSRaaSDkAobQ7WOMfuvrQYzPrIEWjoj0xS9/NMu V3hQ== X-Gm-Message-State: AOAM533pN3gTo3TZH+TG1W9i5JaZlBzxs/hu1ewdF4OOsphzmrD7L8NY I/pu0S8LRrgelVCAlXaz3Fm6TaeTEXMscg== X-Google-Smtp-Source: ABdhPJx49kfpBtny2LY4PnrAdX8wCOG5+bdaK/YXEX7WhHuBbrPPf3E/krXTyvjp0DJZPNKtdTVEzQ== X-Received: by 2002:a63:580e:: with SMTP id m14mr21224739pgb.351.1643729770165; Tue, 01 Feb 2022 07:36:10 -0800 (PST) Received: from localhost.localdomain ([59.12.165.26]) by smtp.gmail.com with ESMTPSA id z14sm21423101pfq.3.2022.02.01.07.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 07:36:09 -0800 (PST) From: Sidong Yang To: linux-btrfs@vger.kernel.org, quwenruo.btrfs@gmx.com, dsterba@suse.cz Cc: Sidong Yang Subject: [RFC PATCH v2] btrfs: qgroup: replace modifing qgroup_flags to bitops Date: Tue, 1 Feb 2022 15:36:01 +0000 Message-Id: <20220201153601.409844-1-realwakka@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This patch replaces the code modifying or checking qgroup_flags to bitops like set_bit or test_bit. This patch fixes potential race condition on qgroup_flags. Before this, it adds enum that represents flag number for using bitops. This patch doesn't deleted existing variable for compatibility. Signed-off-by: Sidong Yang --- v2: - adds BTRFS_QGROUP_STATUS_FLAG_NUM_* This patch added enums for bitops. Because existing defined values is also used in btrfs-progs. And I don't know to break it. And using bitops, it needs casting for its type. I don't know it's good idea. It's better to change qgroup_flags type than cast it? fs/btrfs/ioctl.c | 2 +- fs/btrfs/qgroup.c | 68 ++++++++++++++++----------------- include/uapi/linux/btrfs_tree.h | 12 ++++-- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index cc61813213d8..6e70543e40a6 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4435,7 +4435,7 @@ static long btrfs_ioctl_quota_rescan_status(struct btrfs_fs_info *fs_info, if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) { + if (test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags)) { qsa.flags = 1; qsa.progress = fs_info->qgroup_rescan_progress.objectid; } diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index db680f5be745..68601600d4de 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -499,16 +499,16 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info) out: btrfs_free_path(path); fs_info->qgroup_flags |= flags; - if (!(fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_ON)) + if (!test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags)) clear_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags); - else if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN && + else if (test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags) && ret >= 0) ret = qgroup_rescan_init(fs_info, rescan_progress, 0); if (ret < 0) { ulist_free(fs_info->qgroup_ulist); fs_info->qgroup_ulist = NULL; - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags); btrfs_sysfs_del_qgroups(fs_info); } @@ -1197,7 +1197,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) spin_lock(&fs_info->qgroup_lock); quota_root = fs_info->quota_root; fs_info->quota_root = NULL; - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_ON; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags); spin_unlock(&fs_info->qgroup_lock); btrfs_free_qgroup_config(fs_info); @@ -1353,7 +1353,7 @@ static int quick_update_accounting(struct btrfs_fs_info *fs_info, } out: if (ret) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -1659,7 +1659,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid, ret = update_qgroup_limit_item(trans, qgroup); if (ret) { - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); btrfs_info(fs_info, "unable to update quota limit for %llu", qgroupid); } @@ -1735,7 +1735,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans, ret = btrfs_find_all_roots(NULL, trans->fs_info, bytenr, 0, &old_root, true); if (ret < 0) { - trans->fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&trans->fs_info->qgroup_flags); btrfs_warn(trans->fs_info, "error accounting new delayed refs extent (err code: %d), quota inconsistent", ret); @@ -2211,7 +2211,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans, out: btrfs_free_path(dst_path); if (ret < 0) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -2581,7 +2581,7 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr, } mutex_lock(&fs_info->qgroup_rescan_lock); - if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) { + if (test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags)) { if (fs_info->qgroup_rescan_progress.objectid <= bytenr) { mutex_unlock(&fs_info->qgroup_rescan_lock); ret = 0; @@ -2715,23 +2715,23 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans) spin_unlock(&fs_info->qgroup_lock); ret = update_qgroup_info_item(trans, qgroup); if (ret) - fs_info->qgroup_flags |= - BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, + (unsigned long *)&fs_info->qgroup_flags); ret = update_qgroup_limit_item(trans, qgroup); if (ret) - fs_info->qgroup_flags |= - BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, + (unsigned long *)&fs_info->qgroup_flags); spin_lock(&fs_info->qgroup_lock); } if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_ON; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags); else - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_ON; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags); spin_unlock(&fs_info->qgroup_lock); ret = update_qgroup_status_item(trans); if (ret) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -2849,7 +2849,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, ret = update_qgroup_limit_item(trans, dstgroup); if (ret) { - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); btrfs_info(fs_info, "unable to update quota limit for %llu", dstgroup->qgroupid); @@ -2955,7 +2955,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, if (!committing) mutex_unlock(&fs_info->qgroup_ioctl_lock); if (need_rescan) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -3270,10 +3270,10 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) mutex_lock(&fs_info->qgroup_rescan_lock); if (err > 0 && - fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT) { - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags)) { + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); } else if (err < 0) { - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); } mutex_unlock(&fs_info->qgroup_rescan_lock); @@ -3292,7 +3292,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) mutex_lock(&fs_info->qgroup_rescan_lock); if (!stopped) - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags); if (trans) { ret = update_qgroup_status_item(trans); if (ret < 0) { @@ -3332,13 +3332,11 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, if (!init_flags) { /* we're resuming qgroup rescan at mount time */ - if (!(fs_info->qgroup_flags & - BTRFS_QGROUP_STATUS_FLAG_RESCAN)) { + if (!test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags)) { btrfs_warn(fs_info, "qgroup rescan init failed, qgroup rescan is not queued"); ret = -EINVAL; - } else if (!(fs_info->qgroup_flags & - BTRFS_QGROUP_STATUS_FLAG_ON)) { + } else if (!test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags)) { btrfs_warn(fs_info, "qgroup rescan init failed, qgroup is not enabled"); ret = -EINVAL; @@ -3351,12 +3349,11 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, mutex_lock(&fs_info->qgroup_rescan_lock); if (init_flags) { - if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) { + if (test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags)) { btrfs_warn(fs_info, "qgroup rescan is already in progress"); ret = -EINPROGRESS; - } else if (!(fs_info->qgroup_flags & - BTRFS_QGROUP_STATUS_FLAG_ON)) { + } else if (!test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_ON, (unsigned long *)&fs_info->qgroup_flags)) { btrfs_warn(fs_info, "qgroup rescan init failed, qgroup is not enabled"); ret = -EINVAL; @@ -3366,7 +3363,7 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, mutex_unlock(&fs_info->qgroup_rescan_lock); return ret; } - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_RESCAN; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags); } memset(&fs_info->qgroup_rescan_progress, 0, @@ -3422,12 +3419,12 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) trans = btrfs_join_transaction(fs_info->fs_root); if (IS_ERR(trans)) { - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags); return PTR_ERR(trans); } ret = btrfs_commit_transaction(trans); if (ret) { - fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN; + clear_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -3471,7 +3468,7 @@ int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info, void btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info) { - if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) { + if (test_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, (unsigned long *)&fs_info->qgroup_flags)) { mutex_lock(&fs_info->qgroup_rescan_lock); fs_info->qgroup_rescan_running = true; btrfs_queue_work(fs_info->qgroup_rescan_workers, @@ -4167,8 +4164,7 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_trans_handle *trans, spin_unlock(&blocks->lock); out: if (ret < 0) - fs_info->qgroup_flags |= - BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); return ret; } @@ -4255,7 +4251,7 @@ int btrfs_qgroup_trace_subtree_after_cow(struct btrfs_trans_handle *trans, btrfs_err_rl(fs_info, "failed to account subtree at bytenr %llu: %d", subvol_eb->start, ret); - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + set_bit(BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, (unsigned long *)&fs_info->qgroup_flags); } return ret; } diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index e1c4c732aaba..ddeec3d75828 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -956,14 +956,20 @@ static inline __u16 btrfs_qgroup_level(__u64 qgroupid) return (__u16)(qgroupid >> BTRFS_QGROUP_LEVEL_SHIFT); } +enum { + BTRFS_QGROUP_STATUS_FLAG_NUM_ON, + BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN, + BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT, +}; + /* * is subvolume quota turned on? */ -#define BTRFS_QGROUP_STATUS_FLAG_ON (1ULL << 0) +#define BTRFS_QGROUP_STATUS_FLAG_ON (1ULL << BTRFS_QGROUP_STATUS_FLAG_NUM_ON) /* * RESCAN is set during the initialization phase */ -#define BTRFS_QGROUP_STATUS_FLAG_RESCAN (1ULL << 1) +#define BTRFS_QGROUP_STATUS_FLAG_RESCAN (1ULL << BTRFS_QGROUP_STATUS_FLAG_NUM_RESCAN) /* * Some qgroup entries are known to be out of date, * either because the configuration has changed in a way that @@ -971,7 +977,7 @@ static inline __u16 btrfs_qgroup_level(__u64 qgroupid) * with a non-qgroup-aware version. * Turning qouta off and on again makes it inconsistent, too. */ -#define BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT (1ULL << 2) +#define BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT (1ULL << BTRFS_QGROUP_STATUS_FLAG_NUM_INCONSISTENT) #define BTRFS_QGROUP_STATUS_VERSION 1 -- 2.25.1