lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 05/34] bpf: memcg-based memory accounting for bpf progs
    Date
    Include memory used by bpf programs into the memcg-based accounting.
    This includes the memory used by programs itself, auxiliary data,
    statistics and bpf line info. A memory cgroup containing the
    process which loads the program is getting charged.

    Signed-off-by: Roman Gushchin <guro@fb.com>
    Acked-by: Song Liu <songliubraving@fb.com>
    ---
    kernel/bpf/core.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
    index 55454d2278b1..fd83e5c65d15 100644
    --- a/kernel/bpf/core.c
    +++ b/kernel/bpf/core.c
    @@ -77,7 +77,7 @@ void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, uns

    struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flags)
    {
    - gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
    + gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
    struct bpf_prog_aux *aux;
    struct bpf_prog *fp;

    @@ -86,7 +86,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag
    if (fp == NULL)
    return NULL;

    - aux = kzalloc(sizeof(*aux), GFP_KERNEL | gfp_extra_flags);
    + aux = kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT | gfp_extra_flags);
    if (aux == NULL) {
    vfree(fp);
    return NULL;
    @@ -106,7 +106,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag

    struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags)
    {
    - gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
    + gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
    struct bpf_prog *prog;
    int cpu;

    @@ -138,7 +138,7 @@ int bpf_prog_alloc_jited_linfo(struct bpf_prog *prog)

    prog->aux->jited_linfo = kcalloc(prog->aux->nr_linfo,
    sizeof(*prog->aux->jited_linfo),
    - GFP_KERNEL | __GFP_NOWARN);
    + GFP_KERNEL_ACCOUNT | __GFP_NOWARN);
    if (!prog->aux->jited_linfo)
    return -ENOMEM;

    @@ -219,7 +219,7 @@ void bpf_prog_free_linfo(struct bpf_prog *prog)
    struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,
    gfp_t gfp_extra_flags)
    {
    - gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | gfp_extra_flags;
    + gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags;
    struct bpf_prog *fp;
    u32 pages, delta;
    int ret;
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-11-17 03:56    [W:6.951 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site