1 files changed, 5 insertions, 4 deletions

diff --git a/kernel/bpf/xskmap.c b/kernel/bpf/xskmap.c
index f816ee1a0fa0..a329dab7c7a4 100644
--- a/kernel/bpf/xskmap.c
+++ b/kernel/bpf/xskmap.c
@@ -40,10 +40,9 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *attr)
         if (cost >= U32_MAX - PAGE_SIZE)
                 goto free_m;
 
-        m->map.memory.pages = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT;
-
         /* Notice returns -EPERM on if map size is larger than memlock limit */
-        err = bpf_map_precharge_memlock(m->map.memory.pages);
+        err = bpf_map_charge_init(&m->map.memory,
+                                  round_up(cost, PAGE_SIZE) >> PAGE_SHIFT);
         if (err)
                 goto free_m;
 
@@ -51,7 +50,7 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *attr)
 
         m->flush_list = alloc_percpu(struct list_head);
         if (!m->flush_list)
-                goto free_m;
+                goto free_charge;
 
         for_each_possible_cpu(cpu)
                 INIT_LIST_HEAD(per_cpu_ptr(m->flush_list, cpu));
@@ -65,6 +64,8 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *attr)
 
 free_percpu:
         free_percpu(m->flush_list);
+free_charge:
+        bpf_map_charge_finish(&m->map.memory);
 free_m:
         kfree(m);
         return ERR_PTR(err);