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
Message-Id: <76d61af0219560c03910a189f1ffa340d108858e.1674538665.git-series.apopple@nvidia.com>
In-Reply-To: <cover.f52b9eb2792bccb8a9ecd6bc95055705cfe2ae03.1674538665.git-series.apopple@nvidia.com>
References: <cover.f52b9eb2792bccb8a9ecd6bc95055705cfe2ae03.1674538665.git-series.apopple@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5SXMR27HWV1PyxQSabaLithcZT6h1UUawtSIZjMAIM3jWe6xlsJ9J9Lhd9sY?=
 =?us-ascii?Q?Ej9opYw9IoYPQi5fLmQg0nu6zMSoqJd1Tg2WTz9mrTaHsPFFfhsmNW+wK6x6?=
 =?us-ascii?Q?rOEB/7mliJyqV9YJDReSBujc7AVBe66USJysbGf2m4bnrwj1y8NoYFsU9/L+?=
 =?us-ascii?Q?Gm0JrdvClR2b+geovaKY/ICNifR3M/Ufj3cU08kG9jZ2iGQdSodqoF6sCjbR?=
 =?us-ascii?Q?H7cYNq+9ov8FbEgKifnY8ZqeLuv+V8893i2RswH/ojQQHYA2GZ+ALbHpaFPS?=
 =?us-ascii?Q?qS8+mYGoFjHDfoHRPk6xdUOK7kq13buhgw0iv9ueNM2/oC0Z01nBM0C5M8c+?=
 =?us-ascii?Q?URl5KzfrC7LkCcWRR/KHbcnGqdOBaHRznGQ+MBRu7/YFIW6AEKVMSSwxDbJs?=
 =?us-ascii?Q?7Xb3pULaFcRek+DFHWeii6p6G6gXgoQUiZ85owtZoEyqB66VWEuHbU5cFbM0?=
 =?us-ascii?Q?GCBKx6MzB5+9CR2ZVcfy2Iee6I/fwwUQlg3RfWQ2k6bAUUUrGC0Bw06HNGDA?=
 =?us-ascii?Q?jBQv5ptUTin26QyPiG4uiL0Wp5d3DHc4WIfHyDBPkDl5gBKBrUymDjETJhSj?=
 =?us-ascii?Q?9wNHqtn5s2MBNCGf0Tn6OClbBmizMOxAwuwHeM7ZpRLHSxD8iDv8krAOqZm7?=
 =?us-ascii?Q?txNdfvrReJdVL1UhoFNj61W8YQwfaWqp2GQRc1MtlycteaOB9SOKIBD2V9NJ?=
 =?us-ascii?Q?KQYK2mssX8RKgLUZFMmWxnJ/BJgsR3EzxDi0jCb3kJ/f950akaIJ6arXbM1N?=
 =?us-ascii?Q?WQCUMgzOckwMqsod1n5UuACdlJ/bBgsH1qL6EmQLqMyMH4VKA0Bvp6jUQjdD?=
 =?us-ascii?Q?p5GcnpUYT/trHe6f4PWnwPoAkukxjpFLBCwh33yjTfxdSsBH3zvD9V9Ffb0+?=
 =?us-ascii?Q?Ds/nVaSSt0bQC89jD8fI3zEttKoo+RcN7ZwjQyeLLUcMuZSmfR51v+goMJBE?=
 =?us-ascii?Q?zdwAw+UTeWkcNxnwWomrAvnKWmG6/7Mz8gxVFqPJx7+JEfz7hfW0O0QRphaJ?=
 =?us-ascii?Q?GorxB/+9R8d97OgiAofHV3mRyDFZ+b8jWI5UNo5m9VtdFB8mYUL14ugdDYYW?=
 =?us-ascii?Q?MzieTxeGqzigk894I5bCKHXur8t2BtJvn6s+9FEnNBMdzYBHlbmQ6rIISK96?=
 =?us-ascii?Q?rclotekefodEzt0zbecxcA5Bc5Mt0WG9VazL3QnA0UR7oEXKQL1rq3mss2HV?=
 =?us-ascii?Q?YWQNFRaq5pjFVq9YAp+ga3gfSytpDH7LF6WI3rw9pXZMCd2EK5h8uI0DW34Z?=
 =?us-ascii?Q?cNkhXb9geWK9xozY8iD2HO8zfwb4AGPbxG3XXN3TOqT/oSykiZh/nDAIOHNZ?=
 =?us-ascii?Q?2H0enszIQEKggYko2gtq/DIL+GAfnarYszbjjuYq3HIO3i2Qy2KW8Xyy3lvK?=
 =?us-ascii?Q?SF6B43DzP0Tli6aZmooRU+gpzWec5GiUKMPvW1BPd3HYlssCPq3l9o+vevIc?=
 =?us-ascii?Q?0zqFvy1QGbFUbuaAzX6MrxWsh0tuM2suHs86zAqtZsy3TMgY315EIgRI5qHY?=
 =?us-ascii?Q?kw/goUmj0aEnfoyjbx97gSwU9IyFITFp7csQgUOwCRG/f9lX7QyMTUPLzVDr?=
 =?us-ascii?Q?OhJB9c08Cs4qG6tf9q5axVzsLV1JJsqJviZzMveL?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 921cc3e1-df6a-4199-5a56-08dafdce9594
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 05:48:14.2683
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ociP2uGxEjGDegyYimdwoiteg4BG2tUPDOEZoQkTvDngSvjkWfUbs3CGjoDzboeYOuCZ6BdQtam3fDnPuzITiQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7793
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.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@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