xfs: consolidate btree block freeing tracepoints

Source kernel commit: 78067b92b9096a70ca731a6cde1c286582ff03d7

Don't waste memory on extra per-btree block freeing tracepoints when we
can do it from the generic btree code.

With this patch applied, two tracepoints are collapsed into one
tracepoint, with the following effects on objdump -hx xfs.ko output:

Before:

10 __tracepoints_ptrs 00000b3c  0000000000000000  0000000000000000  00140eb0  2**2
14 __tracepoints_strings 00005453  0000000000000000  0000000000000000  00168540  2**5
29 __tracepoints 00010d90  0000000000000000  0000000000000000  0023f5e0  2**5

After:

10 __tracepoints_ptrs 00000b38  0000000000000000  0000000000000000  001412f0  2**2
14 __tracepoints_strings 00005433  0000000000000000  0000000000000000  001689a0  2**5
29 __tracepoints 00010d30  0000000000000000  0000000000000000  0023fe00  2**5

Column 3 is the section size in bytes; removing these two tracepoints
reduces the size of the ELF segments by 132 bytes.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index f172b61d6a553800a9d99f6a7e692f1c07cd7468..98819653bcb03cbc6b6f1e5815b5bcc9aee80d9e 100644 (file)
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h
@@ -68,6 +68,7 @@
 #define trace_xfs_btree_commit_ifakeroot(a)    ((void) 0)
 #define trace_xfs_btree_bload_level_geometry(a,b,c,d,e,f,g) ((void) 0)
 #define trace_xfs_btree_bload_block(a,b,c,d,e,f) ((void) 0)
+#define trace_xfs_btree_free_block(...)                ((void) 0)
 
 #define trace_xfs_free_extent(a,b,c,d,e,f,g)   ((void) 0)
 #define trace_xfs_agf(a,b,c,d)                 ((void) 0)
@@ -256,7 +257,6 @@
 #define trace_xfs_rmap_find_left_neighbor_result(...)  ((void) 0)
 #define trace_xfs_rmap_lookup_le_range_result(...)     ((void) 0)
 
-#define trace_xfs_rmapbt_free_block(...)       ((void) 0)
 #define trace_xfs_rmapbt_alloc_block(...)      ((void) 0)
 
 #define trace_xfs_ag_resv_critical(...)                ((void) 0)
@@ -276,7 +276,6 @@
 #define trace_xfs_refcount_insert_error(...)   ((void) 0)
 #define trace_xfs_refcount_delete(...)         ((void) 0)
 #define trace_xfs_refcount_delete_error(...)   ((void) 0)
-#define trace_xfs_refcountbt_free_block(...)   ((void) 0)
 #define trace_xfs_refcountbt_alloc_block(...)  ((void) 0)
 #define trace_xfs_refcount_rec_order_error(...)        ((void) 0)
 

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index b9af447ab69dee57afc3f859fd3a9826853c1efd..fb36a3b69ea0d5233d57e4cdab4132e0522d32e5 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -411,6 +411,8 @@ xfs_btree_free_block(
 {
        int                     error;
 
+       trace_xfs_btree_free_block(cur, bp);
+
        error = cur->bc_ops->free_block(cur, bp);
        if (!error) {
                xfs_trans_binval(cur->bc_tp, bp);

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index ac1c3ab868e01c2f1ec47864c4fd70c4494958da..67551df02bde5c223df95ea58646164e9e5a68ed 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -106,8 +106,6 @@ xfs_refcountbt_free_block(
        struct xfs_agf          *agf = agbp->b_addr;
        xfs_fsblock_t           fsbno = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
 
-       trace_xfs_refcountbt_free_block(cur->bc_mp, cur->bc_ag.pag->pag_agno,
-                       XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), 1);
        be32_add_cpu(&agf->agf_refcount_blocks, -1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_REFCOUNT_BLOCKS);
        return xfs_free_extent_later(cur->bc_tp, fsbno, 1,

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index d6e2fc0a3f94929c952634f213b7bae4ffafa67a..7966a3e6a4743bbf6b99aae4a3de6a5c4b199c60 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -123,8 +123,6 @@ xfs_rmapbt_free_block(
        int                     error;
 
        bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp));
-       trace_xfs_rmapbt_free_block(cur->bc_mp, pag->pag_agno,
-                       bno, 1);
        be32_add_cpu(&agf->agf_rmap_blocks, -1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
        error = xfs_alloc_put_freelist(pag, cur->bc_tp, agbp, NULL, bno, 1);