From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 2/4] btrfs: Update per-profile available space when device size/used space get updated
Date: Thu, 2 Jan 2020 15:47:03 +0800 [thread overview]
Message-ID: <20200102074705.136348-3-wqu@suse.com> (raw)
In-Reply-To: <20200102074705.136348-1-wqu@suse.com>
There are 4 locations where device size or used space get updated:
- Chunk allocation
- Chunk removal
- Device grow
- Device shrink
Now also update per-profile available space at those timings.
Please note that, since we have to acquire device_list_mutex inside
__btrfs_alloc_chunk(), this could cause ABBA dead lock.
To work around above problem, we will unlock chunk_mutex at the end to
get a window to lock device_list_mutex.
This looks pretty ugly, but should be good enough before we do a rework
on device_list_mutex and chunk mutex.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/volumes.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d08e24524ccc..368bceb2076a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2808,6 +2808,7 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
struct btrfs_super_block *super_copy = fs_info->super_copy;
u64 old_total;
u64 diff;
+ int ret;
if (!test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state))
return -EACCES;
@@ -2836,6 +2837,11 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
&trans->transaction->dev_update_list);
mutex_unlock(&fs_info->chunk_mutex);
+ mutex_lock(&fs_info->fs_devices->device_list_mutex);
+ ret = calc_per_profile_avail(fs_info);
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
+ if (ret < 0)
+ return ret;
return btrfs_update_device(trans, device);
}
@@ -3014,7 +3020,12 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
goto out;
}
}
+ ret = calc_per_profile_avail(fs_info);
mutex_unlock(&fs_devices->device_list_mutex);
+ if (ret < 0) {
+ btrfs_abort_transaction(trans, ret);
+ goto out;
+ }
ret = btrfs_free_chunk(trans, chunk_offset);
if (ret) {
@@ -4830,6 +4841,10 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
device->fs_devices->total_rw_bytes += diff;
atomic64_add(diff, &fs_info->free_chunk_space);
mutex_unlock(&fs_info->chunk_mutex);
+ } else {
+ mutex_lock(&fs_info->fs_devices->device_list_mutex);
+ ret = calc_per_profile_avail(fs_info);
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
}
return ret;
}
@@ -5147,8 +5162,15 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
check_raid56_incompat_flag(info, type);
check_raid1c34_incompat_flag(info, type);
+ /* To avoid device_list_mutex and chunk_mutex ABBA lock */
+ mutex_unlock(&info->chunk_mutex);
+ mutex_lock(&info->fs_devices->device_list_mutex);
+ ret = calc_per_profile_avail(info);
+ mutex_unlock(&info->fs_devices->device_list_mutex);
+ mutex_lock(&info->chunk_mutex);
+
kfree(devices_info);
- return 0;
+ return ret;
error_del_extent:
write_lock(&em_tree->lock);
--
2.24.1
next prev parent reply other threads:[~2020-01-02 7:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 7:47 [PATCH 0/4] Introduce per-profile available space array to avoid over-confident can_overcommit() Qu Wenruo
2020-01-02 7:47 ` [PATCH 1/4] btrfs: Introduce per-profile available space facility Qu Wenruo
2020-01-02 7:47 ` Qu Wenruo [this message]
2020-01-02 7:47 ` [PATCH 3/4] btrfs: space-info: Use per-profile available space in can_overcommit() Qu Wenruo
2020-01-02 7:47 ` [PATCH 4/4] btrfs: statfs: Use virtual chunk allocation to calculation available data space Qu Wenruo
2020-01-02 8:57 ` [PATCH 0/4] Introduce per-profile available space array to avoid over-confident can_overcommit() Qu WenRuo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200102074705.136348-3-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox