| Message ID | 20160921085137.862-1-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Nicholas,
[auto build test ERROR on asm-generic/master]
[also build test ERROR on v4.8-rc7 next-20160920]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]
url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/percpu-improve-generic-percpu-modify-return-implementation/20160921-170016
base: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git master
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=blackfin
All error/warnings (new ones prefixed by >>):
mm/vmstat.c: In function 'refresh_cpu_vm_stats':
>> mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^ ~~~~~~~~~~~~
In file included from arch/blackfin/include/generated/asm/percpu.h:1:0,
from include/linux/percpu.h:12,
from include/linux/percpu-rwsem.h:6,
from include/linux/fs.h:30,
from mm/vmstat.c:12:
>> include/asm-generic/percpu.h:152:10: error: 'raw_cpu_generic_xchg' undeclared (first use in this function)
__ret = raw_cpu_generic_xchg(pcp); \
^
>> include/asm-generic/percpu.h:382:36: note: in expansion of macro 'this_cpu_generic_xchg'
#define this_cpu_xchg_1(pcp, nval) this_cpu_generic_xchg(pcp, nval)
^~~~~~~~~~~~~~~~~~~~~
>> include/linux/percpu-defs.h:323:24: note: in expansion of macro 'this_cpu_xchg_1'
case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break; \
^~~~
>> include/linux/percpu-defs.h:500:34: note: in expansion of macro '__pcpu_size_call_return2'
#define this_cpu_xchg(pcp, nval) __pcpu_size_call_return2(this_cpu_xchg_, pcp, nval)
^~~~~~~~~~~~~~~~~~~~~~~~
>> mm/vmstat.c:476:8: note: in expansion of macro 'this_cpu_xchg'
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^~~~~~~~~~~~~
include/asm-generic/percpu.h:152:10: note: each undeclared identifier is reported only once for each function it appears in
__ret = raw_cpu_generic_xchg(pcp); \
^
>> include/asm-generic/percpu.h:382:36: note: in expansion of macro 'this_cpu_generic_xchg'
#define this_cpu_xchg_1(pcp, nval) this_cpu_generic_xchg(pcp, nval)
^~~~~~~~~~~~~~~~~~~~~
>> include/linux/percpu-defs.h:323:24: note: in expansion of macro 'this_cpu_xchg_1'
case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break; \
^~~~
>> include/linux/percpu-defs.h:500:34: note: in expansion of macro '__pcpu_size_call_return2'
#define this_cpu_xchg(pcp, nval) __pcpu_size_call_return2(this_cpu_xchg_, pcp, nval)
^~~~~~~~~~~~~~~~~~~~~~~~
>> mm/vmstat.c:476:8: note: in expansion of macro 'this_cpu_xchg'
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^~~~~~~~~~~~~
>> mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^ ~~~~~~~~~~~~
>> mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
>> mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
vim +/raw_cpu_generic_xchg +476 mm/vmstat.c
ee99c71c KOSAKI Motohiro 2009-03-31 470 for_each_populated_zone(zone) {
fbc2edb0 Christoph Lameter 2013-09-11 471 struct per_cpu_pageset __percpu *p = zone->pageset;
2244b95a Christoph Lameter 2006-06-30 472
fbc2edb0 Christoph Lameter 2013-09-11 473 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) {
a7f75e25 Christoph Lameter 2008-02-04 474 int v;
a7f75e25 Christoph Lameter 2008-02-04 475
fbc2edb0 Christoph Lameter 2013-09-11 @476 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
fbc2edb0 Christoph Lameter 2013-09-11 477 if (v) {
fbc2edb0 Christoph Lameter 2013-09-11 478
a7f75e25 Christoph Lameter 2008-02-04 479 atomic_long_add(v, &zone->vm_stat[i]);
:::::: The code at line 476 was first introduced by commit
:::::: fbc2edb05354480a88aa39db8a6acb5782fa1a1b vmstat: use this_cpu() to avoid irqon/off sequence in refresh_cpu_vm_stats
:::::: TO: Christoph Lameter <cl@linux.com>
:::::: CC: Linus Torvalds <torvalds@linux-foundation.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Nicholas,
[auto build test ERROR on asm-generic/master]
[also build test ERROR on v4.8-rc7 next-20160920]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]
url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/percpu-improve-generic-percpu-modify-return-implementation/20160921-170016
base: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git master
config: tile-tilegx_defconfig (attached as .config)
compiler: tilegx-linux-gcc (GCC) 4.6.2
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=tile
All errors (new ones prefixed by >>):
mm/vmstat.c: In function 'refresh_cpu_vm_stats':
mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
>> mm/vmstat.c:476:1: error: 'raw_cpu_generic_xchg' undeclared (first use in this function)
mm/vmstat.c:476:1: note: each undeclared identifier is reported only once for each function it appears in
mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
vim +/raw_cpu_generic_xchg +476 mm/vmstat.c
ee99c71c KOSAKI Motohiro 2009-03-31 470 for_each_populated_zone(zone) {
fbc2edb0 Christoph Lameter 2013-09-11 471 struct per_cpu_pageset __percpu *p = zone->pageset;
2244b95a Christoph Lameter 2006-06-30 472
fbc2edb0 Christoph Lameter 2013-09-11 473 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) {
a7f75e25 Christoph Lameter 2008-02-04 474 int v;
a7f75e25 Christoph Lameter 2008-02-04 475
fbc2edb0 Christoph Lameter 2013-09-11 @476 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
fbc2edb0 Christoph Lameter 2013-09-11 477 if (v) {
fbc2edb0 Christoph Lameter 2013-09-11 478
a7f75e25 Christoph Lameter 2008-02-04 479 atomic_long_add(v, &zone->vm_stat[i]);
:::::: The code at line 476 was first introduced by commit
:::::: fbc2edb05354480a88aa39db8a6acb5782fa1a1b vmstat: use this_cpu() to avoid irqon/off sequence in refresh_cpu_vm_stats
:::::: TO: Christoph Lameter <cl@linux.com>
:::::: CC: Linus Torvalds <torvalds@linux-foundation.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Nicholas,
[auto build test WARNING on asm-generic/master]
[also build test WARNING on v4.8-rc7 next-20160920]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]
url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/percpu-improve-generic-percpu-modify-return-implementation/20160921-170016
base: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git master
config: i386-randconfig-s0-201638 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All warnings (new ones prefixed by >>):
In file included from arch/x86/include/asm/percpu.h:551:0,
from arch/x86/include/asm/preempt.h:5,
from include/linux/preempt.h:59,
from include/linux/spinlock.h:50,
from arch/x86/kernel/nmi.c:13:
arch/x86/kernel/nmi.c: In function 'do_nmi':
include/asm-generic/percpu.h:138:17: warning: unused variable '__p' [-Wunused-variable]
typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \
^
include/asm-generic/percpu.h:378:41: note: in expansion of macro 'this_cpu_generic_add_return'
#define this_cpu_add_return_8(pcp, val) this_cpu_generic_add_return(pcp, val)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/percpu-defs.h:326:24: note: in expansion of macro 'this_cpu_add_return_8'
case 8: pscr2_ret__ = stem##8(variable, __VA_ARGS__); break; \
^~~~
include/linux/percpu-defs.h:499:39: note: in expansion of macro '__pcpu_size_call_return2'
#define this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
^~~~~~~~~~~~~~~~~~~~~~~~
include/linux/percpu-defs.h:511:34: note: in expansion of macro 'this_cpu_add_return'
#define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1)
^~~~~~~~~~~~~~~~~~~
>> arch/x86/kernel/nmi.c:544:6: note: in expansion of macro 'this_cpu_dec_return'
if (this_cpu_dec_return(nmi_state))
^~~~~~~~~~~~~~~~~~~
--
mm/vmstat.c: In function 'refresh_cpu_vm_stats':
mm/vmstat.c:476:1: error: macro "raw_cpu_generic_xchg" requires 2 arguments, but only 1 given
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^ ~~~~~~~~~~~~
In file included from arch/x86/include/asm/percpu.h:551:0,
from arch/x86/include/asm/preempt.h:5,
from include/linux/preempt.h:59,
from include/linux/spinlock.h:50,
from include/linux/wait.h:8,
from include/linux/fs.h:5,
from mm/vmstat.c:12:
include/asm-generic/percpu.h:152:10: error: 'raw_cpu_generic_xchg' undeclared (first use in this function)
__ret = raw_cpu_generic_xchg(pcp); \
^
include/asm-generic/percpu.h:391:36: note: in expansion of macro 'this_cpu_generic_xchg'
#define this_cpu_xchg_8(pcp, nval) this_cpu_generic_xchg(pcp, nval)
^~~~~~~~~~~~~~~~~~~~~
>> include/linux/percpu-defs.h:326:24: note: in expansion of macro 'this_cpu_xchg_8'
case 8: pscr2_ret__ = stem##8(variable, __VA_ARGS__); break; \
^~~~
include/linux/percpu-defs.h:500:34: note: in expansion of macro '__pcpu_size_call_return2'
#define this_cpu_xchg(pcp, nval) __pcpu_size_call_return2(this_cpu_xchg_, pcp, nval)
^~~~~~~~~~~~~~~~~~~~~~~~
mm/vmstat.c:476:8: note: in expansion of macro 'this_cpu_xchg'
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^~~~~~~~~~~~~
include/asm-generic/percpu.h:152:10: note: each undeclared identifier is reported only once for each function it appears in
__ret = raw_cpu_generic_xchg(pcp); \
^
include/asm-generic/percpu.h:391:36: note: in expansion of macro 'this_cpu_generic_xchg'
#define this_cpu_xchg_8(pcp, nval) this_cpu_generic_xchg(pcp, nval)
^~~~~~~~~~~~~~~~~~~~~
>> include/linux/percpu-defs.h:326:24: note: in expansion of macro 'this_cpu_xchg_8'
case 8: pscr2_ret__ = stem##8(variable, __VA_ARGS__); break; \
^~~~
include/linux/percpu-defs.h:500:34: note: in expansion of macro '__pcpu_size_call_return2'
#define this_cpu_xchg(pcp, nval) __pcpu_size_call_return2(this_cpu_xchg_, pcp, nval)
^~~~~~~~~~~~~~~~~~~~~~~~
mm/vmstat.c:476:8: note: in expansion of macro 'this_cpu_xchg'
v = this_cpu_xchg(p->vm_stat_diff[i], 0);
^~~~~~~~~~~~~
vim +/this_cpu_dec_return +544 arch/x86/kernel/nmi.c
1d48922c Don Zickus 2011-09-30 528 inc_irq_stat(__nmi_count);
1d48922c Don Zickus 2011-09-30 529
1d48922c Don Zickus 2011-09-30 530 if (!ignore_nmis)
1d48922c Don Zickus 2011-09-30 531 default_do_nmi(regs);
1d48922c Don Zickus 2011-09-30 532
1d48922c Don Zickus 2011-09-30 533 nmi_exit();
228bdaa9 Steven Rostedt 2011-12-09 534
9d050416 Andy Lutomirski 2015-07-15 535 #ifdef CONFIG_X86_64
9d050416 Andy Lutomirski 2015-07-15 536 if (unlikely(this_cpu_read(update_debug_stack))) {
9d050416 Andy Lutomirski 2015-07-15 537 debug_stack_reset();
9d050416 Andy Lutomirski 2015-07-15 538 this_cpu_write(update_debug_stack, 0);
9d050416 Andy Lutomirski 2015-07-15 539 }
9d050416 Andy Lutomirski 2015-07-15 540 #endif
9d050416 Andy Lutomirski 2015-07-15 541
9d050416 Andy Lutomirski 2015-07-15 542 if (unlikely(this_cpu_read(nmi_cr2) != read_cr2()))
9d050416 Andy Lutomirski 2015-07-15 543 write_cr2(this_cpu_read(nmi_cr2));
9d050416 Andy Lutomirski 2015-07-15 @544 if (this_cpu_dec_return(nmi_state))
9d050416 Andy Lutomirski 2015-07-15 545 goto nmi_restart;
1d48922c Don Zickus 2011-09-30 546 }
9326638c Masami Hiramatsu 2014-04-17 547 NOKPROBE_SYMBOL(do_nmi);
1d48922c Don Zickus 2011-09-30 548
1d48922c Don Zickus 2011-09-30 549 void stop_nmi(void)
1d48922c Don Zickus 2011-09-30 550 {
1d48922c Don Zickus 2011-09-30 551 ignore_nmis++;
1d48922c Don Zickus 2011-09-30 552 }
:::::: The code at line 544 was first introduced by commit
:::::: 9d05041679904b12c12421cbcf9cb5f4860a8d7b x86/nmi: Enable nested do_nmi() handling for 64-bit kernels
:::::: TO: Andy Lutomirski <luto@kernel.org>
:::::: CC: Ingo Molnar <mingo@kernel.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 4d9f233..3fe18fe 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h @@ -65,6 +65,11 @@ extern void setup_per_cpu_areas(void); #define PER_CPU_DEF_ATTRIBUTES #endif +#define raw_cpu_generic_read(pcp) \ +({ \ + *raw_cpu_ptr(&(pcp)); \ +}) + #define raw_cpu_generic_to_op(pcp, val, op) \ do { \ *raw_cpu_ptr(&(pcp)) op val; \ @@ -72,34 +77,39 @@ do { \ #define raw_cpu_generic_add_return(pcp, val) \ ({ \ - raw_cpu_add(pcp, val); \ - raw_cpu_read(pcp); \ + typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \ + \ + *__p += val; \ + *__p; \ }) #define raw_cpu_generic_xchg(pcp, nval) \ ({ \ + typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \ typeof(pcp) __ret; \ - __ret = raw_cpu_read(pcp); \ - raw_cpu_write(pcp, nval); \ + __ret = *__p; \ + *__p = nval; \ __ret; \ }) #define raw_cpu_generic_cmpxchg(pcp, oval, nval) \ ({ \ + typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \ typeof(pcp) __ret; \ - __ret = raw_cpu_read(pcp); \ + __ret = *__p; \ if (__ret == (oval)) \ - raw_cpu_write(pcp, nval); \ + *__p = nval; \ __ret; \ }) #define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \ ({ \ + typeof(&(pcp1)) __p1 = raw_cpu_ptr(&(pcp1)); \ + typeof(&(pcp2)) __p2 = raw_cpu_ptr(&(pcp2)); \ int __ret = 0; \ - if (raw_cpu_read(pcp1) == (oval1) && \ - raw_cpu_read(pcp2) == (oval2)) { \ - raw_cpu_write(pcp1, nval1); \ - raw_cpu_write(pcp2, nval2); \ + if (*__p1 == (oval1) && *__p2 == (oval2)) { \ + *__p1 = nval1; \ + *__p2 = nval2; \ __ret = 1; \ } \ (__ret); \ @@ -109,7 +119,7 @@ do { \ ({ \ typeof(pcp) __ret; \ preempt_disable(); \ - __ret = *this_cpu_ptr(&(pcp)); \ + __ret = raw_cpu_generic_read(pcp); \ preempt_enable(); \ __ret; \ }) @@ -118,17 +128,18 @@ do { \ do { \ unsigned long __flags; \ raw_local_irq_save(__flags); \ - *raw_cpu_ptr(&(pcp)) op val; \ + raw_cpu_generic_to_op(pcp, val, op); \ raw_local_irq_restore(__flags); \ } while (0) + #define this_cpu_generic_add_return(pcp, val) \ ({ \ + typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp)); \ typeof(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ - raw_cpu_add(pcp, val); \ - __ret = raw_cpu_read(pcp); \ + __ret = raw_cpu_generic_add_return(pcp, val); \ raw_local_irq_restore(__flags); \ __ret; \ }) @@ -138,8 +149,7 @@ do { \ typeof(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ - __ret = raw_cpu_read(pcp); \ - raw_cpu_write(pcp, nval); \ + __ret = raw_cpu_generic_xchg(pcp); \ raw_local_irq_restore(__flags); \ __ret; \ }) @@ -149,9 +159,7 @@ do { \ typeof(pcp) __ret; \ unsigned long __flags; \ raw_local_irq_save(__flags); \ - __ret = raw_cpu_read(pcp); \ - if (__ret == (oval)) \ - raw_cpu_write(pcp, nval); \ + __ret = raw_cpu_generic_cmpxchg(pcp, oval, nval); \ raw_local_irq_restore(__flags); \ __ret; \ }) @@ -168,16 +176,16 @@ do { \ }) #ifndef raw_cpu_read_1 -#define raw_cpu_read_1(pcp) (*raw_cpu_ptr(&(pcp))) +#define raw_cpu_read_1(pcp) raw_cpu_generic_read(pcp) #endif #ifndef raw_cpu_read_2 -#define raw_cpu_read_2(pcp) (*raw_cpu_ptr(&(pcp))) +#define raw_cpu_read_2(pcp) raw_cpu_generic_read(pcp) #endif #ifndef raw_cpu_read_4 -#define raw_cpu_read_4(pcp) (*raw_cpu_ptr(&(pcp))) +#define raw_cpu_read_4(pcp) raw_cpu_generic_read(pcp) #endif #ifndef raw_cpu_read_8 -#define raw_cpu_read_8(pcp) (*raw_cpu_ptr(&(pcp))) +#define raw_cpu_read_8(pcp) raw_cpu_generic_read(pcp) #endif #ifndef raw_cpu_write_1
Some architectures require an additional load to find the address of percpu pointers. In some implemenatations, the C aliasing rules do not allow the result of that load to be kept over the store that modifies the percpu variable, which causes additional loads. Work around this by finding the pointer first, then operating on that. It's also possible to mark things as restrict and those kind of games, but that can require larger and arch specific changes. On powerpc, __this_cpu_inc_return compiles to: ld 10,48(13) ldx 9,3,10 addi 9,9,1 stdx 9,3,10 ld 9,48(13) ldx 3,9,3 With this patch it saves 2 loads: ld 10,48(13) ldx 9,3,10 addi 9,9,1 stdx 9,3,10 Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- include/asm-generic/percpu.h | 54 +++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 23 deletions(-)