From: Xiyu Yang <xiyuyang19@fudan.edu.cn>
To: Jeff Layton <jlayton@kernel.org>,
Ilya Dryomov <idryomov@gmail.com>,
ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: yuanxzhang@fudan.edu.cn, Xiyu Yang <xiyuyang19@fudan.edu.cn>,
Xin Tan <tanxin.ctf@gmail.com>
Subject: [PATCH] ceph: Convert from atomic_t to refcount_t on ceph_snap_realm->nref
Date: Sat, 17 Jul 2021 18:06:20 +0800 [thread overview]
Message-ID: <1626516381-40440-1-git-send-email-xiyuyang19@fudan.edu.cn> (raw)
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/ceph/snap.c | 15 ++++++++-------
fs/ceph/super.h | 3 ++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index 4ac0606dcbd4..d4ec9c5118bd 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -68,14 +68,15 @@ void ceph_get_snap_realm(struct ceph_mds_client *mdsc,
lockdep_assert_held(&mdsc->snap_rwsem);
dout("get_realm %p %d -> %d\n", realm,
- atomic_read(&realm->nref), atomic_read(&realm->nref)+1);
+ refcount_read(&realm->nref), refcount_read(&realm->nref)+1);
/*
* since we _only_ increment realm refs or empty the empty
* list with snap_rwsem held, adjusting the empty list here is
* safe. we do need to protect against concurrent empty list
* additions, however.
*/
- if (atomic_inc_return(&realm->nref) == 1) {
+ refcount_inc(&realm->nref);
+ if (refcount_read(&realm->nref) == 1) {
spin_lock(&mdsc->snap_empty_lock);
list_del_init(&realm->empty_item);
spin_unlock(&mdsc->snap_empty_lock);
@@ -121,7 +122,7 @@ static struct ceph_snap_realm *ceph_create_snap_realm(
if (!realm)
return ERR_PTR(-ENOMEM);
- atomic_set(&realm->nref, 1); /* for caller */
+ refcount_set(&realm->nref, 1); /* for caller */
realm->ino = ino;
INIT_LIST_HEAD(&realm->children);
INIT_LIST_HEAD(&realm->child_item);
@@ -209,8 +210,8 @@ static void __put_snap_realm(struct ceph_mds_client *mdsc,
lockdep_assert_held_write(&mdsc->snap_rwsem);
dout("__put_snap_realm %llx %p %d -> %d\n", realm->ino, realm,
- atomic_read(&realm->nref), atomic_read(&realm->nref)-1);
- if (atomic_dec_and_test(&realm->nref))
+ refcount_read(&realm->nref), refcount_read(&realm->nref)-1);
+ if (refcount_dec_and_test(&realm->nref))
__destroy_snap_realm(mdsc, realm);
}
@@ -221,8 +222,8 @@ void ceph_put_snap_realm(struct ceph_mds_client *mdsc,
struct ceph_snap_realm *realm)
{
dout("put_snap_realm %llx %p %d -> %d\n", realm->ino, realm,
- atomic_read(&realm->nref), atomic_read(&realm->nref)-1);
- if (!atomic_dec_and_test(&realm->nref))
+ refcount_read(&realm->nref), refcount_read(&realm->nref)-1);
+ if (!refcount_dec_and_test(&realm->nref))
return;
if (down_write_trylock(&mdsc->snap_rwsem)) {
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 6b6332a5c113..3abb00d7a0eb 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -2,6 +2,7 @@
#ifndef _FS_CEPH_SUPER_H
#define _FS_CEPH_SUPER_H
+#include <linux/refcount.h>
#include <linux/ceph/ceph_debug.h>
#include <asm/unaligned.h>
@@ -859,7 +860,7 @@ struct ceph_readdir_cache_control {
struct ceph_snap_realm {
u64 ino;
struct inode *inode;
- atomic_t nref;
+ refcount_t nref;
struct rb_node node;
u64 created, seq;
--
2.7.4
next reply other threads:[~2021-07-17 10:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-17 10:06 Xiyu Yang [this message]
2021-07-17 11:21 ` [PATCH] ceph: Convert from atomic_t to refcount_t on ceph_snap_realm->nref Jeff Layton
2021-07-17 12:26 ` Xiyu Yang
2021-07-17 13:40 ` Jeff Layton
2021-07-18 19:58 ` kernel test robot
2021-07-18 20:02 ` kernel test robot
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=1626516381-40440-1-git-send-email-xiyuyang19@fudan.edu.cn \
--to=xiyuyang19@fudan.edu.cn \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tanxin.ctf@gmail.com \
--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).