Subject: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.

Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.

__get_cpu_var() is defined as :


#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))



__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.

this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.


This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.

At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.

The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.




Transformations done to __get_cpu_var()


1. Determine the address of the percpu instance of the current processor.

DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);

Converts to

int *x = this_cpu_ptr(&y);


2. Same as #1 but this time an array structure is involved.

DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);

Converts to

int *x = this_cpu_ptr(y);


3. Retrieve the content of the current processors instance of a per cpu
variable.

DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)

Converts to

int x = __this_cpu_read(y);


4. Retrieve the content of a percpu struct

DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);

Converts to

memcpy(&x, this_cpu_ptr(&y), sizeof(x));


5. Assignment to a per cpu variable

DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;

Converts to

__this_cpu_write(y, x);


6. Increment/Decrement etc of a per cpu variable

DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++

Converts to

__this_cpu_inc(y)


Cc: Benjamin Herrenschmidt <[email protected]>
CC: Paul Mackerras <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>

Index: linux/arch/powerpc/include/asm/cputime.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/cputime.h 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/include/asm/cputime.h 2014-02-03 13:26:45.060851321 -0600
@@ -56,10 +56,10 @@
static inline cputime_t cputime_to_scaled(const cputime_t ct)
{
if (cpu_has_feature(CPU_FTR_SPURR) &&
- __get_cpu_var(cputime_last_delta))
+ __this_cpu_read(cputime_last_delta))
return (__force u64) ct *
- __get_cpu_var(cputime_scaled_last_delta) /
- __get_cpu_var(cputime_last_delta);
+ __this_cpu_read(cputime_scaled_last_delta) /
+ __this_cpu_read(cputime_last_delta);
return ct;
}

Index: linux/arch/powerpc/include/asm/hardirq.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/hardirq.h 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/include/asm/hardirq.h 2014-02-03 13:26:45.060851321 -0600
@@ -20,7 +20,7 @@

#define __ARCH_IRQ_STAT

-#define local_softirq_pending() __get_cpu_var(irq_stat).__softirq_pending
+#define local_softirq_pending() __this_cpu_read(irq_stat.__softirq_pending)

static inline void ack_bad_irq(unsigned int irq)
{
Index: linux/arch/powerpc/include/asm/tlbflush.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/tlbflush.h 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/include/asm/tlbflush.h 2014-02-03 13:26:45.060851321 -0600
@@ -107,14 +107,14 @@

static inline void arch_enter_lazy_mmu_mode(void)
{
- struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+ struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);

batch->active = 1;
}

static inline void arch_leave_lazy_mmu_mode(void)
{
- struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+ struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);

if (batch->index)
__flush_tlb_pending(batch);
Index: linux/arch/powerpc/include/asm/xics.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/xics.h 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/include/asm/xics.h 2014-02-03 13:26:45.060851321 -0600
@@ -97,7 +97,7 @@

