From: Frank van Maarseveen <frankvm@frankvm.com>
To: Hugh Dickins <hugh@veritas.com>
Cc: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fix VmSize and VmData after mremap
Date: Fri, 5 Aug 2005 11:05:06 +0200 [thread overview]
Message-ID: <20050805090506.GA26175@janus> (raw)
In-Reply-To: <Pine.LNX.4.61.0508041902310.6282@goblin.wat.veritas.com>
On Thu, Aug 04, 2005 at 07:05:30PM +0100, Hugh Dickins wrote:
> mremap's move_vma is applying __vm_stat_account to the old vma which may
> have already been freed: move it to just before the do_munmap.
>
> mremapping to and fro with CONFIG_DEBUG_SLAB=y showed /proc/<pid>/status
> VmSize and VmData wrapping just like in kernel bugzilla #4842, and fixed
> by this patch - worth including in 2.6.13, though not yet confirmed that
> it fixes that specific report from Frank van Maarseveen.
The patch works, thanks.
>
> Signed-off-by: Hugh Dickins <hugh@veritas.com>
>
> --- 2.6.13-rc5-git2/mm/mremap.c 2005-06-17 20:48:29.000000000 +0100
> +++ linux/mm/mremap.c 2005-08-03 16:22:33.000000000 +0100
> @@ -229,6 +229,7 @@ static unsigned long move_vma(struct vm_
> * since do_munmap() will decrement it by old_len == new_len
> */
> mm->total_vm += new_len >> PAGE_SHIFT;
> + __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
>
> if (do_munmap(mm, old_addr, old_len) < 0) {
> /* OOM: unable to split vma, just get accounts right */
> @@ -243,7 +244,6 @@ static unsigned long move_vma(struct vm_
> vma->vm_next->vm_flags |= VM_ACCOUNT;
> }
>
> - __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
> if (vm_flags & VM_LOCKED) {
> mm->locked_vm += new_len >> PAGE_SHIFT;
> if (new_len > old_len)
--
Frank
prev parent reply other threads:[~2005-08-05 9:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-04 18:05 [PATCH] fix VmSize and VmData after mremap Hugh Dickins
2005-08-05 9:05 ` Frank van Maarseveen [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=20050805090506.GA26175@janus \
--to=frankvm@frankvm.com \
--cc=akpm@osdl.org \
--cc=hugh@veritas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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