Skip to contentSkip to conversation

ucount: Fix atomic_long_inc_below argument typei()

PATCH RESEND Superseded Uros Bizjak 1 participant 3 messages Jul 21, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/2 ucount: Fix atomic_long_inc_below argument typei()

The type of u argument of atomic_long_inc_below() should be long to avoid unwanted truncation to int.

Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")
Cc Andrew Morton <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Cc Alexey Gladkov <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc MengEn Sun <[email protected]>
Cc "Thomas Weißschuh" <[email protected]>
---
 kernel/ucount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ucount.c +1 -1
index 8686e329b8f2..f629db485a07 100644
@@ -199,7 +199,7 @@ void put_ucounts(struct ucounts *ucounts)
 	}
 }
 
-static inline bool atomic_long_inc_below(atomic_long_t *v, int u)
+static inline bool atomic_long_inc_below(atomic_long_t *v, long u)
 {
 	long c, old;
 	c = atomic_long_read(v);
Signature · 1 line
2.50.1
#1 lore raw

PATCH RESEND 2/2 ucount: Use atomic_long_try_cmpxchg() in atomic_long_inc_below()

Use atomic_long_try_cmpxchgi() instead of
atomic_long_cmpxchg (*ptr, old, new) == old in atomic_long_inc_belowi(). x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after cmpxchg (and related move instruction in front of cmpxchg).

Also, atomic_long_try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg fails, enabling further code simplifications.

No functional change intended.

Cc Andrew Morton <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Cc Alexey Gladkov <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc MengEn Sun <[email protected]>
Cc "Thomas Weißschuh" <[email protected]>
---
 kernel/ucount.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
kernel/ucount.c +6 -8
index f629db485a07..586af49fc03e 100644
@@ -201,16 +201,14 @@ void put_ucounts(struct ucounts *ucounts)
 
 static inline bool atomic_long_inc_below(atomic_long_t *v, long u)
 {
-	long c, old;
-	c = atomic_long_read(v);
-	for (;;) {
+	long c = atomic_long_read(v);
+
+	do {
 		if (unlikely(c >= u))
 			return false;
-		old = atomic_long_cmpxchg(v, c, c+1);
-		if (likely(old == c))
-			return true;
-		c = old;
-	}
+	} while (!atomic_long_try_cmpxchg(v, &c, c+1));
+
+	return true;
 }
 
 struct ucounts *inc_ucount(struct user_namespace *ns, kuid_t uid,
Signature · 1 line
2.50.1
#2 lore raw
In reply to Uros Bizjak

Sorry, patches in this series have some problems in their description, please expect v2.

Uros.

Quoted 34 lines · Uros Bizjak

The type of u argument of atomic_long_inc_below() should be long to avoid unwanted truncation to int.

Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")
Cc Andrew Morton <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Cc Alexey Gladkov <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc MengEn Sun <[email protected]>
Cc "Thomas Weißschuh" <[email protected]>
---
 kernel/ucount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ucount.c +1 -2
index 8686e329b8f2..f629db485a07 100644
@@ -199,7 +199,7 @@ void put_ucounts(struct ucounts *ucounts)
        }
 }
 
-static inline bool atomic_long_inc_below(atomic_long_t *v, int u)
+static inline bool atomic_long_inc_below(atomic_long_t *v, long u)
 {
        long c, old;
        c = atomic_long_read(v);
--

2.50.1