From: Allison Henderson <allison.henderson@oracle.com>
To: Dave Chinner <david@fromorbit.com>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/39] xfs: remove need_start_rec parameter from xlog_write()
Date: Thu, 3 Jun 2021 15:29:25 -0700 [thread overview]
Message-ID: <a5b5d295-8cc4-8e36-a1f7-a8f5a4f94217@oracle.com> (raw)
In-Reply-To: <20210603052240.171998-7-david@fromorbit.com>
On 6/2/21 10:22 PM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The CIL push is the only call to xlog_write that sets this variable
> to true. The other callers don't need a start rec, and they tell
> xlog_write what to do by passing the type of ophdr they need written
> in the flags field. The need_start_rec parameter essentially tells
> xlog_write to to write an extra ophdr with a XLOG_START_TRANS type,
> so get rid of the variable to do this and pass XLOG_START_TRANS as
> the flag value into xlog_write() from the CIL push.
>
> $ size fs/xfs/xfs_log.o*
> text data bss dec hex filename
> 27595 560 8 28163 6e03 fs/xfs/xfs_log.o.orig
> 27454 560 8 28022 6d76 fs/xfs/xfs_log.o.patched
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Ok, looks ok
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/xfs_log.c | 44 +++++++++++++++++++++----------------------
> fs/xfs/xfs_log_cil.c | 3 ++-
> fs/xfs/xfs_log_priv.h | 3 +--
> 3 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 969eebbf3f64..87870867d9fb 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -820,9 +820,7 @@ xlog_wait_on_iclog(
> static int
> xlog_write_unmount_record(
> struct xlog *log,
> - struct xlog_ticket *ticket,
> - xfs_lsn_t *lsn,
> - uint flags)
> + struct xlog_ticket *ticket)
> {
> struct xfs_unmount_log_format ulf = {
> .magic = XLOG_UNMOUNT_TYPE,
> @@ -839,7 +837,7 @@ xlog_write_unmount_record(
>
> /* account for space used by record data */
> ticket->t_curr_res -= sizeof(ulf);
> - return xlog_write(log, &vec, ticket, lsn, NULL, flags, false);
> + return xlog_write(log, &vec, ticket, NULL, NULL, XLOG_UNMOUNT_TRANS);
> }
>
> /*
> @@ -853,15 +851,13 @@ xlog_unmount_write(
> struct xfs_mount *mp = log->l_mp;
> struct xlog_in_core *iclog;
> struct xlog_ticket *tic = NULL;
> - xfs_lsn_t lsn;
> - uint flags = XLOG_UNMOUNT_TRANS;
> int error;
>
> error = xfs_log_reserve(mp, 600, 1, &tic, XFS_LOG, 0);
> if (error)
> goto out_err;
>
> - error = xlog_write_unmount_record(log, tic, &lsn, flags);
> + error = xlog_write_unmount_record(log, tic);
> /*
> * At this point, we're umounting anyway, so there's no point in
> * transitioning log state to IOERROR. Just continue...
> @@ -1553,8 +1549,7 @@ xlog_commit_record(
> if (XLOG_FORCED_SHUTDOWN(log))
> return -EIO;
>
> - error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS,
> - false);
> + error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS);
> if (error)
> xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
> return error;
> @@ -2151,13 +2146,16 @@ static int
> xlog_write_calc_vec_length(
> struct xlog_ticket *ticket,
> struct xfs_log_vec *log_vector,
> - bool need_start_rec)
> + uint optype)
> {
> struct xfs_log_vec *lv;
> - int headers = need_start_rec ? 1 : 0;
> + int headers = 0;
> int len = 0;
> int i;
>
> + if (optype & XLOG_START_TRANS)
> + headers++;
> +
> for (lv = log_vector; lv; lv = lv->lv_next) {
> /* we don't write ordered log vectors */
> if (lv->lv_buf_len == XFS_LOG_VEC_ORDERED)
> @@ -2377,8 +2375,7 @@ xlog_write(
> struct xlog_ticket *ticket,
> xfs_lsn_t *start_lsn,
> struct xlog_in_core **commit_iclog,
> - uint flags,
> - bool need_start_rec)
> + uint optype)
> {
> struct xlog_in_core *iclog = NULL;
> struct xfs_log_vec *lv = log_vector;
> @@ -2406,8 +2403,9 @@ xlog_write(
> xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
> }
>
> - len = xlog_write_calc_vec_length(ticket, log_vector, need_start_rec);
> - *start_lsn = 0;
> + len = xlog_write_calc_vec_length(ticket, log_vector, optype);
> + if (start_lsn)
> + *start_lsn = 0;
> while (lv && (!lv->lv_niovecs || index < lv->lv_niovecs)) {
> void *ptr;
> int log_offset;
> @@ -2421,7 +2419,7 @@ xlog_write(
> ptr = iclog->ic_datap + log_offset;
>
> /* start_lsn is the first lsn written to. That's all we need. */
> - if (!*start_lsn)
> + if (start_lsn && !*start_lsn)
> *start_lsn = be64_to_cpu(iclog->ic_header.h_lsn);
>
> /*
> @@ -2434,6 +2432,7 @@ xlog_write(
> int copy_len;
> int copy_off;
> bool ordered = false;
> + bool wrote_start_rec = false;
>
> /* ordered log vectors have no regions to write */
> if (lv->lv_buf_len == XFS_LOG_VEC_ORDERED) {
> @@ -2451,13 +2450,15 @@ xlog_write(
> * write a start record. Only do this for the first
> * iclog we write to.
> */
> - if (need_start_rec) {
> + if (optype & XLOG_START_TRANS) {
> xlog_write_start_rec(ptr, ticket);
> xlog_write_adv_cnt(&ptr, &len, &log_offset,
> sizeof(struct xlog_op_header));
> + optype &= ~XLOG_START_TRANS;
> + wrote_start_rec = true;
> }
>
> - ophdr = xlog_write_setup_ophdr(log, ptr, ticket, flags);
> + ophdr = xlog_write_setup_ophdr(log, ptr, ticket, optype);
> if (!ophdr)
> return -EIO;
>
> @@ -2488,14 +2489,13 @@ xlog_write(
> }
> copy_len += sizeof(struct xlog_op_header);
> record_cnt++;
> - if (need_start_rec) {
> + if (wrote_start_rec) {
> copy_len += sizeof(struct xlog_op_header);
> record_cnt++;
> - need_start_rec = false;
> }
> data_cnt += contwr ? copy_len : 0;
>
> - error = xlog_write_copy_finish(log, iclog, flags,
> + error = xlog_write_copy_finish(log, iclog, optype,
> &record_cnt, &data_cnt,
> &partial_copy,
> &partial_copy_len,
> @@ -2539,7 +2539,7 @@ xlog_write(
> spin_lock(&log->l_icloglock);
> xlog_state_finish_copy(log, iclog, record_cnt, data_cnt);
> if (commit_iclog) {
> - ASSERT(flags & XLOG_COMMIT_TRANS);
> + ASSERT(optype & XLOG_COMMIT_TRANS);
> *commit_iclog = iclog;
> } else {
> error = xlog_state_release_iclog(log, iclog);
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 7b8b7ac85ea9..172bb3551d6b 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -823,7 +823,8 @@ xlog_cil_push_work(
> */
> wait_for_completion(&bdev_flush);
>
> - error = xlog_write(log, &lvhdr, tic, &ctx->start_lsn, NULL, 0, true);
> + error = xlog_write(log, &lvhdr, tic, &ctx->start_lsn, NULL,
> + XLOG_START_TRANS);
> if (error)
> goto out_abort_free_ticket;
>
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index ee7786b33da9..56e1942c47df 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -480,8 +480,7 @@ void xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket);
> void xlog_print_trans(struct xfs_trans *);
> int xlog_write(struct xlog *log, struct xfs_log_vec *log_vector,
> struct xlog_ticket *tic, xfs_lsn_t *start_lsn,
> - struct xlog_in_core **commit_iclog, uint flags,
> - bool need_start_rec);
> + struct xlog_in_core **commit_iclog, uint optype);
> int xlog_commit_record(struct xlog *log, struct xlog_ticket *ticket,
> struct xlog_in_core **iclog, xfs_lsn_t *lsn);
> void xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);
>
next prev parent reply other threads:[~2021-06-03 22:29 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 5:22 [PATCH 00/39 v5] xfs: CIL and log optimisations Dave Chinner
2021-06-03 5:22 ` [PATCH 01/39] xfs: log stripe roundoff is a property of the log Dave Chinner
2021-06-03 5:22 ` [PATCH 02/39] xfs: separate CIL commit record IO Dave Chinner
2021-06-03 5:22 ` [PATCH 03/39] xfs: remove xfs_blkdev_issue_flush Dave Chinner
2021-06-03 5:22 ` [PATCH 04/39] xfs: async blkdev cache flush Dave Chinner
2021-06-03 5:22 ` [PATCH 05/39] xfs: CIL checkpoint flushes caches unconditionally Dave Chinner
2021-06-03 5:22 ` [PATCH 06/39] xfs: remove need_start_rec parameter from xlog_write() Dave Chinner
2021-06-03 22:29 ` Allison Henderson [this message]
2021-06-03 5:22 ` [PATCH 07/39] xfs: journal IO cache flush reductions Dave Chinner
2021-06-03 22:29 ` Allison Henderson
2021-06-04 5:15 ` [xfs] 80d287de7b: stress-ng.dir.ops_per_sec 80.1% improvement kernel test robot
2021-06-03 5:22 ` [PATCH 08/39] xfs: Fix CIL throttle hang when CIL space used going backwards Dave Chinner
2021-06-03 22:29 ` Allison Henderson
2021-06-03 5:22 ` [PATCH 09/39] xfs: xfs_log_force_lsn isn't passed a LSN Dave Chinner
2021-06-03 22:29 ` Allison Henderson
2021-06-03 5:22 ` [PATCH 10/39] xfs: AIL needs asynchronous CIL forcing Dave Chinner
2021-06-03 22:29 ` Allison Henderson
2021-06-03 5:22 ` [PATCH 11/39] xfs: CIL work is serialised, not pipelined Dave Chinner
2021-06-03 5:22 ` [PATCH 12/39] xfs: factor out the CIL transaction header building Dave Chinner
2021-06-03 5:22 ` [PATCH 13/39] xfs: only CIL pushes require a start record Dave Chinner
2021-06-03 5:22 ` [PATCH 14/39] xfs: embed the xlog_op_header in the unmount record Dave Chinner
2021-06-03 5:22 ` [PATCH 15/39] xfs: embed the xlog_op_header in the commit record Dave Chinner
2021-06-03 5:22 ` [PATCH 16/39] xfs: log tickets don't need log client id Dave Chinner
2021-06-03 5:22 ` [PATCH 17/39] xfs: move log iovec alignment to preparation function Dave Chinner
2021-06-03 5:22 ` [PATCH 18/39] xfs: reserve space and initialise xlog_op_header in item formatting Dave Chinner
2021-06-03 5:22 ` [PATCH 19/39] xfs: log ticket region debug is largely useless Dave Chinner
2021-06-03 5:22 ` [PATCH 20/39] xfs: pass lv chain length into xlog_write() Dave Chinner
2021-06-03 5:22 ` [PATCH 21/39] xfs: introduce xlog_write_single() Dave Chinner
2021-06-03 5:22 ` [PATCH 22/39] xfs:_introduce xlog_write_partial() Dave Chinner
2021-06-03 5:22 ` [PATCH 23/39] xfs: xlog_write() no longer needs contwr state Dave Chinner
2021-06-03 5:22 ` [PATCH 24/39] xfs: xlog_write() doesn't need optype anymore Dave Chinner
2021-06-03 5:22 ` [PATCH 25/39] xfs: CIL context doesn't need to count iovecs Dave Chinner
2021-06-03 5:22 ` [PATCH 26/39] xfs: use the CIL space used counter for emptiness checks Dave Chinner
2021-06-03 5:22 ` [PATCH 27/39] xfs: lift init CIL reservation out of xc_cil_lock Dave Chinner
2021-06-03 5:22 ` [PATCH 28/39] xfs: rework per-iclog header CIL reservation Dave Chinner
2021-06-03 5:22 ` [PATCH 29/39] xfs: introduce per-cpu CIL tracking structure Dave Chinner
2021-06-03 9:18 ` kernel test robot
2021-06-03 10:08 ` kernel test robot
2021-06-03 16:49 ` Darrick J. Wong
2021-06-03 5:22 ` [PATCH 30/39] xfs: implement percpu cil space used calculation Dave Chinner
2021-06-03 16:44 ` Darrick J. Wong
2021-06-03 5:22 ` [PATCH 31/39] xfs: track CIL ticket reservation in percpu structure Dave Chinner
2021-06-03 16:43 ` Darrick J. Wong
2021-06-03 5:22 ` [PATCH 32/39] xfs: convert CIL busy extents to per-cpu Dave Chinner
2021-06-03 5:22 ` [PATCH 33/39] xfs: Add order IDs to log items in CIL Dave Chinner
2021-06-03 5:22 ` [PATCH 34/39] xfs: convert CIL to unordered per cpu lists Dave Chinner
2021-06-03 5:22 ` [PATCH 35/39] xfs: convert log vector chain to use list heads Dave Chinner
2021-06-03 10:16 ` kernel test robot
2021-06-03 5:22 ` [PATCH 36/39] xfs: move CIL ordering to the logvec chain Dave Chinner
2021-06-03 5:22 ` [PATCH 37/39] xfs: avoid cil push lock if possible Dave Chinner
2021-06-03 5:22 ` [PATCH 38/39] xfs: xlog_sync() manually adjusts grant head space Dave Chinner
2021-06-03 5:22 ` [PATCH 39/39] xfs: expanding delayed logging design with background material Dave Chinner
2021-06-03 17:05 ` [PATCH 00/39 v5] xfs: CIL and log optimisations Darrick J. Wong
2021-06-03 22:43 ` Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2021-05-19 12:12 [PATCH 00/39 v4] " Dave Chinner
2021-05-19 12:12 ` [PATCH 06/39] xfs: remove need_start_rec parameter from xlog_write() 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=a5b5d295-8cc4-8e36-a1f7-a8f5a4f94217@oracle.com \
--to=allison.henderson@oracle.com \
--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).