Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> writes:
> On Fri, 16 Jan 2015 12:56:36 +0530 "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> wrote:
>
>> This make sure that we try to allocate hugepages from local node if
>> allowed by mempolicy. If we can't, we fallback to small page allocation
>> based on mempolicy. This is based on the observation that allocating pages
>> on local node is more beneficial than allocating hugepages on remote node.
>
> The changelog is a bit incomplete. It doesn't describe the current
> behaviour, nor what is wrong with it. What are the before-and-after
> effects of this change?
>
> And what might be the user-visible effects?
How about ?
With this patch applied we may find transparent huge page allocation
failures if the current node doesn't have enough freee hugepages.
Before this patch such failures result in us retrying the allocation on
other nodes in the numa node mask.
>
>> --- a/mm/mempolicy.c
>> +++ b/mm/mempolicy.c
>> @@ -2030,6 +2030,46 @@ retry_cpuset:
>> return page;
>> }
>>
>> +struct page *alloc_hugepage_vma(gfp_t gfp, struct vm_area_struct *vma,
>> + unsigned long addr, int order)
>
> alloc_pages_vma() is nicely documented. alloc_hugepage_vma() is not
> documented at all. This makes it a bit had for readers to work out the
> difference!
>
> Is it possible to scrunch them both into the same function? Probably
> too messy?
/**
* alloc_hugepage_vma: Allocate a hugepage for a VMA
* @gfp:
* %GFP_USER user allocation.
* %GFP_KERNEL kernel allocations,
* %GFP_HIGHMEM highmem/user allocations,
* %GFP_FS allocation should not call back into a file system.
* %GFP_ATOMIC don't sleep.
*
* @vma: Pointer to VMA or NULL if not available.
* @addr: Virtual Address of the allocation. Must be inside the VMA.
* @order: Order of the hugepage for gfp allocation.
*
* This functions allocate a huge page from the kernel page pool and applies
* a NUMA policy associated with the VMA or the current process.
* For policy other than %MPOL_INTERLEAVE, we make sure we allocate hugepage
* only from the current node if the current node is part of the node mask.
* If we can't allocate a hugepage we fail the allocation and don' try to fallback
* to other nodes in the node mask. If the current node is not part of node mask
* or if the NUMA policy is MPOL_INTERLEAVE we use the allocator that can
* fallback to nodes in the policy node mask.
*
* When VMA is not NULL caller must hold down_read on the mmap_sem of the
* mm_struct of the VMA to prevent it from going away. Should be used for
* all allocations for pages that will be mapped into
* user space. Returns NULL when no page can be allocated.
*
* Should be called with the mm_sem of the vma hold.
*/
>
>> +{
>> + struct page *page;
>> + nodemask_t *nmask;
>> + struct mempolicy *pol;
>> + int node = numa_node_id();
>> + unsigned int cpuset_mems_cookie;
>> +
>> +retry_cpuset:
>> + pol = get_vma_policy(vma, addr);
>> + cpuset_mems_cookie = read_mems_allowed_begin();
>> +
>> + if (pol->mode != MPOL_INTERLEAVE) {
>> + /*
>> + * For interleave policy, we don't worry about
>> + * current node. Otherwise if current node is
>> + * in nodemask, try to allocate hugepage from
>> + * current node. Don't fall back to other nodes
>> + * for THP.
>> + */
>
> This code isn't "interleave policy". It's everything *but* interleave
> policy. Comment makes no sense!
>
I moved the comment before the if check
struct page *alloc_hugepage_vma(gfp_t gfp, struct vm_area_struct *vma,
unsigned long addr, int order)
{
struct page *page;
nodemask_t *nmask;
struct mempolicy *pol;
int node = numa_node_id();
unsigned int cpuset_mems_cookie;
retry_cpuset:
pol = get_vma_policy(vma, addr);
cpuset_mems_cookie = read_mems_allowed_begin();
/*
* For interleave policy, we don't worry about
* current node. Otherwise if current node is
* in nodemask, try to allocate hugepage from
* the current node. Don't fall back to other nodes
* for THP.
*/
if (pol->mode == MPOL_INTERLEAVE)
goto alloc_with_fallback;
nmask = policy_nodemask(gfp, pol);
if (!nmask || node_isset(node, *nmask)) {
mpol_cond_put(pol);
page = alloc_pages_exact_node(node, gfp, order);
if (unlikely(!page &&
read_mems_allowed_retry(cpuset_mems_cookie)))
goto retry_cpuset;
return page;
}
alloc_with_fallback:
mpol_cond_put(pol);
/*
* if current node is not part of node mask, try
* the allocation from any node, and we can do retry
* in that case.
*/
return alloc_pages_vma(gfp, order, vma, addr, node);
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>