Btrfs: fix reclaim counter leak of space_info objects
PATCH 1/2 Btrfs: fix reclaim counter leak of space_info objects
From: Filipe Manana <[email protected]>
Whenever we add a ticket to a space_info object we increment the object's reclaim_size counter witht the ticket's bytes, and we decrement it with the corresponding amount only when we are able to grant the requested space to the ticket. When we are not able to grant the space to a ticket, or when the ticket is removed due to a signal (e.g. an application has received sigterm from the terminal) we never decrement the counter with the corresponding bytes from the ticket. This leak can result in the space reclaim code to later do much more work than necessary. So fix it by decrementing the counter when those two cases happen as well.
--- fs/btrfs/block-group.c | 1 + fs/btrfs/space-info.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)
fs/btrfs/block-group.c +1 -0
@@ -3370,6 +3370,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) space_info->bytes_reserved > 0 || space_info->bytes_may_use > 0))btrfs_dump_space_info (info, space_info,0 ,0 ); +WARN_ON (space_info->reclaim_size >0 );list_del (&space_info->list);btrfs_sysfs_remove_space_info (space_info); }
fs/btrfs/space-info.c +14 -6
@@ -361,6 +361,16 @@ int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,return 0 ; } +static void remove_ticket (struct btrfs_space_info *space_info, +struct reserve_ticket *ticket) +{ +if (!list_empty (&ticket->list)) { +list_del_init (&ticket->list); +ASSERT (space_info->reclaim_size >= ticket->bytes); + space_info->reclaim_size -= ticket->bytes; + } +} +/* * This is for space we already have accounted in space_info->bytes_may_use, so * basically when we're returning space from block_rsv's.
@@ -388,9 +398,7 @@ void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,btrfs_space_info_update_bytes_may_use (fs_info, space_info, ticket->bytes); -list_del_init (&ticket->list); -ASSERT (space_info->reclaim_size >= ticket->bytes); - space_info->reclaim_size -= ticket->bytes; +remove_ticket (space_info, ticket); ticket->bytes =0 ; space_info->tickets_id++;wake_up (&ticket->wait);
@@ -899,7 +907,7 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info,btrfs_info (fs_info,"failing ticket with %llu bytes" , ticket->bytes); -list_del_init (&ticket->list); +remove_ticket (space_info, ticket); ticket->error = -ENOSPC ;wake_up (&ticket->wait);
@@ -1063,7 +1071,7 @@ static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,* despite getting an error, resulting in a space leak * (bytes_may_use counter of our space_info). */ -list_del_init (&ticket->list); +remove_ticket (space_info, ticket); ticket->error = -EINTR ;break ; }
@@ -1121,7 +1129,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,* either the async reclaim job deletes the ticket from the list * or we delete it ourselves at wait_reserve_ticket(). */ -list_del_init (&ticket->list); +remove_ticket (space_info, ticket);if (!ret) ret = -ENOSPC ; }
Signature · 1 line
2.11.0
Quoted 12 lines · On 7.04.20 г. 13:38 ч., [email protected] wrote:
From: Filipe Manana <[email protected]>
Whenever we add a ticket to a
space_infoobject we increment the object'sreclaim_sizecounter witht the ticket's bytes, and we decrement it with the corresponding amount only when we are able to grant the requested space to the ticket. When we are not able to grant the space to a ticket, or when the ticket is removed due to a signal (e.g. an application has received sigterm from the terminal) we never decrement the counter with the corresponding bytes from the ticket. This leak can result in the space reclaim code to later do much more work than necessary. So fix it by decrementing the counter when those two cases happen as well.
Quoted 2 lines
Fixes db161806dc5615 ("btrfs: account ticket size at add/delete time")Signed-off-by Filipe Manana <[email protected]>
Doh, you are correct. I especially like it you've actually factored ticket removal into a function.
Quoted 77 lines
--- fs/btrfs/block-group.c | 1 + fs/btrfs/space-info.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)fs/btrfs/block-group.c +1
-0@@ -3370,6 +3370,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) space_info->bytes_reserved > 0 || space_info->bytes_may_use > 0))btrfs_dump_space_info (info, space_info,0 ,0 ); +WARN_ON (space_info->reclaim_size >0 );list_del (&space_info->list);btrfs_sysfs_remove_space_info (space_info); }fs/btrfs/space-info.c +14
-6@@ -361,6 +361,16 @@ int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,return 0 ; } +static void remove_ticket (struct btrfs_space_info *space_info, +struct reserve_ticket *ticket) +{ +if (!list_empty (&ticket->list)) { +list_del_init (&ticket->list); +ASSERT (space_info->reclaim_size >= ticket->bytes); + space_info->reclaim_size -= ticket->bytes; + } +} +/* * This is for space we already have accounted in space_info->bytes_may_use, so * basically when we're returning space from block_rsv's. @@ -388,9 +398,7 @@ void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,btrfs_space_info_update_bytes_may_use (fs_info, space_info, ticket->bytes); -list_del_init (&ticket->list); -ASSERT (space_info->reclaim_size >= ticket->bytes); - space_info->reclaim_size -= ticket->bytes; +remove_ticket (space_info, ticket); ticket->bytes =0 ; space_info->tickets_id++;wake_up (&ticket->wait);@@ -899,7 +907,7 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info,btrfs_info (fs_info,"failing ticket with %llu bytes" , ticket->bytes); -list_del_init (&ticket->list); +remove_ticket (space_info, ticket); ticket->error = -ENOSPC ;wake_up (&ticket->wait);@@ -1063,7 +1071,7 @@ static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,* despite getting an error, resulting in a space leak * (bytes_may_use counter of our space_info). */ -list_del_init (&ticket->list); +remove_ticket (space_info, ticket); ticket->error = -EINTR ;break ; }@@ -1121,7 +1129,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,* either the async reclaim job deletes the ticket from the list * or we delete it ourselves at wait_reserve_ticket(). */ -list_del_init (&ticket->list); +remove_ticket (space_info, ticket);if (!ret) ret = -ENOSPC ; }
Quoted 12 lines · On Tue, Apr 07, 2020 at 11:38:49AM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
Whenever we add a ticket to a
space_infoobject we increment the object'sreclaim_sizecounter witht the ticket's bytes, and we decrement it with the corresponding amount only when we are able to grant the requested space to the ticket. When we are not able to grant the space to a ticket, or when the ticket is removed due to a signal (e.g. an application has received sigterm from the terminal) we never decrement the counter with the corresponding bytes from the ticket. This leak can result in the space reclaim code to later do much more work than necessary. So fix it by decrementing the counter when those two cases happen as well.
Quoted 2 lines
Fixes db161806dc5615 ("btrfs: account ticket size at add/delete time")Signed-off-by Filipe Manana <[email protected]>
There's a minor conflict with Josef's patch "btrfs: run btrfs_try_granting_tickets if a priority ticket fails" so I'll apply yours to misc-5.7 as it's a regression fix.
Review static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, · line 1135
Quoted 9 lines
(quoted diff) +1
-1@@ -1121,7 +1129,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, * either the async reclaim job deletes the ticket from the list * or we delete it ourselves at wait_reserve_ticket(). */ - list_del_init(&ticket->list); + remove_ticket(space_info, ticket); if (!ret) ret = -ENOSPC; }
The conflicting hunk is:
fs/btrfs/space-info.c +10 -4
@@ -1156,11 +1156,17 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, ret = ticket->error;if (ticket->bytes || ticket->error) {/* -* Need to delete here for priority tickets. For regular tickets -* either the async reclaim job deletes the ticket from the list -* or we delete it ourselves at wait_reserve_ticket(). +* We were a priority ticket, so we need to delete ourselves +* from the list. Because we could have other priority tickets +* behind us that require less space, run +* btrfs_try_granting_tickets() to see if their reservations can +* now be made. */ -list_del_init (&ticket->list); +if (!list_empty (&ticket->list)) { +list_del_init (&ticket->list); +btrfs_try_granting_tickets (fs_info, space_info); + } +if (!ret) ret = -ENOSPC ; }
---
so I assume the correct fixup is to replace list_del_init with remove_ticket.
Quoted 59 lines · David Sterba
Quoted 12 lines · On Tue, Apr 07, 2020 at 11:38:49AM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
Whenever we add a ticket to a
space_infoobject we increment the object'sreclaim_sizecounter witht the ticket's bytes, and we decrement it with the corresponding amount only when we are able to grant the requested space to the ticket. When we are not able to grant the space to a ticket, or when the ticket is removed due to a signal (e.g. an application has received sigterm from the terminal) we never decrement the counter with the corresponding bytes from the ticket. This leak can result in the space reclaim code to later do much more work than necessary. So fix it by decrementing the counter when those two cases happen as well.Quoted 2 lines
Fixes db161806dc5615 ("btrfs: account ticket size at add/delete time")Signed-off-by Filipe Manana <[email protected]>There's a minor conflict with Josef's patch "btrfs: run
btrfs_try_granting_ticketsif a priority ticket fails" so I'll apply yours to misc-5.7 as it's a regression fix.fs/btrfs/space-info.c static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, · line 1135
Quoted 9 lines
fs/btrfs/space-info.c +1
-1@@ -1121,7 +1129,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,* either the async reclaim job deletes the ticket from the list * or we delete it ourselves at wait_reserve_ticket(). */ -list_del_init (&ticket->list); +remove_ticket (space_info, ticket);if (!ret) ret = -ENOSPC ; }The conflicting hunk is:
fs/btrfs/space-info.c +10
-5@@ -1156,11 +1156,17 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, ret = ticket->error;if (ticket->bytes || ticket->error) {/* -* Need to delete here for priority tickets. For regular tickets -* either the async reclaim job deletes the ticket from the list -* or we delete it ourselves at wait_reserve_ticket(). +* We were a priority ticket, so we need to delete ourselves +* from the list. Because we could have other priority tickets +* behind us that require less space, run +* btrfs_try_granting_tickets() to see if their reservations can +* now be made. */ -list_del_init (&ticket->list); +if (!list_empty (&ticket->list)) { +list_del_init (&ticket->list); +btrfs_try_granting_tickets (fs_info, space_info); + } +if (!ret) ret = -ENOSPC ; } ---
Quoted 2 lines
so I assume the correct fixup is to replace
list_del_initwithremove_ticket.
Yes, correct.
Thanks.