Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: 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)

Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Lameter and committed by
Jens Axboe
170d800a 8077c0d9

+8 -8
+3 -3
block/blk-iopoll.c
··· 35 35 unsigned long flags; 36 36 37 37 local_irq_save(flags); 38 - list_add_tail(&iop->list, &__get_cpu_var(blk_cpu_iopoll)); 38 + list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll)); 39 39 __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); 40 40 local_irq_restore(flags); 41 41 } ··· 79 79 80 80 static void blk_iopoll_softirq(struct softirq_action *h) 81 81 { 82 - struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 82 + struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll); 83 83 int rearm = 0, budget = blk_iopoll_budget; 84 84 unsigned long start_time = jiffies; 85 85 ··· 201 201 202 202 local_irq_disable(); 203 203 list_splice_init(&per_cpu(blk_cpu_iopoll, cpu), 204 - &__get_cpu_var(blk_cpu_iopoll)); 204 + this_cpu_ptr(&blk_cpu_iopoll)); 205 205 __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); 206 206 local_irq_enable(); 207 207 }
+4 -4
block/blk-softirq.c
··· 23 23 struct list_head *cpu_list, local_list; 24 24 25 25 local_irq_disable(); 26 - cpu_list = &__get_cpu_var(blk_cpu_done); 26 + cpu_list = this_cpu_ptr(&blk_cpu_done); 27 27 list_replace_init(cpu_list, &local_list); 28 28 local_irq_enable(); 29 29 ··· 44 44 struct list_head *list; 45 45 46 46 local_irq_save(flags); 47 - list = &__get_cpu_var(blk_cpu_done); 47 + list = this_cpu_ptr(&blk_cpu_done); 48 48 list_add_tail(&rq->csd.list, list); 49 49 50 50 if (list->next == &rq->csd.list) ··· 90 90 91 91 local_irq_disable(); 92 92 list_splice_init(&per_cpu(blk_cpu_done, cpu), 93 - &__get_cpu_var(blk_cpu_done)); 93 + this_cpu_ptr(&blk_cpu_done)); 94 94 raise_softirq_irqoff(BLOCK_SOFTIRQ); 95 95 local_irq_enable(); 96 96 } ··· 135 135 if (ccpu == cpu || shared) { 136 136 struct list_head *list; 137 137 do_local: 138 - list = &__get_cpu_var(blk_cpu_done); 138 + list = this_cpu_ptr(&blk_cpu_done); 139 139 list_add_tail(&req->csd.list, list); 140 140 141 141 /*
+1 -1
fs/fscache/object.c
··· 796 796 */ 797 797 bool fscache_object_sleep_till_congested(signed long *timeoutp) 798 798 { 799 - wait_queue_head_t *cong_wq = &__get_cpu_var(fscache_object_cong_wait); 799 + wait_queue_head_t *cong_wq = this_cpu_ptr(&fscache_object_cong_wait); 800 800 DEFINE_WAIT(wait); 801 801 802 802 if (fscache_object_congested())