From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
David Miller <davem@davemloft.net>,
Eric Dumazet <dada1@cosmosbay.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [patch 21/30] cpu alloc: dmaengine conversion
Date: Fri, 16 Nov 2007 15:09:41 -0800 [thread overview]
Message-ID: <20071116231107.350452102@sgi.com> (raw)
In-Reply-To: 20071116230920.278761667@sgi.com
[-- Attachment #1: 0031-cpu-alloc-dmaengine-conversion.patch --]
[-- Type: text/plain, Size: 4319 bytes --]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
drivers/dma/dmaengine.c | 27 ++++++++++++++-------------
include/linux/dmaengine.h | 4 ++--
2 files changed, 16 insertions(+), 15 deletions(-)
Index: linux-2.6/drivers/dma/dmaengine.c
===================================================================
--- linux-2.6.orig/drivers/dma/dmaengine.c 2007-11-15 21:17:24.127154620 -0800
+++ linux-2.6/drivers/dma/dmaengine.c 2007-11-15 21:25:35.354654191 -0800
@@ -84,7 +84,7 @@ static ssize_t show_memcpy_count(struct
int i;
for_each_possible_cpu(i)
- count += per_cpu_ptr(chan->local, i)->memcpy_count;
+ count += CPU_PTR(chan->local, i)->memcpy_count;
return sprintf(buf, "%lu\n", count);
}
@@ -96,7 +96,7 @@ static ssize_t show_bytes_transferred(st
int i;
for_each_possible_cpu(i)
- count += per_cpu_ptr(chan->local, i)->bytes_transferred;
+ count += CPU_PTR(chan->local, i)->bytes_transferred;
return sprintf(buf, "%lu\n", count);
}
@@ -110,7 +110,7 @@ static ssize_t show_in_use(struct class_
atomic_read(&chan->refcount.refcount) > 1)
in_use = 1;
else {
- if (local_read(&(per_cpu_ptr(chan->local,
+ if (local_read(&(CPU_PTR(chan->local,
get_cpu())->refcount)) > 0)
in_use = 1;
put_cpu();
@@ -226,7 +226,7 @@ static void dma_chan_free_rcu(struct rcu
int bias = 0x7FFFFFFF;
int i;
for_each_possible_cpu(i)
- bias -= local_read(&per_cpu_ptr(chan->local, i)->refcount);
+ bias -= local_read(&CPU_PTR(chan->local, i)->refcount);
atomic_sub(bias, &chan->refcount.refcount);
kref_put(&chan->refcount, dma_chan_cleanup);
}
@@ -372,7 +372,8 @@ int dma_async_device_register(struct dma
/* represent channels in sysfs. Probably want devs too */
list_for_each_entry(chan, &device->channels, device_node) {
- chan->local = alloc_percpu(typeof(*chan->local));
+ chan->local = CPU_ALLOC(typeof(*chan->local),
+ GFP_KERNEL | __GFP_ZERO);
if (chan->local == NULL)
continue;
@@ -385,7 +386,7 @@ int dma_async_device_register(struct dma
rc = class_device_register(&chan->class_dev);
if (rc) {
chancnt--;
- free_percpu(chan->local);
+ CPU_FREE(chan->local);
chan->local = NULL;
goto err_out;
}
@@ -413,7 +414,7 @@ err_out:
kref_put(&device->refcount, dma_async_device_cleanup);
class_device_unregister(&chan->class_dev);
chancnt--;
- free_percpu(chan->local);
+ CPU_FREE(chan->local);
}
return rc;
}
@@ -489,8 +490,8 @@ dma_async_memcpy_buf_to_buf(struct dma_c
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++;
+ CPU_PTR(chan->local, cpu)->bytes_transferred += len;
+ CPU_PTR(chan->local, cpu)->memcpy_count++;
put_cpu();
return cookie;
@@ -533,8 +534,8 @@ dma_async_memcpy_buf_to_pg(struct dma_ch
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++;
+ CPU_PTR(chan->local, cpu)->bytes_transferred += len;
+ CPU_PTR(chan->local, cpu)->memcpy_count++;
put_cpu();
return cookie;
@@ -579,8 +580,8 @@ dma_async_memcpy_pg_to_pg(struct dma_cha
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++;
+ CPU_PTR(chan->local, cpu)->bytes_transferred += len;
+ CPU_PTR(chan->local, cpu)->memcpy_count++;
put_cpu();
return cookie;
Index: linux-2.6/include/linux/dmaengine.h
===================================================================
--- linux-2.6.orig/include/linux/dmaengine.h 2007-11-15 21:17:24.135154570 -0800
+++ linux-2.6/include/linux/dmaengine.h 2007-11-15 21:25:35.358654166 -0800
@@ -150,7 +150,7 @@ static inline void dma_chan_get(struct d
if (unlikely(chan->slow_ref))
kref_get(&chan->refcount);
else {
- local_inc(&(per_cpu_ptr(chan->local, get_cpu())->refcount));
+ local_inc(&CPU_PTR(chan->local, get_cpu())->refcount);
put_cpu();
}
}
@@ -160,7 +160,7 @@ static inline void dma_chan_put(struct d
if (unlikely(chan->slow_ref))
kref_put(&chan->refcount, dma_chan_cleanup);
else {
- local_dec(&(per_cpu_ptr(chan->local, get_cpu())->refcount));
+ local_dec(&CPU_PTR(chan->local, get_cpu())->refcount);
put_cpu();
}
}
--
next prev parent reply other threads:[~2007-11-16 23:11 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-16 23:09 [patch 00/30] cpu alloc v2: Optimize by removing arrays of pointers to per cpu objects Christoph Lameter
2007-11-16 23:09 ` [patch 01/30] cpu alloc: Simple version of the allocator (static allocations) Christoph Lameter
2007-11-16 23:09 ` [patch 02/30] cpu alloc: Use in SLUB Christoph Lameter
2007-11-16 23:09 ` [patch 03/30] cpu alloc: Remove SLUB fields Christoph Lameter
2007-11-16 23:09 ` [patch 04/30] cpu alloc: page allocator conversion Christoph Lameter
2007-11-16 23:09 ` [patch 05/30] cpu_alloc: Implement dynamically extendable cpu areas Christoph Lameter
2007-11-16 23:09 ` [patch 06/30] cpu alloc: x86 support Christoph Lameter
2007-11-16 23:09 ` [patch 07/30] cpu alloc: IA64 support Christoph Lameter
2007-11-16 23:32 ` Luck, Tony
2007-11-17 0:05 ` Christoph Lameter
2007-11-16 23:09 ` [patch 08/30] cpu_alloc: Sparc64 support Christoph Lameter
2007-11-16 23:09 ` [patch 09/30] cpu alloc: percpu_counter conversion Christoph Lameter
2007-11-16 23:09 ` [patch 10/30] cpu alloc: crash_notes conversion Christoph Lameter
2007-11-16 23:09 ` [patch 11/30] cpu alloc: workqueue conversion Christoph Lameter
2007-11-16 23:09 ` [patch 12/30] cpu alloc: ACPI cstate handling conversion Christoph Lameter
2007-11-16 23:09 ` [patch 13/30] cpu alloc: genhd statistics conversion Christoph Lameter
2007-11-16 23:09 ` [patch 14/30] cpu alloc: blktrace conversion Christoph Lameter
2007-11-16 23:09 ` [patch 15/30] cpu alloc: SRCU Christoph Lameter
2007-11-16 23:09 ` [patch 16/30] cpu alloc: XFS counters Christoph Lameter
2007-11-19 12:58 ` Christoph Hellwig
2007-11-16 23:09 ` [patch 17/30] cpu alloc: NFS statistics Christoph Lameter
2007-11-16 23:09 ` [patch 18/30] cpu alloc: neigbour statistics Christoph Lameter
2007-11-16 23:09 ` [patch 19/30] cpu alloc: tcp statistics Christoph Lameter
2007-11-16 23:09 ` [patch 20/30] cpu alloc: convert scatches Christoph Lameter
2007-11-16 23:09 ` Christoph Lameter [this message]
2007-11-16 23:09 ` [patch 22/30] cpu alloc: convert loopback statistics Christoph Lameter
2007-11-16 23:09 ` [patch 23/30] cpu alloc: veth conversion Christoph Lameter
2007-11-16 23:09 ` [patch 24/30] cpu alloc: Chelsio statistics conversion Christoph Lameter
2007-11-16 23:09 ` [patch 25/30] cpu alloc: convert mib handling to cpu alloc Christoph Lameter
2007-11-16 23:09 ` [patch 26/30] cpu_alloc: convert network sockets Christoph Lameter
2007-11-16 23:09 ` [patch 27/30] cpu alloc: Explicitly code allocpercpu calls in iucv Christoph Lameter
2007-11-16 23:09 ` [patch 28/30] cpu alloc: Use for infiniband Christoph Lameter
2007-11-16 23:09 ` [patch 29/30] cpu alloc: Use in the crypto subsystem Christoph Lameter
2007-11-16 23:09 ` [patch 30/30] cpu alloc: Remove the allocpercpu functionality Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071116231107.350452102@sgi.com \
--to=clameter@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=dada1@cosmosbay.com \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).