Re: [PATCH v2] net: korina: fix kfree of rx/tx descriptor array

[Jakub Kicinski]

On Sun, 11 Oct 2020 18:53:31 -0400 Willem de Bruijn wrote:
> On Sun, Oct 11, 2020 at 6:04 PM Valentin Vidic wrote:
> > kmalloc returns KSEG0 addresses so convert back from KSEG1
> > in kfree. Also make sure array is freed when the driver is
> > unloaded from the kernel.
> >
> > Fixes: ef11291bcd5f ("Add support the Korina (IDT RC32434) Ethernet MAC")
> > Signed-off-by: Valentin Vidic   
> 
> Ah, this a MIPS architecture feature, both KSEGs mapping the same
> region, just cachable vs non-cachable.
> 
> Acked-by: Willem de Bruijn 

Applied, thank you!

Re: [PATCH v2] net: korina: fix kfree of rx/tx descriptor array

[Willem de Bruijn]

On Sun, Oct 11, 2020 at 6:04 PM Valentin Vidic
 wrote:
>
> kmalloc returns KSEG0 addresses so convert back from KSEG1
> in kfree. Also make sure array is freed when the driver is
> unloaded from the kernel.
>
> Fixes: ef11291bcd5f ("Add support the Korina (IDT RC32434) Ethernet MAC")
> Signed-off-by: Valentin Vidic 

Ah, this a MIPS architecture feature, both KSEGs mapping the same
region, just cachable vs non-cachable.

Acked-by: Willem de Bruijn 


> ---
>  v2: convert kfree address back to KSEG0
>
>  drivers/net/ethernet/korina.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
> index 03e034918d14..af441d699a57 100644
> --- a/drivers/net/ethernet/korina.c
> +++ b/drivers/net/ethernet/korina.c
> @@ -1113,7 +1113,7 @@ static int korina_probe(struct platform_device *pdev)
> return rc;
>
>  probe_err_register:
> -   kfree(lp->td_ring);
> +   kfree(KSEG0ADDR(lp->td_ring));
>  probe_err_td_ring:
> iounmap(lp->tx_dma_regs);
>  probe_err_dma_tx:
> @@ -1133,6 +1133,7 @@ static int korina_remove(struct platform_device *pdev)
> iounmap(lp->eth_regs);
> iounmap(lp->rx_dma_regs);
> iounmap(lp->tx_dma_regs);
> +   kfree(KSEG0ADDR(lp->td_ring));
>
> unregister_netdev(bif->dev);
> free_netdev(bif->dev);
> --
> 2.20.1
>

[PATCH v2] net: korina: fix kfree of rx/tx descriptor array

[Valentin Vidic]

kmalloc returns KSEG0 addresses so convert back from KSEG1
in kfree. Also make sure array is freed when the driver is
unloaded from the kernel.

Fixes: ef11291bcd5f ("Add support the Korina (IDT RC32434) Ethernet MAC")
Signed-off-by: Valentin Vidic 
---
 v2: convert kfree address back to KSEG0

 drivers/net/ethernet/korina.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 03e034918d14..af441d699a57 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1113,7 +1113,7 @@ static int korina_probe(struct platform_device *pdev)
return rc;
 
 probe_err_register:
-   kfree(lp->td_ring);
+   kfree(KSEG0ADDR(lp->td_ring));
 probe_err_td_ring:
iounmap(lp->tx_dma_regs);
 probe_err_dma_tx:
@@ -1133,6 +1133,7 @@ static int korina_remove(struct platform_device *pdev)
iounmap(lp->eth_regs);
iounmap(lp->rx_dma_regs);
iounmap(lp->tx_dma_regs);
+   kfree(KSEG0ADDR(lp->td_ring));
 
unregister_netdev(bif->dev);
free_netdev(bif->dev);
-- 
2.20.1