Skip to contentSkip to conversation

bitops: use the same mechanism for get_count_order[_long]

PATCH In review Wei Yang 2 participants 4 messages May 25, 2020 – May 30, 2020 Bitops API

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH 1/1 bitops: use the same mechanism for get_count_order[_long]

These two functions share the same logic.

---
 include/linux/bitops.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
include/linux/bitops.h +3 -5
index 5b5609e81a84..80703ef27aee 100644
@@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned long l)
 
 static inline int get_count_order(unsigned int count)
 {
-	int order;
+	if (count == 0)
+		return -1;
 
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
+	return fls(--count);
 }
 
 /**
Signature · 1 line
2.23.0
#1 lore raw
Quoted 1 line · Wei Yang

These two functions share the same logic.

So, same comment. Please, add test first, make sure it works on current kernel, then after your patch applied, and send it as a series, thanks!

P.S. W/o test code looks good, but based on my experience I'm very suspicious about "small" changes that may lead to big issues. Hope you understand my point.

Quoted 28 lines
---
 include/linux/bitops.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
include/linux/bitops.h +3 -5
index 5b5609e81a84..80703ef27aee 100644
@@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned long l)
 
 static inline int get_count_order(unsigned int count)
 {
-	int order;
+	if (count == 0)
+		return -1;
 
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
+	return fls(--count);
 }
 
 /**
Signature · 1 line
2.23.0
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author
#2 lore raw
Quoted 9 lines · Andy Shevchenko
Quoted 1 line · Wei Yang

These two functions share the same logic.

So, same comment. Please, add test first, make sure it works on current kernel, then after your patch applied, and send it as a series, thanks!

P.S. W/o test code looks good, but based on my experience I'm very suspicious about "small" changes that may lead to big issues. Hope you understand my point.

Sure, I see your point.

Quoted 33 lines
Quoted 28 lines
---
 include/linux/bitops.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
include/linux/bitops.h +3 -5
index 5b5609e81a84..80703ef27aee 100644
@@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned long l)
 
 static inline int get_count_order(unsigned int count)
 {
-	int order;
+	if (count == 0)
+		return -1;
 
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
+	return fls(--count);
 }
 
 /**
Signature · 1 line
2.23.0
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Signature · 2 lines
Wei Yang
Help you, Help me
author
#3 lore raw
In reply to Wei Yang

Andrew,

Would you mind picking up this one? The test module doesn't show any warning after this on applied.

Quoted 29 lines · Wei Yang

These two functions share the same logic.

---
include/linux/bitops.h | 8 +++-----

1 file changed, 3 insertions(+), 5 deletions(-)
include/linux/bitops.h +3 -5
index 5b5609e81a84..80703ef27aee 100644
@@ -188,12 +188,10 @@ static inline unsigned fls_long(unsigned long l)
 
 static inline int get_count_order(unsigned int count)
 {
-	int order;
+	if (count == 0)
+		return -1;
 
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
+	return fls(--count);
 }
 
 /**
Signature · 1 line
2.23.0
Signature · 2 lines
Wei Yang
Help you, Help me