Skip to content

Commit ce12965

Browse files
wangxiaoguangkdave
authored andcommitted
btrfs: introduce tickets_id to determine whether asynchronous metadata reclaim work makes progress
In btrfs_async_reclaim_metadata_space(), we use ticket's address to determine whether asynchronous metadata reclaim work is making progress. ticket = list_first_entry(&space_info->tickets, struct reserve_ticket, list); if (last_ticket == ticket) { flush_state++; } else { last_ticket = ticket; flush_state = FLUSH_DELAYED_ITEMS_NR; if (commit_cycles) commit_cycles--; } But indeed it's wrong, we should not rely on local variable's address to do this check, because addresses may be same. In my test environment, I dd one 168MB file in a 256MB fs, found that for this file, every time wait_reserve_ticket() called, local variable ticket's address is same, For above codes, assume a previous ticket's address is addrA, last_ticket is addrA. Btrfs_async_reclaim_metadata_space() finished this ticket and wake up it, then another ticket is added, but with the same address addrA, now last_ticket will be same to current ticket, then current ticket's flush work will start from current flush_state, not initial FLUSH_DELAYED_ITEMS_NR, which may result in some enospc issues(I have seen this in my test machine). Signed-off-by: Wang Xiaoguang <[email protected]> Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent ed7a694 commit ce12965

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

fs/btrfs/ctree.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ struct btrfs_space_info {
427427
struct list_head ro_bgs;
428428
struct list_head priority_tickets;
429429
struct list_head tickets;
430+
u64 tickets_id;
430431

431432
struct rw_semaphore groups_sem;
432433
/* for block groups in our same type */

fs/btrfs/extent-tree.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4966,12 +4966,12 @@ static void wake_all_tickets(struct list_head *head)
49664966
*/
49674967
static void btrfs_async_reclaim_metadata_space(struct work_struct *work)
49684968
{
4969-
struct reserve_ticket *last_ticket = NULL;
49704969
struct btrfs_fs_info *fs_info;
49714970
struct btrfs_space_info *space_info;
49724971
u64 to_reclaim;
49734972
int flush_state;
49744973
int commit_cycles = 0;
4974+
u64 last_tickets_id;
49754975

49764976
fs_info = container_of(work, struct btrfs_fs_info, async_reclaim_work);
49774977
space_info = __find_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA);
@@ -4984,8 +4984,7 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)
49844984
spin_unlock(&space_info->lock);
49854985
return;
49864986
}
4987-
last_ticket = list_first_entry(&space_info->tickets,
4988-
struct reserve_ticket, list);
4987+
last_tickets_id = space_info->tickets_id;
49894988
spin_unlock(&space_info->lock);
49904989

49914990
flush_state = FLUSH_DELAYED_ITEMS_NR;
@@ -5005,10 +5004,10 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)
50055004
space_info);
50065005
ticket = list_first_entry(&space_info->tickets,
50075006
struct reserve_ticket, list);
5008-
if (last_ticket == ticket) {
5007+
if (last_tickets_id == space_info->tickets_id) {
50095008
flush_state++;
50105009
} else {
5011-
last_ticket = ticket;
5010+
last_tickets_id = space_info->tickets_id;
50125011
flush_state = FLUSH_DELAYED_ITEMS_NR;
50135012
if (commit_cycles)
50145013
commit_cycles--;
@@ -5384,6 +5383,7 @@ static void space_info_add_old_bytes(struct btrfs_fs_info *fs_info,
53845383
list_del_init(&ticket->list);
53855384
num_bytes -= ticket->bytes;
53865385
ticket->bytes = 0;
5386+
space_info->tickets_id++;
53875387
wake_up(&ticket->wait);
53885388
} else {
53895389
ticket->bytes -= num_bytes;
@@ -5426,6 +5426,7 @@ static void space_info_add_new_bytes(struct btrfs_fs_info *fs_info,
54265426
num_bytes -= ticket->bytes;
54275427
space_info->bytes_may_use += ticket->bytes;
54285428
ticket->bytes = 0;
5429+
space_info->tickets_id++;
54295430
wake_up(&ticket->wait);
54305431
} else {
54315432
trace_btrfs_space_reservation(fs_info, "space_info",

0 commit comments

Comments
 (0)