d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kref: replace hand-rolled atomic ops with refcount API

Browse Source 
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D37608
This commit is contained in:
Mateusz Guzik 2022-12-05 17:38:45 +00:00
parent 85e7d8e0ae
commit 67e628b7a6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/compat/linuxkpi/common/include/linux/kref.h
View File

@ -44,35 +44,35 @@
struct kref {
/* XXX In Linux this is a refcount_t */
atomic_t refcount;
volatile u_int32_t refcount;
};
static inline void
kref_init(struct kref *kref)
{
refcount_init(&kref->refcount.counter, 1);
refcount_init(&kref->refcount, 1);
}
static inline unsigned int
kref_read(const struct kref *kref)
kref_read(struct kref *kref)
{
return (atomic_read(&kref->refcount));
return (refcount_load(&kref->refcount));
}
static inline void
kref_get(struct kref *kref)
{
refcount_acquire(&kref->refcount.counter);
refcount_acquire(&kref->refcount);
}
static inline int
kref_put(struct kref *kref, void (*rel)(struct kref *kref))
{
if (refcount_release(&kref->refcount.counter)) {
if (refcount_release(&kref->refcount)) {
rel(kref);
return 1;
}
@ -84,7 +84,7 @@ kref_put_lock(struct kref *kref, void (*rel)(struct kref *kref),
spinlock_t *lock)
{
if (refcount_release(&kref->refcount.counter)) {
if (refcount_release(&kref->refcount)) {
spin_lock(lock);
rel(kref);
return (1);
@ -98,7 +98,7 @@ kref_sub(struct kref *kref, unsigned int count,
{
while (count--) {
if (refcount_release(&kref->refcount.counter)) {
if (refcount_release(&kref->refcount)) {
rel(kref);
return 1;
}
@ -110,16 +110,16 @@ static inline int __must_check
kref_get_unless_zero(struct kref *kref)
{
return atomic_add_unless(&kref->refcount, 1, 0);
return refcount_acquire_if_not_zero(&kref->refcount);
}
static inline int kref_put_mutex(struct kref *kref,
void (*release)(struct kref *kref), struct mutex *lock)
{
WARN_ON(release == NULL);
if (unlikely(!atomic_add_unless(&kref->refcount, -1, 1))) {
if (unlikely(!refcount_release_if_not_last(&kref->refcount))) {
mutex_lock(lock);
if (unlikely(!atomic_dec_and_test(&kref->refcount))) {
if (unlikely(!refcount_release(&kref->refcount))) {
mutex_unlock(lock);
return 0;
}