From: Alistair Popple <apopple@nvidia.com> To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jgg@nvidia.com, jhubbard@nvidia.com, tjmercier@google.com, hannes@cmpxchg.org, surenb@google.com, mkoutny@suse.com, daniel@ffwll.ch, Alistair Popple <apopple@nvidia.com> Subject: [RFC PATCH 15/19] mm/util: Extend vm_account to charge pages against the pin cgroup Date: Tue, 24 Jan 2023 16:42:44 +1100 [thread overview] Message-ID: <76d61af0219560c03910a189f1ffa340d108858e.1674538665.git-series.apopple@nvidia.com> (raw) In-Reply-To: <cover.f52b9eb2792bccb8a9ecd6bc95055705cfe2ae03.1674538665.git-series.apopple@nvidia.com> The vm_account_pinned() functions currently only account pages against pinned_vm/locked_vm and enforce limits against RLIMIT_MEMLOCK. Extend these to account pages and enforce limits using the pin count cgroup. Accounting of pages will fail if either RLIMIT_MEMLOCK or the cgroup limit is exceeded. Unlike rlimit enforcement which can be bypassed if the user has CAP_IPC_LOCK cgroup limits can not be bypassed. Signed-off-by: Alistair Popple <apopple@nvidia.com> Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org --- include/linux/mm_types.h | 1 + mm/util.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 7de2168..4adf8dc 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1116,6 +1116,7 @@ struct vm_account { struct mm_struct *mm; struct user_struct *user; } a; + struct pins_cgroup *pins_cg; enum vm_account_flags flags; }; diff --git a/mm/util.c b/mm/util.c index af40b1e..e5fb01a 100644 --- a/mm/util.c +++ b/mm/util.c @@ -442,6 +442,7 @@ void vm_account_init(struct vm_account *vm_account, struct task_struct *task, vm_account->a.mm = task->mm; } + vm_account->pins_cg = get_pins_cg(task); vm_account->flags = flags; } EXPORT_SYMBOL_GPL(vm_account_init); @@ -459,6 +460,7 @@ void vm_account_release(struct vm_account *vm_account) free_uid(vm_account->a.user); else mmdrop(vm_account->a.mm); + put_pins_cg(vm_account->pins_cg); } EXPORT_SYMBOL_GPL(vm_account_release); @@ -489,6 +491,15 @@ static int vm_account_cmpxchg(struct vm_account *vm_account, } } +static void vm_unaccount_legacy(struct vm_account *vm_account, + unsigned long npages) +{ + if (vm_account->flags & VM_ACCOUNT_USER) + atomic_long_sub(npages, &vm_account->a.user->locked_vm); + else + atomic64_sub(npages, &vm_account->a.mm->pinned_vm); +} + int vm_account_pinned(struct vm_account *vm_account, unsigned long npages) { unsigned long lock_limit = RLIM_INFINITY; @@ -506,16 +517,19 @@ int vm_account_pinned(struct vm_account *vm_account, unsigned long npages) return ret; } + if (pins_try_charge(vm_account->pins_cg, npages)) { + vm_unaccount_legacy(vm_account, npages); + return -ENOMEM; + } + return 0; } EXPORT_SYMBOL_GPL(vm_account_pinned); void vm_unaccount_pinned(struct vm_account *vm_account, unsigned long npages) { - if (vm_account->flags & VM_ACCOUNT_USER) - atomic_long_sub(npages, &vm_account->a.user->locked_vm); - else - atomic64_sub(npages, &vm_account->a.mm->pinned_vm); + vm_unaccount_legacy(vm_account, npages); + pins_uncharge(vm_account->pins_cg, npages); } EXPORT_SYMBOL_GPL(vm_unaccount_pinned); -- git-series 0.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Alistair Popple <apopple-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> To: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jgg-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, jhubbard-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, tjmercier-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org, surenb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, mkoutny-IBi9RG/b67k@public.gmane.org, daniel-/w4YWyX8dFk@public.gmane.org, Alistair Popple <apopple-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Subject: [RFC PATCH 15/19] mm/util: Extend vm_account to charge pages against the pin cgroup Date: Tue, 24 Jan 2023 16:42:44 +1100 [thread overview] Message-ID: <76d61af0219560c03910a189f1ffa340d108858e.1674538665.git-series.apopple@nvidia.com> (raw) In-Reply-To: <cover.f52b9eb2792bccb8a9ecd6bc95055705cfe2ae03.1674538665.git-series.apopple-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> The vm_account_pinned() functions currently only account pages against pinned_vm/locked_vm and enforce limits against RLIMIT_MEMLOCK. Extend these to account pages and enforce limits using the pin count cgroup. Accounting of pages will fail if either RLIMIT_MEMLOCK or the cgroup limit is exceeded. Unlike rlimit enforcement which can be bypassed if the user has CAP_IPC_LOCK cgroup limits can not be bypassed. Signed-off-by: Alistair Popple <apopple-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org --- include/linux/mm_types.h | 1 + mm/util.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 7de2168..4adf8dc 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1116,6 +1116,7 @@ struct vm_account { struct mm_struct *mm; struct user_struct *user; } a; + struct pins_cgroup *pins_cg; enum vm_account_flags flags; }; diff --git a/mm/util.c b/mm/util.c index af40b1e..e5fb01a 100644 --- a/mm/util.c +++ b/mm/util.c @@ -442,6 +442,7 @@ void vm_account_init(struct vm_account *vm_account, struct task_struct *task, vm_account->a.mm = task->mm; } + vm_account->pins_cg = get_pins_cg(task); vm_account->flags = flags; } EXPORT_SYMBOL_GPL(vm_account_init); @@ -459,6 +460,7 @@ void vm_account_release(struct vm_account *vm_account) free_uid(vm_account->a.user); else mmdrop(vm_account->a.mm); + put_pins_cg(vm_account->pins_cg); } EXPORT_SYMBOL_GPL(vm_account_release); @@ -489,6 +491,15 @@ static int vm_account_cmpxchg(struct vm_account *vm_account, } } +static void vm_unaccount_legacy(struct vm_account *vm_account, + unsigned long npages) +{ + if (vm_account->flags & VM_ACCOUNT_USER) + atomic_long_sub(npages, &vm_account->a.user->locked_vm); + else + atomic64_sub(npages, &vm_account->a.mm->pinned_vm); +} + int vm_account_pinned(struct vm_account *vm_account, unsigned long npages) { unsigned long lock_limit = RLIM_INFINITY; @@ -506,16 +517,19 @@ int vm_account_pinned(struct vm_account *vm_account, unsigned long npages) return ret; } + if (pins_try_charge(vm_account->pins_cg, npages)) { + vm_unaccount_legacy(vm_account, npages); + return -ENOMEM; + } + return 0; } EXPORT_SYMBOL_GPL(vm_account_pinned); void vm_unaccount_pinned(struct vm_account *vm_account, unsigned long npages) { - if (vm_account->flags & VM_ACCOUNT_USER) - atomic_long_sub(npages, &vm_account->a.user->locked_vm); - else - atomic64_sub(npages, &vm_account->a.mm->pinned_vm); + vm_unaccount_legacy(vm_account, npages); + pins_uncharge(vm_account->pins_cg, npages); } EXPORT_SYMBOL_GPL(vm_unaccount_pinned); -- git-series 0.9.1
next prev parent reply other threads:[~2023-01-24 5:50 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-24 5:42 [RFC PATCH 00/19] mm: Introduce a cgroup to limit the amount of locked and pinned memory Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 01/19] mm: Introduce vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 6:29 ` Christoph Hellwig 2023-01-24 6:29 ` Christoph Hellwig 2023-01-24 6:29 ` Christoph Hellwig 2023-01-24 14:32 ` Jason Gunthorpe 2023-01-24 14:32 ` Jason Gunthorpe 2023-01-30 11:36 ` Alistair Popple 2023-01-30 11:36 ` Alistair Popple 2023-01-31 14:00 ` David Hildenbrand 2023-01-31 14:00 ` David Hildenbrand 2023-01-31 14:00 ` David Hildenbrand 2023-01-24 5:42 ` [RFC PATCH 02/19] drivers/vhost: Convert to use vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:55 ` Michael S. Tsirkin 2023-01-24 5:55 ` Michael S. Tsirkin 2023-01-24 5:55 ` Michael S. Tsirkin 2023-01-30 10:43 ` Alistair Popple 2023-01-30 10:43 ` Alistair Popple 2023-01-24 14:34 ` Jason Gunthorpe 2023-01-24 5:42 ` [RFC PATCH 03/19] drivers/vdpa: Convert vdpa to use the new vm_structure Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 14:35 ` Jason Gunthorpe 2023-01-24 14:35 ` Jason Gunthorpe 2023-01-24 5:42 ` [RFC PATCH 04/19] infiniband/umem: Convert to use vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 05/19] RMDA/siw: " Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 14:37 ` Jason Gunthorpe 2023-01-24 15:22 ` Bernard Metzler 2023-01-24 15:22 ` Bernard Metzler 2023-01-24 15:56 ` Bernard Metzler 2023-01-24 15:56 ` Bernard Metzler 2023-01-30 11:34 ` Alistair Popple 2023-01-30 11:34 ` Alistair Popple 2023-01-30 13:27 ` Bernard Metzler 2023-01-24 5:42 ` [RFC PATCH 06/19] RDMA/usnic: convert " Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 14:41 ` Jason Gunthorpe 2023-01-24 14:41 ` Jason Gunthorpe 2023-01-30 11:10 ` Alistair Popple 2023-01-30 11:10 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 07/19] vfio/type1: Charge pinned pages to pinned_vm instead of locked_vm Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 08/19] vfio/spapr_tce: Convert accounting to pinned_vm Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 09/19] io_uring: convert to use vm_account Alistair Popple 2023-01-24 14:44 ` Jason Gunthorpe 2023-01-30 11:12 ` Alistair Popple 2023-01-30 11:12 ` Alistair Popple 2023-01-30 13:21 ` Jason Gunthorpe 2023-01-24 5:42 ` [RFC PATCH 10/19] net: skb: Switch to using vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 14:51 ` Jason Gunthorpe 2023-01-24 14:51 ` Jason Gunthorpe 2023-01-30 11:17 ` Alistair Popple 2023-02-06 4:36 ` Alistair Popple 2023-02-06 4:36 ` Alistair Popple 2023-02-06 13:14 ` Jason Gunthorpe 2023-02-06 13:14 ` Jason Gunthorpe 2023-01-24 5:42 ` [RFC PATCH 11/19] xdp: convert to use vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 12/19] kvm/book3s_64_vio: Convert account_locked_vm() to vm_account_pinned() Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 13/19] fpga: dfl: afu: convert to use vm_account Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 14/19] mm: Introduce a cgroup for pinned memory Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 8:20 ` kernel test robot 2023-01-24 15:00 ` kernel test robot 2023-01-24 15:41 ` kernel test robot 2023-01-27 21:44 ` Tejun Heo 2023-01-27 21:44 ` Tejun Heo 2023-01-30 13:20 ` Jason Gunthorpe 2023-01-30 13:20 ` Jason Gunthorpe 2023-01-24 5:42 ` Alistair Popple [this message] 2023-01-24 5:42 ` [RFC PATCH 15/19] mm/util: Extend vm_account to charge pages against the pin cgroup Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 16/19] mm/util: Refactor account_locked_vm Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 9:52 ` kernel test robot 2023-01-24 5:42 ` [RFC PATCH 17/19] mm: Convert mmap and mlock to use account_locked_vm Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 18/19] mm/mmap: Charge locked memory to pins cgroup Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 5:42 ` [RFC PATCH 19/19] selftests/vm: Add pins-cgroup selftest for mlock/mmap Alistair Popple 2023-01-24 5:42 ` Alistair Popple 2023-01-24 18:26 ` [RFC PATCH 00/19] mm: Introduce a cgroup to limit the amount of locked and pinned memory Yosry Ahmed 2023-01-24 18:26 ` Yosry Ahmed 2023-01-31 0:54 ` Alistair Popple 2023-01-31 0:54 ` Alistair Popple 2023-01-31 5:14 ` Yosry Ahmed 2023-01-31 5:14 ` Yosry Ahmed 2023-01-31 11:22 ` Alistair Popple 2023-01-31 11:22 ` Alistair Popple 2023-01-31 19:49 ` Yosry Ahmed 2023-01-31 19:49 ` Yosry Ahmed 2023-01-24 20:12 ` Jason Gunthorpe 2023-01-24 20:12 ` Jason Gunthorpe 2023-01-31 13:57 ` David Hildenbrand 2023-01-31 14:03 ` Jason Gunthorpe 2023-01-31 14:03 ` Jason Gunthorpe 2023-01-31 14:06 ` David Hildenbrand 2023-01-31 14:10 ` Jason Gunthorpe 2023-01-31 14:10 ` Jason Gunthorpe 2023-01-31 14:15 ` David Hildenbrand 2023-01-31 14:15 ` David Hildenbrand 2023-01-31 14:21 ` Jason Gunthorpe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=76d61af0219560c03910a189f1ffa340d108858e.1674538665.git-series.apopple@nvidia.com \ --to=apopple@nvidia.com \ --cc=cgroups@vger.kernel.org \ --cc=daniel@ffwll.ch \ --cc=hannes@cmpxchg.org \ --cc=jgg@nvidia.com \ --cc=jhubbard@nvidia.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mkoutny@suse.com \ --cc=surenb@google.com \ --cc=tjmercier@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.