lkml.org 
[lkml]   [2022]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 5.10 136/452] bpf: Fix excessive memory allocation in stack_map_alloc()
    Hi!

    > The 'n_buckets * (value_size + sizeof(struct stack_map_bucket))' part of the
    > allocated memory for 'smap' is never used after the memlock accounting was
    > removed, thus get rid of it.
    >
    > [ Note, Daniel:
    >
    > Commit b936ca643ade ("bpf: rework memlock-based memory accounting for maps")
    > moved `cost += n_buckets * (value_size + sizeof(struct stack_map_bucket))`
    > up and therefore before the bpf_map_area_alloc() allocation, sigh. In a later
    > step commit c85d69135a91 ("bpf: move memory size checks to bpf_map_charge_init()"),
    > and the overflow checks of `cost >= U32_MAX - PAGE_SIZE` moved into
    > bpf_map_charge_init(). And then 370868107bf6 ("bpf: Eliminate rlimit-based
    > memory accounting for stackmap maps") finally removed the bpf_map_charge_init().
    > Anyway, the original code did the allocation same way as /after/ this fix. ]

    We don't have 370868107bf6 in 5.10. Can someone verify this is still
    right think to do for 5.10?

    Best regards,
    Pavel

    > +++ b/kernel/bpf/stackmap.c
    > @@ -121,7 +121,6 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)
    > return ERR_PTR(-E2BIG);
    >
    > cost = n_buckets * sizeof(struct stack_map_bucket *) + sizeof(*smap);
    > - cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));
    > err = bpf_map_charge_init(&mem, cost);
    > if (err)
    > return ERR_PTR(err);

    --
    DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
    HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2022-06-08 13:45    [W:4.137 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site