Skip to content

Commit

Permalink
hugetlb: fix get_policy for stacked shared memory files
Browse files Browse the repository at this point in the history
Here's another breakage as a result of shared memory stacked files :(

The NUMA policy for a VMA is determined by checking the following (in the
order given):

1) vma->vm_ops->get_policy() (if defined)
2) vma->vm_policy (if defined)
3) task->mempolicy (if defined)
4) Fall back to default_policy

By switching to stacked files for shared memory, get_policy() is now always
set to shm_get_policy which is a wrapper function.  This causes us to stop
at step 1, which yields NULL for hugetlb instead of task->mempolicy which
was the previous (and correct) result.

This patch modifies the shm_get_policy() wrapper to maintain steps 1-3 for
the wrapped vm_ops.

(akpm: the refcounting of mempolicies is busted and this patch does nothing to
improve it)

Signed-off-by: Adam Litke <[email protected]>
Acked-by: William Irwin <[email protected]>
Cc: dean gaudet <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Adam Litke authored and Linus Torvalds committed Jun 16, 2007
1 parent 74584ae commit 2274192
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ipc/shm.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,10 @@ struct mempolicy *shm_get_policy(struct vm_area_struct *vma, unsigned long addr)

if (sfd->vm_ops->get_policy)
pol = sfd->vm_ops->get_policy(vma, addr);
else
else if (vma->vm_policy)
pol = vma->vm_policy;
else
pol = current->mempolicy;
return pol;
}
#endif
Expand Down

0 comments on commit 2274192

Please sign in to comment.