提交 bfcb4c0f 编写于 作者: M Miaohe Lin 提交者: Zheng Zengkai

mm/mmap.c: fix missing call to vm_unacct_memory in mmap_region

stable inclusion
from stable-v5.10.137
commit 4ffa6cecb53d46af8f869cc7a5a376341ebef79f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4ffa6cecb53d46af8f869cc7a5a376341ebef79f

--------------------------------

[ Upstream commit 7f82f922 ]

Since the beginning, charged is set to 0 to avoid calling vm_unacct_memory
twice because vm_unacct_memory will be called by above unmap_region.  But
since commit 4f74d2c8 ("vm: remove 'nr_accounted' calculations from
the unmap_vmas() interfaces"), unmap_region doesn't call vm_unacct_memory
anymore.  So charged shouldn't be set to 0 now otherwise the calling to
paired vm_unacct_memory will be missed and leads to imbalanced account.

Link: https://lkml.kernel.org/r/20220618082027.43391-1-linmiaohe@huawei.com
Fixes: 4f74d2c8 ("vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces")
Signed-off-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 2b110838
...@@ -2159,7 +2159,6 @@ static unsigned long __mmap_region(struct mm_struct *mm, struct file *file, ...@@ -2159,7 +2159,6 @@ static unsigned long __mmap_region(struct mm_struct *mm, struct file *file,
/* Undo any partial mapping done by a device driver. */ /* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
charged = 0;
if (vm_flags & VM_SHARED) if (vm_flags & VM_SHARED)
mapping_unmap_writable(file->f_mapping); mapping_unmap_writable(file->f_mapping);
allow_write_and_free_vma: allow_write_and_free_vma:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册