From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Andrey Albershteyn <aalbersh@kernel.org>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 02/10] libxfs: split error injection option parsing out of libxfs_buftarg_init
Date: Fri, 25 Sep 2026 15:33:14 -0700 [thread overview]
Message-ID: <20260925223314.GR2705364@frogsfrogsfrogs> (raw)
In-Reply-To: <20260925051336.2997014-3-hch@lst.de>
On Fri, Sep 25, 2026 at 07:12:48AM +0200, Christoph Hellwig wrote:
> Add a separate helper to keep this debug code separate from the main
> initialization flow, and only set up the error injection once when
> in libxfs_mount, thus skipping it for sb probing.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Much nicer, thanks for cleaning that up :)
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
> ---
> libxfs/init.c | 102 +++++++++++++++++++++++++-------------------------
> 1 file changed, 51 insertions(+), 51 deletions(-)
>
> diff --git a/libxfs/init.c b/libxfs/init.c
> index 63015badc24e..1b5e1e1e8ba8 100644
> --- a/libxfs/init.c
> +++ b/libxfs/init.c
> @@ -445,8 +445,7 @@ static struct xfs_buftarg *
> libxfs_buftarg_alloc(
> struct xfs_mount *mp,
> struct libxfs_init *xi,
> - struct libxfs_dev *dev,
> - unsigned long write_fails)
> + struct libxfs_dev *dev)
> {
> struct xfs_buftarg *btp;
>
> @@ -461,10 +460,6 @@ libxfs_buftarg_alloc(
> btp->bt_bdev_fd = dev->fd;
> btp->bt_xfile = NULL;
> btp->flags = 0;
> - if (write_fails) {
> - btp->writes_left = write_fails;
> - btp->flags |= XFS_BUFTARG_INJECT_WRITE_FAIL;
> - }
> pthread_mutex_init(&btp->lock, NULL);
>
> btp->bcache = cache_init(xi->bcache_flags, libxfs_bhash_size,
> @@ -487,6 +482,52 @@ static char *wf_opts[] = {
> [WF_MAX_OPTS] = NULL,
> };
>
> +static void
> +setup_buftarg_write_error(
> + struct xfs_buftarg *btp,
> + char *val)
> +{
> + if (!val) {
> + fprintf(stderr, _("write fail requires a parameter\n"));
> + exit(1);
> + }
> + if (!btp)
> + return;
> + btp->writes_left = strtoul(val, NULL, 0);
> + if (btp->writes_left)
> + btp->flags |= XFS_BUFTARG_INJECT_WRITE_FAIL;
> +}
> +
> +static void
> +libxfs_setup_write_error_injection(
> + struct xfs_mount *mp)
> +{
> + char *p = getenv("LIBXFS_DEBUG_WRITE_CRASH");
> +
> + /* Simulate utility crash after a certain number of writes. */
> + while (p && *p) {
> + char *val;
> +
> + switch (getsubopt(&p, wf_opts, &val)) {
> + case WF_DATA:
> + setup_buftarg_write_error(mp->m_ddev_targp, val);
> + break;
> + case WF_LOG:
> + setup_buftarg_write_error(mp->m_logdev_targp, val);
> + break;
> + case WF_RT:
> + if (mp->m_rtdev_targp == mp->m_ddev_targp)
> + break;
> + setup_buftarg_write_error(mp->m_rtdev_targp, val);
> + break;
> + default:
> + fprintf(stderr, _("unknown write fail type %s\n"), val);
> + exit(1);
> + break;
> + }
> + }
> +}
> +
> static void
> libxfs_buftarg_reinit(
> struct xfs_mount *mp,
> @@ -529,46 +570,6 @@ libxfs_buftarg_init(
> struct xfs_mount *mp,
> struct libxfs_init *xi)
> {
> - char *p = getenv("LIBXFS_DEBUG_WRITE_CRASH");
> - unsigned long dfail = 0, lfail = 0, rfail = 0;
> -
> - /* Simulate utility crash after a certain number of writes. */
> - while (p && *p) {
> - char *val;
> -
> - switch (getsubopt(&p, wf_opts, &val)) {
> - case WF_DATA:
> - if (!val) {
> - fprintf(stderr,
> - _("ddev write fail requires a parameter\n"));
> - exit(1);
> - }
> - dfail = strtoul(val, NULL, 0);
> - break;
> - case WF_LOG:
> - if (!val) {
> - fprintf(stderr,
> - _("logdev write fail requires a parameter\n"));
> - exit(1);
> - }
> - lfail = strtoul(val, NULL, 0);
> - break;
> - case WF_RT:
> - if (!val) {
> - fprintf(stderr,
> - _("rtdev write fail requires a parameter\n"));
> - exit(1);
> - }
> - rfail = strtoul(val, NULL, 0);
> - break;
> - default:
> - fprintf(stderr, _("unknown write fail type %s\n"),
> - val);
> - exit(1);
> - break;
> - }
> - }
> -
> /*
> * This can happen if the utility called libxfs_buftarg_init manually
> * before libxfs_mount, which calls us again.
> @@ -581,17 +582,15 @@ libxfs_buftarg_init(
> return;
> }
>
> - mp->m_ddev_targp = libxfs_buftarg_alloc(mp, xi, &xi->data, dfail);
> + mp->m_ddev_targp = libxfs_buftarg_alloc(mp, xi, &xi->data);
> if (!xi->log.dev || xi->log.dev == xi->data.dev)
> mp->m_logdev_targp = mp->m_ddev_targp;
> else
> - mp->m_logdev_targp = libxfs_buftarg_alloc(mp, xi, &xi->log,
> - lfail);
> + mp->m_logdev_targp = libxfs_buftarg_alloc(mp, xi, &xi->log);
> if (!xi->rt.dev || xi->rt.dev == xi->data.dev)
> mp->m_rtdev_targp = mp->m_ddev_targp;
> else
> - mp->m_rtdev_targp = libxfs_buftarg_alloc(mp, xi, &xi->rt,
> - rfail);
> + mp->m_rtdev_targp = libxfs_buftarg_alloc(mp, xi, &xi->rt);
> }
>
> /* Compute maximum possible height for per-AG btree types for this fs. */
> @@ -740,6 +739,7 @@ libxfs_mount(
> if (flags & LIBXFS_MOUNT_REPORT_CORRUPTION)
> xfs_set_reporting_corruption(mp);
> libxfs_buftarg_init(mp, xi);
> + libxfs_setup_write_error_injection(mp);
>
> if (xi->data.name)
> mp->m_fsname = strdup(xi->data.name);
> --
> 2.53.0
>
>
next prev parent reply other threads:[~2026-09-25 22:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-25 5:12 fix missing RT detection in libxfs v2 Christoph Hellwig
2026-09-25 5:12 ` [PATCH 01/10] libxfs: refactor the reinit case in libxfs_buftarg_init Christoph Hellwig
2026-09-25 22:32 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 02/10] libxfs: split error injection option parsing out of libxfs_buftarg_init Christoph Hellwig
2026-09-25 22:33 ` Darrick J. Wong [this message]
2026-09-25 5:12 ` [PATCH 03/10] libxfs: remove buftarg member aliases Christoph Hellwig
2026-09-25 5:12 ` [PATCH 04/10] libxfs: unify buftarg handling with the kernel Christoph Hellwig
2026-09-25 22:37 ` Darrick J. Wong
2026-09-26 5:59 ` Christoph Hellwig
2026-09-27 15:18 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 05/10] libxfs: make the size check in rtmount_init internal RT device aware Christoph Hellwig
2026-09-25 22:38 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 06/10] libxfs: don't clear ->dev in libxfs_device_close Christoph Hellwig
2026-09-25 22:39 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 07/10] libxfs: fix buftarg initialization for the RT device Christoph Hellwig
2026-09-25 22:42 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 08/10] libxfs: rename bt_bdev* Christoph Hellwig
2026-09-25 22:43 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 09/10] libfrog: improve ramdisk handling in platform_flush_device Christoph Hellwig
2026-09-25 22:47 ` Darrick J. Wong
2026-09-26 6:02 ` Christoph Hellwig
2026-09-27 15:22 ` Darrick J. Wong
2026-09-25 5:12 ` [PATCH 10/10] xfs_db: remove a double-whitespace in rdump_regfile_data Christoph Hellwig
2026-09-25 22:47 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260925223314.GR2705364@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=aalbersh@kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox