Commit c9690043 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: use %px for data pointers when debugging 



Starting with commit 57e73442 ("vsprintf: refactor %pK code out of
pointer"), the behavior of the raw '%p' printk format specifier was
changed to print a 32-bit hash of the pointer value to avoid leaking
kernel pointers into dmesg.  For most situations that's good.

This is /undesirable/ behavior when we're trying to debug XFS, however,
so define a PTR_FMT that prints the actual pointer when we're in debug
mode.

Note that %p for tracepoints still prints the raw pointer, so in the
long run we could consider rewriting some of these messages as
tracepoints.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent aff68a55

fs/xfs/libxfs/xfs_dir2_node.c

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ xfs_dir2_node_addname_int( 
					(unsigned long long)ifbno, lastfbno);

				if (fblk) {

					xfs_alert(mp,

				" fblk %p blkno %llu index %d magic 0x%x",

				" fblk "PTR_FMT" blkno %llu index %d magic 0x%x",

						fblk,

						(unsigned long long)fblk->blkno,

						fblk->index,

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ xfs_aops_discard_page( 
		goto out_invalidate;



	xfs_alert(ip->i_mount,

		"page discard on page %p, inode 0x%llx, offset %llu.",

		"page discard on page "PTR_FMT", inode 0x%llx, offset %llu.",

			page, ip->i_ino, offset);



	xfs_ilock(ip, XFS_ILOCK_EXCL);

fs/xfs/xfs_dquot_item.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ xfs_qm_dquot_logitem_push( 


	error = xfs_qm_dqflush(dqp, &bp);

	if (error) {

		xfs_warn(dqp->q_mount, "%s: push error %d on dqp %p",

		xfs_warn(dqp->q_mount, "%s: push error %d on dqp "PTR_FMT,

			__func__, error, dqp);

	} else {

		if (!xfs_buf_delwri_queue(bp, buffer_list))

fs/xfs/xfs_fsops.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ xfs_do_force_shutdown( 


	if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {

		xfs_notice(mp,

	"%s(0x%x) called from line %d of file %s.  Return address = %p",

	"%s(0x%x) called from line %d of file %s.  Return address = "PTR_FMT,

			__func__, flags, lnnum, fname, __return_address);

	}

	/*

fs/xfs/xfs_inode.c

+5 −5
Original line number Diff line number Diff line
@@ -3529,7 +3529,7 @@ xfs_iflush_int( 
	if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC),

			       mp, XFS_ERRTAG_IFLUSH_1)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: Bad inode %Lu magic number 0x%x, ptr %p",

			"%s: Bad inode %Lu magic number 0x%x, ptr "PTR_FMT,

			__func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip);

		goto corrupt_out;

	}
@@ -3539,7 +3539,7 @@ xfs_iflush_int( 
		    (ip->i_d.di_format != XFS_DINODE_FMT_BTREE),

		    mp, XFS_ERRTAG_IFLUSH_3)) {

			xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

				"%s: Bad regular inode %Lu, ptr %p",

				"%s: Bad regular inode %Lu, ptr "PTR_FMT,

				__func__, ip->i_ino, ip);

			goto corrupt_out;

		}
@@ -3550,7 +3550,7 @@ xfs_iflush_int( 
		    (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL),

		    mp, XFS_ERRTAG_IFLUSH_4)) {

			xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

				"%s: Bad directory inode %Lu, ptr %p",

				"%s: Bad directory inode %Lu, ptr "PTR_FMT,

				__func__, ip->i_ino, ip);

			goto corrupt_out;

		}
@@ -3559,7 +3559,7 @@ xfs_iflush_int( 
				ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: detected corrupt incore inode %Lu, "

			"total extents = %d, nblocks = %Ld, ptr %p",

			"total extents = %d, nblocks = %Ld, ptr "PTR_FMT,

			__func__, ip->i_ino,

			ip->i_d.di_nextents + ip->i_d.di_anextents,

			ip->i_d.di_nblocks, ip);
@@ -3568,7 +3568,7 @@ xfs_iflush_int( 
	if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,

				mp, XFS_ERRTAG_IFLUSH_6)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: bad inode %Lu, forkoff 0x%x, ptr %p",

			"%s: bad inode %Lu, forkoff 0x%x, ptr "PTR_FMT,

			__func__, ip->i_ino, ip->i_d.di_forkoff, ip);

		goto corrupt_out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE