Patch "net: hns: Fix the device being used for dma mapping during TX" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: hns: Fix the device being used for dma mapping during TX
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-hns-fix-the-device-being-used-for-dma-mapping-during-tx.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Jun 15 11:12:23 CEST 2017
From: Kejian Yan <[email protected]>
Date: Tue, 23 May 2017 21:53:41 -0400
Subject: net: hns: Fix the device being used for dma mapping during TX
From: Kejian Yan <[email protected]>
[ Upstream commit b85ea006b6bebb692628f11882af41c3e12e1e09 ]
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.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -304,8 +304,8 @@ int hns_nic_net_xmit_hw(struct net_devic 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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-hns-fix-the-device-being-used-for-dma-mapping-during-tx.patch