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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 F3702C433E8 for ; Mon, 22 Mar 2021 12:53:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DBE08619F1 for ; Mon, 22 Mar 2021 12:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbhCVMxR (ORCPT ); Mon, 22 Mar 2021 08:53:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39697 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbhCVMun (ORCPT ); Mon, 22 Mar 2021 08:50:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616417443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=glc/uxJ9dUBdoxNi24XCrkscMw9RlpeASRtfppNYdOM=; b=O22Tz2QCA4UEmkV0iNhg1sLGodhvhYRrmj5iAVScf+H5CYwwp9Plrbx0v06ieoe+PjLHQj R6FznX/0cEqh/keNgjaP/nuHI3OoYcTYioLVtxeVLsyumYxRt7QTmibbMcKlXc56BjvV4K 8jt8wCEn/VivnHoSUwVthbcjYiBudks= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-197-GhdZQu73PO6KKVHZqQck1Q-1; Mon, 22 Mar 2021 08:50:41 -0400 X-MC-Unique: GhdZQu73PO6KKVHZqQck1Q-1 Received: by mail-pj1-f70.google.com with SMTP id r18so27025214pjz.1 for ; Mon, 22 Mar 2021 05:50:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=glc/uxJ9dUBdoxNi24XCrkscMw9RlpeASRtfppNYdOM=; b=prEq0XGBEcVgNmY2kytUKiQ7fYNyjv5a/rymZLNPZRRgvhymayWkoDO9ATt4HiPw5Z 16IKgcCPsfZxbZ2RB0iAkkoPicdEEGkjrW+LT5MY963T9MpQKbY6NZ7FxKXpBaHx9TV3 ev9BE1AImgCnPPrE8geoO0qVc3Iz0PG59d98HGeX9ZTcEYzBrD95tFFtmiejsgtFQO/2 D0u/38EPdq4nackWXYqAurvKJIFSV7nMiQb2oDZEOeqwLlIqoL7vZgL/TdCuLh39eyCO rCuug1uF5MWaylUTxxm9cYEQ1Wxlq0LLYwpOI6Pf74eyhg1d1V1BUJwTytqaYcRqDqpN ZcRQ== X-Gm-Message-State: AOAM531lKSJhxrvN4yL7qoKRmYyxJjjxYsuRLOPerIVaKMehjbJ81BZS KLeLdAEUMhD1el3pcIMVaOmEAb6V4Q4CktSYtmF9P9dJf+N3zH7YQNxqxQPGDiSLU27sp5PeDJl 6/QOo0Lc7vgq8Ief9UECc X-Received: by 2002:a62:ee09:0:b029:211:1113:2e7c with SMTP id e9-20020a62ee090000b029021111132e7cmr19107081pfi.49.1616417439946; Mon, 22 Mar 2021 05:50:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTzj68BKAXuL8aOq6AKUDYPTusTWyH72CbK2f3Z4u0JGZeEsvP7/qsTVZQhlXpEVcRQWHOEA== X-Received: by 2002:a62:ee09:0:b029:211:1113:2e7c with SMTP id e9-20020a62ee090000b029021111132e7cmr19107067pfi.49.1616417439637; Mon, 22 Mar 2021 05:50:39 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id e1sm13934172pfi.175.2021.03.22.05.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 05:50:39 -0700 (PDT) Date: Mon, 22 Mar 2021 20:50:28 +0800 From: Gao Xiang To: Brian Foster Cc: linux-xfs@vger.kernel.org, "Darrick J. Wong" , Dave Chinner , Christoph Hellwig , Eric Sandeen Subject: Re: [PATCH v8 4/5] xfs: support shrinking unused space in the last AG Message-ID: <20210322125028.GC2007006@xiangao.remote.csb> References: <20210305025703.3069469-1-hsiangkao@redhat.com> <20210305025703.3069469-5-hsiangkao@redhat.com> <20210322120722.GC2000812@xiangao.remote.csb> <20210322123652.GB2007006@xiangao.remote.csb> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Mon, Mar 22, 2021 at 08:43:19AM -0400, Brian Foster wrote: > On Mon, Mar 22, 2021 at 08:36:52PM +0800, Gao Xiang wrote: > > On Mon, Mar 22, 2021 at 08:26:41AM -0400, Brian Foster wrote: > > > On Mon, Mar 22, 2021 at 08:07:22PM +0800, Gao Xiang wrote: > > > > On Mon, Mar 22, 2021 at 07:30:40AM -0400, Brian Foster wrote: > > > > > On Fri, Mar 05, 2021 at 10:57:02AM +0800, Gao Xiang wrote: > > > > > > As the first step of shrinking, this attempts to enable shrinking > > > > > > unused space in the last allocation group by fixing up freespace > > > > > > btree, agi, agf and adjusting super block and use a helper > > > > > > xfs_ag_shrink_space() to fixup the last AG. > > > > > > > > > > > > This can be all done in one transaction for now, so I think no > > > > > > additional protection is needed. > > > > > > > > > > > > Reviewed-by: Darrick J. Wong > > > > > > Signed-off-by: Gao Xiang > > > > > > --- > > > > > > fs/xfs/xfs_fsops.c | 88 ++++++++++++++++++++++++++++------------------ > > > > > > fs/xfs/xfs_trans.c | 1 - > > > > > > 2 files changed, 53 insertions(+), 36 deletions(-) > > > > > > > > > > > > diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c > > > > > > index fc9e799b2ae3..71cba61a451c 100644 > > > > > > --- a/fs/xfs/xfs_fsops.c > > > > > > +++ b/fs/xfs/xfs_fsops.c > > > ... > > > > > > @@ -115,10 +120,15 @@ xfs_growfs_data_private( > > > > > > if (nb_mod && nb_mod < XFS_MIN_AG_BLOCKS) { > > > > > > nagcount--; > > > > > > nb = (xfs_rfsblock_t)nagcount * mp->m_sb.sb_agblocks; > > > > > > - if (nb < mp->m_sb.sb_dblocks) > > > > > > - return -EINVAL; > > > > > > } > > > > > > delta = nb - mp->m_sb.sb_dblocks; > > > > > > + /* > > > > > > + * XFS doesn't really support single-AG filesystems, so do not > > > > > > + * permit callers to remove the filesystem's second and last AG. > > > > > > + */ > > > > > > + if (delta < 0 && nagcount < 2) > > > > > > + return -EINVAL; > > > > > > + > > > > > > > > > > What if the filesystem is already single AG? Unless I'm missing > > > > > something, we already have a check a bit further down that prevents > > > > > removal of AGs in the first place. > > > > > > > > I think it tends to forbid (return -EINVAL) shrinking the filesystem with > > > > a single AG only? Am I missing something? > > > > > > > > > > My assumption was this check means one can't shrink a filesystem that is > > > already agcount == 1. The comment refers to preventing shrink from > > > causing an agcount == 1 fs. What is the intent? > > > > I think it means the latter -- preventing shrink from causing an agcount == 1 > > fs. since nagcount (new agcount) <= 1? > > > > Right, so that leads to my question... does this check also fail a > shrink on an fs that is already agcount == 1? If so, why? I know > technically it's not a supported configuration, but mkfs allows it. Ah, I'm not sure if Darrick would like to forbid agcount == 1 shrinking functionitity completely, see the previous comment: https://lore.kernel.org/r/20201014160633.GD9832@magnolia/ (please ignore the modification at that time, since it was buggy...) Thanks, Gao Xiang > > Brian > > > Actually, I'm not good at English, if comments need to be improved, please > > kindly point out. Thank you very much! > > > > Thanks, > > Gao Xiang > > > > > > > > Brian > > > > > > > Thanks, > > > > Gao Xiang > > > > > > > > > > > > > > Otherwise looks reasonable.. > > > > > > > > > > Brian > > > > > > > > > > > oagcount = mp->m_sb.sb_agcount; > > > > > > > > > > > > /* allocate the new per-ag structures */ > > > > > > @@ -126,15 +136,22 @@ xfs_growfs_data_private( > > > > > > error = xfs_initialize_perag(mp, nagcount, &nagimax); > > > > > > if (error) > > > > > > return error; > > > > > > + } else if (nagcount < oagcount) { > > > > > > + /* TODO: shrinking the entire AGs hasn't yet completed */ > > > > > > + return -EINVAL; > > > > > > } > > > > > > > > > > > > error = xfs_trans_alloc(mp, &M_RES(mp)->tr_growdata, > > > > > > - XFS_GROWFS_SPACE_RES(mp), 0, XFS_TRANS_RESERVE, &tp); > > > > > > + (delta > 0 ? XFS_GROWFS_SPACE_RES(mp) : -delta), 0, > > > > > > + XFS_TRANS_RESERVE, &tp); > > > > > > if (error) > > > > > > return error; > > > > > > > > > > > > - error = xfs_resizefs_init_new_ags(tp, &id, oagcount, nagcount, > > > > > > - delta, &lastag_resetagres); > > > > > > + if (delta > 0) > > > > > > + error = xfs_resizefs_init_new_ags(tp, &id, oagcount, nagcount, > > > > > > + delta, &lastag_resetagres); > > > > > > + else > > > > > > + error = xfs_ag_shrink_space(mp, &tp, nagcount - 1, -delta); > > > > > > if (error) > > > > > > goto out_trans_cancel; > > > > > > > > > > > > @@ -145,7 +162,7 @@ xfs_growfs_data_private( > > > > > > */ > > > > > > if (nagcount > oagcount) > > > > > > xfs_trans_mod_sb(tp, XFS_TRANS_SB_AGCOUNT, nagcount - oagcount); > > > > > > - if (delta > 0) > > > > > > + if (delta) > > > > > > xfs_trans_mod_sb(tp, XFS_TRANS_SB_DBLOCKS, delta); > > > > > > if (id.nfree) > > > > > > xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, id.nfree); > > > > > > @@ -169,28 +186,29 @@ xfs_growfs_data_private( > > > > > > xfs_set_low_space_thresholds(mp); > > > > > > mp->m_alloc_set_aside = xfs_alloc_set_aside(mp); > > > > > > > > > > > > - /* > > > > > > - * If we expanded the last AG, free the per-AG reservation > > > > > > - * so we can reinitialize it with the new size. > > > > > > - */ > > > > > > - if (lastag_resetagres) { > > > > > > - struct xfs_perag *pag; > > > > > > - > > > > > > - pag = xfs_perag_get(mp, id.agno); > > > > > > - error = xfs_ag_resv_free(pag); > > > > > > - xfs_perag_put(pag); > > > > > > - if (error) > > > > > > - return error; > > > > > > + if (delta > 0) { > > > > > > + /* > > > > > > + * If we expanded the last AG, free the per-AG reservation > > > > > > + * so we can reinitialize it with the new size. > > > > > > + */ > > > > > > + if (lastag_resetagres) { > > > > > > + struct xfs_perag *pag; > > > > > > + > > > > > > + pag = xfs_perag_get(mp, id.agno); > > > > > > + error = xfs_ag_resv_free(pag); > > > > > > + xfs_perag_put(pag); > > > > > > + if (error) > > > > > > + return error; > > > > > > + } > > > > > > + /* > > > > > > + * Reserve AG metadata blocks. ENOSPC here does not mean there > > > > > > + * was a growfs failure, just that there still isn't space for > > > > > > + * new user data after the grow has been run. > > > > > > + */ > > > > > > + error = xfs_fs_reserve_ag_blocks(mp); > > > > > > + if (error == -ENOSPC) > > > > > > + error = 0; > > > > > > } > > > > > > - > > > > > > - /* > > > > > > - * Reserve AG metadata blocks. ENOSPC here does not mean there was a > > > > > > - * growfs failure, just that there still isn't space for new user data > > > > > > - * after the grow has been run. > > > > > > - */ > > > > > > - error = xfs_fs_reserve_ag_blocks(mp); > > > > > > - if (error == -ENOSPC) > > > > > > - error = 0; > > > > > > return error; > > > > > > > > > > > > out_trans_cancel: > > > > > > diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c > > > > > > index 44f72c09c203..d047f5f26cc0 100644 > > > > > > --- a/fs/xfs/xfs_trans.c > > > > > > +++ b/fs/xfs/xfs_trans.c > > > > > > @@ -434,7 +434,6 @@ xfs_trans_mod_sb( > > > > > > tp->t_res_frextents_delta += delta; > > > > > > break; > > > > > > case XFS_TRANS_SB_DBLOCKS: > > > > > > - ASSERT(delta > 0); > > > > > > tp->t_dblocks_delta += delta; > > > > > > break; > > > > > > case XFS_TRANS_SB_AGCOUNT: > > > > > > -- > > > > > > 2.27.0 > > > > > > > > > > > > > > > > > > > > >