From: Andrey Ryabinin <aryabinin@virtuozzo.com>
To: Roman Penyaev <rpenyaev@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Michal Hocko <mhocko@suse.com>, Joe Perches <joe@perches.com>,
"Luis R. Rodriguez" <mcgrof@kernel.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] mm/vmalloc: do not call kmemleak_free() on not yet accounted memory
Date: Fri, 11 Jan 2019 22:26:39 +0300 [thread overview]
Message-ID: <b761b165-9892-0761-cd33-14300e39e36f@virtuozzo.com> (raw)
In-Reply-To: <20190103145954.16942-3-rpenyaev@suse.de>
On 1/3/19 5:59 PM, Roman Penyaev wrote:
> __vmalloc_area_node() calls vfree() on error path, which in turn calls
> kmemleak_free(), but area is not yet accounted by kmemleak_vmalloc().
>
> Signed-off-by: Roman Penyaev <rpenyaev@suse.de>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
> Cc: Joe Perches <joe@perches.com>
> Cc: "Luis R. Rodriguez" <mcgrof@kernel.org>
> Cc: linux-mm@kvack.org
> Cc: linux-kernel@vger.kernel.org
> ---
> mm/vmalloc.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index 2cd24186ba84..dc6a62bca503 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -1565,6 +1565,14 @@ void vfree_atomic(const void *addr)
> __vfree_deferred(addr);
> }
>
> +static void __vfree(const void *addr)
> +{
> + if (unlikely(in_interrupt()))
> + __vfree_deferred(addr);
> + else
> + __vunmap(addr, 1);
> +}
> +
> /**
> * vfree - release memory allocated by vmalloc()
> * @addr: memory base address
> @@ -1591,10 +1599,8 @@ void vfree(const void *addr)
>
> if (!addr)
> return;
> - if (unlikely(in_interrupt()))
> - __vfree_deferred(addr);
> - else
> - __vunmap(addr, 1);
> +
> + __vfree(addr);
> }
> EXPORT_SYMBOL(vfree);
>
> @@ -1709,7 +1715,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
> warn_alloc(gfp_mask, NULL,
> "vmalloc: allocation failure, allocated %ld of %ld bytes",
> (area->nr_pages*PAGE_SIZE), area->size);
> - vfree(area->addr);
> + __vfree(area->addr);
This can't be an interrupt context for a several reasons. One of them is BUG_ON(in_interrupt()) in __get_vm_area_node()
which is called right before __vmalloc_are_node().
So you can just do __vunmap(area->addr, 1); instead of __vfree().
> return NULL;
> }
>
>
next prev parent reply other threads:[~2019-01-11 19:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-03 14:59 [PATCH 0/3] mm/vmalloc: fix size check and few cleanups Roman Penyaev
2019-01-03 14:59 ` [PATCH 1/3] mm/vmalloc: fix size check for remap_vmalloc_range_partial() Roman Penyaev
2019-01-03 15:13 ` Michal Hocko
2019-01-03 19:27 ` Roman Penyaev
2019-01-03 19:40 ` Michal Hocko
2019-01-03 20:31 ` Roman Penyaev
2019-01-04 9:38 ` Michal Hocko
2019-01-04 10:21 ` Roman Penyaev
2019-01-04 10:28 ` Michal Hocko
2019-01-03 19:59 ` Michal Hocko
2019-01-04 11:06 ` Roman Penyaev
2019-01-11 19:19 ` Andrey Ryabinin
2019-01-03 14:59 ` [PATCH 2/3] mm/vmalloc: do not call kmemleak_free() on not yet accounted memory Roman Penyaev
2019-01-11 19:26 ` Andrey Ryabinin [this message]
2019-01-12 17:19 ` Roman Penyaev
2019-01-03 14:59 ` [PATCH 3/3] mm/vmalloc: pass VM_USERMAP flags directly to __vmalloc_node_range() Roman Penyaev
2019-01-03 15:23 ` Michal Hocko
2019-01-11 19:19 ` Andrey Ryabinin
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=b761b165-9892-0761-cd33-14300e39e36f@virtuozzo.com \
--to=aryabinin@virtuozzo.com \
--cc=akpm@linux-foundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcgrof@kernel.org \
--cc=mhocko@suse.com \
--cc=rpenyaev@suse.de \
/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).