static inline void xics_push_cppr(unsigned int vec)
{
- struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+ struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
return;
@@ -110,7 +110,7 @@

static inline unsigned char xics_pop_cppr(void)
{
- struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+ struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

if (WARN_ON(os_cppr->index < 1))
return LOWEST_PRIORITY;
@@ -120,7 +120,7 @@

static inline void xics_set_base_cppr(unsigned char cppr)
{
- struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+ struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

/* we only really want to set the priority when there's
* just one cppr value on the stack
@@ -132,7 +132,7 @@

static inline unsigned char xics_cppr_top(void)
{
- struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+ struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

return os_cppr->stack[os_cppr->index];
}
Index: linux/arch/powerpc/kernel/dbell.c
===================================================================
--- linux.orig/arch/powerpc/kernel/dbell.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/dbell.c 2014-02-03 13:26:45.060851321 -0600
@@ -41,7 +41,7 @@

may_hard_irq_enable();

- __get_cpu_var(irq_stat).doorbell_irqs++;
+ __this_cpu_inc(irq_stat.doorbell_irqs);

smp_ipi_demux();

Index: linux/arch/powerpc/kernel/hw_breakpoint.c
===================================================================
--- linux.orig/arch/powerpc/kernel/hw_breakpoint.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/hw_breakpoint.c 2014-02-03 13:26:45.060851321 -0600
@@ -63,7 +63,7 @@
int arch_install_hw_breakpoint(struct perf_event *bp)
{
struct arch_hw_breakpoint *info = counter_arch_bp(bp);
- struct perf_event **slot = &__get_cpu_var(bp_per_reg);
+ struct perf_event **slot = this_cpu_ptr(&bp_per_reg);

*slot = bp;

@@ -88,7 +88,7 @@
*/
void arch_uninstall_hw_breakpoint(struct perf_event *bp)
{
- struct perf_event **slot = &__get_cpu_var(bp_per_reg);
+ struct perf_event **slot = this_cpu_ptr(&bp_per_reg);

if (*slot != bp) {
WARN_ONCE(1, "Can't find the breakpoint");
@@ -226,7 +226,7 @@
*/
rcu_read_lock();

- bp = __get_cpu_var(bp_per_reg);
+ bp = __this_cpu_read(bp_per_reg);
if (!bp)
goto out;
info = counter_arch_bp(bp);
Index: linux/arch/powerpc/kernel/irq.c
===================================================================
--- linux.orig/arch/powerpc/kernel/irq.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/irq.c 2014-02-03 13:26:45.060851321 -0600
@@ -114,7 +114,7 @@
static inline notrace int decrementer_check_overflow(void)
{
u64 now = get_tb_or_rtc();
- u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
+ u64 *next_tb = this_cpu_ptr(&decrementers_next_tb);

return now >= *next_tb;
}
Index: linux/arch/powerpc/kernel/kprobes.c
===================================================================
--- linux.orig/arch/powerpc/kernel/kprobes.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/kprobes.c 2014-02-03 13:26:45.060851321 -0600
@@ -118,7 +118,7 @@

static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
{
- __get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
+ __this_cpu_write(current_kprobe, kcb->prev_kprobe.kp);
kcb->kprobe_status = kcb->prev_kprobe.status;
kcb->kprobe_saved_msr = kcb->prev_kprobe.saved_msr;
}
@@ -126,7 +126,7 @@
static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
struct kprobe_ctlblk *kcb)
{
- __get_cpu_var(current_kprobe) = p;
+ __this_cpu_write(current_kprobe, p);
kcb->kprobe_saved_msr = regs->msr;
}

@@ -191,7 +191,7 @@
ret = 1;
goto no_kprobe;
}
- p = __get_cpu_var(current_kprobe);
+ p = __this_cpu_read(current_kprobe);
if (p->break_handler && p->break_handler(p, regs)) {
goto ss_probe;
}
Index: linux/arch/powerpc/kernel/process.c
===================================================================
--- linux.orig/arch/powerpc/kernel/process.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/process.c 2014-02-03 13:28:48.338290902 -0600
@@ -497,7 +497,7 @@

int set_breakpoint(struct arch_hw_breakpoint *brk)
{
- __get_cpu_var(current_brk) = *brk;
+ __this_cpu_write(current_brk, *brk);

if (cpu_has_feature(CPU_FTR_DAWR))
return set_dawr(brk);
@@ -811,7 +811,7 @@
* schedule DABR
*/
#ifndef CONFIG_HAVE_HW_BREAKPOINT
- if (unlikely(!hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))
+ if (unlikely(!hw_brk_match(this_cpu_ptr(&current_brk), &new->thread.hw_brk)))
set_breakpoint(&new->thread.hw_brk);
#endif /* CONFIG_HAVE_HW_BREAKPOINT */
#endif
@@ -825,7 +825,7 @@
* Collect processor utilization data per process
*/
if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
- struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
+ struct cpu_usage *cu = this_cpu_ptr(&cpu_usage_array);
long unsigned start_tb, current_tb;
start_tb = old_thread->start_tb;
cu->current_tb = current_tb = mfspr(SPRN_PURR);
@@ -835,7 +835,7 @@
#endif /* CONFIG_PPC64 */

#ifdef CONFIG_PPC_BOOK3S_64
- batch = &__get_cpu_var(ppc64_tlb_batch);
+ batch = this_cpu_ptr(&ppc64_tlb_batch);
if (batch->active) {
current_thread_info()->local_flags |= _TLF_LAZY_MMU;
if (batch->index)
@@ -858,7 +858,7 @@
#ifdef CONFIG_PPC_BOOK3S_64
if (current_thread_info()->local_flags & _TLF_LAZY_MMU) {
current_thread_info()->local_flags &= ~_TLF_LAZY_MMU;
- batch = &__get_cpu_var(ppc64_tlb_batch);
+ batch = this_cpu_ptr(&ppc64_tlb_batch);
batch->active = 1;
}
#endif /* CONFIG_PPC_BOOK3S_64 */
Index: linux/arch/powerpc/kernel/smp.c
===================================================================
--- linux.orig/arch/powerpc/kernel/smp.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/smp.c 2014-02-03 13:26:45.060851321 -0600
@@ -240,7 +240,7 @@

irqreturn_t smp_ipi_demux(void)
{
- struct cpu_messages *info = &__get_cpu_var(ipi_message);
+ struct cpu_messages *info = this_cpu_ptr(&ipi_message);
unsigned int all;

mb(); /* order any irq clear */
@@ -420,9 +420,9 @@
idle_task_exit();
cpu = smp_processor_id();
printk(KERN_DEBUG "CPU%d offline\n", cpu);
- __get_cpu_var(cpu_state) = CPU_DEAD;
+ __this_cpu_write(cpu_state, CPU_DEAD);
smp_wmb();
- while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
+ while (__this_cpu_read(cpu_state) != CPU_UP_PREPARE)
cpu_relax();
}

Index: linux/arch/powerpc/kernel/sysfs.c
===================================================================
--- linux.orig/arch/powerpc/kernel/sysfs.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/sysfs.c 2014-02-03 13:26:45.060851321 -0600
@@ -394,10 +394,10 @@
ppc_set_pmu_inuse(1);

/* Only need to enable them once */
- if (__get_cpu_var(pmcs_enabled))
+ if (__this_cpu_read(pmcs_enabled))
return;

- __get_cpu_var(pmcs_enabled) = 1;
+ __this_cpu_write(pmcs_enabled, 1);

if (ppc_md.enable_pmcs)
ppc_md.enable_pmcs();
Index: linux/arch/powerpc/kernel/time.c
===================================================================
--- linux.orig/arch/powerpc/kernel/time.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/time.c 2014-02-03 13:30:05.936679287 -0600
@@ -457,9 +457,9 @@

DEFINE_PER_CPU(u8, irq_work_pending);

-#define set_irq_work_pending_flag() __get_cpu_var(irq_work_pending) = 1
-#define test_irq_work_pending() __get_cpu_var(irq_work_pending)
-#define clear_irq_work_pending() __get_cpu_var(irq_work_pending) = 0
+#define set_irq_work_pending_flag() __this_cpu_write(irq_work_pending, 1)
+#define test_irq_work_pending() __this_cpu_read(irq_work_pending)
+#define clear_irq_work_pending() __this_cpu_write(irq_work_pending, 0)

#endif /* 32 vs 64 bit */

@@ -485,8 +485,8 @@
void timer_interrupt(struct pt_regs * regs)
{
struct pt_regs *old_regs;
- u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
- struct clock_event_device *evt = &__get_cpu_var(decrementers);
+ u64 *next_tb = this_cpu_ptr(&decrementers_next_tb);
+ struct clock_event_device *evt = this_cpu_ptr(&decrementers);
u64 now;

/* Ensure a positive value is written to the decrementer, or else
@@ -545,7 +544,7 @@
#ifdef CONFIG_PPC64
/* collect purr register values often, for accurate calculations */
if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
- struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array);
+ struct cpu_usage *cu = this_cpu_ptr(&cpu_usage_array);
cu->current_tb = mfspr(SPRN_PURR);
}
#endif
@@ -808,7 +807,7 @@
/* Don't adjust the decrementer if some irq work is pending */
if (test_irq_work_pending())
return 0;
- __get_cpu_var(decrementers_next_tb) = get_tb_or_rtc() + evt;
+ __this_cpu_write(decrementers_next_tb, get_tb_or_rtc() + evt);
set_dec(evt);

/* We may have raced with new irq work */
Index: linux/arch/powerpc/kernel/traps.c
===================================================================
--- linux.orig/arch/powerpc/kernel/traps.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/traps.c 2014-02-03 13:26:45.060851321 -0600
@@ -688,7 +688,7 @@
enum ctx_state prev_state = exception_enter();
int recover = 0;

- __get_cpu_var(irq_stat).mce_exceptions++;
+ __this_cpu_inc(irq_stat.mce_exceptions);

/* See if any machine dependent calls. In theory, we would want
* to call the CPU first, and call the ppc_md. one if the CPU
@@ -1492,7 +1492,7 @@

void performance_monitor_exception(struct pt_regs *regs)
{
- __get_cpu_var(irq_stat).pmu_irqs++;
+ __this_cpu_inc(irq_stat.pmu_irqs);

perf_irq(regs);
}
Index: linux/arch/powerpc/kvm/e500.c
===================================================================
--- linux.orig/arch/powerpc/kvm/e500.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kvm/e500.c 2014-02-03 13:26:45.060851321 -0600
@@ -76,11 +76,11 @@
unsigned long sid;
int ret = -1;

- sid = ++(__get_cpu_var(pcpu_last_used_sid));
+ sid = __this_cpu_inc_return(pcpu_last_used_sid);
if (sid < NUM_TIDS) {
- __get_cpu_var(pcpu_sids).entry[sid] = entry;
+ __this_cpu_write(pcpu_sids)entry[sid], entry);
entry->val = sid;
- entry->pentry = &__get_cpu_var(pcpu_sids).entry[sid];
+ entry->pentry = this_cpu_ptr(&pcpu_sids.entry[sid]);
ret = sid;
}

@@ -108,8 +108,8 @@
static inline int local_sid_lookup(struct id *entry)
{
if (entry && entry->val != 0 &&
- __get_cpu_var(pcpu_sids).entry[entry->val] == entry &&
- entry->pentry == &__get_cpu_var(pcpu_sids).entry[entry->val])
+ __this_cpu_read(pcpu_sids.entry[entry->val]) == entry &&
+ entry->pentry == this_cpu_ptr(&pcpu_sids.entry[entry->val]))
return entry->val;
return -1;
}
@@ -117,8 +117,8 @@
/* Invalidate all id mappings on local core -- call with preempt disabled */
static inline void local_sid_destroy_all(void)
{
- __get_cpu_var(pcpu_last_used_sid) = 0;
- memset(&__get_cpu_var(pcpu_sids), 0, sizeof(__get_cpu_var(pcpu_sids)));
+ __this_cpu_write(pcpu_last_used_sid, 0);
+ memset(this_cpu_ptr(&pcpu_sids), 0, sizeof(pcpu_sids));
}

static void *kvmppc_e500_id_table_alloc(struct kvmppc_vcpu_e500 *vcpu_e500)
Index: linux/arch/powerpc/kvm/e500mc.c
===================================================================
--- linux.orig/arch/powerpc/kvm/e500mc.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kvm/e500mc.c 2014-02-03 13:26:45.060851321 -0600
@@ -141,9 +141,9 @@
mtspr(SPRN_GESR, vcpu->arch.shared->esr);

if (vcpu->arch.oldpir != mfspr(SPRN_PIR) ||
- __get_cpu_var(last_vcpu_on_cpu) != vcpu) {
+ __this_cpu_read(last_vcpu_on_cpu) != vcpu) {
kvmppc_e500_tlbil_all(vcpu_e500);
- __get_cpu_var(last_vcpu_on_cpu) = vcpu;
+ __this_cpu_read(last_vcpu_on_cpu) = vcpu;
}

kvmppc_load_guest_fp(vcpu);
Index: linux/arch/powerpc/mm/hash_native_64.c
===================================================================
--- linux.orig/arch/powerpc/mm/hash_native_64.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/mm/hash_native_64.c 2014-02-03 13:26:45.060851321 -0600
@@ -649,7 +649,7 @@
unsigned long want_v;
unsigned long flags;
real_pte_t pte;
- struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+ struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
unsigned long psize = batch->psize;
int ssize = batch->ssize;
int i;
Index: linux/arch/powerpc/mm/hash_utils_64.c
===================================================================
--- linux.orig/arch/powerpc/mm/hash_utils_64.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/mm/hash_utils_64.c 2014-02-03 13:26:45.060851321 -0600
@@ -1284,7 +1284,7 @@
else {
int i;
struct ppc64_tlb_batch *batch =
- &__get_cpu_var(ppc64_tlb_batch);
+ this_cpu_ptr(&ppc64_tlb_batch);

for (i = 0; i < number; i++)
flush_hash_page(batch->vpn[i], batch->pte[i],
Index: linux/arch/powerpc/mm/hugetlbpage-book3e.c
===================================================================
--- linux.orig/arch/powerpc/mm/hugetlbpage-book3e.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/mm/hugetlbpage-book3e.c 2014-02-03 13:31:42.464674595 -0600
@@ -37,9 +37,9 @@

/* Just round-robin the entries and wrap when we hit the end */
if (unlikely(index == ncams - 1))
- __get_cpu_var(next_tlbcam_idx) = tlbcam_index;
+ __this_cpu_write(next_tlbcam_idx, tlbcam_index);
else
- __get_cpu_var(next_tlbcam_idx)++;
+ __this_cpu_inc(next_tlbcam_idx);

return index;
}
Index: linux/arch/powerpc/mm/hugetlbpage.c
===================================================================
--- linux.orig/arch/powerpc/mm/hugetlbpage.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/mm/hugetlbpage.c 2014-02-03 13:32:30.863669474 -0600
@@ -472,7 +472,7 @@
{
struct hugepd_freelist **batchp;

- batchp = &get_cpu_var(hugepd_freelist_cur);
+ batchp = this_cpu_ptr(&hugepd_freelist_cur);

if (atomic_read(&tlb->mm->mm_users) < 2 ||
cpumask_equal(mm_cpumask(tlb->mm),
Index: linux/arch/powerpc/mm/stab.c
===================================================================
--- linux.orig/arch/powerpc/mm/stab.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/mm/stab.c 2014-02-03 13:26:45.060851321 -0600
@@ -133,12 +133,12 @@
stab_entry = make_ste(get_paca()->stab_addr, GET_ESID(ea), vsid);

if (!is_kernel_addr(ea)) {
- offset = __get_cpu_var(stab_cache_ptr);
+ offset = __this_cpu_read(stab_cache_ptr);
if (offset < NR_STAB_CACHE_ENTRIES)
- __get_cpu_var(stab_cache[offset++]) = stab_entry;
+ __this_cpu_read(stab_cache[offset++]) = stab_entry;
else
offset = NR_STAB_CACHE_ENTRIES+1;
- __get_cpu_var(stab_cache_ptr) = offset;
+ __this_cpu_write(stab_cache_ptr, offset);

/* Order update */
asm volatile("sync":::"memory");
@@ -177,12 +177,12 @@
*/
hard_irq_disable();

- offset = __get_cpu_var(stab_cache_ptr);
+ offset = __this_cpu_read(stab_cache_ptr);
if (offset <= NR_STAB_CACHE_ENTRIES) {
int i;

for (i = 0; i < offset; i++) {
- ste = stab + __get_cpu_var(stab_cache[i]);
+ ste = stab + __this_cpu_read(stab_cache[i]);
ste->esid_data = 0; /* invalidate entry */
}
} else {
@@ -206,7 +206,7 @@

asm volatile("sync; slbia; sync":::"memory");

- __get_cpu_var(stab_cache_ptr) = 0;
+ __this_cpu_write(stab_cache_ptr, 0);

/* Now preload some entries for the new task */
if (test_tsk_thread_flag(tsk, TIF_32BIT))
Index: linux/arch/powerpc/perf/core-book3s.c
===================================================================
--- linux.orig/arch/powerpc/perf/core-book3s.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/perf/core-book3s.c 2014-02-03 13:26:45.060851321 -0600
@@ -332,7 +332,7 @@

static void power_pmu_bhrb_enable(struct perf_event *event)
{
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);

if (!ppmu->bhrb_nr)
return;
@@ -347,7 +347,7 @@

static void power_pmu_bhrb_disable(struct perf_event *event)
{
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);

if (!ppmu->bhrb_nr)
return;
@@ -961,7 +961,7 @@
if (!ppmu)
return;
local_irq_save(flags);
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);

if (!cpuhw->disabled) {
/*
@@ -1027,7 +1027,7 @@
return;
local_irq_save(flags);

- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
if (!cpuhw->disabled)
goto out;

@@ -1211,7 +1211,7 @@
* Add the event to the list (if there is room)
* and check whether the total set is still feasible.
*/
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
n0 = cpuhw->n_events;
if (n0 >= ppmu->n_counter)
goto out;
@@ -1277,7 +1277,7 @@

power_pmu_read(event);

- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
for (i = 0; i < cpuhw->n_events; ++i) {
if (event == cpuhw->event[i]) {
while (++i < cpuhw->n_events) {
@@ -1383,7 +1383,7 @@
*/
void power_pmu_start_txn(struct pmu *pmu)
{
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);

perf_pmu_disable(pmu);
cpuhw->group_flag |= PERF_EVENT_TXN;
@@ -1397,7 +1397,7 @@
*/
void power_pmu_cancel_txn(struct pmu *pmu)
{
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);

cpuhw->group_flag &= ~PERF_EVENT_TXN;
perf_pmu_enable(pmu);
@@ -1415,7 +1415,7 @@

if (!ppmu)
return -EAGAIN;
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
n = cpuhw->n_events;
if (check_excludes(cpuhw->event, cpuhw->flags, 0, n))
return -EAGAIN;
@@ -1772,7 +1772,7 @@

if (event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK) {
struct cpu_hw_events *cpuhw;
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
power_pmu_bhrb_read(cpuhw);
data.br_stack = &cpuhw->bhrb_stack;
}
@@ -1845,7 +1845,7 @@
static void perf_event_interrupt(struct pt_regs *regs)
{
int i, j;
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
struct perf_event *event;
unsigned long val[8];
int found, active;
Index: linux/arch/powerpc/perf/core-fsl-emb.c
===================================================================
--- linux.orig/arch/powerpc/perf/core-fsl-emb.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/perf/core-fsl-emb.c 2014-02-03 13:26:45.060851321 -0600
@@ -210,7 +210,7 @@
unsigned long flags;

local_irq_save(flags);
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);

if (!cpuhw->disabled) {
cpuhw->disabled = 1;
@@ -249,7 +249,7 @@
unsigned long flags;

local_irq_save(flags);
- cpuhw = &__get_cpu_var(cpu_hw_events);
+ cpuhw = this_cpu_ptr(&cpu_hw_events);
if (!cpuhw->disabled)
goto out;

@@ -653,7 +653,7 @@
static void perf_event_interrupt(struct pt_regs *regs)
{
int i;
- struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
+ struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
struct perf_event *event;
unsigned long val;
int found = 0;
Index: linux/arch/powerpc/platforms/cell/interrupt.c
===================================================================
--- linux.orig/arch/powerpc/platforms/cell/interrupt.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/cell/interrupt.c 2014-02-03 13:26:45.060851321 -0600
@@ -82,7 +82,7 @@

static void iic_eoi(struct irq_data *d)
{
- struct iic *iic = &__get_cpu_var(cpu_iic);
+ struct iic *iic = this_cpu_ptr(&cpu_iic);
out_be64(&iic->regs->prio, iic->eoi_stack[--iic->eoi_ptr]);
BUG_ON(iic->eoi_ptr < 0);
}
@@ -148,7 +148,7 @@
struct iic *iic;
unsigned int virq;

- iic = &__get_cpu_var(cpu_iic);
+ iic = this_cpu_ptr(&cpu_iic);
*(unsigned long *) &pending =
in_be64((u64 __iomem *) &iic->regs->pending_destr);
if (!(pending.flags & CBE_IIC_IRQ_VALID))
@@ -163,7 +163,7 @@

void iic_setup_cpu(void)
{
- out_be64(&__get_cpu_var(cpu_iic).regs->prio, 0xff);
+ out_be64(this_cpu_ptr(&cpu_iic.regs->prio), 0xff);
}

u8 iic_get_target_id(int cpu)
Index: linux/arch/powerpc/platforms/ps3/interrupt.c
===================================================================
--- linux.orig/arch/powerpc/platforms/ps3/interrupt.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/ps3/interrupt.c 2014-02-03 13:26:45.060851321 -0600
@@ -711,7 +711,7 @@

static unsigned int ps3_get_irq(void)
{
- struct ps3_private *pd = &__get_cpu_var(ps3_private);
+ struct ps3_private *pd = this_cpu_ptr(&ps3_private);
u64 x = (pd->bmp.status & pd->bmp.mask);
unsigned int plug;

Index: linux/arch/powerpc/platforms/pseries/dtl.c
===================================================================
--- linux.orig/arch/powerpc/platforms/pseries/dtl.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/pseries/dtl.c 2014-02-03 13:26:45.060851321 -0600
@@ -74,7 +74,7 @@
*/
static void consume_dtle(struct dtl_entry *dtle, u64 index)
{
- struct dtl_ring *dtlr = &__get_cpu_var(dtl_rings);
+ struct dtl_ring *dtlr = this_cpu_ptr(&dtl_rings);
struct dtl_entry *wp = dtlr->write_ptr;
struct lppaca *vpa = local_paca->lppaca_ptr;

Index: linux/arch/powerpc/platforms/pseries/hvCall_inst.c
===================================================================
--- linux.orig/arch/powerpc/platforms/pseries/hvCall_inst.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/pseries/hvCall_inst.c 2014-02-03 13:26:45.070851115 -0600
@@ -109,7 +109,7 @@
if (opcode > MAX_HCALL_OPCODE)
return;

- h = &__get_cpu_var(hcall_stats)[opcode / 4];
+ h = this_cpu_ptr(&hcall_stats[opcode / 4]);
h->tb_start = mftb();
h->purr_start = mfspr(SPRN_PURR);
}
@@ -122,7 +122,7 @@
if (opcode > MAX_HCALL_OPCODE)
return;

- h = &__get_cpu_var(hcall_stats)[opcode / 4];
+ h = this_cpu_ptr(&hcall_stats[opcode / 4]);
h->num_calls++;
h->tb_total += mftb() - h->tb_start;
h->purr_total += mfspr(SPRN_PURR) - h->purr_start;
Index: linux/arch/powerpc/platforms/pseries/iommu.c
===================================================================
--- linux.orig/arch/powerpc/platforms/pseries/iommu.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/pseries/iommu.c 2014-02-03 13:26:45.070851115 -0600
@@ -200,7 +200,7 @@

local_irq_save(flags); /* to protect tcep and the page behind it */

- tcep = __get_cpu_var(tce_page);
+ tcep = __this_cpu_read(tce_page);

/* This is safe to do since interrupts are off when we're called
* from iommu_alloc{,_sg}()
@@ -213,7 +213,7 @@
return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
direction, attrs);
}
- __get_cpu_var(tce_page) = tcep;
+ __this_cpu_write(tce_page, tcep);
}

rpn = __pa(uaddr) >> TCE_SHIFT;
@@ -399,7 +399,7 @@
long l, limit;

local_irq_disable(); /* to protect tcep and the page behind it */
- tcep = __get_cpu_var(tce_page);
+ tcep = __this_cpu_read(tce_page);

if (!tcep) {
tcep = (__be64 *)__get_free_page(GFP_ATOMIC);
@@ -407,7 +407,7 @@
local_irq_enable();
return -ENOMEM;
}
- __get_cpu_var(tce_page) = tcep;
+ __this_cpu_write(tce_page, tcep);
}

proto_tce = TCE_PCI_READ | TCE_PCI_WRITE;
Index: linux/arch/powerpc/platforms/pseries/lpar.c
===================================================================
--- linux.orig/arch/powerpc/platforms/pseries/lpar.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/pseries/lpar.c 2014-02-03 13:26:45.070851115 -0600
@@ -514,7 +514,7 @@
unsigned long vpn;
unsigned long i, pix, rc;
unsigned long flags = 0;
- struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+ struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
unsigned long param[9];
unsigned long hash, index, shift, hidx, slot;
@@ -689,7 +689,7 @@

local_irq_save(flags);

- depth = &__get_cpu_var(hcall_trace_depth);
+ depth = this_cpu_ptr(&hcall_trace_depth);

if (*depth)
goto out;
@@ -714,7 +714,7 @@

local_irq_save(flags);

- depth = &__get_cpu_var(hcall_trace_depth);
+ depth = this_cpu_ptr(&hcall_trace_depth);

if (*depth)
goto out;
Index: linux/arch/powerpc/platforms/pseries/ras.c
===================================================================
--- linux.orig/arch/powerpc/platforms/pseries/ras.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/platforms/pseries/ras.c 2014-02-03 13:26:45.070851115 -0600
@@ -301,8 +301,8 @@
/* If it isn't an extended log we can use the per cpu 64bit buffer */
h = (struct rtas_error_log *)&savep[1];
if (!h->extended) {
- memcpy(&__get_cpu_var(mce_data_buf), h, sizeof(__u64));
- errhdr = (struct rtas_error_log *)&__get_cpu_var(mce_data_buf);
+ memcpy(this_cpu_ptr(&mce_data_buf), h, sizeof(__u64));
+ errhdr = (struct rtas_error_log *)this_cpu_ptr(&mce_data_buf);
} else {
int len;

Index: linux/arch/powerpc/sysdev/xics/xics-common.c
===================================================================
--- linux.orig/arch/powerpc/sysdev/xics/xics-common.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/sysdev/xics/xics-common.c 2014-02-03 13:26:45.070851115 -0600
@@ -155,7 +155,7 @@

void xics_teardown_cpu(void)
{
- struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+ struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);

/*
* we have to reset the cppr index to 0 because we're
Index: linux/arch/powerpc/kernel/iommu.c
===================================================================
--- linux.orig/arch/powerpc/kernel/iommu.c 2014-02-03 13:26:45.070851115 -0600
+++ linux/arch/powerpc/kernel/iommu.c 2014-02-03 13:26:45.070851115 -0600
@@ -208,7 +208,7 @@
* We don't need to disable preemption here because any CPU can
* safely use any IOMMU pool.
*/
- pool_nr = __raw_get_cpu_var(iommu_pool_hash) & (tbl->nr_pools - 1);
+ pool_nr = __this_cpu_read(iommu_pool_hash) & (tbl->nr_pools - 1);

if (largealloc)
pool = &(tbl->large_pool);


2014-02-15 03:53:30

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

For some reason Im still getting these as attachments instead of inline
in the email, which makes reviewing a major PITA. Christoph, I'm not
sure what you are doing wrong here but you should consider fixing it :-)

Cheers,
Ben.

2014-02-15 04:26:40

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 15 Feb 2014 14:50:08 +1100
Benjamin Herrenschmidt <[email protected]> wrote:

> For some reason Im still getting these as attachments instead of inline
> in the email, which makes reviewing a major PITA. Christoph, I'm not
> sure what you are doing wrong here but you should consider fixing it :-)

Get a better email client ;-)

They show up fine for me. Looking at the raw format, could it possibly
be the DKIM-Signature? Here's (most of) the header:

Return-Path: [email protected]
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on goliath
X-Spam-Level:
X-Spam-Status: No, score=-0.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
LOCAL_SUBJECT_PATCH,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.2
Delivered-To: [email protected]
X-FDA: 68539149672.07.nose31_2242917219f26
X-HE-Tag: nose31_2242917219f26
X-Filterd-Recvd-Size: 34239
Received: from mail.hover.com.cust.hostedemail.com [216.40.42.134]
by goliath with IMAP (fetchmail-6.3.26)
for <rostedt@localhost> (single-drop); Fri, 14 Feb 2014 15:23:03 -0500 (EST)
Received: from qmta09.emeryville.ca.mail.comcast.net (qmta09.emeryville.ca.mail.comcast.net [76.96.30.96])
by imf20.hostedemail.com (Postfix) with ESMTP
for <[email protected]>; Fri, 14 Feb 2014 20:20:35 +0000 (UTC)
Received: from omta15.emeryville.ca.mail.comcast.net ([76.96.30.71])
by qmta09.emeryville.ca.mail.comcast.net with comcast
id SKft1n0011Y3wxoA9LLbGd; Fri, 14 Feb 2014 20:20:35 +0000
Received: from gentwo.org ([98.213.233.247])
by omta15.emeryville.ca.mail.comcast.net with comcast
id SLLY1n0095Lw0ES8bLLZFV; Fri, 14 Feb 2014 20:20:34 +0000
Received: by gentwo.org (Postfix, from userid 1001)
id 2941A68181; Fri, 14 Feb 2014 14:19:08 -0600 (CST)
Message-Id: <[email protected]>
Date: Fri, 14 Feb 2014 14:19:20 -0600
From: Christoph Lameter <[email protected]>
To: Tejun Heo <[email protected]>
Cc: [email protected],
[email protected],
[email protected],
Ingo Molnar <[email protected]>,
Peter Zijlstra <[email protected]>,
Thomas Gleixner <[email protected]>,
Benjamin Herrenschmidt <[email protected]>,
Paul Mackerras <[email protected]>
Subject: [PATCH 39/48] powerpc: Replace __get_cpu_var uses
References: <[email protected]>
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline; filename=this_powerpc
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
s=q20121106; t=1392409235;
bh=3eMNjwtVIqOOdbqtLUxQGKw+WvtREJiNlp1vuKEVub8=;
h=Received:Received:Received:Message-Id:Date:From:To:Subject:
Content-Type;
b=AtOZLlCPJL9tvUnoSyw0qPmNQym1dGDConwMdjEnayz2rNubuobF/JYdewBUypgbZ
3sq/JQoBriYX8NsMHQhzZL4bh+7gM6OPWhGSIczq6MNuzFvw7E9MVTeX+t+yhVXMNG
O+sWkLbWkM18luLRPlJU7wD6ANEFrGgQvt7i1GqSrCVZ+qKgXq9brzu9NTsMp4ODzv
Djs9LTZEBTjbYxllW+16x+lV/Y6zY9LYQzsB6VEEpjO2J5Z6Wbk12K4puGL0rPPKoW
rpxrQjP44g+Tgr5iguuBUQAqIuzcgbDu3MtOwz+HllZuKiye+qQB+Eq/U5+CqtaIxl
FN9CB0XgHTDJA==


-- Steve

2014-02-15 07:56:07

by Mike Galbraith

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Fri, 2014-02-14 at 23:26 -0500, Steven Rostedt wrote:
> On Sat, 15 Feb 2014 14:50:08 +1100
> Benjamin Herrenschmidt <[email protected]> wrote:
>
> > For some reason Im still getting these as attachments instead of inline
> > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > sure what you are doing wrong here but you should consider fixing it :-)
>
> Get a better email client ;-)

Yeah, evolution shows them inline just fine (thought you made it do bad
things too, it couldn't save signed patches or such).

-Mike

2014-02-15 09:42:55

by Peter Zijlstra

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, Feb 15, 2014 at 02:50:08PM +1100, Benjamin Herrenschmidt wrote:
> For some reason Im still getting these as attachments instead of inline
> in the email, which makes reviewing a major PITA. Christoph, I'm not
> sure what you are doing wrong here but you should consider fixing it :-)

Yeah, what the others have already said; evolution is a pile of steaming
crap. Get yourself a real MUA :-)

For some reason it does absurd things with "Content-Disposition:
inline".

2014-02-15 10:00:35

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Fri, 2014-02-14 at 23:26 -0500, Steven Rostedt wrote:
> On Sat, 15 Feb 2014 14:50:08 +1100
> Benjamin Herrenschmidt <[email protected]> wrote:
>
> > For some reason Im still getting these as attachments instead of inline
> > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > sure what you are doing wrong here but you should consider fixing it :-)
>
> Get a better email client ;-)

Hah, maybe, I use evolution... but those patches from Christoph are the
only ones to do that for me, everything else works just fine.

Cheers,
Ben.

> They show up fine for me. Looking at the raw format, could it possibly
> be the DKIM-Signature? Here's (most of) the header:
>
> Return-Path: [email protected]
> X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on goliath
> X-Spam-Level:
> X-Spam-Status: No, score=-0.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
> LOCAL_SUBJECT_PATCH,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.2
> Delivered-To: [email protected]
> X-FDA: 68539149672.07.nose31_2242917219f26
> X-HE-Tag: nose31_2242917219f26
> X-Filterd-Recvd-Size: 34239
> Received: from mail.hover.com.cust.hostedemail.com [216.40.42.134]
> by goliath with IMAP (fetchmail-6.3.26)
> for <rostedt@localhost> (single-drop); Fri, 14 Feb 2014 15:23:03 -0500 (EST)
> Received: from qmta09.emeryville.ca.mail.comcast.net (qmta09.emeryville.ca.mail.comcast.net [76.96.30.96])
> by imf20.hostedemail.com (Postfix) with ESMTP
> for <[email protected]>; Fri, 14 Feb 2014 20:20:35 +0000 (UTC)
> Received: from omta15.emeryville.ca.mail.comcast.net ([76.96.30.71])
> by qmta09.emeryville.ca.mail.comcast.net with comcast
> id SKft1n0011Y3wxoA9LLbGd; Fri, 14 Feb 2014 20:20:35 +0000
> Received: from gentwo.org ([98.213.233.247])
> by omta15.emeryville.ca.mail.comcast.net with comcast
> id SLLY1n0095Lw0ES8bLLZFV; Fri, 14 Feb 2014 20:20:34 +0000
> Received: by gentwo.org (Postfix, from userid 1001)
> id 2941A68181; Fri, 14 Feb 2014 14:19:08 -0600 (CST)
> Message-Id: <[email protected]>
> Date: Fri, 14 Feb 2014 14:19:20 -0600
> From: Christoph Lameter <[email protected]>
> To: Tejun Heo <[email protected]>
> Cc: [email protected],
> [email protected],
> [email protected],
> Ingo Molnar <[email protected]>,
> Peter Zijlstra <[email protected]>,
> Thomas Gleixner <[email protected]>,
> Benjamin Herrenschmidt <[email protected]>,
> Paul Mackerras <[email protected]>
> Subject: [PATCH 39/48] powerpc: Replace __get_cpu_var uses
> References: <[email protected]>
> Content-Type: text/plain; charset=UTF-8
> Content-Disposition: inline; filename=this_powerpc
> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
> s=q20121106; t=1392409235;
> bh=3eMNjwtVIqOOdbqtLUxQGKw+WvtREJiNlp1vuKEVub8=;
> h=Received:Received:Received:Message-Id:Date:From:To:Subject:
> Content-Type;
> b=AtOZLlCPJL9tvUnoSyw0qPmNQym1dGDConwMdjEnayz2rNubuobF/JYdewBUypgbZ
> 3sq/JQoBriYX8NsMHQhzZL4bh+7gM6OPWhGSIczq6MNuzFvw7E9MVTeX+t+yhVXMNG
> O+sWkLbWkM18luLRPlJU7wD6ANEFrGgQvt7i1GqSrCVZ+qKgXq9brzu9NTsMp4ODzv
> Djs9LTZEBTjbYxllW+16x+lV/Y6zY9LYQzsB6VEEpjO2J5Z6Wbk12K4puGL0rPPKoW
> rpxrQjP44g+Tgr5iguuBUQAqIuzcgbDu3MtOwz+HllZuKiye+qQB+Eq/U5+CqtaIxl
> FN9CB0XgHTDJA==
>
>
> -- Steve
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2014-02-15 10:02:02

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 2014-02-15 at 10:42 +0100, Peter Zijlstra wrote:
> On Sat, Feb 15, 2014 at 02:50:08PM +1100, Benjamin Herrenschmidt wrote:
> > For some reason Im still getting these as attachments instead of inline
> > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > sure what you are doing wrong here but you should consider fixing it :-)
>
> Yeah, what the others have already said; evolution is a pile of steaming
> crap. Get yourself a real MUA :-)

I yet have to find one that isn't a steaming pile ... :-) Sadly I got
used to evo and transferring all my filters etc... to another one is
something I'm really not looking fwd to, though I suppose it will have
to happen sooner or later.

Plus dwmw2 keeps convincing me that evo doesn't suck as much as I think
it does :-)

Cheers,
Ben.

> For some reason it does absurd things with "Content-Disposition:
> inline".
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2014-02-15 11:01:05

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 2014-02-15 at 08:54 +0100, Mike Galbraith wrote:
> > > For some reason Im still getting these as attachments instead of inline
> > > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > > sure what you are doing wrong here but you should consider fixing it :-)
> >
> > Get a better email client ;-)
>
> Yeah, evolution shows them inline just fine (thought you made it do bad
> things too, it couldn't save signed patches or such).

Evo 3.8.4 here and they show as attachements only... odd.

Ben.

2014-02-15 11:29:56

by Mike Galbraith

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 2014-02-15 at 21:00 +1100, Benjamin Herrenschmidt wrote:
> On Sat, 2014-02-15 at 08:54 +0100, Mike Galbraith wrote:
> > > > For some reason Im still getting these as attachments instead of inline
> > > > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > > > sure what you are doing wrong here but you should consider fixing it :-)
> > >
> > > Get a better email client ;-)
> >
> > Yeah, evolution shows them inline just fine (thought you made it do bad
> > things too, it couldn't save signed patches or such).
>
> Evo 3.8.4 here and they show as attachements only... odd.

Heh, 3.2.3 here. I may never "upgrade" this box again. No daemon from
hell, no grub2, everything including evolution (ok, mostly) just works.

-Mike

2014-02-15 12:07:32

by Andreas Schwab

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

Benjamin Herrenschmidt <[email protected]> writes:

> On Sat, 2014-02-15 at 10:42 +0100, Peter Zijlstra wrote:
>> On Sat, Feb 15, 2014 at 02:50:08PM +1100, Benjamin Herrenschmidt wrote:
>> > For some reason Im still getting these as attachments instead of inline
>> > in the email, which makes reviewing a major PITA. Christoph, I'm not
>> > sure what you are doing wrong here but you should consider fixing it :-)
>>
>> Yeah, what the others have already said; evolution is a pile of steaming
>> crap. Get yourself a real MUA :-)
>
> I yet have to find one that isn't a steaming pile ... :-)

Gnus.

Andreas.

--
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."

2014-02-15 15:45:19

by Peter Zijlstra

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, Feb 15, 2014 at 09:01:19PM +1100, Benjamin Herrenschmidt wrote:
> On Sat, 2014-02-15 at 10:42 +0100, Peter Zijlstra wrote:
> > On Sat, Feb 15, 2014 at 02:50:08PM +1100, Benjamin Herrenschmidt wrote:
> > > For some reason Im still getting these as attachments instead of inline
> > > in the email, which makes reviewing a major PITA. Christoph, I'm not
> > > sure what you are doing wrong here but you should consider fixing it :-)
> >
> > Yeah, what the others have already said; evolution is a pile of steaming
> > crap. Get yourself a real MUA :-)
>
> I yet have to find one that isn't a steaming pile ... :-) Sadly I got
> used to evo and transferring all my filters etc... to another one is
> something I'm really not looking fwd to, though I suppose it will have
> to happen sooner or later.
>
> Plus dwmw2 keeps convincing me that evo doesn't suck as much as I think
> it does :-)

