On Mon, Jul 22, 2019 at 05:06:29PM -0700, Darrick J. Wong wrote:
> On Tue, Jul 23, 2019 at 09:34:52AM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > When trying to correlate XFS kernel allocations to memory reclaim
> > behaviour, it is useful to know what allocations XFS is actually
> > attempting. This information is not directly available from
> > tracepoints in the generic memory allocation and reclaim
> > tracepoints, so these new trace points provide a high level
> > indication of what the XFS memory demand actually is.
> >
> > There is no per-filesystem context in this code, so we just trace
> > the type of allocation, the size and the iallocation constraints.
> > The kmem code alos doesn't include much of the common XFS headers,
> > so there are a few definitions that need to be added to the trace
> > headers and a couple of types that need to be made common to avoid
> > needing to include the whole world in the kmem code.
> >
> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > ---
> > fs/xfs/kmem.c | 11 +++++++++--
> > fs/xfs/libxfs/xfs_types.h | 8 ++++++++
> > fs/xfs/xfs_mount.h | 7 -------
> > fs/xfs/xfs_trace.h | 33 +++++++++++++++++++++++++++++++++
> > 4 files changed, 50 insertions(+), 9 deletions(-)
> >
> > diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
> > index 16bb9a328678..edcf393c8fd9 100644
> > --- a/fs/xfs/kmem.c
> > +++ b/fs/xfs/kmem.c
> > @@ -3,10 +3,10 @@
> > * Copyright (c) 2000-2005 Silicon Graphics, Inc.
> > * All Rights Reserved.
> > */
> > -#include <linux/sched/mm.h>
> > +#include "xfs.h"
> > #include <linux/backing-dev.h>
> > -#include "kmem.h"
> > #include "xfs_message.h"
> > +#include "xfs_trace.h"
> >
> > void *
> > kmem_alloc(size_t size, xfs_km_flags_t flags)
> > @@ -15,6 +15,8 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
> > gfp_t lflags = kmem_flags_convert(flags);
> > void *ptr;
> >
> > + trace_kmem_alloc(size, flags, _RET_IP_);
> > +
> > do {
> > ptr = kmalloc(size, lflags);
> > if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
> > @@ -35,6 +37,8 @@ kmem_alloc_large(size_t size, xfs_km_flags_t flags)
> > void *ptr;
> > gfp_t lflags;
> >
> > + trace_kmem_alloc_large(size, flags, _RET_IP_);
> > +
> > ptr = kmem_alloc(size, flags | KM_MAYFAIL);
> > if (ptr)
> > return ptr;
> > @@ -65,6 +69,8 @@ kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags)
> > gfp_t lflags = kmem_flags_convert(flags);
> > void *ptr;
> >
> > + trace_kmem_realloc(newsize, flags, _RET_IP_);
> > +
> > do {
> > ptr = krealloc(old, newsize, lflags);
> > if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
> > @@ -85,6 +91,7 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)
> > gfp_t lflags = kmem_flags_convert(flags);
> > void *ptr;
> >
> > + trace_kmem_zone_alloc(0, flags, _RET_IP_);
> > do {
> > ptr = kmem_cache_alloc(zone, lflags);
> > if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))
> > diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
> > index 802b34cd10fe..300b3e91ca3a 100644
> > --- a/fs/xfs/libxfs/xfs_types.h
> > +++ b/fs/xfs/libxfs/xfs_types.h
> > @@ -169,6 +169,14 @@ typedef struct xfs_bmbt_irec
> > xfs_exntst_t br_state; /* extent state */
> > } xfs_bmbt_irec_t;
> >
> > +/* per-AG block reservation types */
> > +enum xfs_ag_resv_type {
> > + XFS_AG_RESV_NONE = 0,
> > + XFS_AG_RESV_AGFL,
> > + XFS_AG_RESV_METADATA,
> > + XFS_AG_RESV_RMAPBT,
> > +};
> > +
> > /*
> > * Type verifier functions
> > */
> > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> > index 4adb6837439a..fdb60e09a9c5 100644
> > --- a/fs/xfs/xfs_mount.h
> > +++ b/fs/xfs/xfs_mount.h
> > @@ -327,13 +327,6 @@ xfs_daddr_to_agbno(struct xfs_mount *mp, xfs_daddr_t d)
> > }
> >
> > /* per-AG block reservation data structures*/
> > -enum xfs_ag_resv_type {
> > - XFS_AG_RESV_NONE = 0,
> > - XFS_AG_RESV_AGFL,
> > - XFS_AG_RESV_METADATA,
> > - XFS_AG_RESV_RMAPBT,
> > -};
> > -
>
> Hmm, what does moving this chunk enable? I don't see the immediate
> relevants to the added tracepoints...? (insofar as "ZOMG MACROS OH MY EYES")
The enum is used in a tracepoint class definition:
DECLARE_EVENT_CLASS(xfs_ag_resv_class,
TP_PROTO(struct xfs_perag *pag, enum xfs_ag_resv_type resv,
xfs_extlen_t len),
TP_ARGS(pag, resv, len),
And requiring an include of xfs_mount.h in kmem.c pulls in about
10 other irrelevent include file dependencies....
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
