[PATCH 40/50] xfs: move xfs_bmap_btalloc_filestreams() to xfs_filestreams.c

Dave Chinner
2022-06-11T01:27:40Z

xfs_bmap_btalloc_filestreams() calls two filestreams functions to
select the AG to allocate from. Both those functions end up in
the same selection function that iterates all AGs multiple times.
Worst case, xfs_bmap_btalloc_filestreams() can iterate all AGs 4
times just to select the initial AG to allocate in.

Move xfs_bmap_btalloc_filestreams() to fs/xfs/xfs_filestreams.c so
that the inefficient abstraction can be greatly simplified and
the implementation made more efficient.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/libxfs/xfs_bmap.c | 78 ++--------------------------------------
fs/xfs/xfs_filestream.c | 67 ++++++++++++++++++++++++++++++++--
fs/xfs/xfs_filestream.h | 5 +--
3 files changed, 71 insertions(+), 79 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 65f407ace78f..6a87897ac644 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3215,68 +3215,6 @@ xfs_bmap_select_minlen(
return args->maxlen;
}

-STATIC int
-xfs_bmap_btalloc_filestreams(
- struct xfs_bmalloca *ap,
- struct xfs_alloc_arg *args,
- xfs_extlen_t *blen)
-{
- struct xfs_mount *mp = ap->ip->i_mount;
- struct xfs_perag *pag;
- xfs_agnumber_t start_agno;
- int error;
-
- args->total = ap->total;
-
- start_agno = XFS_FSB_TO_AGNO(mp, args->fsbno);
- if (start_agno == NULLAGNUMBER)
- start_agno = 0;
-
- pag = xfs_perag_grab(mp, start_agno);
- if (pag) {
- error = xfs_bmap_longest_free_extent(pag, args->tp, blen);
- xfs_perag_rele(pag);
- if (error) {
- if (error != -EAGAIN)
- return error;
- *blen = 0;
- }
- }
-
- if (*blen < args->maxlen) {
- xfs_agnumber_t agno = start_agno;
-
- error = xfs_filestream_new_ag(ap, &agno);
- if (error)
- return error;
- if (agno == NULLAGNUMBER)
- goto out_select;
-
- pag = xfs_perag_grab(mp, agno);
- if (!pag)
- goto out_select;
-
- error = xfs_bmap_longest_free_extent(pag, args->tp, blen);
- xfs_perag_rele(pag);
- if (error) {
- if (error != -EAGAIN)
- return error;
- *blen = 0;
- }
- start_agno = agno;
- }
-
-out_select:
- args->minlen = xfs_bmap_select_minlen(ap, args, *blen);
-
- /*
- * Set the failure fallback case to look in the selected AG as stream
- * may have moved.
- */
- ap->blkno = args->fsbno = XFS_AGB_TO_FSB(mp, start_agno, 0);
- return 0;
-}
-
/* Update all inode and quota accounting for the allocation we just did. */
static void
xfs_bmap_btalloc_accounting(
@@ -3615,25 +3553,15 @@ xfs_btalloc_filestreams(
struct xfs_alloc_arg *args,
int stripe_align)
{
- xfs_agnumber_t agno = xfs_filestream_lookup_ag(ap->ip);
xfs_extlen_t blen = 0;
int error;

- /* Determine the initial block number we will target for allocation. */
- if (agno == NULLAGNUMBER)
- agno = 0;
- ap->blkno = XFS_AGB_TO_FSB(args->mp, agno, 0);
- xfs_bmap_adjacent(ap);
-
- /*
- * Search for an allocation group with a single extent large enough for
- * the request. If one isn't found, then adjust the minimum allocation
- * size to the largest space found.
- */
- error = xfs_bmap_btalloc_filestreams(ap, args, &blen);
+ error = xfs_filestream_select_ag(ap, args, &blen);
if (error)
return error;

+ args->minlen = xfs_bmap_select_minlen(ap, args, blen);
+
if (ap->aeof) {
error = xfs_btalloc_at_eof(ap, args, blen, stripe_align, true);
if (error || args->fsbno != NULLFSBLOCK)
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 2eb702034d05..458df92fd9a6 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -12,6 +12,7 @@
#include "xfs_mount.h"
#include "xfs_inode.h"
#include "xfs_bmap.h"
+#include "xfs_bmap_util.h"
#include "xfs_alloc.h"
#include "xfs_mru_cache.h"
#include "xfs_trace.h"
@@ -263,7 +264,7 @@ xfs_filestream_get_parent(
*
* Returns NULLAGNUMBER in case of an error.
*/
-xfs_agnumber_t
+static xfs_agnumber_t
xfs_filestream_lookup_ag(
struct xfs_inode *ip)
{
@@ -312,7 +313,7 @@ xfs_filestream_lookup_ag(
* This is called when the allocator can't find a suitable extent in the
* current AG, and we have to move the stream into a new AG with more space.
*/
-int
+static int
xfs_filestream_new_ag(
struct xfs_bmalloca *ap,
xfs_agnumber_t *agp)
@@ -358,6 +359,68 @@ xfs_filestream_new_ag(
return err;
}

+/*
+ * Search for an allocation group with a single extent large enough for
+ * the request. If one isn't found, then adjust the minimum allocation
+ * size to the largest space found.
+ */
+int
+xfs_filestream_select_ag(
+ struct xfs_bmalloca *ap,
+ struct xfs_alloc_arg *args,
+ xfs_extlen_t *blen)
+{
+ struct xfs_mount *mp = ap->ip->i_mount;
+ struct xfs_perag *pag;
+ xfs_agnumber_t start_agno = xfs_filestream_lookup_ag(ap->ip);
+ int error;
+
+ /* Determine the initial block number we will target for allocation. */
+ if (start_agno == NULLAGNUMBER)
+ start_agno = 0;
+ ap->blkno = XFS_AGB_TO_FSB(args->mp, start_agno, 0);
+ xfs_bmap_adjacent(ap);
+ args->total = ap->total;
+
+ pag = xfs_perag_grab(mp, start_agno);
+ if (pag) {
+ error = xfs_bmap_longest_free_extent(pag, args->tp, blen);
+ xfs_perag_rele(pag);
+ if (error) {
+ if (error != -EAGAIN)
+ return error;
+ *blen = 0;
+ }
+ }
+
+ if (*blen < args->maxlen) {
+ xfs_agnumber_t agno = start_agno;
+
+ error = xfs_filestream_new_ag(ap, &agno);
+ if (error)
+ return error;
+ if (agno == NULLAGNUMBER)
+ goto out_select;
+
+ pag = xfs_perag_grab(mp, agno);
+ if (!pag)
+ goto out_select;
+
+ error = xfs_bmap_longest_free_extent(pag, args->tp, blen);
+ xfs_perag_rele(pag);
+ if (error) {
+ if (error != -EAGAIN)
+ return error;
+ *blen = 0;
+ }
+ start_agno = agno;
+ }
+
+out_select:
+ ap->blkno = XFS_AGB_TO_FSB(mp, start_agno, 0);
+ return 0;
+}
+
void
xfs_filestream_deassociate(
struct xfs_inode *ip)
diff --git a/fs/xfs/xfs_filestream.h b/fs/xfs/xfs_filestream.h
index 403226ebb80b..df9f7553e106 100644
--- a/fs/xfs/xfs_filestream.h
+++ b/fs/xfs/xfs_filestream.h
@@ -9,13 +9,14 @@
struct xfs_mount;
struct xfs_inode;
struct xfs_bmalloca;
+struct xfs_alloc_arg;

int xfs_filestream_mount(struct xfs_mount *mp);
void xfs_filestream_unmount(struct xfs_mount *mp);
void xfs_filestream_deassociate(struct xfs_inode *ip);
-xfs_agnumber_t xfs_filestream_lookup_ag(struct xfs_inode *ip);
-int xfs_filestream_new_ag(struct xfs_bmalloca *ap, xfs_agnumber_t *agp);
int xfs_filestream_peek_ag(struct xfs_mount *mp, xfs_agnumber_t agno);
+int xfs_filestream_select_ag(struct xfs_bmalloca *ap,
+ struct xfs_alloc_arg *args, xfs_extlen_t *blen);

static inline int
xfs_inode_is_filestream(
--
2.35.1