Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200727184506.2279656-1-guro@fb.com> <20200727184506.2279656-20-guro@fb.com>
In-Reply-To: <20200727184506.2279656-20-guro@fb.com>
From:   Song Liu <song@kernel.org>
Date:   Mon, 27 Jul 2020 22:32:35 -0700
Message-ID: <CAPhsuW5VxGQfDRVU6hH6xj4qU7p0hpmupvLnpE9fgexdK8D+rQ@mail.gmail.com>
Subject: Re: [PATCH bpf-next v2 19/35] bpf: eliminate rlimit-based memory
 accounting for lpm_trie maps
To:     Roman Gushchin <guro@fb.com>
Cc:     bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Kernel Team <kernel-team@fb.com>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Jul 27, 2020 at 12:25 PM Roman Gushchin <guro@fb.com> wrote:
>
> Do not use rlimit-based memory accounting for lpm_trie maps.
> It has been replaced with the memcg-based memory accounting.
>
> Signed-off-by: Roman Gushchin <guro@fb.com>

Acked-by: Song Liu <songliubraving@fb.com>

> ---
>  kernel/bpf/lpm_trie.c | 13 -------------
>  1 file changed, 13 deletions(-)
>
> diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c
> index d85e0fc2cafc..c747f0835eb1 100644
> --- a/kernel/bpf/lpm_trie.c
> +++ b/kernel/bpf/lpm_trie.c
> @@ -540,8 +540,6 @@ static int trie_delete_elem(struct bpf_map *map, void *_key)
>  static struct bpf_map *trie_alloc(union bpf_attr *attr)
>  {
>         struct lpm_trie *trie;
> -       u64 cost = sizeof(*trie), cost_per_node;
> -       int ret;
>
>         if (!bpf_capable())
>                 return ERR_PTR(-EPERM);
> @@ -567,20 +565,9 @@ static struct bpf_map *trie_alloc(union bpf_attr *attr)
>                           offsetof(struct bpf_lpm_trie_key, data);
>         trie->max_prefixlen = trie->data_size * 8;
>
> -       cost_per_node = sizeof(struct lpm_trie_node) +
> -                       attr->value_size + trie->data_size;
> -       cost += (u64) attr->max_entries * cost_per_node;
> -
> -       ret = bpf_map_charge_init(&trie->map.memory, cost);
> -       if (ret)
> -               goto out_err;
> -
>         spin_lock_init(&trie->lock);
>
>         return &trie->map;
> -out_err:
> -       kfree(trie);
> -       return ERR_PTR(ret);
>  }
>
>  static void trie_free(struct bpf_map *map)
> --
> 2.26.2
>