There's a good solution there; make dwmw2 fix it ;-)

David; in particular; quilt mail adds "Content-Disposition: inline"
headers and Evo, in its infinite wisdom, makes the entire body into an
attachment.

2014-02-15 18:12:16

by David Woodhouse

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 2014-02-15 at 16:45 +0100, Peter Zijlstra wrote:
>
> David; in particular; quilt mail adds "Content-Disposition: inline"
> headers and Evo, in its infinite wisdom, makes the entire body into an
> attachment.

Hm, looking at the original email I see it as an inline part, displayed
by default. I can read it, select parts of it and hit 'reply' to cite
only the selected part... everything I can do with a normal email.

Ben, what precisely is it that makes it hard to read and review? All I
can see is a trivial cosmetic issue; it's a few pixels down and right
from where it would normally be.

But even that looks like it should be considered a bug. Please file in
GNOME bugzilla.

--
dwmw2


Attachments:
smime.p7s (5.61 kB)

2014-02-15 20:33:32

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses

On Sat, 2014-02-15 at 18:12 +0000, David Woodhouse wrote:
> On Sat, 2014-02-15 at 16:45 +0100, Peter Zijlstra wrote:
> >
> > David; in particular; quilt mail adds "Content-Disposition: inline"
> > headers and Evo, in its infinite wisdom, makes the entire body into an
> > attachment.
>
> Hm, looking at the original email I see it as an inline part, displayed
> by default. I can read it, select parts of it and hit 'reply' to cite
> only the selected part... everything I can do with a normal email.
>
> Ben, what precisely is it that makes it hard to read and review? All I
> can see is a trivial cosmetic issue; it's a few pixels down and right
> from where it would normally be.
>
> But even that looks like it should be considered a bug. Please file in
> GNOME bugzilla.

In my case it doesn't have an inline part. I only get an attachment,

I'll file it in gnome bz.

Cheers,
Ben.

2014-02-15 20:53:30

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: [PATCH 39/48] powerpc: Replace __get_cpu_var uses


On Sun, 2014-02-16 at 07:32 +1100, Benjamin Herrenschmidt wrote:

> > But even that looks like it should be considered a bug. Please file in
> > GNOME bugzilla.
>
> In my case it doesn't have an inline part. I only get an attachment,
>
> I'll file it in gnome bz.

Hah, story of my life: 3.8.x is marked "obsolete" in gnome BZ :)

I suppose that's the price for using Ubuntu, the version of evolution is
always just old enough that nobody cares about bugs in it anymore :-)

Anyway, gnome3 PPA gave me 3.10.3 and the problem is still there, filing
as https://bugzilla.gnome.org/show_bug.cgi?id=724437

Cheers,
Ben.