Attachment 269261 Details for Bug 318261 – fix alternate_node_alloc this_cpu

[patch] fix alternate_node_alloc this_cpu

slab-pass-this-cpu-alternate-node.patch (text/plain), 1.88 KB, created by Steven Rostedt on 2007-11-26 20:20:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Rostedt

Created: 2007-11-26 20:20:49 UTC

Size: 1.88 KB

patch

obsolete

>Index: linux-2.6.21-rt-hack/mm/slab.c
>===================================================================
>--- linux-2.6.21-rt-hack.orig/mm/slab.c
>+++ linux-2.6.21-rt-hack/mm/slab.c
>@@ -1082,7 +1082,7 @@ cache_free_alien(struct kmem_cache *cach
> }
> 
> static inline void *alternate_node_alloc(struct kmem_cache *cachep,
>-		gfp_t flags)
>+					 gfp_t flags, int *this_cpu)
> {
> 	return NULL;
> }
>@@ -1097,7 +1097,7 @@ static inline void *____cache_alloc_node
> 
> static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
> 				int nodeid, int *this_cpu);
>-static void *alternate_node_alloc(struct kmem_cache *, gfp_t);
>+static void *alternate_node_alloc(struct kmem_cache *, gfp_t, int *);
> 
> static struct array_cache **alloc_alien_cache(int node, int limit)
> {
>@@ -3320,9 +3320,10 @@ ____cache_alloc(struct kmem_cache *cache
>  * If we are in_interrupt, then process context, including cpusets and
>  * mempolicy, may not apply and should not be used for allocation policy.
>  */
>-static void *alternate_node_alloc(struct kmem_cache *cachep, gfp_t flags)
>+static void *alternate_node_alloc(struct kmem_cache *cachep, gfp_t flags,
>+				  int *this_cpu)
> {
>-	int nid_alloc, nid_here, this_cpu = raw_smp_processor_id();
>+	int nid_alloc, nid_here;
> 
> 	if (in_interrupt() || (flags & __GFP_THISNODE))
> 		return NULL;
>@@ -3332,7 +3333,7 @@ static void *alternate_node_alloc(struct
> 	else if (current->mempolicy)
> 		nid_alloc = slab_node(current->mempolicy);
> 	if (nid_alloc != nid_here)
>-		return ____cache_alloc_node(cachep, flags, nid_alloc, &this_cpu);
>+		return ____cache_alloc_node(cachep, flags, nid_alloc, this_cpu);
> 	return NULL;
> }
> 
>@@ -3536,7 +3537,7 @@ __do_cache_alloc(struct kmem_cache *cach
> 	void *objp;
> 
> 	if (unlikely(current->flags & (PF_SPREAD_SLAB | PF_MEMPOLICY))) {
>-		objp = alternate_node_alloc(cache, flags);
>+		objp = alternate_node_alloc(cache, flags, this_cpu);
> 		if (objp)
> 			goto out;
> 	}

Actions: View | Diff

Attachments on bug 318261: 269261