1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
index 15bf228d2e98..b0bdc7b040ad 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -364,10 +364,9 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
                 /* make sure page count doesn't overflow */
                 goto free_htab;
 
-        htab->map.memory.pages = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT;
-
-        /* if map size is larger than memlock limit, reject it early */
-        err = bpf_map_precharge_memlock(htab->map.memory.pages);
+        /* if map size is larger than memlock limit, reject it */
+        err = bpf_map_charge_init(&htab->map.memory,
+                                  round_up(cost, PAGE_SIZE) >> PAGE_SHIFT);
         if (err)
                 goto free_htab;
 
@@ -376,7 +375,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
                                            sizeof(struct bucket),
                                            htab->map.numa_node);
         if (!htab->buckets)
-                goto free_htab;
+                goto free_charge;
 
         if (htab->map.map_flags & BPF_F_ZERO_SEED)
                 htab->hashrnd = 0;
@@ -409,6 +408,8 @@ free_prealloc:
         prealloc_destroy(htab);
 free_buckets:
         bpf_map_area_free(htab->buckets);
+free_charge:
+        bpf_map_charge_finish(&htab->map.memory);
 free_htab:
         kfree(htab);
         return ERR_PTR(err);