[Devel] [PATCH RHEL7 COMMIT] ms/percpu: fix this_cpu_sub() subtrahend casting for unsigneds

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-514.10.2.vz7.29.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.10.2.vz7.29.11
------>
commit 5ad39e4995ed1e4a041ae08a7fb4ccf984f3adec
Author: Greg Thelen <gthelen at google.com>
Date:   Tue Apr 4 14:20:17 2017 +0400

    ms/percpu: fix this_cpu_sub() subtrahend casting for unsigneds
    
    commit bd09d9a35111b6ffc0c7585d3853d0ec7f9f1eb4 upstream.
    
    this_cpu_sub() is implemented as negation and addition.
    
    This patch casts the adjustment to the counter type before negation to
    sign extend the adjustment.  This helps in cases where the counter type
    is wider than an unsigned adjustment.  An alternative to this patch is
    to declare such operations unsupported, but it seemed useful to avoid
    surprises.
    
    This patch specifically helps the following example:
      unsigned int delta = 1
      preempt_disable()
      this_cpu_write(long_counter, 0)
      this_cpu_sub(long_counter, delta)
      preempt_enable()
    
    Before this change long_counter on a 64 bit machine ends with value
    0xffffffff, rather than 0xffffffffffffffff.  This is because
    this_cpu_sub(pcp, delta) boils down to this_cpu_add(pcp, -delta),
    which is basically:
      long_counter = 0 + 0xffffffff
    
    Also apply the same cast to:
      __this_cpu_sub()
      __this_cpu_sub_return()
      this_cpu_sub_return()
    
    All percpu_test.ko passes, especially the following cases which
    previously failed:
    
      l -= ui_one;
      __this_cpu_sub(long_counter, ui_one);
      CHECK(l, long_counter, -1);
    
      l -= ui_one;
      this_cpu_sub(long_counter, ui_one);
      CHECK(l, long_counter, -1);
      CHECK(l, long_counter, 0xffffffffffffffff);
    
      ul -= ui_one;
      __this_cpu_sub(ulong_counter, ui_one);
      CHECK(ul, ulong_counter, -1);
      CHECK(ul, ulong_counter, 0xffffffffffffffff);
    
      ul = this_cpu_sub_return(ulong_counter, ui_one);
      CHECK(ul, ulong_counter, 2);
    
      ul = __this_cpu_sub_return(ulong_counter, ui_one);
      CHECK(ul, ulong_counter, 1);
    
    Signed-off-by: Greg Thelen <gthelen at google.com>
    Acked-by: Tejun Heo <tj at kernel.org>
    Acked-by: Johannes Weiner <hannes at cmpxchg.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    
    https://jira.sw.ru/browse/PSBM-63424
    
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 arch/x86/include/asm/percpu.h | 3 ++-
 include/linux/percpu.h        | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 0da5200..b3e18f8 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -128,7 +128,8 @@ do {							\
 do {									\
 	typedef typeof(var) pao_T__;					\
 	const int pao_ID__ = (__builtin_constant_p(val) &&		\
-			      ((val) == 1 || (val) == -1)) ? (val) : 0;	\
+			      ((val) == 1 || (val) == -1)) ?		\
+				(int)(val) : 0;				\
 	if (0) {							\
 		pao_T__ pao_tmp__;					\
 		pao_tmp__ = (val);					\
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 0042989..c85727d 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -338,7 +338,7 @@ do {									\
 #endif
 
 #ifndef this_cpu_sub
-# define this_cpu_sub(pcp, val)		this_cpu_add((pcp), -(val))
+# define this_cpu_sub(pcp, val)		this_cpu_add((pcp), -(typeof(pcp))(val))
 #endif
 
 #ifndef this_cpu_inc
@@ -424,7 +424,7 @@ do {									\
 # define this_cpu_add_return(pcp, val)	__pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
 #endif
 
-#define this_cpu_sub_return(pcp, val)	this_cpu_add_return(pcp, -(val))
+#define this_cpu_sub_return(pcp, val)	this_cpu_add_return(pcp, -(typeof(pcp))(val))
 #define this_cpu_inc_return(pcp)	this_cpu_add_return(pcp, 1)
 #define this_cpu_dec_return(pcp)	this_cpu_add_return(pcp, -1)
 
@@ -592,7 +592,7 @@ do {									\
 #endif
 
 #ifndef __this_cpu_sub
-# define __this_cpu_sub(pcp, val)	__this_cpu_add((pcp), -(val))
+# define __this_cpu_sub(pcp, val)	__this_cpu_add((pcp), -(typeof(pcp))(val))
 #endif
 
 #ifndef __this_cpu_inc
@@ -674,7 +674,7 @@ do {									\
 	__pcpu_size_call_return2(__this_cpu_add_return_, pcp, val)
 #endif
 
-#define __this_cpu_sub_return(pcp, val)	__this_cpu_add_return(pcp, -(val))
+#define __this_cpu_sub_return(pcp, val)	__this_cpu_add_return(pcp, -(typeof(pcp))(val))
 #define __this_cpu_inc_return(pcp)	__this_cpu_add_return(pcp, 1)
 #define __this_cpu_dec_return(pcp)	__this_cpu_add_return(pcp, -1)