From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/9] xfs: XLOG_STATE_IOERROR must die
Date: Fri, 2 Jul 2021 09:00:10 +0100 [thread overview]
Message-ID: <YN7HivsUsXYmfBHM@infradead.org> (raw)
In-Reply-To: <20210630063813.1751007-3-david@fromorbit.com>
> else
> ASSERT(iclog->ic_state == XLOG_STATE_WANT_SYNC ||
> - iclog->ic_state == XLOG_STATE_IOERROR);
> + xlog_is_shutdown(log));
Nit: think doing this as:
else if (!xlog_is_shutdown(log))
ASSERT(iclog->ic_state == XLOG_STATE_WANT_SYNC);
would be a tad cleaner.
> else
> ASSERT(iclog->ic_state == XLOG_STATE_WANT_SYNC ||
> - iclog->ic_state == XLOG_STATE_IOERROR);
> + xlog_is_shutdown(log));
Same here.
> @@ -2765,12 +2755,13 @@ xlog_state_do_callback(
> struct xlog_in_core *iclog;
> struct xlog_in_core *first_iclog;
> bool cycled_icloglock;
> - bool ioerror;
> int flushcnt = 0;
> int repeats = 0;
>
> spin_lock(&log->l_icloglock);
> do {
> + repeats++;
> +
> /*
> * Scan all iclogs starting with the one pointed to by the
> * log. Reset this starting point each time the log is
> @@ -2779,23 +2770,21 @@ xlog_state_do_callback(
> * Keep looping through iclogs until one full pass is made
> * without running any callbacks.
> */
> - first_iclog = log->l_iclog;
> - iclog = log->l_iclog;
> cycled_icloglock = false;
> - ioerror = false;
> - repeats++;
> -
> - do {
> + first_iclog = NULL;
> + for (iclog = log->l_iclog;
> + iclog != first_iclog;
> + iclog = iclog->ic_next) {
> LIST_HEAD(cb_list);
>
> - if (xlog_state_iodone_process_iclog(log, iclog,
> - &ioerror))
> - break;
> + if (!first_iclog)
> + first_iclog = iclog;
>
> - if (iclog->ic_state != XLOG_STATE_CALLBACK &&
> - iclog->ic_state != XLOG_STATE_IOERROR) {
> - iclog = iclog->ic_next;
> - continue;
> + if (!xlog_is_shutdown(log)) {
> + if (xlog_state_iodone_process_iclog(log, iclog))
> + break;
> + if (iclog->ic_state != XLOG_STATE_CALLBACK)
> + continue;
> }
> list_splice_init(&iclog->ic_callbacks, &cb_list);
> spin_unlock(&log->l_icloglock);
> @@ -2810,8 +2799,7 @@ xlog_state_do_callback(
> wake_up_all(&iclog->ic_force_wait);
> else
> xlog_state_clean_iclog(log, iclog);
> - iclog = iclog->ic_next;
> - } while (first_iclog != iclog);
> + };
I don't think swiching to a random other iteration style here helps
to review. Please keep the old in in this otherwise pretty mechnical
change and clean it up later if you strongly prefer the new style.
(which I'm really not sold on, btw - yes it makes the continiue easier
but otherwise isn't all that great either).
Otherwise looks fine and long overdue.
next prev parent reply other threads:[~2021-07-02 8:00 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 6:38 [PATCH 0/9] xfs: shutdown is a racy mess Dave Chinner
2021-06-30 6:38 ` [PATCH 1/9] xfs: convert XLOG_FORCED_SHUTDOWN() to xlog_is_shutdown() Dave Chinner
2021-06-30 16:10 ` Darrick J. Wong
2021-07-02 7:48 ` Christoph Hellwig
2021-07-02 8:45 ` Dave Chinner
2021-07-02 9:27 ` Christoph Hellwig
2021-06-30 6:38 ` [PATCH 2/9] xfs: XLOG_STATE_IOERROR must die Dave Chinner
2021-06-30 15:22 ` kernel test robot
2021-06-30 15:22 ` [PATCH] xfs: fix semicolon.cocci warnings kernel test robot
2021-07-02 8:00 ` Christoph Hellwig [this message]
2021-07-02 8:55 ` [PATCH 2/9] xfs: XLOG_STATE_IOERROR must die Dave Chinner
2021-06-30 6:38 ` [PATCH 3/9] xfs: move recovery needed state updates to xfs_log_mount_finish Dave Chinner
2021-07-02 8:10 ` Christoph Hellwig
2021-06-30 6:38 ` [PATCH 4/9] xfs: convert log flags to an operational state field Dave Chinner
2021-07-02 8:15 ` Christoph Hellwig
2021-07-09 4:33 ` Darrick J. Wong
2021-06-30 6:38 ` [PATCH 5/9] xfs: make forced shutdown processing atomic Dave Chinner
2021-07-02 8:24 ` Christoph Hellwig
2021-07-05 1:28 ` Dave Chinner
2021-07-09 4:40 ` Darrick J. Wong
2021-07-14 3:15 ` Dave Chinner
2021-07-14 5:02 ` Darrick J. Wong
2021-06-30 6:38 ` [PATCH 6/9] xfs: reowrk up xlog_state_do_callback Dave Chinner
2021-07-02 8:28 ` Christoph Hellwig
2021-07-09 4:42 ` Darrick J. Wong
2021-06-30 6:38 ` [PATCH 7/9] xfs: separate out log shutdown callback processing Dave Chinner
2021-07-02 8:36 ` Christoph Hellwig
2021-07-05 1:46 ` Dave Chinner
2021-06-30 6:38 ` [PATCH 8/9] xfs: don't run shutdown callbacks on active iclogs Dave Chinner
2021-07-02 8:48 ` Christoph Hellwig
2021-07-05 2:04 ` Dave Chinner
2021-06-30 6:38 ` [PATCH 9/9] xfs: log head and tail aren't reliable during shutdown Dave Chinner
2021-07-02 8:53 ` Christoph Hellwig
2021-07-05 2:22 ` Dave Chinner
2021-07-14 3:19 [PATCH 0/9 v2] xfs: shutdown is a racy mess Dave Chinner
2021-07-14 3:19 ` [PATCH 2/9] xfs: XLOG_STATE_IOERROR must die Dave Chinner
2021-07-14 6:13 ` Christoph Hellwig
2021-07-14 21:51 ` Darrick J. Wong
2021-08-10 5:18 [PATCH 0/9 v3] xfs: shutdown is a racy mess Dave Chinner
2021-08-10 5:18 ` [PATCH 2/9] xfs: XLOG_STATE_IOERROR must die Dave Chinner
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=YN7HivsUsXYmfBHM@infradead.org \
--to=hch@infradead.org \
--cc=david@fromorbit.com \
--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;
as well as URLs for NNTP newsgroup(s).