On Tue, Jan 26, 2021 at 01:12:59PM -0800, Darrick J. Wong wrote:
> On Tue, Jan 26, 2021 at 08:26:00AM -0500, Brian Foster wrote:
> > On Mon, Jan 25, 2021 at 10:57:35AM -0800, Darrick J. Wong wrote:
> > > On Mon, Jan 25, 2021 at 01:16:23PM -0500, Brian Foster wrote:
> > > > On Sun, Jan 24, 2021 at 09:39:53AM +0000, Christoph Hellwig wrote:
> > > > > > + /* We only allow one retry for EDQUOT/ENOSPC. */
> > > > > > + if (*retry || (error != -EDQUOT && error != -ENOSPC)) {
> > > > > > + *retry = false;
> > > > > > + return error;
> > > > > > + }
> > > > >
> > > > > > + /* Release resources, prepare for scan. */
> > > > > > + xfs_trans_cancel(*tpp);
> > > > > > + *tpp = NULL;
> > > > > > + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> > > > > > +
> > > > > > + /* Try to free some quota for this file's dquots. */
> > > > > > + *retry = true;
> > > > > > + xfs_blockgc_free_quota(ip, 0);
> > > > > > + return 0;
> > > > >
> > > > > I till have grave reservations about this calling conventions. And if
> > > > > you just remove the unlock and th call to xfs_blockgc_free_quota here
> > > > > we don't equire a whole lot of boilerplate code in the callers while
> > > > > making the code possible to reason about for a mere human.
> > > > >
> > > >
> > > > I agree that the retry pattern is rather odd. I'm curious, is there a
> > > > specific reason this scanning task has to execute outside of transaction
> > > > context in the first place?
> > >
> > > Dave didn't like the open-coded retry and told me to shrink the call
> > > sites to:
> > >
> > > error = xfs_trans_reserve_quota(...);
> > > if (error)
> > > goto out_trans_cancel;
> > > if (quota_retry)
> > > goto retry;
> > >
> > > So here we are, slowly putting things almost all the way back to where
> > > they were originally. Now I have a little utility function:
> > >
> > > /*
> > > * Cancel a transaction and try to clear some space so that we can
> > > * reserve some quota. The caller must hold the ILOCK; when this
> > > * function returns, the transaction will be cancelled and the ILOCK
> > > * will have been released.
> > > */
> > > int
> > > xfs_trans_cancel_qretry(
> > > struct xfs_trans *tp,
> > > struct xfs_inode *ip)
> > > {
> > > ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
> > >
> > > xfs_trans_cancel(tp);
> > > xfs_iunlock(ip, XFS_ILOCK_EXCL);
> > >
> > > return xfs_blockgc_free_quota(ip, 0);
> > > }
> > >
> > > Which I guess reduces the amount of call site boilerplate from 4 lines
> > > to two, only now I've spent half of last week on this.
> > >
> > > > Assuming it does because the underlying work
> > > > may involve more transactions or whatnot, I'm wondering if this logic
> > > > could be buried further down in the transaction allocation path.
> > > >
> > > > For example, if we passed the quota reservation and inode down into a
> > > > new variant of xfs_trans_alloc(), it could acquire the ilock and attempt
> > > > the quota reservation as a final step (to avoid adding an extra
> > > > unconditional ilock cycle). If quota res fails, iunlock and release the
> > > > log res internally and perform the scan. From there, perhaps we could
> > > > retry the quota reservation immediately without logres or the ilock by
> > > > saving references to the dquots, and then only reacquire logres/ilock on
> > > > success..? Just thinking out loud so that might require further
> > > > thought...
> > >
> > > Yes, that's certainly possible, and probably a good design goal to have
> > > a xfs_trans_alloc_quota(tres, ip, whichfork, nblks, &tp) that one could
> > > call to reserve a transaction, lock the inode, and reserve the
> > > appropriate amounts of quota to handle mapping nblks into an inode fork.
> > >
> > > However, there are complications that don't make this a trivial switch:
> > >
> > > 1. Reflink and (new) swapext don't actually know how many blocks they
> > > need to reserve until after they've grabbed the two ILOCKs, which means
> > > that the wrapper is of no use here.
> > >
> >
> > IMO, it's preferable to define a clean/usable interface if we can find
> > one that covers the majority of use cases and have to open code a
> > handful of outliers than define a cumbersome interface that must be used
> > everywhere to accommodate the outliers. Perhaps we'll find cleaner ways
> > to deal with open coded outliers over time..?
>
> Sure, we might, but let's not delay this cleanup, since these are the
> last two pieces that I need to get merged before I can send out deferred
> inode inactivation for review. Deferred inode inactivation adds yet
> another button that we can push to reclaim free space when something hits
> EDQUOT/ENOSPC.
>
Not sure I see the need to rush in a particular interface that multiple
reviewers have expressed reservations about just because there are more
patches coming built on top. That just creates more churn and cleanup
work for later, which means more review/test cycles and more work
indirectly for people who might have to deal with backports, etc. I'm
not dead set against what this patch does if there's no better
alternative, but IMO it's better to get it right than get it fast so we
should at least give fair consideration to some alternatives if ideas
are being presented.
> FWIW I did start down the path of building a better interface last week,
> but quickly became mired in (1) how do we allocate rt quota with a new
> interface and (2) do we care? And then I started looking at what rt
> allocations do wrt quota and decided that fixing that (or even removing
> it) would be an entire patchset.
>
> Hence I'm trying to constrain this patchset to updating the existing
> callsites to do the scan+retry, and no more.
>
Ok, well I think that helps me understand the situation, but I'm still
not really following if/how that conflicts with any of the previous
suggestions (which is why I was asking for example code to consider).
> > Perhaps (at least in the
> > reflink case) we could attempt a worst case quota reservation with the
> > helper, knowing that it will have invoked the scan on -EDQUOT, and then
> > fall back to a more accurate open-coded xfs_trans_reserve_() call (that
> > will no longer fall into retry loops on failure)..?
>
> Making a worst case reservation and backing off creates more ways for
> things to fail unnecessarily.
>
> For a remap operation, the worst case is if the source file range has an
> allocated mapping and the destination file range is a hole, because we
> have to increment quota by the size of that allocated mapping. If we
> run out of quota we'll have to flush the fs and try again. If we fail
> the quota reservation a second time, the whole operation fails.
>
Right...
> This is not good behavior for all the other cases -- if both mappings
> are holes or both allocated, we just failed an operation that would have
> made no net change to the quota allocations. If the source file range
> is a hole and the destination range is allocated, we actually would have
> /decreased/ the quota usage, but instead we fail with EDQUOT.
>
But that wasn't the suggestion. The suggestion was to do something along
the lines of the following in the reflink case:
error = xfs_trans_alloc_quota(..., ip, resblks, worstqres, ...);
if (error == -EDQUOT) {
worstqres = 0;
error = xfs_trans_alloc(..., resblks, ...);
...
}
if (!worstqres) {
worstqres = <calculate actual quota res>
error = xfs_trans_reserve_quota(...);
if (error)
return error;
}
...
... where the initial transaction allocation failure would have failed
on the worst case qres, but also would have run the internal reclaim
scan and retried before it returned. Therefore, we could still attempt
the open coded non-worst case reservation and either proceed or return
-EDQUOT with generally similar scan->retry semantics as this patch, just
without the open coded goto loops everywhere we attach quota reservation
to a transaction. This of course assumes that the
xfs_trans_alloc_quota() interface works well enough for the majority of
other cases without need for open coded reservation...
> Right now the remap code handles those cases just fine, at a cost of
> open coded logic.
>
> > > 2. For the remaining quota reservation callsites, you have to deal with
> > > the bmap code that computes qblocks for reservation against the realtime
> > > device. This is opening a huge can of worms because:
> > >
> > > 3. Realtime and quota are not supported, which means that none of that
> > > code ever gets properly QA'd. It would be totally stupid to rework most
> > > of the quota reservation callsites and still leave that logic bomb.
> > > This gigantic piece of technical debt needs to be paid off, either by
> > > fixing the functionality and getting it under test, or by dropping rt
> > > quota support completely and officially.
> > >
> >
> > I'm not following what you're referring to here. Can you point to
> > examples in the code for reference, please?
>
> If you format a filesystem with realtime and mount it with -oquota, xfs
> will ignore the 'quota' mount option completely. Some code exists to
> do rt quota accounting (xfs_alloc_file_space and xfs_iomap_write_direct
> are examples) but since we never allow rt+quota, the code coverage on
> that is 0%.
>
Ok, but how is that any different for what this patch does?
Brian
> I've also noticed that those functions seem to have this odd behavior
> where for rt files, they'll reserve quota for the allocated blocks
> themselves but not the bmbt blocks; but for regular files, they reserve
> quota for both the allocated blocks and the bmbt blocks. The quota code
> makes various allowances for transactions that try to commit quota count
> updates but have zero quota reservation attached to the transaction,
> which I /think/ could have been an attempt to work around that quirk.
>
> I also just noticed that xfs_bmapi_reserve_delalloc only works with
> non-rt files. I guess that's fine since rt files don't use the delalloc
> mechanism anyway (and I think the reason they don't is that xfs can't
> currently do write-around to handle rextsize>1 filesystems) but that's
> another mess to sort.
>
> (FWIW I'm slowly working through all those rt issues as part of maturing
> the rt reflink patchset, but that's at the far end of my dev tree...)
>
> --D
>
> >
> > Brian
> >
> > > My guess is that fixing rt quota is probably going to take 10-15
> > > patches, and doing more small cleanups to convert the callsites will be
> > > another 10 or so.
> > >
> > > 4. We're already past -rc5, and what started as two cleanup patchsets of
> > > 13 is now four patchsets of 27 patches, and I /really/ would just like
> > > to get these patches merged without expanding the scope of work even
> > > further.
> > >
> > > --D
> > >
> > > > Brian
> > > >
> > >
> >
>
