From: Andreas Dilger <adilger@dilger.ca>
To: Jan Kara <jack@suse.cz>
Cc: Ted Tso <tytso@mit.edu>,
linux-ext4@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 2/2] jbd2: Avoid leaking transaction credits when unreserving handle
Date: Tue, 19 May 2020 18:44:25 -0600 [thread overview]
Message-ID: <20AA140E-877B-4240-9BEF-91D24215AF45@dilger.ca> (raw)
In-Reply-To: <20200518092120.10322-3-jack@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 2809 bytes --]
On May 18, 2020, at 3:21 AM, Jan Kara <jack@suse.cz> wrote:
>
> When reserved transaction handle is unused, we subtract its reserved
> credits in __jbd2_journal_unreserve_handle() called from
> jbd2_journal_stop(). However this function forgets to remove reserved
> credits from transaction->t_outstanding_credits and thus the transaction
> space that was reserved remains effectively leaked. The leaked
> transaction space can be quite significant in some cases and leads to
> unnecessarily small transactions and thus reducing throughput of the
> journalling machinery. E.g. fsmark workload creating lots of 4k files
> was observed to have about 20% lower throughput due to this when ext4 is
> mounted with dioread_nolock mount option.
>
> Subtract reserved credits from t_outstanding_credits as well.
>
> CC: stable@vger.kernel.org
> Fixes: 8f7d89f36829 ("jbd2: transaction reservation support")
> Signed-off-by: Jan Kara <jack@suse.cz>
Patch looks reasonable, with one minor nit below.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
> ---
> fs/jbd2/transaction.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 3dccc23cf010..b49a103cff1f 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -541,17 +541,24 @@ handle_t *jbd2_journal_start(journal_t *journal, int nblocks)
> }
> EXPORT_SYMBOL(jbd2_journal_start);
>
> -static void __jbd2_journal_unreserve_handle(handle_t *handle)
> +static void __jbd2_journal_unreserve_handle(handle_t *handle, transaction_t *t)
> {
> journal_t *journal = handle->h_journal;
>
> WARN_ON(!handle->h_reserved);
> sub_reserved_credits(journal, handle->h_total_credits);
> + if (t)
> + atomic_sub(handle->h_total_credits, &t->t_outstanding_credits);
> }
>
> void jbd2_journal_free_reserved(handle_t *handle)
> {
> - __jbd2_journal_unreserve_handle(handle);
> + journal_t *journal = handle->h_journal;
> +
> + /* Get j_state_lock to pin running transaction if it exists */
> + read_lock(&journal->j_state_lock);
> + __jbd2_journal_unreserve_handle(handle, journal->j_running_transaction);
> + read_unlock(&journal->j_state_lock);
> jbd2_free_handle(handle);
> }
> EXPORT_SYMBOL(jbd2_journal_free_reserved);
> @@ -721,8 +728,10 @@ static void stop_this_handle(handle_t *handle)
> }
> atomic_sub(handle->h_total_credits,
> &transaction->t_outstanding_credits);
> - if (handle->h_rsv_handle)
> - __jbd2_journal_unreserve_handle(handle->h_rsv_handle);
> + if (handle->h_rsv_handle) {
> + __jbd2_journal_unreserve_handle(handle->h_rsv_handle,
> + transaction);
> + }
There isn't any need for braces {} around this one-line if-block.
Cheers, Andreas
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]
next prev parent reply other threads:[~2020-05-20 0:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200518092120.10322-1-jack@suse.cz>
2020-05-18 9:21 ` [PATCH 2/2] jbd2: Avoid leaking transaction credits when unreserving handle Jan Kara
2020-05-20 0:44 ` Andreas Dilger [this message]
2020-05-20 13:27 ` Jan Kara
2020-05-22 0:12 ` Sasha Levin
[not found] <20200520133119.1383-1-jack@suse.cz>
2020-05-20 13:31 ` Jan Kara
2020-05-29 2:44 ` Theodore Y. Ts'o
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=20AA140E-877B-4240-9BEF-91D24215AF45@dilger.ca \
--to=adilger@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
/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).