diff options
| author | Miaohe Lin <linmiaohe@huawei.com> | 2022-06-18 16:20:27 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-25 11:11:23 +0200 |
| commit | 06a6d6c51e791b89f1024a8b5fb696b16f4c5187 (patch) | |
| tree | d3e4a300ef7a5908def2b79feb27824ea6363ddd /mm | |
| parent | 58410698a7444c20b5449b1b413090e0c3079a31 (diff) | |
| download | linux-rt-06a6d6c51e791b89f1024a8b5fb696b16f4c5187.tar.gz | |
mm/mmap.c: fix missing call to vm_unacct_memory in mmap_region
[ Upstream commit 7f82f922319ede486540e8746769865b9508d2c2 ]
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 4f74d2c8e827 ("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: 4f74d2c8e827 ("vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 64d1d133af79..a29d5b1fa1a1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1778,7 +1778,6 @@ unmap_and_free_vma: /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); - charged = 0; if (vm_flags & VM_SHARED) mapping_unmap_writable(file->f_mapping); allow_write_and_free_vma: |