lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH bpf-next v2 08/35] bpf: memcg-based memory accounting for lpm_trie maps
    Date
    Include lpm trie and lpm trie node objects into the memcg-based memory
    accounting.

    Signed-off-by: Roman Gushchin <guro@fb.com>
    ---
    kernel/bpf/lpm_trie.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
    index 44474bf3ab7a..d85e0fc2cafc 100644
    --- a/kernel/bpf/lpm_trie.c
    +++ b/kernel/bpf/lpm_trie.c
    @@ -282,7 +282,7 @@ static struct lpm_trie_node *lpm_trie_node_alloc(const struct lpm_trie *trie,
    if (value)
    size += trie->map.value_size;

    - node = kmalloc_node(size, GFP_ATOMIC | __GFP_NOWARN,
    + node = kmalloc_node(size, GFP_ATOMIC | __GFP_NOWARN | __GFP_ACCOUNT,
    trie->map.numa_node);
    if (!node)
    return NULL;
    @@ -557,7 +557,7 @@ static struct bpf_map *trie_alloc(union bpf_attr *attr)
    attr->value_size > LPM_VAL_SIZE_MAX)
    return ERR_PTR(-EINVAL);

    - trie = kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN);
    + trie = kzalloc(sizeof(*trie), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
    if (!trie)
    return ERR_PTR(-ENOMEM);

    --
    2.26.2
    \
     
     \ /
      Last update: 2020-07-27 20:47    [W:4.070 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site