| Message ID | 20220124143531.361005-1-toke@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c63003e3d99761afb280add3b30de1cf30fa522b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: cpsw: Properly initialise struct page_pool_params | expand |
Hi Toke, Thanks for looking into this. I'll this patch this evening when I have access to hardware. Colin Foster On Mon, Jan 24, 2022 at 03:35:29PM +0100, Toke Høiland-Jørgensen wrote: > The cpsw driver didn't properly initialise the struct page_pool_params > before calling page_pool_create(), which leads to crashes after the struct > has been expanded with new parameters. > > The second Fixes tag below is where the buggy code was introduced, but > because the code was moved around this patch will only apply on top of the > commit in the first Fixes tag. > > Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") > Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support") > Reported-by: Colin Foster <colin.foster@in-advantage.com> > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> > --- > drivers/net/ethernet/ti/cpsw_priv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c > index ba220593e6db..8f6817f346ba 100644 > --- a/drivers/net/ethernet/ti/cpsw_priv.c > +++ b/drivers/net/ethernet/ti/cpsw_priv.c > @@ -1146,7 +1146,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv) > static struct page_pool *cpsw_create_page_pool(struct cpsw_common *cpsw, > int size) > { > - struct page_pool_params pp_params; > + struct page_pool_params pp_params = {}; > struct page_pool *pool; > > pp_params.order = 0; > -- > 2.34.1 >
On Mon, Jan 24, 2022 at 03:35:29PM +0100, Toke Høiland-Jørgensen wrote: > The cpsw driver didn't properly initialise the struct page_pool_params > before calling page_pool_create(), which leads to crashes after the struct > has been expanded with new parameters. > > The second Fixes tag below is where the buggy code was introduced, but > because the code was moved around this patch will only apply on top of the > commit in the first Fixes tag. > > Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") > Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support") > Reported-by: Colin Foster <colin.foster@in-advantage.com> > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> > --- > drivers/net/ethernet/ti/cpsw_priv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c > index ba220593e6db..8f6817f346ba 100644 > --- a/drivers/net/ethernet/ti/cpsw_priv.c > +++ b/drivers/net/ethernet/ti/cpsw_priv.c > @@ -1146,7 +1146,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv) > static struct page_pool *cpsw_create_page_pool(struct cpsw_common *cpsw, > int size) > { > - struct page_pool_params pp_params; > + struct page_pool_params pp_params = {}; > struct page_pool *pool; > > pp_params.order = 0; > -- > 2.34.1 > Works for me. Thanks Toke! Hopefully my tested by tag addition is done correctly: Tested-by: Colin Foster <colin.foster@in-advantage.com>
On 24/01/2022 15.35, Toke Høiland-Jørgensen wrote: > The cpsw driver didn't properly initialise the struct page_pool_params > before calling page_pool_create(), which leads to crashes after the struct > has been expanded with new parameters. > > The second Fixes tag below is where the buggy code was introduced, but > because the code was moved around this patch will only apply on top of the > commit in the first Fixes tag. > > Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") > Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support") > Reported-by: Colin Foster <colin.foster@in-advantage.com> > Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> > --- Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Colin Foster <colin.foster@in-advantage.com> writes: > On Mon, Jan 24, 2022 at 03:35:29PM +0100, Toke Høiland-Jørgensen wrote: >> The cpsw driver didn't properly initialise the struct page_pool_params >> before calling page_pool_create(), which leads to crashes after the struct >> has been expanded with new parameters. >> >> The second Fixes tag below is where the buggy code was introduced, but >> because the code was moved around this patch will only apply on top of the >> commit in the first Fixes tag. >> >> Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") >> Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support") >> Reported-by: Colin Foster <colin.foster@in-advantage.com> >> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> >> --- >> drivers/net/ethernet/ti/cpsw_priv.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c >> index ba220593e6db..8f6817f346ba 100644 >> --- a/drivers/net/ethernet/ti/cpsw_priv.c >> +++ b/drivers/net/ethernet/ti/cpsw_priv.c >> @@ -1146,7 +1146,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv) >> static struct page_pool *cpsw_create_page_pool(struct cpsw_common *cpsw, >> int size) >> { >> - struct page_pool_params pp_params; >> + struct page_pool_params pp_params = {}; >> struct page_pool *pool; >> >> pp_params.order = 0; >> -- >> 2.34.1 >> > > Works for me. Thanks Toke! Hopefully my tested by tag addition is done > correctly: > > Tested-by: Colin Foster <colin.foster@in-advantage.com> You're welcome! Tag looks good, thanks for testing :) -Toke
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 24 Jan 2022 15:35:29 +0100 you wrote: > The cpsw driver didn't properly initialise the struct page_pool_params > before calling page_pool_create(), which leads to crashes after the struct > has been expanded with new parameters. > > The second Fixes tag below is where the buggy code was introduced, but > because the code was moved around this patch will only apply on top of the > commit in the first Fixes tag. > > [...] Here is the summary with links: - [net] net: cpsw: Properly initialise struct page_pool_params https://git.kernel.org/netdev/net/c/c63003e3d997 You are awesome, thank you!
diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c index ba220593e6db..8f6817f346ba 100644 --- a/drivers/net/ethernet/ti/cpsw_priv.c +++ b/drivers/net/ethernet/ti/cpsw_priv.c @@ -1146,7 +1146,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv) static struct page_pool *cpsw_create_page_pool(struct cpsw_common *cpsw, int size) { - struct page_pool_params pp_params; + struct page_pool_params pp_params = {}; struct page_pool *pool; pp_params.order = 0;
The cpsw driver didn't properly initialise the struct page_pool_params before calling page_pool_create(), which leads to crashes after the struct has been expanded with new parameters. The second Fixes tag below is where the buggy code was introduced, but because the code was moved around this patch will only apply on top of the commit in the first Fixes tag. Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv") Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support") Reported-by: Colin Foster <colin.foster@in-advantage.com> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> --- drivers/net/ethernet/ti/cpsw_priv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)