[<prev] [next>] [day] [month] [year] [list]
Message-Id: <f3b11743f170f4750efa58eba61843563a4b7926.1675669136.git-series.apopple@nvidia.com>
Date: Mon, 6 Feb 2023 18:47:48 +1100
From: Alistair Popple <apopple@...dia.com>
To: linux-mm@...ck.org, cgroups@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, jgg@...dia.com, jhubbard@...dia.com,
tjmercier@...gle.com, hannes@...xchg.org, surenb@...gle.com,
mkoutny@...e.com, daniel@...ll.ch,
"Daniel P . Berrange" <berrange@...hat.com>,
Alex Williamson <alex.williamson@...hat.com>,
Alistair Popple <apopple@...dia.com>,
Björn Töpel <bjorn@...nel.org>,
Magnus Karlsson <magnus.karlsson@...el.com>,
Maciej Fijalkowski <maciej.fijalkowski@...el.com>,
Jonathan Lemon <jonathan.lemon@...il.com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>,
netdev@...r.kernel.org, bpf@...r.kernel.org
Subject: [PATCH 11/19] xdp: convert to use vm_account
Switch to using the new vm_account struct to charge pinned pages and
enforce the rlimit. This will allow a future change to also charge a
cgroup for limiting the number of pinned pages.
Signed-off-by: Alistair Popple <apopple@...dia.com>
Cc: "Björn Töpel" <bjorn@...nel.org>
Cc: Magnus Karlsson <magnus.karlsson@...el.com>
Cc: Maciej Fijalkowski <maciej.fijalkowski@...el.com>
Cc: Jonathan Lemon <jonathan.lemon@...il.com>
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Daniel Borkmann <daniel@...earbox.net>
Cc: Jesper Dangaard Brouer <hawk@...nel.org>
Cc: John Fastabend <john.fastabend@...il.com>
Cc: netdev@...r.kernel.org
Cc: bpf@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
---
include/net/xdp_sock.h | 3 ++-
net/xdp/xdp_umem.c | 38 +++++++++++++-------------------------
2 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 3057e1a..9a21054 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -12,6 +12,7 @@
#include <linux/mutex.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
+#include <linux/vm_account.h>
#include <net/sock.h>
struct net_device;
@@ -25,7 +26,7 @@ struct xdp_umem {
u32 chunk_size;
u32 chunks;
u32 npgs;
- struct user_struct *user;
+ struct vm_account vm_account;
refcount_t users;
u8 flags;
bool zc;
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 4681e8e..4b5fb2f 100644
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -29,12 +29,10 @@ static void xdp_umem_unpin_pages(struct xdp_umem *umem)
umem->pgs = NULL;
}
-static void xdp_umem_unaccount_pages(struct xdp_umem *umem)
+static void xdp_umem_unaccount_pages(struct xdp_umem *umem, u32 npgs)
{
- if (umem->user) {
- atomic_long_sub(umem->npgs, &umem->user->locked_vm);
- free_uid(umem->user);
- }
+ vm_unaccount_pinned(&umem->vm_account, npgs);
+ vm_account_release(&umem->vm_account);
}
static void xdp_umem_addr_unmap(struct xdp_umem *umem)
@@ -54,13 +52,15 @@ static int xdp_umem_addr_map(struct xdp_umem *umem, struct page **pages,
static void xdp_umem_release(struct xdp_umem *umem)
{
+ u32 npgs = umem->npgs;
+
umem->zc = false;
ida_free(&umem_ida, umem->id);
xdp_umem_addr_unmap(umem);
xdp_umem_unpin_pages(umem);
- xdp_umem_unaccount_pages(umem);
+ xdp_umem_unaccount_pages(umem, npgs);
kfree(umem);
}
@@ -127,24 +127,13 @@ static int xdp_umem_pin_pages(struct xdp_umem *umem, unsigned long address)
static int xdp_umem_account_pages(struct xdp_umem *umem)
{
- unsigned long lock_limit, new_npgs, old_npgs;
-
- if (capable(CAP_IPC_LOCK))
- return 0;
-
- lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
- umem->user = get_uid(current_user());
+ vm_account_init(&umem->vm_account, current,
+ current_user(), VM_ACCOUNT_USER);
+ if (vm_account_pinned(&umem->vm_account, umem->npgs)) {
+ vm_account_release(&umem->vm_account);
+ return -ENOBUFS;
+ }
- do {
- old_npgs = atomic_long_read(&umem->user->locked_vm);
- new_npgs = old_npgs + umem->npgs;
- if (new_npgs > lock_limit) {
- free_uid(umem->user);
- umem->user = NULL;
- return -ENOBUFS;
- }
- } while (atomic_long_cmpxchg(&umem->user->locked_vm, old_npgs,
- new_npgs) != old_npgs);
return 0;
}
@@ -204,7 +193,6 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
umem->chunks = chunks;
umem->npgs = (u32)npgs;
umem->pgs = NULL;
- umem->user = NULL;
umem->flags = mr->flags;
INIT_LIST_HEAD(&umem->xsk_dma_list);
@@ -227,7 +215,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
out_unpin:
xdp_umem_unpin_pages(umem);
out_account:
- xdp_umem_unaccount_pages(umem);
+ xdp_umem_unaccount_pages(umem, npgs);
return err;
}
--
git-series 0.9.1
Powered by blists - more mailing lists