From: Mike Kravetz <mike.kravetz@oracle.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Muchun Song <songmuchun@bytedance.com>
Cc: mhocko@kernel.org, rientjes@google.com, mgorman@suse.de,
walken@google.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Jianchao Guo <guojianchao@bytedance.com>
Subject: Re: [PATCH v3] mm/hugetlb: add mempolicy check in the reservation routine
Date: Mon, 27 Jul 2020 19:42:59 -0700 [thread overview]
Message-ID: <833be473-a065-4402-f369-f946b6f4e312@oracle.com> (raw)
In-Reply-To: <20200727171953.443afb897bb88261facf5512@linux-foundation.org>
On 7/27/20 5:19 PM, Andrew Morton wrote:
> On Sat, 25 Jul 2020 16:07:49 +0800 Muchun Song <songmuchun@bytedance.com> wrote:
>
>> In the reservation routine, we only check whether the cpuset meets
>> the memory allocation requirements. But we ignore the mempolicy of
>> MPOL_BIND case. If someone mmap hugetlb succeeds, but the subsequent
>> memory allocation may fail due to mempolicy restrictions and receives
>> the SIGBUS signal. This can be reproduced by the follow steps.
>>
>> 1) Compile the test case.
>> cd tools/testing/selftests/vm/
>> gcc map_hugetlb.c -o map_hugetlb
>>
>> 2) Pre-allocate huge pages. Suppose there are 2 numa nodes in the
>> system. Each node will pre-allocate one huge page.
>> echo 2 > /proc/sys/vm/nr_hugepages
>>
>> 3) Run test case(mmap 4MB). We receive the SIGBUS signal.
>> numactl --membind=0 ./map_hugetlb 4
>>
>> With this patch applied, the mmap will fail in the step 3) and throw
>> "mmap: Cannot allocate memory".
>
> This doesn't compile with CONFIG_NUMA=n - ther eis no implementation of
> get_task_policy().
>
> I think it needs more than a simple build fix - can we please rework
> the patch so that its impact (mainly code size) on non-NUMA machines is
> minimized?
I'll let Muchun see if there is a more elegant fix. However, a relatively
simple build fix such as:
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 8069ca47c18c..4bfbddfee0d3 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3455,12 +3455,14 @@ static unsigned int allowed_mems_nr(struct hstate *h)
{
int node;
unsigned int nr = 0;
- struct mempolicy *mpol = get_task_policy(current);
- nodemask_t *mpol_allowed;
+ nodemask_t *mpol_allowed = NULL;
unsigned int *array = h->free_huge_pages_node;
+#ifdef CONFIG_NUMA
+ struct mempolicy *mpol = get_task_policy(current);
gfp_t gfp_mask = htlb_alloc_mask(h);
mpol_allowed = policy_nodemask(gfp_mask, mpol);
+#endif
for_each_node_mask(node, cpuset_current_mems_allowed) {
if (!mpol_allowed ||
Does not have much of an impact on code size. Here are the non-numa
versions of the routine before Muchun's patch and after.
Dump of assembler code for function cpuset_mems_nr:
0xffffffff8126a3a0 <+0>: callq 0xffffffff81060f80 <__fentry__>
0xffffffff8126a3a5 <+5>: xor %eax,%eax
0xffffffff8126a3a7 <+7>: mov %gs:0x17bc0,%rdx
0xffffffff8126a3b0 <+16>: testb $0x1,0x778(%rdx)
0xffffffff8126a3b7 <+23>: jne 0xffffffff8126a3ba <cpuset_mems_nr+26>
0xffffffff8126a3b9 <+25>: retq
0xffffffff8126a3ba <+26>: mov (%rdi),%eax
0xffffffff8126a3bc <+28>: retq
End of assembler dump.
Dump of assembler code for function allowed_mems_nr:
0xffffffff8126a3a0 <+0>: callq 0xffffffff81060f80 <__fentry__>
0xffffffff8126a3a5 <+5>: xor %eax,%eax
0xffffffff8126a3a7 <+7>: mov %gs:0x17bc0,%rdx
0xffffffff8126a3b0 <+16>: testb $0x1,0x778(%rdx)
0xffffffff8126a3b7 <+23>: jne 0xffffffff8126a3ba <allowed_mems_nr+26>
0xffffffff8126a3b9 <+25>: retq
0xffffffff8126a3ba <+26>: mov 0x6c(%rdi),%eax
0xffffffff8126a3bd <+29>: retq
End of assembler dump.
--
Mike Kravetz
prev parent reply other threads:[~2020-07-28 2:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 8:07 [PATCH v3] mm/hugetlb: add mempolicy check in the reservation routine Muchun Song
2020-07-27 23:09 ` Mike Kravetz
2020-07-28 0:19 ` Andrew Morton
2020-07-28 2:40 ` [External] " Muchun Song
2020-07-28 2:42 ` Mike Kravetz [this message]
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=833be473-a065-4402-f369-f946b6f4e312@oracle.com \
--to=mike.kravetz@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=guojianchao@bytedance.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@kernel.org \
--cc=rientjes@google.com \
--cc=songmuchun@bytedance.com \
--cc=walken@google.com \
/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).