diff mbox series

[v1,1/2] ethernet: arc: fix the device for dma_map_single/dma_unmap_single

Message ID dcb70a05-2607-47dd-8abd-f6cf1b012c51@gmail.com (mailing list archive)
State New
Headers show
Series [v1,1/2] ethernet: arc: fix the device for dma_map_single/dma_unmap_single | expand

Commit Message

Johan Jonker Oct. 27, 2024, 9:41 a.m. UTC 
The ndev->dev and pdev->dev aren't the same device, use ndev->dev.parent
which has dma_mask, ndev->dev.parent is just pdev->dev.
Or it would cause the following issue:

[   39.933526] ------------[ cut here ]------------
[   39.938414] WARNING: CPU: 1 PID: 501 at kernel/dma/mapping.c:149 dma_map_page_attrs+0x90/0x1f8

Signed-off-by: David Wu <david.wu@rock-chips.com>
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---

Original:
https://github.com/andyshrk/linux/commit/a98b368ca6ae79d227415c34e4ca39934af08a6f

Changed:
Use dev variable
---
 drivers/net/ethernet/arc/emac_main.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

--
2.39.2

Comments

Andrew Lunn Oct. 28, 2024, 1:03 p.m. UTC | #1 
On Sun, Oct 27, 2024 at 10:41:48AM +0100, Johan Jonker wrote:
> The ndev->dev and pdev->dev aren't the same device, use ndev->dev.parent
> which has dma_mask, ndev->dev.parent is just pdev->dev.
> Or it would cause the following issue:
> 
> [   39.933526] ------------[ cut here ]------------
> [   39.938414] WARNING: CPU: 1 PID: 501 at kernel/dma/mapping.c:149 dma_map_page_attrs+0x90/0x1f8
> 
> Signed-off-by: David Wu <david.wu@rock-chips.com>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>

A few process issues:

For a patch set please add a patch 0/X which explains the big picture
of what the patchset does. For a single patch, you don't need one.

Please read:

https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html

It is not clear which tree you intend these patches to be applied
to. This one looks like it should be to net, but needs a Fixes:
tag. The MDIO patch might be for net-next? 

    Andrew

---
pw-bot: cr
Johan Jonker Oct. 29, 2024, 2:53 p.m. UTC | #2 
On 10/28/24 14:03, Andrew Lunn wrote:
> On Sun, Oct 27, 2024 at 10:41:48AM +0100, Johan Jonker wrote:
>> The ndev->dev and pdev->dev aren't the same device, use ndev->dev.parent
>> which has dma_mask, ndev->dev.parent is just pdev->dev.
>> Or it would cause the following issue:
>>
>> [   39.933526] ------------[ cut here ]------------
>> [   39.938414] WARNING: CPU: 1 PID: 501 at kernel/dma/mapping.c:149 dma_map_page_attrs+0x90/0x1f8
>>
>> Signed-off-by: David Wu <david.wu@rock-chips.com>
>> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> 
> A few process issues:
> 
> For a patch set please add a patch 0/X which explains the big picture
> of what the patchset does. For a single patch, you don't need one.
> 
> Please read:
> 
> https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
> 

> It is not clear which tree you intend these patches to be applied
> to. This one looks like it should be to net, but needs a Fixes:
> tag. The MDIO patch might be for net-next? 

Hi Andrew, Andy,

My desktop setup has a problem compiling older kernels for rk3066 MK808 to verify.

Are you able to bisect/compile for rk3036 before this one:

====
commit bc0e610a6eb0d46e4123fafdbe5e6141d9fff3be (HEAD -> test1)
Author: Jianglei Nie <niejianglei2021@163.com>
Date:   Wed Mar 9 20:18:24 2022 +0800

    net: arc_emac: Fix use after free in arc_mdio_probe()

====
This is the oldest EMAC related checkout I can compile.
At that patch it still gives this warnings in the kernel log.

[   16.678988] ------------[ cut here ]------------
[   16.684189] WARNING: CPU: 0 PID: 809 at kernel/dma/mapping.c:151 dma_map_page_attrs+0x2b4/0x358

The driver was maintained on auto pilot recent years without a check by Rockchip users somehow.
Currently I don't know where and when this was introduced.
Please advise how to move forward. Should we just mark it net-next?

Johan

