Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7179906293ebdc333f14a03d3e58b03604848f3c

Authored by Kirill Korotaev
Committed by Linus Torvalds
1 parent 202d182a92
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] mm acct accounting fix 

This patch fixes mm->total_vm and mm->locked_vm acctounting in case when
move_page_tables() fails inside move_vma().

Signed-Off-By: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

... ... @@ -224,6 +224,12 @@
224 224 split = 1;
225 225 }
226 226  
  227 + /*
  228 + * if we failed to move page tables we still do total_vm increment
  229 + * since do_munmap() will decrement it by old_len == new_len
  230 + */
  231 + mm->total_vm += new_len >> PAGE_SHIFT;
  232 +
227 233 if (do_munmap(mm, old_addr, old_len) < 0) {
228 234 /* OOM: unable to split vma, just get accounts right */
229 235 vm_unacct_memory(excess >> PAGE_SHIFT);
... ... @@ -237,7 +243,6 @@
237 243 vma->vm_next->vm_flags |= VM_ACCOUNT;
238 244 }
239 245  
240   - mm->total_vm += new_len >> PAGE_SHIFT;
241 246 __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
242 247 if (vm_flags & VM_LOCKED) {
243 248 mm->locked_vm += new_len >> PAGE_SHIFT;