From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 3/8] xfs: move the locking from xlog_state_finish_copy to the callers
Date: Mon, 14 Oct 2019 11:02:21 -0700 [thread overview]
Message-ID: <20191014180221.GY13108@magnolia> (raw)
In-Reply-To: <20191009142748.18005-4-hch@lst.de>
On Wed, Oct 09, 2019 at 04:27:43PM +0200, Christoph Hellwig wrote:
> This will allow optimizing various locking cycles in the following
> patches.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_log.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 4f5927ddfa40..860a555772fe 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -1967,7 +1967,6 @@ xlog_dealloc_log(
> /*
> * Update counters atomically now that memcpy is done.
> */
> -/* ARGSUSED */
> static inline void
> xlog_state_finish_copy(
> struct xlog *log,
> @@ -1975,16 +1974,11 @@ xlog_state_finish_copy(
> int record_cnt,
> int copy_bytes)
> {
> - spin_lock(&log->l_icloglock);
> + lockdep_assert_held(&log->l_icloglock);
>
> be32_add_cpu(&iclog->ic_header.h_num_logops, record_cnt);
> iclog->ic_offset += copy_bytes;
> -
> - spin_unlock(&log->l_icloglock);
> -} /* xlog_state_finish_copy */
> -
> -
> -
> +}
>
> /*
> * print out info relating to regions written which consume
> @@ -2266,7 +2260,9 @@ xlog_write_copy_finish(
> * This iclog has already been marked WANT_SYNC by
> * xlog_state_get_iclog_space.
> */
> + spin_lock(&log->l_icloglock);
> xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt);
> + spin_unlock(&log->l_icloglock);
> *record_cnt = 0;
> *data_cnt = 0;
> return xlog_state_release_iclog(log, iclog);
> @@ -2277,11 +2273,11 @@ xlog_write_copy_finish(
>
> if (iclog->ic_size - log_offset <= sizeof(xlog_op_header_t)) {
> /* no more space in this iclog - push it. */
> + spin_lock(&log->l_icloglock);
> xlog_state_finish_copy(log, iclog, *record_cnt, *data_cnt);
> *record_cnt = 0;
> *data_cnt = 0;
>
> - spin_lock(&log->l_icloglock);
> xlog_state_want_sync(log, iclog);
> spin_unlock(&log->l_icloglock);
>
> @@ -2504,7 +2500,9 @@ xlog_write(
>
> ASSERT(len == 0);
>
> + spin_lock(&log->l_icloglock);
> xlog_state_finish_copy(log, iclog, record_cnt, data_cnt);
> + spin_unlock(&log->l_icloglock);
> if (!commit_iclog)
> return xlog_state_release_iclog(log, iclog);
>
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-14 18:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 14:27 misc iclog state machine cleanups Christoph Hellwig
2019-10-09 14:27 ` [PATCH 1/8] xfs: pass the correct flag to xlog_write_iclog Christoph Hellwig
2019-10-14 17:10 ` Darrick J. Wong
2019-10-15 17:06 ` Brian Foster
2019-10-09 14:27 ` [PATCH 2/8] xfs: remove the unused ic_io_size field from xlog_in_core Christoph Hellwig
2019-10-14 17:12 ` Darrick J. Wong
2019-10-15 17:07 ` Brian Foster
2019-10-09 14:27 ` [PATCH 3/8] xfs: move the locking from xlog_state_finish_copy to the callers Christoph Hellwig
2019-10-14 18:02 ` Darrick J. Wong [this message]
2019-10-15 17:07 ` Brian Foster
2019-10-09 14:27 ` [PATCH 4/8] xfs: call xlog_state_release_iclog with l_icloglock held Christoph Hellwig
2019-10-14 18:12 ` Darrick J. Wong
2019-10-15 17:07 ` Brian Foster
2019-10-09 14:27 ` [PATCH 5/8] xfs: remove dead ifdef XFSERRORDEBUG code Christoph Hellwig
2019-10-14 17:13 ` Darrick J. Wong
2019-10-15 17:09 ` Brian Foster
2019-10-09 14:27 ` [PATCH 6/8] xfs: remove the unused XLOG_STATE_ALL and XLOG_STATE_UNUSED flags Christoph Hellwig
2019-10-12 0:36 ` Darrick J. Wong
2019-10-15 17:09 ` Brian Foster
2019-10-09 14:27 ` [PATCH 7/8] xfs: turn ic_state into an enum Christoph Hellwig
2019-10-14 18:25 ` Darrick J. Wong
2019-10-15 17:09 ` Brian Foster
2019-10-09 14:27 ` [PATCH 8/8] xfs: remove the XLOG_STATE_DO_CALLBACK state Christoph Hellwig
2019-10-12 0:41 ` Darrick J. Wong
2019-10-14 7:22 ` Christoph Hellwig
2019-10-14 19:05 ` Darrick J. Wong
2019-10-15 17:09 ` Brian Foster
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=20191014180221.GY13108@magnolia \
--to=darrick.wong@oracle.com \
--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;
as well as URLs for NNTP newsgroup(s).