Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1577498 > unrolled thread

[PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX

Started bySalil Mehta <salil.mehta@huawei.com>
First post2017-02-09 12:50 +0100
Last post2017-02-10 19:50 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX Salil Mehta <salil.mehta@huawei.com> - 2017-02-09 12:50 +0100
    Re: [PATCH V2 net] net: hns: Fix the device being used for dma  mapping during TX David Miller <davem@davemloft.net> - 2017-02-10 19:50 +0100

#1577498 — [PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX

FromSalil Mehta <salil.mehta@huawei.com>
Date2017-02-09 12:50 +0100
Subject[PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX
Message-ID<t8VoC-5CX-17@gated-at.bofh.it>
From: Kejian Yan <yankejian@huawei.com>

This patch fixes the device being used to DMA map skb->data.
Erroneous device assignment causes the crash when SMMU is enabled.
This happens during TX since buffer gets DMA mapped with device
correspondign to net_device and gets unmapped using the device
related to DSAF.

Signed-off-by: Kejian Yan <yankejian@huawei.com>
Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
Change log:

PATCH V2: Addressed comment given by,
          Yuan Linyu <linyu.yuan@alcatel-sbell.com.cn>

PATCH V1: Initial submit
---
 drivers/net/ethernet/hisilicon/hns/hns_enet.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 672b646..8aed728 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -305,8 +305,8 @@ int hns_nic_net_xmit_hw(struct net_device *ndev,
 			struct hns_nic_ring_data *ring_data)
 {
 	struct hns_nic_priv *priv = netdev_priv(ndev);
-	struct device *dev = priv->dev;
 	struct hnae_ring *ring = ring_data->ring;
+	struct device *dev = ring_to_dev(ring);
 	struct netdev_queue *dev_queue;
 	struct skb_frag_struct *frag;
 	int buf_num;
-- 
1.7.9.5

[toc] | [next] | [standalone]


#1578703 — Re: [PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX

FromDavid Miller <davem@davemloft.net>
Date2017-02-10 19:50 +0100
SubjectRe: [PATCH V2 net] net: hns: Fix the device being used for dma mapping during TX
Message-ID<t9oqB-7bE-7@gated-at.bofh.it>
In reply to#1577498
From: Salil Mehta <salil.mehta@huawei.com>
Date: Thu, 9 Feb 2017 11:46:15 +0000

> From: Kejian Yan <yankejian@huawei.com>
> 
> This patch fixes the device being used to DMA map skb->data.
> Erroneous device assignment causes the crash when SMMU is enabled.
> This happens during TX since buffer gets DMA mapped with device
> correspondign to net_device and gets unmapped using the device
> related to DSAF.
> 
> Signed-off-by: Kejian Yan <yankejian@huawei.com>
> Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
> Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

Applied, thank you.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web