Commit 353e7af4 authored by Roman Gushchin's avatar Roman Gushchin Committed by Alexei Starovoitov
Browse files

bpf: Memcg-based memory accounting for lpm_trie maps 



Include lpm trie and lpm trie node objects into the memcg-based memory
accounting.

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-14-guro@fb.com
parent 88145681

kernel/bpf/lpm_trie.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = bpf_map_kmalloc_node(&trie->map, size, GFP_ATOMIC | __GFP_NOWARN,

				    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);