From: "Darrick J. Wong" <djwong@kernel.org>
To: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org,
yuanxzhang@fudan.edu.cn, Xin Tan <tanxin.ctf@gmail.com>
Subject: Re: [PATCH] xfs: Convert from atomic_t to refcount_t on xlog_ticket->t_ref
Date: Mon, 19 Jul 2021 19:20:24 -0700 [thread overview]
Message-ID: <20210720022024.GI23236@magnolia> (raw)
In-Reply-To: <1626517262-42986-1-git-send-email-xiyuyang19@fudan.edu.cn>
On Sat, Jul 17, 2021 at 06:21:02PM +0800, Xiyu Yang wrote:
> refcount_t type and corresponding API can protect refcounters from
> accidental underflow and overflow and further use-after-free situations.
>
> Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
> ---
> fs/xfs/xfs_log.c | 10 +++++-----
> fs/xfs/xfs_log_priv.h | 4 +++-
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 36fa2650b081..1da711f1a229 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -3347,8 +3347,8 @@ void
> xfs_log_ticket_put(
> xlog_ticket_t *ticket)
> {
> - ASSERT(atomic_read(&ticket->t_ref) > 0);
> - if (atomic_dec_and_test(&ticket->t_ref))
> + ASSERT(refcount_read(&ticket->t_ref) > 0);
> + if (refcount_dec_and_test(&ticket->t_ref))
I thought the refcount functions already had code to warn about
refcounts that get decremented below zero...
> kmem_cache_free(xfs_log_ticket_zone, ticket);
> }
>
> @@ -3356,8 +3356,8 @@ xlog_ticket_t *
> xfs_log_ticket_get(
> xlog_ticket_t *ticket)
> {
> - ASSERT(atomic_read(&ticket->t_ref) > 0);
> - atomic_inc(&ticket->t_ref);
> + ASSERT(refcount_read(&ticket->t_ref) > 0);
...and can't come back from the dead? Also, how much of a performance
impact does this have over the atomic_t functions? The last time anyone
proposed conversions similar to this, there were concerns about that.
--D
> + refcount_inc(&ticket->t_ref);
> return ticket;
> }
>
> @@ -3477,7 +3477,7 @@ xlog_ticket_alloc(
>
> unit_res = xlog_calc_unit_res(log, unit_bytes);
>
> - atomic_set(&tic->t_ref, 1);
> + refcount_set(&tic->t_ref, 1);
> tic->t_task = current;
> INIT_LIST_HEAD(&tic->t_queue);
> tic->t_unit_res = unit_res;
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index 4c41bbfa33b0..c4157d87cea4 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -6,6 +6,8 @@
> #ifndef __XFS_LOG_PRIV_H__
> #define __XFS_LOG_PRIV_H__
>
> +#include <linux/refcount.h>
> +
> struct xfs_buf;
> struct xlog;
> struct xlog_ticket;
> @@ -163,7 +165,7 @@ typedef struct xlog_ticket {
> struct list_head t_queue; /* reserve/write queue */
> struct task_struct *t_task; /* task that owns this ticket */
> xlog_tid_t t_tid; /* transaction identifier : 4 */
> - atomic_t t_ref; /* ticket reference count : 4 */
> + refcount_t t_ref; /* ticket reference count : 4 */
> int t_curr_res; /* current reservation in bytes : 4 */
> int t_unit_res; /* unit reservation in bytes : 4 */
> char t_ocnt; /* original count : 1 */
> --
> 2.7.4
>
prev parent reply other threads:[~2021-07-20 2:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-17 10:21 [PATCH] xfs: Convert from atomic_t to refcount_t on xlog_ticket->t_ref Xiyu Yang
2021-07-20 2:20 ` Darrick J. Wong [this message]
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=20210720022024.GI23236@magnolia \
--to=djwong@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tanxin.ctf@gmail.com \
--cc=xiyuyang19@fudan.edu.cn \
--cc=yuanxzhang@fudan.edu.cn \
/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).