> 
>     Andrew
> 
> ---
> pw-bot: cr
> 
>
Andy Yan Oct. 30, 2024, 12:19 a.m. UTC | #3 
Hi Johan，

At 2024-10-29 22:53:26, "Johan Jonker" <jbx6244@gmail.com> wrote:
>
>
>On 10/28/24 14:03, Andrew Lunn wrote:
>> On Sun, Oct 27, 2024 at 10:41:48AM +0100, Johan Jonker wrote:
>>> The ndev->dev and pdev->dev aren't the same device, use ndev->dev.parent
>>> which has dma_mask, ndev->dev.parent is just pdev->dev.
>>> Or it would cause the following issue:
>>>
>>> [   39.933526] ------------[ cut here ]------------
>>> [   39.938414] WARNING: CPU: 1 PID: 501 at kernel/dma/mapping.c:149 dma_map_page_attrs+0x90/0x1f8
>>>
>>> Signed-off-by: David Wu <david.wu@rock-chips.com>
>>> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
>> 
>> A few process issues:
>> 
>> For a patch set please add a patch 0/X which explains the big picture
>> of what the patchset does. For a single patch, you don't need one.
>> 
>> Please read:
>> 
>> https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
>> 
>
>> It is not clear which tree you intend these patches to be applied
>> to. This one looks like it should be to net, but needs a Fixes:
>> tag. The MDIO patch might be for net-next? 
>
>Hi Andrew, Andy,
>
>My desktop setup has a problem compiling older kernels for rk3066 MK808 to verify.
>
>Are you able to bisect/compile for rk3036 before this one:


 I will try to do it in the following days.


>
>====
>commit bc0e610a6eb0d46e4123fafdbe5e6141d9fff3be (HEAD -> test1)
>Author: Jianglei Nie <niejianglei2021@163.com>
>Date:   Wed Mar 9 20:18:24 2022 +0800
>
>    net: arc_emac: Fix use after free in arc_mdio_probe()
>
>====
>This is the oldest EMAC related checkout I can compile.
>At that patch it still gives this warnings in the kernel log.
>
>[   16.678988] ------------[ cut here ]------------
>[   16.684189] WARNING: CPU: 0 PID: 809 at kernel/dma/mapping.c:151 dma_map_page_attrs+0x2b4/0x358
>
>The driver was maintained on auto pilot recent years without a check by Rockchip users somehow.
>Currently I don't know where and when this was introduced.
>Please advise how to move forward. Should we just mark it net-next?
>
>Johan
>
>> 
>>     Andrew
>> 
>> ---
>> pw-bot: cr
>> 
>> 
>
>_______________________________________________
>Linux-rockchip mailing list
>Linux-rockchip@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff mbox series

Patch

diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index 31ee477dd131..8283aeee35fb 100644
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -111,6 +111,7 @@  static void arc_emac_tx_clean(struct net_device *ndev)
 {
 	struct arc_emac_priv *priv = netdev_priv(ndev);
 	struct net_device_stats *stats = &ndev->stats;
+	struct device *dev = ndev->dev.parent;
 	unsigned int i;

 	for (i = 0; i < TX_BD_NUM; i++) {
@@ -140,7 +141,7 @@  static void arc_emac_tx_clean(struct net_device *ndev)
 			stats->tx_bytes += skb->len;
 		}

-		dma_unmap_single(&ndev->dev, dma_unmap_addr(tx_buff, addr),
+		dma_unmap_single(dev, dma_unmap_addr(tx_buff, addr),
 				 dma_unmap_len(tx_buff, len), DMA_TO_DEVICE);

 		/* return the sk_buff to system */
@@ -174,6 +175,7 @@  static void arc_emac_tx_clean(struct net_device *ndev)
 static int arc_emac_rx(struct net_device *ndev, int budget)
 {
 	struct arc_emac_priv *priv = netdev_priv(ndev);
+	struct device *dev = ndev->dev.parent;
 	unsigned int work_done;

 	for (work_done = 0; work_done < budget; work_done++) {
@@ -223,9 +225,9 @@  static int arc_emac_rx(struct net_device *ndev, int budget)
 			continue;
 		}

-		addr = dma_map_single(&ndev->dev, (void *)skb->data,
+		addr = dma_map_single(dev, (void *)skb->data,
 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
-		if (dma_mapping_error(&ndev->dev, addr)) {
+		if (dma_mapping_error(dev, addr)) {
 			if (net_ratelimit())
 				netdev_err(ndev, "cannot map dma buffer\n");
 			dev_kfree_skb(skb);
@@ -237,7 +239,7 @@  static int arc_emac_rx(struct net_device *ndev, int budget)
 		}

 		/* unmap previosly mapped skb */
-		dma_unmap_single(&ndev->dev, dma_unmap_addr(rx_buff, addr),
+		dma_unmap_single(dev, dma_unmap_addr(rx_buff, addr),
 				 dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE);

 		pktlen = info & LEN_MASK;
@@ -423,6 +425,7 @@  static int arc_emac_open(struct net_device *ndev)
 {
 	struct arc_emac_priv *priv = netdev_priv(ndev);
 	struct phy_device *phy_dev = ndev->phydev;
+	struct device *dev = ndev->dev.parent;
 	int i;

 	phy_dev->autoneg = AUTONEG_ENABLE;
@@ -445,9 +448,9 @@  static int arc_emac_open(struct net_device *ndev)
 		if (unlikely(!rx_buff->skb))
 			return -ENOMEM;

-		addr = dma_map_single(&ndev->dev, (void *)rx_buff->skb->data,
+		addr = dma_map_single(dev, (void *)rx_buff->skb->data,
 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);
-		if (dma_mapping_error(&ndev->dev, addr)) {
+		if (dma_mapping_error(dev, addr)) {
 			netdev_err(ndev, "cannot dma map\n");
 			dev_kfree_skb(rx_buff->skb);
 			return -ENOMEM;
@@ -548,6 +551,7 @@  static void arc_emac_set_rx_mode(struct net_device *ndev)
 static void arc_free_tx_queue(struct net_device *ndev)
 {
 	struct arc_emac_priv *priv = netdev_priv(ndev);
+	struct device *dev = ndev->dev.parent;
 	unsigned int i;

 	for (i = 0; i < TX_BD_NUM; i++) {
@@ -555,7 +559,7 @@  static void arc_free_tx_queue(struct net_device *ndev)
 		struct buffer_state *tx_buff = &priv->tx_buff[i];

 		if (tx_buff->skb) {
-			dma_unmap_single(&ndev->dev,
+			dma_unmap_single(dev,
 					 dma_unmap_addr(tx_buff, addr),
 					 dma_unmap_len(tx_buff, len),
 					 DMA_TO_DEVICE);
@@ -579,6 +583,7 @@  static void arc_free_tx_queue(struct net_device *ndev)
 static void arc_free_rx_queue(struct net_device *ndev)
 {
 	struct arc_emac_priv *priv = netdev_priv(ndev);
+	struct device *dev = ndev->dev.parent;
 	unsigned int i;

 	for (i = 0; i < RX_BD_NUM; i++) {
@@ -586,7 +591,7 @@  static void arc_free_rx_queue(struct net_device *ndev)
 		struct buffer_state *rx_buff = &priv->rx_buff[i];

 		if (rx_buff->skb) {
-			dma_unmap_single(&ndev->dev,
+			dma_unmap_single(dev,
 					 dma_unmap_addr(rx_buff, addr),
 					 dma_unmap_len(rx_buff, len),
 					 DMA_FROM_DEVICE);
@@ -679,6 +684,7 @@  static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
 	unsigned int len, *txbd_curr = &priv->txbd_curr;
 	struct net_device_stats *stats = &ndev->stats;
 	__le32 *info = &priv->txbd[*txbd_curr].info;
+	struct device *dev = ndev->dev.parent;
 	dma_addr_t addr;

 	if (skb_padto(skb, ETH_ZLEN))
@@ -692,10 +698,9 @@  static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
 		return NETDEV_TX_BUSY;
 	}

-	addr = dma_map_single(&ndev->dev, (void *)skb->data, len,
-			      DMA_TO_DEVICE);
+	addr = dma_map_single(dev, (void *)skb->data, len, DMA_TO_DEVICE);

-	if (unlikely(dma_mapping_error(&ndev->dev, addr))) {
+	if (unlikely(dma_mapping_error(dev, addr))) {
 		stats->tx_dropped++;
 		stats->tx_errors++;
 		dev_kfree_skb_any(skb);