| Message ID | 49a31389f88ab40b11f07afa5c728a1368e39a45.1541908447.git.osandov@fb.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2] xfs: cache minimum realtime summary level | expand |
On Sat, Nov 10, 2018 at 07:59:58PM -0800, Omar Sandoval wrote: > From: Omar Sandoval <osandov@fb.com> > > The realtime summary is a two-dimensional array on disk, effectively: > > u32 rsum[log2(number of realtime extents) + 1][number of blocks in the bitmap] > > rsum[log][bbno] is the number of extents of size 2**log which start in > bitmap block bbno. > > xfs_rtallocate_extent_near() uses xfs_rtany_summary() to check whether > rsum[log][bbno] != 0 for any log level. However, the summary array is > stored in row-major order (i.e., like an array in C), so all of these > entries are not adjacent, but rather spread across the entire summary > file. In the worst case (a full bitmap block), xfs_rtany_summary() has > to check every level. > > This means that on a moderately-used realtime device, an allocation will > waste a lot of time finding, reading, and releasing buffers for the > realtime summary. In particular, one of our storage services (which runs > on servers with 8 very slow CPUs and 15 8 TB XFS realtime filesystems) > spends almost 5% of its CPU cycles in xfs_rtbuf_get() and > xfs_trans_brelse() called from xfs_rtany_summary(). > > One solution would be to also store the summary with the dimensions > swapped. However, this would require a disk format change to a very old > component of XFS. > > Instead, we can cache the minimum size which contains any extents. We do > so lazily; rather than guaranteeing that the cache contains the precise > minimum, it always contains a loose lower bound which we tighten when we > read or update a summary block. This only uses a few kilobytes of memory > and is already serialized via the realtime bitmap and summary inode > locks, so the cost is minimal. With this change, the same workload only > spends 0.2% of its CPU cycles in the realtime allocator. > > Signed-off-by: Omar Sandoval <osandov@fb.com> > --- > Based on Linus' master branch. > > Changes from v1: > - Clarify comment in xfs_rtmount_inodes(). > - Use kmem_* instead of kvmalloc/kvfree > > fs/xfs/libxfs/xfs_rtbitmap.c | 4 ++++ > fs/xfs/xfs_mount.h | 6 ++++++ > fs/xfs/xfs_rtalloc.c | 27 +++++++++++++++++++++++---- > 3 files changed, 33 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c > index b228c821bae6..6d4990717cee 100644 > --- a/fs/xfs/libxfs/xfs_rtbitmap.c > +++ b/fs/xfs/libxfs/xfs_rtbitmap.c > @@ -505,6 +505,10 @@ xfs_rtmodify_summary_int( > uint first = (uint)((char *)sp - (char *)bp->b_addr); > > *sp += delta; > + if (*sp == 0 && log == mp->m_rsum_cache[bbno]) > + mp->m_rsum_cache[bbno]++; > + if (*sp != 0 && log < mp->m_rsum_cache[bbno]) > + mp->m_rsum_cache[bbno] = log; > xfs_trans_log_buf(tp, bp, first, first + sizeof(*sp) - 1); > } > if (sum) > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h > index 7964513c3128..2b626a4b4824 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -89,6 +89,12 @@ typedef struct xfs_mount { > int m_logbsize; /* size of each log buffer */ > uint m_rsumlevels; /* rt summary levels */ > uint m_rsumsize; /* size of rt summary, bytes */ > + /* > + * Cache of rt summary level per bitmap block with the invariant that > + * m_rsum_cache[bbno] <= the minimum i for which rsum[i][bbno] != 0. > + * Reads and writes are serialized by the rsumip inode lock. > + */ > + uint8_t *m_rsum_cache; > struct xfs_inode *m_rbmip; /* pointer to bitmap inode */ > struct xfs_inode *m_rsumip; /* pointer to summary inode */ > struct xfs_inode *m_rootip; /* pointer to root directory */ > diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c > index 926ed314ffba..330406e0af14 100644 > --- a/fs/xfs/xfs_rtalloc.c > +++ b/fs/xfs/xfs_rtalloc.c > @@ -64,8 +64,12 @@ xfs_rtany_summary( > int log; /* loop counter, log2 of ext. size */ > xfs_suminfo_t sum; /* summary data */ > > + /* There are no extents at levels < m_rsum_cache[bbno]. */ > + if (low < mp->m_rsum_cache[bbno]) > + low = mp->m_rsum_cache[bbno]; > + > /* > - * Loop over logs of extent sizes. Order is irrelevant. > + * Loop over logs of extent sizes. > */ > for (log = low; log <= high; log++) { > /* > @@ -80,13 +84,17 @@ xfs_rtany_summary( > */ > if (sum) { > *stat = 1; > - return 0; > + goto out; > } > } > /* > * Found nothing, return failure. > */ > *stat = 0; > +out: > + /* There were no extents at levels < log. */ > + if (log > mp->m_rsum_cache[bbno]) > + mp->m_rsum_cache[bbno] = log; > return 0; > } > > @@ -1187,8 +1195,8 @@ xfs_rtmount_init( > } > > /* > - * Get the bitmap and summary inodes into the mount structure > - * at mount time. > + * Get the bitmap and summary inodes and the summary cache into the mount > + * structure at mount time. > */ > int /* error */ > xfs_rtmount_inodes( > @@ -1211,6 +1219,16 @@ xfs_rtmount_inodes( > return error; > } > ASSERT(mp->m_rsumip != NULL); > + /* > + * The rsum cache is initialized to all zeroes, which is trivially a > + * lower bound on the minimum level with any free extents. > + */ > + mp->m_rsum_cache = kmem_zalloc_large(sbp->sb_rbmblocks, KM_SLEEP); Hmmm, how much memory does this require? Let's say I had a 64TB realtime volume on a 4k block filesystem and 1 block per rt extent. That's ... 2^(46 - 12) = 2^34 rt blocks. Each rtbitmap block tracks 2^(12+3) = 2^15 blocks, which means that there are 2^(34-15) = 2^19 rtbitmap blocks. The cache requires 1 byte per rtbitmap block (2^19) which means it requires ~512k of memory? And if I had 1EB that would be 8MB of RAM? (Granted you said you use 256K rt extents, which cuts down the memory requirements by 64x, but I don't want to assume everyone will do this.) > + if (!mp->m_rsum_cache) { > + xfs_irele(mp->m_rbmip); > + xfs_irele(mp->m_rsumip); > + return -ENOMEM; > + } That's a pretty high order memory allocation and it seem unfortunate to fail the mount because we couldn't cobble together enough [kv]memory to set up a rtsummary cache. One option would be to fall back to reading the rtsummary file if m_rsum_cache == NULL (i.e. we couldn't get enough memory to set up the cache). Another option could be to use the xfs big memory array that I've been developing for the xfs online repair patchset which uses a memfd to create a byte-addressable array whose pages can be swapped out. The downside of xfbma is that array accesses are pretty heavyweight. --D > return 0; > } > > @@ -1218,6 +1236,7 @@ void > xfs_rtunmount_inodes( > struct xfs_mount *mp) > { > + kmem_free(mp->m_rsum_cache); > if (mp->m_rbmip) > xfs_irele(mp->m_rbmip); > if (mp->m_rsumip) > -- > 2.19.1 >
On Tue, Nov 13, 2018 at 09:42:34AM -0800, Darrick J. Wong wrote: > On Sat, Nov 10, 2018 at 07:59:58PM -0800, Omar Sandoval wrote: > > From: Omar Sandoval <osandov@fb.com> > > > > The realtime summary is a two-dimensional array on disk, effectively: > > > > u32 rsum[log2(number of realtime extents) + 1][number of blocks in the bitmap] > > > > rsum[log][bbno] is the number of extents of size 2**log which start in > > bitmap block bbno. > > > > xfs_rtallocate_extent_near() uses xfs_rtany_summary() to check whether > > rsum[log][bbno] != 0 for any log level. However, the summary array is > > stored in row-major order (i.e., like an array in C), so all of these > > entries are not adjacent, but rather spread across the entire summary > > file. In the worst case (a full bitmap block), xfs_rtany_summary() has > > to check every level. > > > > This means that on a moderately-used realtime device, an allocation will > > waste a lot of time finding, reading, and releasing buffers for the > > realtime summary. In particular, one of our storage services (which runs > > on servers with 8 very slow CPUs and 15 8 TB XFS realtime filesystems) > > spends almost 5% of its CPU cycles in xfs_rtbuf_get() and > > xfs_trans_brelse() called from xfs_rtany_summary(). > > > > One solution would be to also store the summary with the dimensions > > swapped. However, this would require a disk format change to a very old > > component of XFS. > > > > Instead, we can cache the minimum size which contains any extents. We do > > so lazily; rather than guaranteeing that the cache contains the precise > > minimum, it always contains a loose lower bound which we tighten when we > > read or update a summary block. This only uses a few kilobytes of memory > > and is already serialized via the realtime bitmap and summary inode > > locks, so the cost is minimal. With this change, the same workload only > > spends 0.2% of its CPU cycles in the realtime allocator. > > > > Signed-off-by: Omar Sandoval <osandov@fb.com> > > --- [snip] > Hmmm, how much memory does this require? > > Let's say I had a 64TB realtime volume on a 4k block filesystem and 1 > block per rt extent. > > That's ... 2^(46 - 12) = 2^34 rt blocks. > > Each rtbitmap block tracks 2^(12+3) = 2^15 blocks, which means that > there are 2^(34-15) = 2^19 rtbitmap blocks. > > The cache requires 1 byte per rtbitmap block (2^19) which means it > requires ~512k of memory? And if I had 1EB that would be 8MB of RAM? > > (Granted you said you use 256K rt extents, which cuts down the memory > requirements by 64x, but I don't want to assume everyone will do this.) Yup, that math looks right. > > + if (!mp->m_rsum_cache) { > > + xfs_irele(mp->m_rbmip); > > + xfs_irele(mp->m_rsumip); > > + return -ENOMEM; > > + } > > That's a pretty high order memory allocation and it seem unfortunate to > fail the mount because we couldn't cobble together enough [kv]memory to > set up a rtsummary cache. > > One option would be to fall back to reading the rtsummary file if > m_rsum_cache == NULL (i.e. we couldn't get enough memory to set up the > cache). Good idea, I'll make this continue without the cache if it can't be allocated. Thanks for the review. > Another option could be to use the xfs big memory array that > I've been developing for the xfs online repair patchset which uses a > memfd to create a byte-addressable array whose pages can be swapped out. > The downside of xfbma is that array accesses are pretty heavyweight. > > --D
diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index b228c821bae6..6d4990717cee 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c @@ -505,6 +505,10 @@ xfs_rtmodify_summary_int( uint first = (uint)((char *)sp - (char *)bp->b_addr); *sp += delta; + if (*sp == 0 && log == mp->m_rsum_cache[bbno]) + mp->m_rsum_cache[bbno]++; + if (*sp != 0 && log < mp->m_rsum_cache[bbno]) + mp->m_rsum_cache[bbno] = log; xfs_trans_log_buf(tp, bp, first, first + sizeof(*sp) - 1); } if (sum) diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 7964513c3128..2b626a4b4824 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -89,6 +89,12 @@ typedef struct xfs_mount { int m_logbsize; /* size of each log buffer */ uint m_rsumlevels; /* rt summary levels */ uint m_rsumsize; /* size of rt summary, bytes */ + /* + * Cache of rt summary level per bitmap block with the invariant that + * m_rsum_cache[bbno] <= the minimum i for which rsum[i][bbno] != 0. + * Reads and writes are serialized by the rsumip inode lock. + */ + uint8_t *m_rsum_cache; struct xfs_inode *m_rbmip; /* pointer to bitmap inode */ struct xfs_inode *m_rsumip; /* pointer to summary inode */ struct xfs_inode *m_rootip; /* pointer to root directory */ diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 926ed314ffba..330406e0af14 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -64,8 +64,12 @@ xfs_rtany_summary( int log; /* loop counter, log2 of ext. size */ xfs_suminfo_t sum; /* summary data */ + /* There are no extents at levels < m_rsum_cache[bbno]. */ + if (low < mp->m_rsum_cache[bbno]) + low = mp->m_rsum_cache[bbno]; + /* - * Loop over logs of extent sizes. Order is irrelevant. + * Loop over logs of extent sizes. */ for (log = low; log <= high; log++) { /* @@ -80,13 +84,17 @@ xfs_rtany_summary( */ if (sum) { *stat = 1; - return 0; + goto out; } } /* * Found nothing, return failure. */ *stat = 0; +out: + /* There were no extents at levels < log. */ + if (log > mp->m_rsum_cache[bbno]) + mp->m_rsum_cache[bbno] = log; return 0; } @@ -1187,8 +1195,8 @@ xfs_rtmount_init( } /* - * Get the bitmap and summary inodes into the mount structure - * at mount time. + * Get the bitmap and summary inodes and the summary cache into the mount + * structure at mount time. */ int /* error */ xfs_rtmount_inodes( @@ -1211,6 +1219,16 @@ xfs_rtmount_inodes( return error; } ASSERT(mp->m_rsumip != NULL); + /* + * The rsum cache is initialized to all zeroes, which is trivially a + * lower bound on the minimum level with any free extents. + */ + mp->m_rsum_cache = kmem_zalloc_large(sbp->sb_rbmblocks, KM_SLEEP); + if (!mp->m_rsum_cache) { + xfs_irele(mp->m_rbmip); + xfs_irele(mp->m_rsumip); + return -ENOMEM; + } return 0; } @@ -1218,6 +1236,7 @@ void xfs_rtunmount_inodes( struct xfs_mount *mp) { + kmem_free(mp->m_rsum_cache); if (mp->m_rbmip) xfs_irele(mp->m_rbmip); if (mp->m_rsumip)