[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAAywjhQ7ySv_Bu4EFxxYnDL5Di4ur0wbFYyVR0bKP6ggMfdXHg@mail.gmail.com>
Date: Thu, 21 Aug 2025 16:08:44 -0700
From: Samiullah Khawaja <skhawaja@...gle.com>
To: Mina Almasry <almasrymina@...gle.com>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Jesper Dangaard Brouer <hawk@...nel.org>, Ilias Apalodimas <ilias.apalodimas@...aro.org>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>
Subject: Re: [PATCH net v1] page_pool: fix incorrect mp_ops error handling
On Wed, Aug 20, 2025 at 8:03 PM Mina Almasry <almasrymina@...gle.com> wrote:
>
> Minor fix to the memory provider error handling, we should be jumping to
> free_ptr_ring in this error case rather than returning directly.
>
> Found by code-inspection.
>
> Cc: skhawaja@...gle.com
>
> Fixes: b400f4b87430 ("page_pool: Set `dma_sync` to false for devmem memory provider")
> Signed-off-by: Mina Almasry <almasrymina@...gle.com>
>
> ---
> net/core/page_pool.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index 343a6cac21e3..ba70569bd4b0 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -287,8 +287,10 @@ static int page_pool_init(struct page_pool *pool,
> }
>
> if (pool->mp_ops) {
> - if (!pool->dma_map || !pool->dma_sync)
> - return -EOPNOTSUPP;
> + if (!pool->dma_map || !pool->dma_sync) {
> + err = -EOPNOTSUPP;
> + goto free_ptr_ring;
> + }
>
> if (WARN_ON(!is_kernel_rodata((unsigned long)pool->mp_ops))) {
> err = -EFAULT;
>
> base-commit: c42be534547d6e45c155c347dd792b6ad9c24def
> --
> 2.51.0.rc1.193.gad69d77794-goog
>
Reviewed-by: Samiullah Khawaja <skhawaja@...gle.com>
Powered by blists - more mailing lists