Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <0DB920A0-26A5-4B76-B2E6-78B1B678072C@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_252D0CE2-0624-4473-BA9F-9CEB980F1CD9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 1/4] ext4: Support for checksumming from journal triggers
Date:   Wed, 16 Jun 2021 13:56:30 -0600
In-Reply-To: <20210616105655.5129-2-jack@suse.cz>
Cc:     Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org
To:     Jan Kara <jack@suse.cz>
References: <20210616105655.5129-1-jack@suse.cz>
 <20210616105655.5129-2-jack@suse.cz>
Precedence: bulk


--Apple-Mail=_252D0CE2-0624-4473-BA9F-9CEB980F1CD9
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Jun 16, 2021, at 4:56 AM, Jan Kara <jack@suse.cz> wrote:
>=20
> JBD2 layer support triggers which are called when journaling layer =
moves
> buffer to a certain state. We can use the frozen trigger, which gets
> called when buffer data is frozen and about to be written out to the
> journal, to compute block checksums for some buffer types (similarly =
as
> does ocfs2). This avoids unnecessary repeated recomputation of the
> checksum (at the cost of larger window where memory corruption won't =
be
> caught by checksumming) and is even necessary when there are
> unsynchronized updaters of the checksummed data.
>=20
> So add argument to ext4_journal_get_write_access() and
> ext4_journal_get_create_access() which describes buffer type so that
> triggers can be set accordingly. This patch is mostly only a change of
> prototype of the above mentioned functions and a few small helpers. =
Real
> checksumming will come later.
>=20
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---

Comment inline.

>=20
> diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
> index be799040a415..f601e24b6015 100644
> --- a/fs/ext4/ext4_jbd2.c
> +++ b/fs/ext4/ext4_jbd2.c
> @@ -229,11 +231,18 @@ int __ext4_journal_get_write_access(const char =
*where, unsigned int line,
>=20
> 	if (ext4_handle_valid(handle)) {
> 		err =3D jbd2_journal_get_write_access(handle, bh);
> -		if (err)
> +		if (err) {
> 			ext4_journal_abort_handle(where, line, __func__, =
bh,
> 						  handle, err);
> +			return err;
> +		}
> 	}
> -	return err;
> +	if (trigger_type =3D=3D EXT4_JTR_NONE || =
!ext4_has_metadata_csum(sb))
> +		return 0;
> +	WARN_ON_ONCE(trigger_type >=3D EXT4_JOURNAL_TRIGGER_COUNT);

I'm not sure WARN_ON_ONCE() is enough here.  This would essentially =
result
in executing a random (or maybe NULL) function pointer later on.  Either
trigger_type should be checked early and return an error, or this should
be a BUG_ON() so that the crash happens here instead of in jbd context.

> +	jbd2_journal_set_triggers(bh,
> +		=
&EXT4_SB(sb)->s_journal_triggers[trigger_type].tr_triggers);
> +	return 0;
> }
>=20
> /*
> @@ -304,17 +313,27 @@ int __ext4_forget(const char *where, unsigned =
int line,
> int __ext4_journal_get_create_access(const char *where, unsigned int =
line,
> -				handle_t *handle, struct buffer_head =
*bh)
> +				handle_t *handle, struct super_block =
*sb,
> +				struct buffer_head *bh,
> +				enum ext4_journal_trigger_type =
trigger_type)
> {
> -	int err =3D 0;
> +	int err;
>=20
> -	if (ext4_handle_valid(handle)) {
> -		err =3D jbd2_journal_get_create_access(handle, bh);
> -		if (err)
> -			ext4_journal_abort_handle(where, line, __func__,
> -						  bh, handle, err);
> +	if (!ext4_handle_valid(handle))
> +		return 0;
> +
> +	err =3D jbd2_journal_get_create_access(handle, bh);
> +	if (err) {
> +		ext4_journal_abort_handle(where, line, __func__, bh, =
handle,
> +					  err);
> +		return err;
> 	}
> -	return err;
> +	if (trigger_type =3D=3D EXT4_JTR_NONE || =
!ext4_has_metadata_csum(sb))
> +		return 0;
> +	WARN_ON_ONCE(trigger_type >=3D EXT4_JOURNAL_TRIGGER_COUNT);

Same.

> +	jbd2_journal_set_triggers(bh,
> +		=
&EXT4_SB(sb)->s_journal_triggers[trigger_type].tr_triggers);
> +	return 0;
> }


Cheers, Andreas


--Apple-Mail=_252D0CE2-0624-4473-BA9F-9CEB980F1CD9
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+AFAmDKV24ACgkQcqXauRfM
H+Aqpg/9EqZ8D3mb6R7/lah7naT0ASlRNsBJIlRRqq0c+r2cmbtrCrEDoqxgf/2V
LD/Zs2MveADVV1Sd7IR2s17sMt/3LzV+/dgoAO6ui8/t/RRF76v90BeA/39g0yTH
WOWVIGKX8NvnAsNFoGAWFsfCT5OxQHKlucysmCGm+VEqumTC3YYzrdsD/X+P3ZH9
Z07Txf4T5sdHM6xop5s8flQnT0h9Exi1sTdtTUXfGj61lB1q3LwCbeBnB2rE2jek
lwAORTVC4L4uu6IKDZh9qbS5aBzywgvUdOw33b5ARfoQCaO3L37tf14tr74+3NIk
VYEUpI+6mrf9ovOEKrq3uqQRpdwgWKCvhsVZdESdmV4t5H+gNxKRWPCB/47jw/f3
H85/NlQ8lrkJBvuRD0UKW5WP5bT8FJ5Ja6ZRjK3xR2Bj33We1xf1/JJeJ8wHYRHs
Xi8UUQm5VB4Rb2Lw9/C734+Wwi0WsLGPp3rlmXWCcKK5rDH4yv8NaF1SIUyz8ya2
AC20FmyHOXX1Eg1sTOox29S2MjqiYfuRGq/+sWaa7Q5kRh+cZuZkInFrtjJz2ufq
nPHs+VM3V5u9DEV5CvyaSMvQRZswM/A6LTlTlWEzfOKq20uAF2B7bbKyVSstdFeo
89642D1Cvxz718WKUeX+Tw8cKqhw2951VLKk1AyI31+MWixGbxk=
=mUZG
-----END PGP SIGNATURE-----

--Apple-Mail=_252D0CE2-0624-4473-BA9F-9CEB980F1CD9--