Received-SPF: pass (google.com: domain of linux-kernel+bounces-133525-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Andreas Dilger <adilger@dilger.ca>
Message-Id: <E34A242A-4FB8-402E-842F-89E61CE56979@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_538C0DAC-3BDC-46CE-A0D4-B4B59A2FD009";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH v3 08/13] f2fs: fiemap: add physical length to
 trace_f2fs_fiemap
Date: Fri, 5 Apr 2024 13:28:36 -0600
In-Reply-To: <c24fc95fa184fdd799d9d3d32b3227f790ba772f.1712126039.git.sweettea-kernel@dorminy.me>
Cc: Jonathan Corbet <corbet@lwn.net>,
 Kent Overstreet <kent.overstreet@linux.dev>,
 Brian Foster <bfoster@redhat.com>,
 Chris Mason <clm@fb.com>,
 Josef Bacik <josef@toxicpanda.com>,
 David Sterba <dsterba@suse.com>,
 Jaegeuk Kim <jaegeuk@kernel.org>,
 Chao Yu <chao@kernel.org>,
 Alexander Viro <viro@zeniv.linux.org.uk>,
 Christian Brauner <brauner@kernel.org>,
 Jan Kara <jack@suse.cz>,
 =?utf-8?Q?Micka=C3=ABl_Sala=C3=BCn?= <mic@digikod.net>,
 linux-doc@vger.kernel.org,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 linux-bcachefs@vger.kernel.org,
 linux-btrfs <linux-btrfs@vger.kernel.org>,
 linux-f2fs-devel@lists.sourceforge.net,
 linux-fsdevel@vger.kernel.org,
 kernel-team@meta.com
To: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
References: <cover.1712126039.git.sweettea-kernel@dorminy.me>
 <c24fc95fa184fdd799d9d3d32b3227f790ba772f.1712126039.git.sweettea-kernel@dorminy.me>


--Apple-Mail=_538C0DAC-3BDC-46CE-A0D4-B4B59A2FD009
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Apr 3, 2024, at 1:22 AM, Sweet Tea Dorminy =
<sweettea-kernel@dorminy.me> wrote:
>=20
> Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>

With the compat macro in the first patch in the series, IMHO this one
should be merged into the next patch that actually sets the phys_len,
since passing "0" for the phys_len isn't super useful by itself IMHO.

Cheers, Andreas

> ---
> fs/f2fs/data.c              |  6 +++---
> fs/f2fs/inline.c            |  2 +-
> include/trace/events/f2fs.h | 10 +++++++---
> 3 files changed, 11 insertions(+), 7 deletions(-)
>=20
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 87f8d828e038..34af1673461b 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -1836,7 +1836,7 @@ static int f2fs_xattr_fiemap(struct inode =
*inode,
>=20
> 		err =3D fiemap_fill_next_extent(
> 				fieinfo, 0, phys, len, 0, flags);
> -		trace_f2fs_fiemap(inode, 0, phys, len, flags, err);
> +		trace_f2fs_fiemap(inode, 0, phys, len, 0, flags, err);
> 		if (err)
> 			return err;
> 	}
> @@ -1863,7 +1863,7 @@ static int f2fs_xattr_fiemap(struct inode =
*inode,
> 	if (phys) {
> 		err =3D fiemap_fill_next_extent(
> 				fieinfo, 0, phys, len, 0, flags);
> -		trace_f2fs_fiemap(inode, 0, phys, len, flags, err);
> +		trace_f2fs_fiemap(inode, 0, phys, len, 0, flags, err);
> 	}
>=20
> 	return (err < 0 ? err : 0);
> @@ -1982,7 +1982,7 @@ int f2fs_fiemap(struct inode *inode, struct =
fiemap_extent_info *fieinfo,
>=20
> 		ret =3D fiemap_fill_next_extent(fieinfo, logical,
> 				phys, size, 0, flags);
> -		trace_f2fs_fiemap(inode, logical, phys, size, flags, =
ret);
> +		trace_f2fs_fiemap(inode, logical, phys, size, 0, flags, =
ret);
> 		if (ret)
> 			goto out;
> 		size =3D 0;
> diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
> index 49d2f87fe048..235b0d72f6fc 100644
> --- a/fs/f2fs/inline.c
> +++ b/fs/f2fs/inline.c
> @@ -808,7 +808,7 @@ int f2fs_inline_data_fiemap(struct inode *inode,
> 					(char *)F2FS_INODE(ipage);
> 	err =3D fiemap_fill_next_extent(
> 			fieinfo, start, byteaddr, ilen, 0, flags);
> -	trace_f2fs_fiemap(inode, start, byteaddr, ilen, flags, err);
> +	trace_f2fs_fiemap(inode, start, byteaddr, ilen, 0, flags, err);
> out:
> 	f2fs_put_page(ipage, 1);
> 	return err;
> diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
> index 7ed0fc430dc6..63706eb3a5db 100644
> --- a/include/trace/events/f2fs.h
> +++ b/include/trace/events/f2fs.h
> @@ -2276,9 +2276,10 @@ TRACE_EVENT(f2fs_bmap,
> TRACE_EVENT(f2fs_fiemap,
>=20
> 	TP_PROTO(struct inode *inode, sector_t lblock, sector_t pblock,
> -		unsigned long long len, unsigned int flags, int ret),
> +		unsigned long long len, unsigned long long phys_len,
> +		unsigned int flags, int ret),
>=20
> -	TP_ARGS(inode, lblock, pblock, len, flags, ret),
> +	TP_ARGS(inode, lblock, pblock, len, phys_len, flags, ret),
>=20
> 	TP_STRUCT__entry(
> 		__field(dev_t, dev)
> @@ -2286,6 +2287,7 @@ TRACE_EVENT(f2fs_fiemap,
> 		__field(sector_t, lblock)
> 		__field(sector_t, pblock)
> 		__field(unsigned long long, len)
> +		__field(unsigned long long, phys_len)
> 		__field(unsigned int, flags)
> 		__field(int, ret)
> 	),
> @@ -2296,16 +2298,18 @@ TRACE_EVENT(f2fs_fiemap,
> 		__entry->lblock		=3D lblock;
> 		__entry->pblock		=3D pblock;
> 		__entry->len		=3D len;
> +		__entry->phys_len	=3D phys_len;
> 		__entry->flags		=3D flags;
> 		__entry->ret		=3D ret;
> 	),
>=20
> 	TP_printk("dev =3D (%d,%d), ino =3D %lu, lblock:%lld, =
pblock:%lld, "
> -		"len:%llu, flags:%u, ret:%d",
> +		"len:%llu, plen:%llu, flags:%u, ret:%d",
> 		show_dev_ino(__entry),
> 		(unsigned long long)__entry->lblock,
> 		(unsigned long long)__entry->pblock,
> 		__entry->len,
> +		__entry->phys_len,
> 		__entry->flags,
> 		__entry->ret)
> );
> --
> 2.43.0
>=20
>=20


Cheers, Andreas


--Apple-Mail=_538C0DAC-3BDC-46CE-A0D4-B4B59A2FD009
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAmYQUOQACgkQcqXauRfM
H+BUSQ//dbRTR76g+R9wqiRBS5vw0ahQgPCf6yTSReukjBaQF0M9oly6GAGm4nN2
ilNV7M4T5M8lAN4yil25IwWcYrIjz9BBygH6en1dbB+P/vkSHXIBebtR/a2rNS3/
jxT1O/usTLB0QCUh3wtetRyWPRoD9y0hMIIxdWuBOQVFTXHCptfJ2AGl5QB2TsY+
kI9Zovu7baYF0AwgTqMIZzWsm3Vvj4Cf6k7k5EApmXUKb1BVzQANexhmZHssr6XU
BO6t9//3rDWYCkUsSI67TCmC64uGwYiCsu+4fYrVoQVO6D8YRcxWTfYh6qLTNPnA
50oFWH0R39X87I/L4iY2b2szG3956IQxJSZm0wdJSplMcJidylfOr88l1xRLe4qh
Vk4v72XzN97rXc32qn20gcuiVqXKSzXAJjnmJdPOFMzBmfk2jD7TPNW+xRT0xLdS
kGDZzEh7Iwh9vy/BUu/5nBXs1EZOLmit72jqeo8cT0nR/eZAgdX6N7LlLZQW0K2c
5D+tYcFAd7UTiTlt9yR1dv2vdNoIZVwhc24sUXyPhXdUq6G+VgvgadCjnjmu3HeB
D9ZCKOzqvtmRkxvbGeqXAAYybdLMcWYmXBw0M9s6kEONeTy3qqqrLHCwI8lp406m
xarUriKrfSZunKeZDwMJkrmNsZhOYS/JamFtZZInZW6nYKf9M5Q=
=2SWR
-----END PGP SIGNATURE-----

--Apple-Mail=_538C0DAC-3BDC-46CE-A0D4-B4B59A2FD009--