Skip to contentSkip to conversation

ucount: Fix and improve atomic_long_inc_below

PATCH Superseded Uros Bizjak 2 participants 5 messages Jul 13, 2022 – Jul 15, 2022

lore
Share & tools
lore
#0 lore raw

cover ucount: Fix and improve atomic_long_inc_below

The series fixes wrong argument type and improves atomic_long_inc_below by using atomic_long_try_cmpxchg instead of atomic_long_cmpxchg.

Cc "Eric W. Biederman" <[email protected]>

Uros Bizjak (2):
ucount: Fix atomic_long_inc_below argument type
ucount: Use atomic_long_try_cmpxchg in atomic_long_inc_below

 kernel/ucount.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
Signature · 1 line
2.35.3
#1 lore raw

PATCH 1/2 ucount: Fix atomic_long_inc_below argument type

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 "Eric W. Biederman" <[email protected]>
---
 kernel/ucount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ucount.c +1 -1
index 06ea04d44685..974ac1585009 100644
@@ -216,7 +216,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.35.3
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ucount: Fix atomic_long_inc_below argument type

Quoted 2 lines · Uros Bizjak

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

Quoted 21 lines
Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")
Cc "Eric W. Biederman" <[email protected]>
---
 kernel/ucount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ucount.c +1 -1
index 06ea04d44685..974ac1585009 100644
@@ -216,7 +216,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);
#3 lore raw

PATCH 2/2 ucount: Use atomic_long_try_cmpxchg in atomic_long_inc_below

In reply to Uros Bizjak

Use atomic_long_try_cmpxchg instead of
atomic_long_cmpxchg (*ptr, old, new) == old in atomic_long_inc_below. 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 "Eric W. Biederman" <[email protected]>
---
 kernel/ucount.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
kernel/ucount.c +6 -8
index 974ac1585009..5d980460104e 100644
@@ -218,16 +218,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.35.3
#4 lore raw
In reply to Uros Bizjak
Quoted 5 lines · Uros Bizjak

The series fixes wrong argument type and improves atomic_long_inc_below by using atomic_long_try_cmpxchg instead of atomic_long_cmpxchg.

Cc "Eric W. Biederman" <[email protected]>

The bug fix at least looks correct. I haven't reviewed the atomic_long_try_cmpxchg yet.

Thanks,
Eric

Quoted 7 lines

Uros Bizjak (2):
ucount: Fix atomic_long_inc_below argument type
ucount: Use atomic_long_try_cmpxchg in atomic_long_inc_below

 kernel/ucount.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)