2020-07-27 19:24:48

by Roman Gushchin

Subject: [PATCH bpf-next v2 12/35] bpf: refine memcg-based memory accounting for xskmap maps

Extend xskmap memory accounting to include the memory taken by
the xsk_map_node structure.

Signed-off-by: Roman Gushchin <[email protected]>
---
net/xdp/xskmap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c
index 8367adbbe9df..e574b22defe5 100644
--- a/net/xdp/xskmap.c
+++ b/net/xdp/xskmap.c
@@ -28,7 +28,8 @@ static struct xsk_map_node *xsk_map_node_alloc(struct xsk_map *map,
struct xsk_map_node *node;
int err;

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

--
2.26.2

2020-07-28 00:02:11

by Song Liu

Subject: Re: [PATCH bpf-next v2 12/35] bpf: refine memcg-based memory accounting for xskmap maps

On Mon, Jul 27, 2020 at 12:25 PM Roman Gushchin <[email protected]> wrote:
>
> Extend xskmap memory accounting to include the memory taken by
> the xsk_map_node structure.
>
> Signed-off-by: Roman Gushchin <[email protected]>

Acked-by: Song Liu <[email protected]>

> ---
> net/xdp/xskmap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c
> index 8367adbbe9df..e574b22defe5 100644
> --- a/net/xdp/xskmap.c
> +++ b/net/xdp/xskmap.c
> @@ -28,7 +28,8 @@ static struct xsk_map_node *xsk_map_node_alloc(struct xsk_map *map,
> struct xsk_map_node *node;
> int err;
>
> - node = kzalloc(sizeof(*node), GFP_ATOMIC | __GFP_NOWARN);
> + node = kzalloc(sizeof(*node),
> + GFP_ATOMIC | __GFP_NOWARN | __GFP_ACCOUNT);
> if (!node)
> return ERR_PTR(-ENOMEM);
>
> --
> 2.26.2
>