alloc_percpu: Use __get_cpu_ptr in drivers/dma Impact: slight efficiency improvement on some archs. Let's use __get_cpu_ptr and get_cpu_ptr now, rather than per_cpu_ptr(..., smp_processor_id()). Signed-off-by: Rusty Russell Cc: Maciej Sosnowski Cc: Dan Williams --- drivers/dma/dmaengine.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -111,10 +111,9 @@ static ssize_t show_in_use(struct device atomic_read(&chan->refcount.refcount) > 1) in_use = 1; else { - if (local_read(&(per_cpu_ptr(chan->local, - get_cpu())->refcount)) > 0) + if (local_read(&get_cpu_ptr(chan->local)->refcount) > 0) in_use = 1; - put_cpu(); + put_cpu_ptr(chan->local); } return sprintf(buf, "%d\n", in_use); @@ -498,6 +497,7 @@ dma_async_memcpy_buf_to_buf(struct dma_c struct dma_async_tx_descriptor *tx; dma_addr_t dma_dest, dma_src; dma_cookie_t cookie; + struct dma_chan_percpu *local; int cpu; dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE); @@ -514,10 +514,10 @@ dma_async_memcpy_buf_to_buf(struct dma_c tx->callback = NULL; cookie = tx->tx_submit(tx); - cpu = get_cpu(); - per_cpu_ptr(chan->local, cpu)->bytes_transferred += len; - per_cpu_ptr(chan->local, cpu)->memcpy_count++; - put_cpu(); + local = get_cpu_ptr(chan->local); + local->bytes_transferred += len; + local->memcpy_count++; + put_cpu_ptr(chan->local); return cookie; } @@ -544,6 +544,7 @@ dma_async_memcpy_buf_to_pg(struct dma_ch struct dma_async_tx_descriptor *tx; dma_addr_t dma_dest, dma_src; dma_cookie_t cookie; + struct dma_chan_percpu *local; int cpu; dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE); @@ -560,10 +561,10 @@ dma_async_memcpy_buf_to_pg(struct dma_ch tx->callback = NULL; cookie = tx->tx_submit(tx); - cpu = get_cpu(); - per_cpu_ptr(chan->local, cpu)->bytes_transferred += len; - per_cpu_ptr(chan->local, cpu)->memcpy_count++; - put_cpu(); + local = get_cpu_ptr(chan->local); + local->bytes_transferred += len; + local->memcpy_count++; + put_cpu_ptr(chan->local); return cookie; } @@ -592,6 +593,7 @@ dma_async_memcpy_pg_to_pg(struct dma_cha struct dma_async_tx_descriptor *tx; dma_addr_t dma_dest, dma_src; dma_cookie_t cookie; + struct dma_chan_percpu *local; int cpu; dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE); @@ -609,10 +611,10 @@ dma_async_memcpy_pg_to_pg(struct dma_cha tx->callback = NULL; cookie = tx->tx_submit(tx); - cpu = get_cpu(); - per_cpu_ptr(chan->local, cpu)->bytes_transferred += len; - per_cpu_ptr(chan->local, cpu)->memcpy_count++; - put_cpu(); + local = get_cpu_ptr(chan->local); + local->bytes_transferred += len; + local->memcpy_count++; + put_cpu_ptr(chan->local); return cookie; }