From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-mm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: David Miller <davem@davemloft.net>
Cc: Eric Dumazet <dada1@cosmosbay.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 19/28] cpu alloc: convert scatches
Date: Tue, 06 Nov 2007 11:52:03 -0800 [thread overview]
Message-ID: <20071106195201.999428198@sgi.com> (raw)
In-Reply-To: 20071106195144.983665861@sgi.com
[-- Attachment #1: cpu_alloc_ipv4_icomp --]
[-- Type: text/plain, Size: 6109 bytes --]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
net/ipv4/ipcomp.c | 26 +++++++++++++-------------
net/ipv6/ipcomp6.c | 26 +++++++++++++-------------
2 files changed, 26 insertions(+), 26 deletions(-)
Index: linux-2.6/net/ipv4/ipcomp.c
===================================================================
--- linux-2.6.orig/net/ipv4/ipcomp.c 2007-11-05 09:41:23.000000000 -0800
+++ linux-2.6/net/ipv4/ipcomp.c 2007-11-05 09:41:37.000000000 -0800
@@ -47,8 +47,8 @@ static int ipcomp_decompress(struct xfrm
int dlen = IPCOMP_SCRATCH_SIZE;
const u8 *start = skb->data;
const int cpu = get_cpu();
- u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
- struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+ u8 *scratch = *CPU_PTR(ipcomp_scratches, cpu);
+ struct crypto_comp *tfm = *CPU_PTR(ipcd->tfms, cpu);
int err = crypto_comp_decompress(tfm, start, plen, scratch, &dlen);
if (err)
@@ -102,8 +102,8 @@ static int ipcomp_compress(struct xfrm_s
int dlen = IPCOMP_SCRATCH_SIZE;
u8 *start = skb->data;
const int cpu = get_cpu();
- u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
- struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+ u8 *scratch = *CPU_PTR(ipcomp_scratches, cpu);
+ struct crypto_comp *tfm = *CPU_PTR(ipcd->tfms, cpu);
int err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
if (err)
@@ -251,9 +251,9 @@ static void ipcomp_free_scratches(void)
return;
for_each_possible_cpu(i)
- vfree(*per_cpu_ptr(scratches, i));
+ vfree(*CPU_PTR(scratches, i));
- free_percpu(scratches);
+ CPU_FREE(scratches);
}
static void **ipcomp_alloc_scratches(void)
@@ -264,7 +264,7 @@ static void **ipcomp_alloc_scratches(voi
if (ipcomp_scratch_users++)
return ipcomp_scratches;
- scratches = alloc_percpu(void *);
+ scratches = CPU_ALLOC(void *, GFP_KERNEL);
if (!scratches)
return NULL;
@@ -274,7 +274,7 @@ static void **ipcomp_alloc_scratches(voi
void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
if (!scratch)
return NULL;
- *per_cpu_ptr(scratches, i) = scratch;
+ *CPU_PTR(scratches, i) = scratch;
}
return scratches;
@@ -302,10 +302,10 @@ static void ipcomp_free_tfms(struct cryp
return;
for_each_possible_cpu(cpu) {
- struct crypto_comp *tfm = *per_cpu_ptr(tfms, cpu);
+ struct crypto_comp *tfm = *CPU_PTR(tfms, cpu);
crypto_free_comp(tfm);
}
- free_percpu(tfms);
+ CPU_FREE(tfms);
}
static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)
@@ -321,7 +321,7 @@ static struct crypto_comp **ipcomp_alloc
struct crypto_comp *tfm;
tfms = pos->tfms;
- tfm = *per_cpu_ptr(tfms, cpu);
+ tfm = *CPU_PTR(tfms, cpu);
if (!strcmp(crypto_comp_name(tfm), alg_name)) {
pos->users++;
@@ -337,7 +337,7 @@ static struct crypto_comp **ipcomp_alloc
INIT_LIST_HEAD(&pos->list);
list_add(&pos->list, &ipcomp_tfms_list);
- pos->tfms = tfms = alloc_percpu(struct crypto_comp *);
+ pos->tfms = tfms = CPU_ALLOC(struct crypto_comp *, GFP_KERNEL);
if (!tfms)
goto error;
@@ -346,7 +346,7 @@ static struct crypto_comp **ipcomp_alloc
CRYPTO_ALG_ASYNC);
if (!tfm)
goto error;
- *per_cpu_ptr(tfms, cpu) = tfm;
+ *CPU_PTR(tfms, cpu) = tfm;
}
return tfms;
Index: linux-2.6/net/ipv6/ipcomp6.c
===================================================================
--- linux-2.6.orig/net/ipv6/ipcomp6.c 2007-11-05 09:41:23.000000000 -0800
+++ linux-2.6/net/ipv6/ipcomp6.c 2007-11-05 09:43:13.000000000 -0800
@@ -87,8 +87,8 @@ static int ipcomp6_input(struct xfrm_sta
start = skb->data;
cpu = get_cpu();
- scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
- tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+ scratch = *CPU_PTR(ipcomp6_scratches, cpu);
+ tfm = *CPU_PTR(ipcd->tfms, cpu);
err = crypto_comp_decompress(tfm, start, plen, scratch, &dlen);
if (err)
@@ -139,8 +139,8 @@ static int ipcomp6_output(struct xfrm_st
start = skb->data;
cpu = get_cpu();
- scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
- tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+ scratch = *CPU_PTR(ipcomp6_scratches, cpu);
+ tfm = *CPU_PTR(ipcd->tfms, cpu);
err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
if (err || (dlen + sizeof(*ipch)) >= plen) {
@@ -262,12 +262,12 @@ static void ipcomp6_free_scratches(void)
return;
for_each_possible_cpu(i) {
- void *scratch = *per_cpu_ptr(scratches, i);
+ void *scratch = *CPU_PTR(scratches, i);
vfree(scratch);
}
- free_percpu(scratches);
+ CPU_FREE(scratches);
}
static void **ipcomp6_alloc_scratches(void)
@@ -278,7 +278,7 @@ static void **ipcomp6_alloc_scratches(vo
if (ipcomp6_scratch_users++)
return ipcomp6_scratches;
- scratches = alloc_percpu(void *);
+ scratches = CPU_ALLOC(void *, GFP_KERNEL);
if (!scratches)
return NULL;
@@ -288,7 +288,7 @@ static void **ipcomp6_alloc_scratches(vo
void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
if (!scratch)
return NULL;
- *per_cpu_ptr(scratches, i) = scratch;
+ *CPU_PTR(scratches, i) = scratch;
}
return scratches;
@@ -316,10 +316,10 @@ static void ipcomp6_free_tfms(struct cry
return;
for_each_possible_cpu(cpu) {
- struct crypto_comp *tfm = *per_cpu_ptr(tfms, cpu);
+ struct crypto_comp *tfm = *CPU_PTR(tfms, cpu);
crypto_free_comp(tfm);
}
- free_percpu(tfms);
+ CPU_FREE(tfms);
}
static struct crypto_comp **ipcomp6_alloc_tfms(const char *alg_name)
@@ -335,7 +335,7 @@ static struct crypto_comp **ipcomp6_allo
struct crypto_comp *tfm;
tfms = pos->tfms;
- tfm = *per_cpu_ptr(tfms, cpu);
+ tfm = *CPU_PTR(tfms, cpu);
if (!strcmp(crypto_comp_name(tfm), alg_name)) {
pos->users++;
@@ -351,7 +351,7 @@ static struct crypto_comp **ipcomp6_allo
INIT_LIST_HEAD(&pos->list);
list_add(&pos->list, &ipcomp6_tfms_list);
- pos->tfms = tfms = alloc_percpu(struct crypto_comp *);
+ pos->tfms = tfms = CPU_ALLOC(struct crypto_comp *, GFP_KERNEL);
if (!tfms)
goto error;
@@ -360,7 +360,7 @@ static struct crypto_comp **ipcomp6_allo
CRYPTO_ALG_ASYNC);
if (!tfm)
goto error;
- *per_cpu_ptr(tfms, cpu) = tfm;
+ *CPU_PTR(tfms, cpu) = tfm;
}
return tfms;
--
next prev parent reply other threads:[~2007-11-06 19:56 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-06 19:51 [patch 00/28] cpu alloc v1: Optimize by removing arrays of pointers to per cpu objects Christoph Lameter
2007-11-06 19:51 ` [patch 01/28] cpu alloc: The allocator Christoph Lameter
2007-11-08 12:34 ` Peter Zijlstra
2007-11-08 12:37 ` Peter Zijlstra
2007-11-08 18:33 ` Christoph Lameter
2007-11-08 18:50 ` Christoph Lameter
2007-11-08 20:19 ` Peter Zijlstra
[not found] ` <1194522615.6289.136.camel@twins>
[not found] ` <Pine.LNX.4.64.0711081030380.7871@schroedinger.engr.sgi.com>
2007-11-08 20:19 ` Peter Zijlstra
2007-11-08 20:24 ` Christoph Lameter
2007-11-08 23:26 ` David Miller
2007-11-08 23:26 ` David Miller
2007-11-13 11:15 ` David Miller
2007-11-13 21:40 ` Christoph Lameter
2007-11-13 21:58 ` Eric Dumazet
2007-11-13 22:00 ` Christoph Lameter
2007-11-14 1:33 ` David Miller
2007-11-13 22:02 ` Christoph Lameter
2007-11-14 1:30 ` David Miller
2007-11-14 1:48 ` Christoph Lameter
2007-11-13 22:20 ` Christoph Lameter
2007-11-14 1:36 ` David Miller
2007-11-14 1:37 ` David Miller
2007-11-14 1:50 ` Christoph Lameter
2007-11-14 2:00 ` David Miller
2007-11-14 2:05 ` Christoph Lameter
2007-11-14 1:06 ` Andi Kleen
2007-11-14 1:52 ` David Miller
2007-11-14 1:57 ` Christoph Lameter
2007-11-14 2:01 ` David Miller
2007-11-14 2:03 ` Christoph Lameter
2007-11-14 2:28 ` Andi Kleen
2007-11-14 3:48 ` David Miller
2007-11-14 3:49 ` Christoph Lameter
2007-11-16 10:23 ` large lockdep bss (was: Re: [patch 01/28] cpu alloc: The allocator) Peter Zijlstra
2007-11-16 11:44 ` Andi Kleen
2007-11-14 4:15 ` [patch 01/28] cpu alloc: The allocator Christoph Lameter
2007-11-14 4:18 ` David Miller
2007-11-14 4:21 ` David Miller
2007-11-14 4:26 ` Christoph Lameter
2007-11-14 5:53 ` David Miller
2007-11-15 18:49 ` Christoph Lameter
2007-11-15 22:03 ` David Miller
2007-11-16 2:19 ` Christoph Lameter
2007-11-16 2:50 ` David Miller
2007-11-16 2:55 ` Christoph Lameter
2007-11-16 2:58 ` David Miller
2007-11-16 3:10 ` Christoph Lameter
2007-11-16 3:17 ` David Miller
2007-11-16 3:19 ` Christoph Lameter
2007-11-06 19:51 ` [patch 02/28] cpu alloc: x86_64 support Christoph Lameter
2007-11-06 19:51 ` [patch 03/28] cpu alloc: IA64 support Christoph Lameter
2007-11-06 19:51 ` [patch 04/28] cpu alloc: i386 support Christoph Lameter
2007-11-06 19:51 ` [patch 05/28] cpu alloc: Use in SLUB Christoph Lameter
2007-11-06 19:51 ` [patch 06/28] cpu alloc: Remove SLUB fields Christoph Lameter
2007-11-06 19:51 ` [patch 07/28] cpu alloc: page allocator conversion Christoph Lameter
2007-11-06 19:51 ` [patch 08/28] cpu alloc: percpu_counter conversion Christoph Lameter
2007-11-06 19:51 ` [patch 09/28] cpu alloc: crash_notes conversion Christoph Lameter
2007-11-06 19:51 ` [patch 10/28] cpu alloc: workqueue conversion Christoph Lameter
2007-11-06 19:51 ` [patch 11/28] cpu alloc: ACPI cstate handling conversion Christoph Lameter
2007-11-06 19:51 ` [patch 12/28] cpu alloc: genhd statistics conversion Christoph Lameter
2007-11-06 19:51 ` [patch 13/28] cpu alloc: blktrace conversion Christoph Lameter
2007-11-06 19:51 ` [patch 14/28] cpu alloc: SRCU Christoph Lameter
2007-11-06 19:51 ` [patch 15/28] cpu alloc: XFS counters Christoph Lameter
2007-11-06 19:52 ` [patch 16/28] cpu alloc: NFS statistics Christoph Lameter
2007-11-06 19:52 ` [patch 17/28] cpu alloc: neigbour statistics Christoph Lameter
2007-11-06 19:52 ` [patch 18/28] cpu alloc: tcp statistics Christoph Lameter
2007-11-06 19:52 ` Christoph Lameter [this message]
2007-11-06 19:52 ` [patch 20/28] cpu alloc: dmaengine conversion Christoph Lameter
2007-11-06 19:52 ` [patch 21/28] cpu alloc: convert loopback statistics Christoph Lameter
2007-11-06 19:52 ` [patch 22/28] cpu alloc: veth conversion Christoph Lameter
2007-11-06 19:52 ` [patch 23/28] cpu alloc: Chelsio statistics conversion Christoph Lameter
2007-11-06 19:52 ` [patch 24/28] cpu alloc: convert mib handling to cpu alloc Christoph Lameter
2007-11-06 19:52 ` [patch 25/28] cpu alloc: Explicitly code allocpercpu calls in iucv Christoph Lameter
2007-11-06 19:52 ` [patch 26/28] cpu alloc: Use for infiniband Christoph Lameter
2007-11-06 19:52 ` [patch 27/28] cpu alloc: Use in the crypto subsystem Christoph Lameter
2007-11-06 19:52 ` [patch 28/28] cpu alloc: Remove the allocpercpu functionality Christoph Lameter
2007-11-07 13:10 ` [patch 00/28] cpu alloc v1: Optimize by removing arrays of pointers to per cpu objects Martin Schwidefsky
2007-11-07 18:05 ` 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=20071106195201.999428198@sgi.com \
--to=clameter@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=linux-mm@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.