From: Helge Deller <deller@gmx.de>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
jejb@parisc-linux.org, mpatocka@redhat.com,
kirill.shutemov@linux.intel.com
Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
John David Anglin <dave.anglin@bell.net>,
Meelis Roos <mroos@linux.ee>
Subject: Re: [PATCH] parisc: mm: Fix a memory leak related to pmd not attached to the pgd
Date: Mon, 13 Jul 2015 18:52:37 +0000 [thread overview]
Message-ID: <55A408F5.601@gmx.de> (raw)
In-Reply-To: <1436779963-4286-1-git-send-email-christophe.jaillet@wanadoo.fr>
Hi Christophe,
On 13.07.2015 11:32, Christophe JAILLET wrote:
> Commit 0e0da48dee8d ("parisc: mm: don't count preallocated pmds")
> introduced a memory leak.
>
> After this commit, the 'return' statement in pmd_free is executed in all
> cases. Even for pmd that are not attached to the pgd.
> So 'free_pages' can never be called anymore, leading to a memory leak.
That's really great!!! Thanks for spotting this!
I assume this fixes the leak which killed our debian buildds with OOM
after an uptime of 1-4 days and which only happened since kernel 4.0.
Meelis Roos reported the issue already in this thread:
http://marc.info/?l=linux-parisc&m\x142999113232154&w=2
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Helge Deller <deller@gmx.de>
Will this patch be pushed via linux-mm or another tree, if
not I can take it via the parisc tree?
Helge
> ---
> This patch is *untested* as I don't have the hardware to test it.
>
> This is just a guess based on the indentation, the comment in the code
> and the commit log.
> ---
> arch/parisc/include/asm/pgalloc.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
> index 3a08eae..f66d3738 100644
> --- a/arch/parisc/include/asm/pgalloc.h
> +++ b/arch/parisc/include/asm/pgalloc.h
> @@ -72,7 +72,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
>
> static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
> {
> - if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)
> + if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) {
> /*
> * This is the permanent pmd attached to the pgd;
> * cannot free it.
> @@ -81,6 +81,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
> */
> mm_inc_nr_pmds(mm);
> return;
> + }
> free_pages((unsigned long)pmd, PMD_ORDER);
> }
>
>
WARNING: multiple messages have this Message-ID (diff)
From: Helge Deller <deller@gmx.de>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
jejb@parisc-linux.org, mpatocka@redhat.com,
kirill.shutemov@linux.intel.com
Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
John David Anglin <dave.anglin@bell.net>,
Meelis Roos <mroos@linux.ee>
Subject: Re: [PATCH] parisc: mm: Fix a memory leak related to pmd not attached to the pgd
Date: Mon, 13 Jul 2015 20:52:37 +0200 [thread overview]
Message-ID: <55A408F5.601@gmx.de> (raw)
In-Reply-To: <1436779963-4286-1-git-send-email-christophe.jaillet@wanadoo.fr>
Hi Christophe,
On 13.07.2015 11:32, Christophe JAILLET wrote:
> Commit 0e0da48dee8d ("parisc: mm: don't count preallocated pmds")
> introduced a memory leak.
>
> After this commit, the 'return' statement in pmd_free is executed in all
> cases. Even for pmd that are not attached to the pgd.
> So 'free_pages' can never be called anymore, leading to a memory leak.
That's really great!!! Thanks for spotting this!
I assume this fixes the leak which killed our debian buildds with OOM
after an uptime of 1-4 days and which only happened since kernel 4.0.
Meelis Roos reported the issue already in this thread:
http://marc.info/?l=linux-parisc&m=142999113232154&w=2
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Helge Deller <deller@gmx.de>
Will this patch be pushed via linux-mm or another tree, if
not I can take it via the parisc tree?
Helge
> ---
> This patch is *untested* as I don't have the hardware to test it.
>
> This is just a guess based on the indentation, the comment in the code
> and the commit log.
> ---
> arch/parisc/include/asm/pgalloc.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
> index 3a08eae..f66d3738 100644
> --- a/arch/parisc/include/asm/pgalloc.h
> +++ b/arch/parisc/include/asm/pgalloc.h
> @@ -72,7 +72,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
>
> static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
> {
> - if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)
> + if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) {
> /*
> * This is the permanent pmd attached to the pgd;
> * cannot free it.
> @@ -81,6 +81,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
> */
> mm_inc_nr_pmds(mm);
> return;
> + }
> free_pages((unsigned long)pmd, PMD_ORDER);
> }
>
>
next prev parent reply other threads:[~2015-07-13 18:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 9:32 [PATCH] parisc: mm: Fix a memory leak related to pmd not attached to the pgd Christophe JAILLET
2015-07-13 9:32 ` Christophe JAILLET
2015-07-13 9:46 ` Kirill A. Shutemov
2015-07-13 9:46 ` Kirill A. Shutemov
2015-07-13 12:48 ` Mikulas Patocka
2015-07-13 12:48 ` Mikulas Patocka
2015-07-13 18:52 ` Helge Deller [this message]
2015-07-13 18:52 ` Helge Deller
[not found] ` <55A4095E.4060200@gmx.de>
2015-07-14 11:52 ` John David Anglin
2015-07-14 12:01 ` John David Anglin
2015-07-20 19:28 ` Meelis Roos
2015-07-20 19:28 ` Meelis Roos
2015-07-14 11:09 ` Dan Carpenter
2015-07-14 11:09 ` Dan Carpenter
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=55A408F5.601@gmx.de \
--to=deller@gmx.de \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dave.anglin@bell.net \
--cc=jejb@parisc-linux.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=mroos@linux.ee \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.