From: Randy Dunlap <rdunlap@infradead.org>
To: Mina Almasry <almasrymina@google.com>,
linux-mm@kvack.org, linux-next@vger.kernel.org,
open list <linux-kernel@vger.kernel.org>
Cc: David Rientjes <rientjes@google.com>,
Greg Thelen <gthelen@google.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Shakeel Butt <shakeelb@google.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] hugetlb: fix CONFIG_CGROUP_HUGETLB ifdefs
Date: Fri, 14 Feb 2020 17:56:57 -0800 [thread overview]
Message-ID: <f0fd4a6b-1d4a-8e7d-65c0-a454fbf550a2@infradead.org> (raw)
In-Reply-To: <5237b9bc-2614-0a3a-afa5-5015f30d28bc@infradead.org>
On 2/14/20 5:17 PM, Randy Dunlap wrote:
> On 2/14/20 1:00 PM, Mina Almasry wrote:
>> On Fri, Feb 14, 2020 at 12:46 PM Mina Almasry <almasrymina@google.com> wrote:
>>>
>>> Fixes an #ifdef bug in the patch referred to below that was
>>> causing a build error when CONFIG_DEBUG_VM &&
>>> !CONFIG_CCGROUP_HUGETLB.
>
> Hi Mina,
>
> I don't know if this was supposed to fix the 2 build reports that I made,
> but this does not apply cleanly to mmotm (and it's a reply email so it's
> more difficult to apply anyway):
>
> Applying patch mm-hugetlb-fix-CONFIG_CGROUP_HUGETLB.patch
> patching file mm/hugetlb.c
> Hunk #1 succeeded at 289 with fuzz 1.
> Hunk #2 succeeded at 325 with fuzz 2.
> Hunk #3 FAILED at 435.
> 1 out of 3 hunks FAILED -- rejects in file mm/hugetlb.c
>
OK, I applied this patch manually and it does fix most of the reported build problems.
The only one remaining is this:
CC mm/migrate.o
In file included from ../mm/migrate.c:39:0:
../include/linux/hugetlb_cgroup.h:146:21: warning: ‘struct file_region’ declared inside parameter list will not be visible outside of this definition or declaration
struct file_region *rg,
^~~~~~~~~~~
../include/linux/hugetlb_cgroup.h:145:63: warning: ‘struct resv_map’ declared inside parameter list will not be visible outside of this definition or declaration
static inline void hugetlb_cgroup_uncharge_file_region(struct resv_map *resv,
^~~~~~~~
../include/linux/hugetlb_cgroup.h:233:59: warning: ‘struct resv_map’ declared inside parameter list will not be visible outside of this definition or declaration
static inline void hugetlb_cgroup_uncharge_counter(struct resv_map *resv,
^~~~~~~~
>
>>> Fixes: b5f16a533ce8a ("hugetlb: support file_region coalescing again")
>>> Signed-off-by: Mina Almasry <almasrymina@google.com>
>>> Cc: David Rientjes <rientjes@google.com>
>>> Cc: Greg Thelen <gthelen@google.com>
>>> Cc: Mike Kravetz <mike.kravetz@oracle.com>
>>> Cc: Shakeel Butt <shakeelb@google.com>
>>> Cc: Andrew Morton <akpm@linux-foundation.org>
>>> ---
>>> mm/hugetlb.c | 8 +++++---
>>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>>> index ee6d262fe6ac0..95d34c58981d2 100644
>>> --- a/mm/hugetlb.c
>>> +++ b/mm/hugetlb.c
>>> @@ -289,7 +289,7 @@ static bool has_same_uncharge_info(struct file_region *rg,
>>> #endif
>>> }
>>>
>>> -#ifdef CONFIG_DEBUG_VM
>>> +#if defined(CONFIG_DEBUG_VM) && defined(CONFIG_CGROUP_HUGETLB)
>>> static void dump_resv_map(struct resv_map *resv)
>>> {
>>> struct list_head *head = &resv->regions;
>>> @@ -325,6 +325,10 @@ static void check_coalesce_bug(struct resv_map *resv)
>>> }
>>> }
>>> }
>>> +#else
>>> +static void check_coalesce_bug(struct resv_map *resv)
>>> +{
>>> +}
>>> #endif
>>>
>>> static void coalesce_file_region(struct resv_map *resv, struct file_region *rg)
>>> @@ -431,9 +435,7 @@ static long add_reservation_in_range(struct resv_map *resv, long f, long t,
>>> }
>>>
>>> VM_BUG_ON(add < 0);
>>> -#ifdef CONFIG_DEBUG_VM
>>> check_coalesce_bug(resv);
>>> -#endif
>>> return add;
>>> }
>>>
>>> --
>>> 2.25.0.265.gbab2e86ba0-goog
--
~Randy
Reported-by: Randy Dunlap <rdunlap@infradead.org>
next prev parent reply other threads:[~2020-02-15 1:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200203173311.6269a8be06a05e5a4aa08a93@linux-foundation.org>
2020-02-14 6:26 ` mmotm 2020-02-13-22-26 uploaded Andrew Morton
2020-02-14 16:29 ` mmotm 2020-02-13-22-26 uploaded (mm/hugetlb.c) Randy Dunlap
2020-02-14 17:18 ` Mike Kravetz
2020-02-14 20:51 ` Mina Almasry
[not found] ` <20200214204544.231482-1-almasrymina@google.com>
2020-02-14 21:00 ` [PATCH] hugetlb: fix CONFIG_CGROUP_HUGETLB ifdefs Mina Almasry
2020-02-15 1:17 ` Randy Dunlap
2020-02-15 1:56 ` Randy Dunlap [this message]
2020-02-16 20:40 ` Mina Almasry
2020-02-16 21:03 ` Mina Almasry
2020-02-17 2:48 ` Randy Dunlap
2020-02-17 2:57 ` [PATCH] hugetlb: fix <linux/hugetlb_cgroup.h> structs Randy Dunlap
2020-02-17 3:53 ` [PATCH] hugetlb: fix CONFIG_CGROUP_HUGETLB ifdefs Stephen Rothwell
2020-02-14 16:49 ` mmotm 2020-02-13-22-26 uploaded (mm/migrate.c, hugetlb_cgroup.h) Randy Dunlap
2020-02-25 3:53 ` mmotm 2020-02-24-19-53 uploaded Andrew Morton
2020-02-25 6:16 ` mmotm 2020-02-24-19-53 uploaded (init/main.c: initrd*) Randy Dunlap
2020-02-25 6:18 ` Randy Dunlap
2020-02-25 6:21 ` Randy Dunlap
2020-02-25 16:41 ` mmotm 2020-02-24-19-53 uploaded (drivers/platform/x86/intel_pmc_core.c) Randy Dunlap
2020-02-25 17:01 ` mmotm 2020-02-24-19-53 uploaded (objtool warning) Randy Dunlap
2020-02-27 21:52 ` Josh Poimboeuf
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=f0fd4a6b-1d4a-8e7d-65c0-a454fbf550a2@infradead.org \
--to=rdunlap@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=almasrymina@google.com \
--cc=gthelen@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=rientjes@google.com \
--cc=shakeelb@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).