account_locked_vm() is used to account memory to mm->locked_vm. This
adds accounting to the pins cgorup as it behaves similarly and should
be accounted against the same global limit if set.
This means memory must now be unaccounted for correctly, as the cgroup
typically outlives both the mm and the task. It is assumed that
callers of account_locked_vm() only do accounting against the current
task. Callers that need to do accounting against remote tasks should
use account_pinned_vm() and associated struct vm_account to hold
references to the cgroup.
Signed-off-by: Alistair Popple <apopple@xxxxxxxxxx>
Cc: linux-mm@xxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
mm/util.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/mm/util.c b/mm/util.c
index 78b060d..d6159e3 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -551,15 +551,21 @@ int __account_locked_vm(struct mm_struct *mm, unsigned long pages,
struct task_struct *task, bool bypass_rlim)
{
unsigned long locked_vm, limit;
+ struct pins_cgroup *pins_cg = get_pins_cg(task);
int ret = 0;
mmap_assert_write_locked(mm);
+ if (pins_cg && pins_try_charge(pins_cg, pages))
+ return -ENOMEM;
+
locked_vm = mm->locked_vm;
if (!bypass_rlim) {
limit = task_rlimit(task, RLIMIT_MEMLOCK) >> PAGE_SHIFT;
- if (locked_vm + pages > limit)
+ if (locked_vm + pages > limit) {
+ pins_uncharge(pins_cg, pages);
ret = -ENOMEM;
+ }
}
if (!ret)
@@ -569,6 +575,12 @@ int __account_locked_vm(struct mm_struct *mm, unsigned long pages,
(void *)_RET_IP_, pages << PAGE_SHIFT, locked_vm << PAGE_SHIFT,
task_rlimit(task, RLIMIT_MEMLOCK), ret ? " - exceeded" : "");
+ pr_debug("%s: [%d] caller %ps %lu %lu/%lu%s\n", __func__, task->pid,
+ (void *)_RET_IP_, pages << PAGE_SHIFT, locked_vm << PAGE_SHIFT,
+ task_rlimit(task, RLIMIT_MEMLOCK), ret ? " - exceeded" : "");
+
+ if (pins_cg)
+ put_pins_cg(pins_cg);
return ret;
}
EXPORT_SYMBOL_GPL(__account_locked_vm);
@@ -584,8 +596,18 @@ void __unaccount_locked_vm(struct mm_struct *mm, unsigned long pages)
{
unsigned long locked_vm = mm->locked_vm;
+ /*
+ * TODO: Convert book3s vio to use pinned vm to ensure
+ * unaccounting happens to the correct cgroup.
+ */
+ struct pins_cgroup *pins_cg = get_pins_cg(current);
+
mmap_assert_write_locked(mm);
WARN_ON_ONCE(pages > locked_vm);
+ if (pins_cg) {
+ pins_uncharge(pins_cg, pages);
+ put_pins_cg(pins_cg);
+ }
mm->locked_vm = locked_vm - pages;
}
EXPORT_SYMBOL_GPL(__unaccount_locked_vm);
--
git-series 0.9.1
