Skip to contentSkip to conversation

Replace opencoded set_mask_bits

PATCH In review Vineet Gupta 1 participant 5 messages Jan 23, 2019 – Feb 8, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover Replace opencoded set_mask_bits

Hi,

Repost of [1] rebased on 5.0-rc3 + accumulated Acked-by/Reviewed-by. No code changes since v1.

Please consider applying.

[1] http://lists.infradead.org/pipermail/linux-snps-arc/2019-January/005201.html

Thx,
-Vineet

Vineet Gupta (3):
coredump: Replace opencoded set_mask_bits()
fs: inode_set_flags() replace opencoded set_mask_bits() bitops.h: set_mask_bits() to return old value

 fs/exec.c              | 7 +------
 fs/inode.c             | 8 +-------
 include/linux/bitops.h | 2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/3 coredump: Replace opencoded set_mask_bits()

Cc Alexander Viro <viro at zeniv.linux.org.uk>
Cc Peter Zijlstra (Intel) <peterz at infradead.org>
Cc linux-fsdevel at vger.kernel.org
Cc linux-kernel at vger.kernel.org
Reviewed-by Anthony Yznaga <anthony.yznaga at oracle.com>
Acked-by Oleg Nesterov <oleg at redhat.com>
Signed-off-by Vineet Gupta <vgupta at synopsys.com>
---
 fs/exec.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
fs/exec.c +1 -6
index fb72d36f7823..df7f05362283 100644
@@ -1944,15 +1944,10 @@ EXPORT_SYMBOL(set_binfmt);
  */
 void set_dumpable(struct mm_struct *mm, int value)
 {
-	unsigned long old, new;
-
 	if (WARN_ON((unsigned)value > SUID_DUMP_ROOT))
 		return;
 
-	do {
-		old = READ_ONCE(mm->flags);
-		new = (old & ~MMF_DUMPABLE_MASK) | value;
-	} while (cmpxchg(&mm->flags, old, new) != old);
+	set_mask_bits(&mm->flags, MMF_DUMPABLE_MASK, value);
 }
 
 SYSCALL_DEFINE3(execve,
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 2/3 fs: inode_set_flags() replace opencoded set_mask_bits()

In reply to Vineet Gupta

It seems that 5f16f3225b0624 and 00a1a053ebe5, both with same commitlog ("ext4: atomically set inode->i_flags in ext4_set_inode_flags()") introduced the set_mask_bits API, but somehow missed not using it in ext4 in the end

Also, set_mask_bits is used in fs quite a bit and we can possibly come up with a generic llsc based implementation (w/o the cmpxchg loop)

Cc Alexander Viro <viro at zeniv.linux.org.uk>
Cc Theodore Ts'o <tytso at mit.edu>
Cc Peter Zijlstra (Intel) <peterz at infradead.org>
Cc linux-fsdevel at vger.kernel.org
Cc linux-kernel at vger.kernel.org
Reviewed-by Anthony Yznaga <anthony.yznaga at oracle.com>
Signed-off-by Vineet Gupta <vgupta at synopsys.com>
---
 fs/inode.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
fs/inode.c +1 -7
index 0cd47fe0dbe5..799b0c4beda8 100644
@@ -2096,14 +2096,8 @@ EXPORT_SYMBOL(inode_dio_wait);
 void inode_set_flags(struct inode *inode, unsigned int flags,
 		     unsigned int mask)
 {
-	unsigned int old_flags, new_flags;
-
 	WARN_ON_ONCE(flags & ~mask);
-	do {
-		old_flags = READ_ONCE(inode->i_flags);
-		new_flags = (old_flags & ~mask) | flags;
-	} while (unlikely(cmpxchg(&inode->i_flags, old_flags,
-				  new_flags) != old_flags));
+	set_mask_bits(&inode->i_flags, mask, flags);
 }
 EXPORT_SYMBOL(inode_set_flags);
 
Signature · 1 line
2.7.4
#3 lore raw

PATCH v2 3/3 bitops.h: set_mask_bits() to return old value

In reply to Vineet Gupta
| > Also, set_mask_bits is used in fs quite a bit and we can possibly come up
| > with a generic llsc based implementation (w/o the cmpxchg loop)
|
| May I also suggest changing the return value of set_mask_bits() to old.
|
| You can compute the new value given old, but you cannot compute the old
| value given new, therefore old is the better return value. Also, no
| current user seems to use the return value, so changing it is without
| risk.
Link http://lkml.kernel.org/g/20150807110955.GH16853 at twins.programming.kicks-ass.net
Suggested-by Peter Zijlstra <peterz at infradead.org>
Cc Miklos Szeredi <mszeredi at redhat.com>
Cc Ingo Molnar <mingo at kernel.org>
Cc Jani Nikula <jani.nikula at intel.com>
Cc Chris Wilson <chris at chris-wilson.co.uk>
Cc Andrew Morton <akpm at linux-foundation.org>
Reviewed-by Anthony Yznaga <anthony.yznaga at oracle.com>
Acked-by Will Deacon <will.deacon at arm.com>
Signed-off-by Vineet Gupta <vgupta at synopsys.com>
---
 include/linux/bitops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bitops.h +1 -1
index 705f7c442691..602af23b98c7 100644
@@ -246,7 +246,7 @@ static __always_inline void __assign_bit(long nr, volatile unsigned long *addr,
 		new__ = (old__ & ~mask__) | bits__;		\
 	} while (cmpxchg(ptr, old__, new__) != old__);		\
 								\
-	new__;							\
+	old__;							\
 })
 #endif
 
Signature · 1 line
2.7.4
#4 lore raw
In reply to Vineet Gupta
Quoted 11 lines · Vineet Gupta

Hi,

Repost of [1] rebased on 5.0-rc3 + accumulated Acked-by/Reviewed-by. No code changes since v1.

Please consider applying.

[1] http://lists.infradead.org/pipermail/linux-snps-arc/2019-January/005201.html

Thx,
-Vineet

Ping ! @Peter, @Arnd are you happy with this. If so, Andrew can you please add this via mm tree or do i need to pester the respective maintainers !

Thx,
-Vineet

Quoted 11 lines

Vineet Gupta (3):
coredump: Replace opencoded set_mask_bits()
fs: inode_set_flags() replace opencoded set_mask_bits() bitops.h: set_mask_bits() to return old value

 fs/exec.c              | 7 +------
 fs/inode.c             | 8 +-------
 include/linux/bitops.h | 2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)