From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 874CFC433E1 for ; Thu, 6 Aug 2020 11:21:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BE2E022D03 for ; Thu, 6 Aug 2020 11:21:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="nugW4y5e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE2E022D03 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 509B78D0001; Thu, 6 Aug 2020 03:45:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BACF6B0010; Thu, 6 Aug 2020 03:45:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A9058D0001; Thu, 6 Aug 2020 03:45:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id 20A386B000E for ; Thu, 6 Aug 2020 03:45:53 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D6BD91F0A for ; Thu, 6 Aug 2020 07:45:52 +0000 (UTC) X-FDA: 77119359744.30.nose97_32087d226fb5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id A60E3180B3C83 for ; Thu, 6 Aug 2020 07:45:52 +0000 (UTC) X-HE-Tag: nose97_32087d226fb5 X-Filterd-Recvd-Size: 8397 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Thu, 6 Aug 2020 07:45:52 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id p1so27073554pls.4 for ; Thu, 06 Aug 2020 00:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=V4vziIOnsYsNSJ2sZd3hBsKudMXx7jTbaEJS7ylUkkk=; b=nugW4y5eMhXNCObM/4CbLO3YApAHY87G2PRBwb1bOlLpWWzx6o40qrn1L6R2qWhv7U zuVfdeXJC26qy2YGegsWXSB3QpQR9btcQiXqPJCCgpy9eFX9Lq99nY489y7tXad+qINq Qqzj+YQPp+ZlUWTcvR4ZscWjBGc5PCEf+F5cVne0cWzB19yBtYRJXvZ7LR7JmpCf7IkS Ilp3gpe4gWpSJ+fd0Wk1Nz6QhiMktPSnjyoDxINH1ont9PlMclRmLyUjmsumYOZ/dV44 1yRTfjqtk1SgUZb4Ga+WNAWU5OF2Un03WYtaO9sOPJ/f5QdxkAWol7pMzW/Qljnpi0Gg 1TfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=V4vziIOnsYsNSJ2sZd3hBsKudMXx7jTbaEJS7ylUkkk=; b=jZbc/r9nSmEXIMUO79F1Fgy92p7knfIbmeJkDiIkvcwIWJO70mLg662fCLnQ+Q1eGl k8HJ1qvPNa0JDMyOo5MJIv1PqPFbzJ7dFgreg3szh8ZepPiC7eMIMjbGIRRv6+RRV/8b 5QcFZGAabmeoJWDzX9OvpLuxD3ch949T8k09m8sQKvcarJ1hOnXJBvJNIPDLgWx7079V UXJ3aLxldKY6FaEWD8j2DT5Bc+PZBSTOt5IHcZWRe81pQEUKtxVLqr/wKs/RTuQxQM7e 4BDA9/HPzKISzKKqDDbJLDLI16UqJM03YM+u+hrppqiYb26splz4Y311Wx1TCTAnxEZM huGA== X-Gm-Message-State: AOAM531hFK/yv79c8FEQtb3TiMSyKV8c9foEwhqImKnE3n81NTgJEDoE V2T1YuwVwD0wbrRj/r1tWBPQelC/+4llGt63EFOvVQ== X-Google-Smtp-Source: ABdhPJzdjiuyIgHM2geRvWH0EJ20/xGHVcUqQTqcj8nIheEBUk7XBKKxrl0fdmLBuAK1s6Cnp3FlaNL2IbOS/kBtS5s= X-Received: by 2002:a17:90a:fa8c:: with SMTP id cu12mr7353995pjb.229.1596699950726; Thu, 06 Aug 2020 00:45:50 -0700 (PDT) MIME-Version: 1.0 References: <20200728034938.14993-1-songmuchun@bytedance.com> In-Reply-To: <20200728034938.14993-1-songmuchun@bytedance.com> From: Muchun Song Date: Thu, 6 Aug 2020 15:45:14 +0800 Message-ID: Subject: Re: [PATCH v4] mm/hugetlb: add mempolicy check in the reservation routine To: Andrew Morton Cc: mike.kravetz@oracle.com, David Rientjes , mgorman@suse.de, Michel Lespinasse , Linux Memory Management List , Michal Hocko , LKML , Baoquan He Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: A60E3180B3C83 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, Jul 28, 2020 at 11:49 AM Muchun Song 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". > > Signed-off-by: Muchun Song > Reported-by: Jianchao Guo > Suggested-by: Michal Hocko > Reviewed-by: Mike Kravetz Hi Andrew, Any comments or forgot to add this to the queue for the merge window? > --- > changelog in v4: > 1) Fix compilation errors with !CONFIG_NUMA. > > changelog in v3: > 1) Do not allocate nodemask on the stack. > 2) Update comment. > > changelog in v2: > 1) Reuse policy_nodemask(). > > include/linux/mempolicy.h | 14 ++++++++++++++ > mm/hugetlb.c | 22 ++++++++++++++++++---- > mm/mempolicy.c | 2 +- > 3 files changed, 33 insertions(+), 5 deletions(-) > > diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h > index ea9c15b60a96..0656ece1ccf1 100644 > --- a/include/linux/mempolicy.h > +++ b/include/linux/mempolicy.h > @@ -152,6 +152,15 @@ extern int huge_node(struct vm_area_struct *vma, > extern bool init_nodemask_of_mempolicy(nodemask_t *mask); > extern bool mempolicy_nodemask_intersects(struct task_struct *tsk, > const nodemask_t *mask); > +extern nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *policy); > + > +static inline nodemask_t *policy_nodemask_current(gfp_t gfp) > +{ > + struct mempolicy *mpol = get_task_policy(current); > + > + return policy_nodemask(gfp, mpol); > +} > + > extern unsigned int mempolicy_slab_node(void); > > extern enum zone_type policy_zone; > @@ -281,5 +290,10 @@ static inline int mpol_misplaced(struct page *page, struct vm_area_struct *vma, > static inline void mpol_put_task_policy(struct task_struct *task) > { > } > + > +static inline nodemask_t *policy_nodemask_current(gfp_t gfp) > +{ > + return NULL; > +} > #endif /* CONFIG_NUMA */ > #endif > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 589c330df4db..a34458f6a475 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3463,13 +3463,21 @@ static int __init default_hugepagesz_setup(char *s) > } > __setup("default_hugepagesz=", default_hugepagesz_setup); > > -static unsigned int cpuset_mems_nr(unsigned int *array) > +static unsigned int allowed_mems_nr(struct hstate *h) > { > int node; > unsigned int nr = 0; > + nodemask_t *mpol_allowed; > + unsigned int *array = h->free_huge_pages_node; > + gfp_t gfp_mask = htlb_alloc_mask(h); > + > + mpol_allowed = policy_nodemask_current(gfp_mask); > > - for_each_node_mask(node, cpuset_current_mems_allowed) > - nr += array[node]; > + for_each_node_mask(node, cpuset_current_mems_allowed) { > + if (!mpol_allowed || > + (mpol_allowed && node_isset(node, *mpol_allowed))) > + nr += array[node]; > + } > > return nr; > } > @@ -3648,12 +3656,18 @@ static int hugetlb_acct_memory(struct hstate *h, long delta) > * we fall back to check against current free page availability as > * a best attempt and hopefully to minimize the impact of changing > * semantics that cpuset has. > + * > + * Apart from cpuset, we also have memory policy mechanism that > + * also determines from which node the kernel will allocate memory > + * in a NUMA system. So similar to cpuset, we also should consider > + * the memory policy of the current task. Similar to the description > + * above. > */ > if (delta > 0) { > if (gather_surplus_pages(h, delta) < 0) > goto out; > > - if (delta > cpuset_mems_nr(h->free_huge_pages_node)) { > + if (delta > allowed_mems_nr(h)) { > return_unused_surplus_pages(h, delta); > goto out; > } > diff --git a/mm/mempolicy.c b/mm/mempolicy.c > index 93fcfc1f2fa2..fce14c3f4f38 100644 > --- a/mm/mempolicy.c > +++ b/mm/mempolicy.c > @@ -1873,7 +1873,7 @@ static int apply_policy_zone(struct mempolicy *policy, enum zone_type zone) > * Return a nodemask representing a mempolicy for filtering nodes for > * page allocation > */ > -static nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *policy) > +nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *policy) > { > /* Lower zones don't get a nodemask applied for MPOL_BIND */ > if (unlikely(policy->mode == MPOL_BIND) && > -- > 2.11.0 > -- Yours, Muchun