| Message ID | 20230812023016.10553-1-liangchen.linux@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8a519a572598b7c0c07b02f69bf5b4e8dd4b2d7d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: veth: Page pool creation error handling for existing pools only | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 12 Aug 2023 10:30:16 +0800 you wrote: > The failure handling procedure destroys page pools for all queues, > including those that haven't had their page pool created yet. this patch > introduces necessary adjustments to prevent potential risks and > inconsistency with the error handling behavior. > > Fixes: 0ebab78cbcbf ("net: veth: add page_pool for page recycling") > Acked-by: Jesper Dangaard Brouer <hawk@kernel.org> > Signed-off-by: Liang Chen <liangchen.linux@gmail.com> > > [...] Here is the summary with links: - [net-next,v2] net: veth: Page pool creation error handling for existing pools only https://git.kernel.org/netdev/net/c/8a519a572598 You are awesome, thank you!
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 614f3e3efab0..509e901da41d 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1081,8 +1081,9 @@ static int __veth_napi_enable_range(struct net_device *dev, int start, int end) err_xdp_ring: for (i--; i >= start; i--) ptr_ring_cleanup(&priv->rq[i].xdp_ring, veth_ptr_free); + i = end; err_page_pool: - for (i = start; i < end; i++) { + for (i--; i >= start; i--) { page_pool_destroy(priv->rq[i].page_pool); priv->rq[i].page_pool = NULL; }
The failure handling procedure destroys page pools for all queues, including those that haven't had their page pool created yet. this patch introduces necessary adjustments to prevent potential risks and inconsistency with the error handling behavior. Fixes: 0ebab78cbcbf ("net: veth: add page_pool for page recycling") Acked-by: Jesper Dangaard Brouer <hawk@kernel.org> Signed-off-by: Liang Chen <liangchen.linux@gmail.com> --- Changes from v1: - add fixes tag --- drivers/net/veth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)