From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03AB3C433DF for ; Tue, 7 Jul 2020 14:47:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D95FB20773 for ; Tue, 7 Jul 2020 14:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728204AbgGGOq7 (ORCPT ); Tue, 7 Jul 2020 10:46:59 -0400 Received: from mx2.suse.de ([195.135.220.15]:39720 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgGGOq6 (ORCPT ); Tue, 7 Jul 2020 10:46:58 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 1C723AD4A; Tue, 7 Jul 2020 14:46:56 +0000 (UTC) Subject: Re: [PATCH 15/23] btrfs: use ticketing for data space reservations To: Josef Bacik , linux-btrfs@vger.kernel.org, kernel-team@fb.com References: <20200630135921.745612-1-josef@toxicpanda.com> <20200630135921.745612-16-josef@toxicpanda.com> From: Nikolay Borisov Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <63ed5861-0728-662a-20c1-03e60a59ee25@suse.com> Date: Tue, 7 Jul 2020 17:46:54 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200630135921.745612-16-josef@toxicpanda.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 30.06.20 г. 16:59 ч., Josef Bacik wrote: > Now that we have all the infrastructure in place, use the ticketing > infrastructure to make data allocations. This still maintains the exact > same flushing behavior, but now we're using tickets to get our > reservations satisfied. > > Reviewed-by: Nikolay Borisov > Tested-by: Nikolay Borisov > Signed-off-by: Josef Bacik > --- > fs/btrfs/space-info.c | 125 ++++++++++++++++++++++-------------------- > 1 file changed, 67 insertions(+), 58 deletions(-) > > diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c > index 799ee6090693..ee4747917b81 100644 > --- a/fs/btrfs/space-info.c > +++ b/fs/btrfs/space-info.c > @@ -1068,6 +1068,54 @@ static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info, > } while (flush_state < states_nr); > } > > +static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info, > + struct btrfs_space_info *space_info, > + struct reserve_ticket *ticket, > + const enum btrfs_flush_state *states, > + int states_nr) > +{ > + int flush_state = 0; > + int commit_cycles = 2; > + > + while (!space_info->full) { > + flush_space(fs_info, space_info, U64_MAX, ALLOC_CHUNK_FORCE); > + spin_lock(&space_info->lock); > + if (ticket->bytes == 0) { > + spin_unlock(&space_info->lock); > + return; > + } > + spin_unlock(&space_info->lock); > + } > +again: > + while (flush_state < states_nr) { > + u64 flush_bytes = U64_MAX; > + > + if (!commit_cycles) { > + if (states[flush_state] == FLUSH_DELALLOC_WAIT) { > + flush_state++; > + continue; > + } > + if (states[flush_state] == COMMIT_TRANS) > + flush_bytes = ticket->bytes; > + } > + > + flush_space(fs_info, space_info, flush_bytes, > + states[flush_state]); > + spin_lock(&space_info->lock); > + if (ticket->bytes == 0) { > + spin_unlock(&space_info->lock); > + return; > + } > + spin_unlock(&space_info->lock); > + flush_state++; > + } > + if (commit_cycles) { > + commit_cycles--; > + flush_state = 0; > + goto again; > + } > +} > + > static void wait_reserve_ticket(struct btrfs_fs_info *fs_info, > struct btrfs_space_info *space_info, > struct reserve_ticket *ticket) > @@ -1134,6 +1182,15 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, > evict_flush_states, > ARRAY_SIZE(evict_flush_states)); > break; > + case BTRFS_RESERVE_FLUSH_DATA: > + priority_reclaim_data_space(fs_info, space_info, ticket, > + data_flush_states, > + ARRAY_SIZE(data_flush_states)); > + break; > + case BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE: > + priority_reclaim_data_space(fs_info, space_info, ticket, > + NULL, 0); > + break; > default: > ASSERT(0); > break; > @@ -1341,78 +1398,30 @@ int btrfs_reserve_data_bytes(struct btrfs_fs_info *fs_info, u64 bytes, > enum btrfs_reserve_flush_enum flush) > { > struct btrfs_space_info *data_sinfo = fs_info->data_sinfo; > - const enum btrfs_flush_state *states = NULL; > u64 used; > - int states_nr = 0; > - int commit_cycles = 2; > int ret = -ENOSPC; > > ASSERT(!current->journal_info || flush != BTRFS_RESERVE_FLUSH_DATA); > > - if (flush == BTRFS_RESERVE_FLUSH_DATA) { > - states = data_flush_states; > - states_nr = ARRAY_SIZE(data_flush_states); > - } > - > spin_lock(&data_sinfo->lock); > -again: > used = btrfs_space_info_used(data_sinfo, true); > > if (used + bytes > data_sinfo->total_bytes) { > - u64 prev_total_bytes = data_sinfo->total_bytes; > - int flush_state = 0; > + struct reserve_ticket ticket; > > + init_waitqueue_head(&ticket.wait); > + ticket.bytes = bytes; > + ticket.error = 0; > + list_add_tail(&ticket.list, &data_sinfo->priority_tickets); nit: Shouldn't adding the ticket also be recorded in spac_info->reclaim_size? I see later that you are removing this code and relying on the existing logic in __reserve_metadata_bytes( renamed to reserve_bytes) which correctly modifies reclaim_size, but this just means this particular patch is slightly broken. > spin_unlock(&data_sinfo->lock); > > - /* > - * Everybody can force chunk allocation, so try this first to > - * see if we can just bail here and make our reservation. > - */ > - flush_space(fs_info, data_sinfo, bytes, ALLOC_CHUNK_FORCE); > - spin_lock(&data_sinfo->lock); > - if (prev_total_bytes < data_sinfo->total_bytes) > - goto again; > + ret = handle_reserve_ticket(fs_info, data_sinfo, &ticket, > + flush); > + } else { > + btrfs_space_info_update_bytes_may_use(fs_info, data_sinfo, bytes); > + ret = 0;