* [PATCH v8 17/21] mm/mmap: Use vms accounted pages in mmap_region()
[not found] <20240830040101.822209-1-Liam.Howlett@oracle.com>
@ 2024-08-30 4:00 ` Liam R. Howlett
0 siblings, 0 replies; only message in thread
From: Liam R. Howlett @ 2024-08-30 4:00 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-mm, linux-kernel, Suren Baghdasaryan, Lorenzo Stoakes,
Matthew Wilcox, Vlastimil Babka, sidhartha.kumar, Bert Karwatzki,
Jiri Olsa, Kees Cook, Paul E . McKenney, Jeff Xu, Liam R. Howlett,
linux-security-module, Paul Moore
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
Change from nr_pages variable to vms.nr_accounted for the charged pages
calculation. This is necessary for a future patch.
This also avoids checking security_vm_enough_memory_mm() if the amount
of memory won't change.
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Kees Cook <kees@kernel.org>
Cc: linux-security-module@vger.kernel.org
Reviewed-by: Kees Cook <kees@kernel.org>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Acked-by: Paul Moore <paul@paul-moore.com> (LSM)
---
mm/mmap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index cd09dd164e85..4faadc54e89d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1414,9 +1414,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
*/
if (accountable_mapping(file, vm_flags)) {
charged = pglen;
- charged -= nr_accounted;
- if (security_vm_enough_memory_mm(mm, charged))
+ charged -= vms.nr_accounted;
+ if (charged && security_vm_enough_memory_mm(mm, charged))
goto abort_munmap;
+
vms.nr_accounted = 0;
vm_flags |= VM_ACCOUNT;
}
--
2.43.0
^ permalink raw reply related [flat|nested] only message in thread