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


Groups > linux.kernel > #1577405

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

From Salil Mehta <salil.mehta@huawei.com>
Newsgroups linux.kernel
Subject [PATCH net] net: hns: Fix the device being used for dma mapping during TX
Date 2017-02-09 10:30 +0100
Message-ID <t8Td8-4n9-3@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
 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..2b52a12 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -305,7 +305,7 @@ 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 device *dev = ring_to_dev(ring_data->ring);
 	struct hnae_ring *ring = ring_data->ring;
 	struct netdev_queue *dev_queue;
 	struct skb_frag_struct *frag;
-- 
1.7.9.5

Back to linux.kernel | Previous | NextNext in thread | Find similar | Unroll thread


Thread

[PATCH net] net: hns: Fix the device being used for dma mapping during TX Salil Mehta <salil.mehta@huawei.com> - 2017-02-09 10:30 +0100
  RE: [PATCH net] net: hns: Fix the device being used for dma mapping  during TX YUAN Linyu <Linyu.Yuan@alcatel-sbell.com.cn> - 2017-02-09 10:40 +0100
    RE: [PATCH net] net: hns: Fix the device being used for dma mapping  during TX Salil Mehta <salil.mehta@huawei.com> - 2017-02-09 10:50 +0100
    RE: [PATCH net] net: hns: Fix the device being used for dma mapping  during TX Salil Mehta <salil.mehta@huawei.com> - 2017-02-09 11:30 +0100
  Re: [PATCH net] net: hns: Fix the device being used for dma mapping  during TX "Lino Sanfilippo" <LinoSanfilippo@gmx.de> - 2017-02-09 11:30 +0100
    RE: [PATCH net] net: hns: Fix the device being used for dma mapping  during TX Salil Mehta <salil.mehta@huawei.com> - 2017-02-09 12:40 +0100
      Aw: RE: [PATCH net] net: hns: Fix the device being used for dma  mapping during TX "Lino Sanfilippo" <LinoSanfilippo@gmx.de> - 2017-02-10 14:20 +0100

csiph-web