linux-next: build failure after merge of the percpu tree
Hi all,
After merging the percpu tree, today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/vhost/net.c:26:include/linux/if_macvlan.h: In function 'macvlan_count_rx':include/linux/if_macvlan.h:69: error: read-only variable 'tcp_ptr__' used as 'asm' output In file included from drivers/net/macvlan.c:30:include/linux/if_macvlan.h: In function 'macvlan_count_rx':include/linux/if_macvlan.h:69: error: read-only variable 'tcp_ptr__' used as 'asm' output In file included from drivers/net/macvtap.c:2:include/linux/if_macvlan.h: In function 'macvlan_count_rx':include/linux/if_macvlan.h:69: error: read-only variable 'tcp_ptr__' used as 'asm' output
Caused by commit 7f56c13698abfb1bdf6cf2b5cfcd80626d44c12e ("x86, percpu:
Optimize this_cpu_ptr").
That line in if_macvlan.h is:
rx_stats = this_cpu_ptr(vlan->rx_stats);
Where vlan is a "const struct macvlan_dev *".
I have used the percpu tree from next-20100909 for today.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 x86, percpu: Fix __this_cpu_ptr with const pointers
Fix this error when the pointer is marked const:
error: read-only variable 'tcp_ptr__' used as 'asm' output
--- arch/x86/include/asm/percpu.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/percpu.h +4 -4
@@ -54,12 +54,12 @@*/ #define __this_cpu_ptr (ptr) \ ({ \ - typeof(ptr) tcp_ptr__ = (ptr); \ + unsigned long tcp_ptr__; \ __verify_pcpu_ptr(ptr); \ asm volatile("add " __percpu_arg(1) ", %0" \ - : "+r" (tcp_ptr__) \ - : "m" (this_cpu_off)); \ - tcp_ptr__; \ + : "=r" (tcp_ptr__) \ + : "m" (this_cpu_off), "0" (ptr)); \ + (typeof(ptr) __kernel __force) tcp_ptr__; \ })#else #define __percpu_arg (x) "%P" #x
Signature · 1 line
1.7.2.2
Tejun Heo
maintainerRe: [PATCH] x86, percpu: Fix __this_cpu_ptr with const pointers
I folded the fix into the original patch and also updated the address space casting for sparse.
Thanks.
Quoted 1 line
From
9c5b46f782cde2c88a5e4f02a6112bfcfb105f8fMon Sep 17 00:00:00 2001
From: Brian Gerst <[email protected]>
Date: Thu, 9 Sep 2010 18:17:26 +0200
Subject: [PATCH] x86, percpu: Optimize this_cpu_ptr
Allow arches to implement __this_cpu_ptr, and provide an x86 version.
Before:
movq $foo, %rax
movq %gs:this_cpu_off, %rdx
addq %rdx, %rax
After:
movq $foo, %rax
addq %gs:this_cpu_off, %rax
The benefit is doing it in one less instruction and not clobbering a temporary register.
tj: * Beefed up the comment a bit and renamed in-macro temp variable
to match neighboring macros.
* Folded fix for const pointer case found in linux-next.
* Fixed sparse notation.
--- arch/x86/include/asm/percpu.h | 14 ++++++++++++++ include/asm-generic/percpu.h | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)
arch/x86/include/asm/percpu.h +14 -0
@@ -47,6 +47,20 @@#ifdef CONFIG_SMP #define __percpu_arg (x) "%%"__stringify(__percpu_seg)":%P" #x#define __my_cpu_offset percpu_read(this_cpu_off) + +/* +* Compared to the generic __my_cpu_offset version, the following +* saves one instruction and avoids clobbering a temp register. +*/ +#define __this_cpu_ptr (ptr) \ +({ \ + unsigned long tcp_ptr__; \ + __verify_pcpu_ptr(ptr); \ + asm volatile("add " __percpu_arg(1) ", %0" \ + : "=r" (tcp_ptr__) \ + : "m" (this_cpu_off), "0" (ptr)); \ + (typeof(*(ptr)) __kernel __force *)tcp_ptr__; \ +})#else #define __percpu_arg (x) "%P" #x#endif
include/asm-generic/percpu.h +7 -2
@@ -60,9 +60,14 @@ extern unsigned long __per_cpu_offset[NR_CPUS];#define __raw_get_cpu_var (var) \ (*SHIFT_PERCPU_PTR(&(var), __my_cpu_offset)) -#define this_cpu_ptr (ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset) +#ifndef __this_cpu_ptr#define __this_cpu_ptr (ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) - +#endif +#ifdef CONFIG_DEBUG_PREEMPT +#define this_cpu_ptr (ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset) +#else +#define this_cpu_ptr (ptr) __this_cpu_ptr(ptr) +#endif #ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA extern void setup_per_cpu_areas (void );
Signature · 1 line
1.7.1