Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 16 Jun 2022 15:09:24 +0200
From:   Greg KH <gregkh@linuxfoundation.org>
To:     Yuntao Wang <ytcoode@gmail.com>
Cc:     daniel@iogearbox.net, linux-kernel@vger.kernel.org, pavel@denx.de,
        sashal@kernel.org, stable@vger.kernel.org, ast@kernel.org,
        andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
        john.fastabend@gmail.com, kpsingh@kernel.org, bpf@vger.kernel.org
Subject: Re: [PATCH] bpf: Fix incorrect memory charge cost calculation in
 stack_map_alloc()
Message-ID: <YqsrhAgihc0EjzIC@kroah.com>
References: <YqbunqapIFiIVqOb@kroah.com>
 <20220614142622.998611-1-ytcoode@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220614142622.998611-1-ytcoode@gmail.com>
Precedence: bulk

On Tue, Jun 14, 2022 at 10:26:22PM +0800, Yuntao Wang wrote:
> commit b45043192b3e481304062938a6561da2ceea46a6 upstream.
> 
> This is a backport of the original upstream patch for 5.4/5.10.
> 
> The original upstream patch has been applied to 5.4/5.10 branches, which
> simply removed the line:
> 
>   cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));
> 
> This is correct for upstream branch but incorrect for 5.4/5.10 branches,
> as the 5.4/5.10 branches do not have the commit 370868107bf6 ("bpf:
> Eliminate rlimit-based memory accounting for stackmap maps"), so the
> bpf_map_charge_init() function has not been removed.
> 
> Currently the bpf_map_charge_init() function in 5.4/5.10 branches takes a
> wrong memory charge cost, the
> 
>   attr->max_entries * (sizeof(struct stack_map_bucket) + (u64)value_size))
> 
> part is missing, let's fix it.
> 
> Cc: <stable@vger.kernel.org> # 5.4.y
> Cc: <stable@vger.kernel.org> # 5.10.y
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> Note that the original upstream patch is currently applied to
> linux-stable-rc/linux-5.4.y branch, not linux/linux-5.4.y, this patch
> depends on that patch.

Now queued up, thanks.

greg k-h