Unverified Commit b7d644ed authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11675 【OLK 6.6】net: hns3: some bugfixes for hns3 driver 

Merge Pull Request from: @chen-hao418 
 
    driver inclusion
    category: bugfix
    bugzilla: https://gitee.com/openeuler/kernel/issues/IASZI4
    CVE: NA

    Yonglong Liu:
    net: hns3: delete redundant enabling actions for Layer 2 fowarding

    Peiyang Wang:
    net: hns3: use correct release function during uninitialization
    net: hns3: void array out of bound when loop tnl_num
    net: hns3: don't add the len of vlan head if skb_vlan_pop failed
    net: hns3: default enable tx bounce buffer when smmu enabled

    Jian Shen:
    net: hns3: add sync command to sync io-pgtable

    Jie Wang:
    net: hns3: fix a deadlock problem when config TC during resetting

    Hao Lan:
    net: hns3: fix missing features due to dev->features configuration too early
    net: hns3: fixed reset failure issues caused by the incorrect reset type
    net: hns3: Resolved the issue that the debugfs query result is inconsistent. 
 
Link:https://gitee.com/openeuler/kernel/pulls/11675

 

Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 981db208 233f4df4

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+3 −1
Original line number Diff line number Diff line
@@ -1293,8 +1293,10 @@ static ssize_t hns3_dbg_read(struct file *filp, char __user *buffer, 


		/* save the buffer addr until the last read operation */

		*save_buf = read_buf;

	}



	/* get data ready for the first time to read */

	if (!*ppos) {

		ret = hns3_dbg_read_cmd(dbg_data, hns3_dbg_cmd[index].cmd,

					read_buf, hns3_dbg_cmd[index].buf_len);

		if (ret)

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+58 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/irq.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/iommu.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/skbuff.h>
@@ -388,6 +389,24 @@ static const struct hns3_rx_ptype hns3_rx_ptype_tbl[] = { 
#define HNS3_INVALID_PTYPE \

		ARRAY_SIZE(hns3_rx_ptype_tbl)



static void hns3_dma_map_sync(struct device *dev, unsigned long iova)

{

	struct iommu_domain *domain = iommu_get_domain_for_dev(dev);

	struct iommu_iotlb_gather iotlb_gather;

	size_t granule;



	if (!domain || domain->type != IOMMU_DOMAIN_DMA)

		return;



	granule = 1 << __ffs(domain->pgsize_bitmap);

	iova = ALIGN_DOWN(iova, granule);

	iotlb_gather.start = iova;

	iotlb_gather.end = iova + granule - 1;

	iotlb_gather.pgsize = granule;



	iommu_iotlb_sync(domain, &iotlb_gather);

}



static irqreturn_t hns3_irq_handle(int irq, void *vector)

{

	struct hns3_enet_tqp_vector *tqp_vector = vector;
@@ -1040,6 +1059,8 @@ static bool hns3_can_use_tx_sgl(struct hns3_enet_ring *ring, 
static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring)

{

	u32 alloc_size = ring->tqp->handle->kinfo.tx_spare_buf_size;

	struct net_device *netdev = ring_to_netdev(ring);

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hns3_tx_spare *tx_spare;

	struct page *page;

	dma_addr_t dma;
@@ -1081,6 +1102,7 @@ static void hns3_init_tx_spare_buffer(struct hns3_enet_ring *ring) 
	tx_spare->buf = page_address(page);

	tx_spare->len = PAGE_SIZE << order;

	ring->tx_spare = tx_spare;

	ring->tx_copybreak = priv->tx_copybreak;

	return;



dma_mapping_error:
@@ -1962,7 +1984,9 @@ static int hns3_map_and_fill_desc(struct hns3_enet_ring *ring, void *priv, 
				  unsigned int type)

{

	struct hns3_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];

	struct hnae3_handle *handle = ring->tqp->handle;

	struct device *dev = ring_to_dev(ring);

	struct hnae3_ae_dev *ae_dev;

	unsigned int size;

	dma_addr_t dma;
@@ -1994,6 +2018,13 @@ static int hns3_map_and_fill_desc(struct hns3_enet_ring *ring, void *priv, 
		return -ENOMEM;

	}



	/* Add a SYNC command to sync io-pgtale to avoid errors in pgtable

	 * prefetch

	 */

	ae_dev = hns3_get_ae_dev(handle);

	if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)

		hns3_dma_map_sync(dev, dma);



	desc_cb->priv = priv;

	desc_cb->length = size;

	desc_cb->dma = dma;
@@ -2700,7 +2731,6 @@ static int hns3_nic_set_features(struct net_device *netdev, 
			return ret;

	}



	netdev->features = features;

	return 0;

}
@@ -5122,6 +5152,30 @@ static void hns3_nic_dealloc_vector_data(struct hns3_nic_priv *priv) 
	devm_kfree(&pdev->dev, priv->tqp_vector);

}



static void hns3_update_tx_spare_buf_config(struct hns3_nic_priv *priv)

{

#define HNS3_MIN_SPARE_BUF_SIZE (2 * 1024 * 1024)

#define HNS3_MAX_PACKET_SIZE (64 * 1024)



	struct iommu_domain *domain = iommu_get_domain_for_dev(priv->dev);

	struct hnae3_ae_dev *ae_dev = hns3_get_ae_dev(priv->ae_handle);

	struct hnae3_handle *handle = priv->ae_handle;



	if (ae_dev->dev_version < HNAE3_DEVICE_VERSION_V3)

		return;



	if (!(domain && domain->type == IOMMU_DOMAIN_DMA))

		return;



	priv->min_tx_copybreak = HNS3_MAX_PACKET_SIZE;

	priv->min_tx_spare_buf_size = HNS3_MIN_SPARE_BUF_SIZE;



	if (priv->tx_copybreak < priv->min_tx_copybreak)

		priv->tx_copybreak = priv->min_tx_copybreak;

	if (handle->kinfo.tx_spare_buf_size < priv->min_tx_spare_buf_size)

		handle->kinfo.tx_spare_buf_size = priv->min_tx_spare_buf_size;

}



static void hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv,

			      unsigned int ring_type)

{
@@ -5361,6 +5415,7 @@ int hns3_init_all_ring(struct hns3_nic_priv *priv) 
	int i, j;

	int ret;



	hns3_update_tx_spare_buf_config(priv);

	for (i = 0; i < ring_num; i++) {

		ret = hns3_alloc_ring_memory(&priv->ring[i]);

		if (ret) {
@@ -5575,6 +5630,8 @@ static int hns3_client_init(struct hnae3_handle *handle) 
	priv->ae_handle = handle;

	priv->tx_timeout_count = 0;

	priv->max_non_tso_bd_num = ae_dev->dev_specs.max_non_tso_bd_num;

	priv->min_tx_copybreak = 0;

	priv->min_tx_spare_buf_size = 0;

	set_bit(HNS3_NIC_STATE_DOWN, &priv->state);

	eth_zero_addr(priv->roh_perm_mac);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+2 −0
Original line number Diff line number Diff line
@@ -620,6 +620,8 @@ struct hns3_nic_priv { 
	struct hns3_enet_coalesce rx_coal;

	u32 tx_copybreak;

	u32 rx_copybreak;

	u32 min_tx_copybreak;

	u32 min_tx_spare_buf_size;

	u8 roh_perm_mac[ETH_ALEN];

};

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+33 −0
Original line number Diff line number Diff line
@@ -1991,6 +1991,31 @@ static int hns3_set_tx_spare_buf_size(struct net_device *netdev, 
	return ret;

}



static int hns3_check_tx_copybreak(struct net_device *netdev, u32 copybreak)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	if (copybreak < priv->min_tx_copybreak) {

		netdev_err(netdev, "tx copybreak %u should be no less than %u!\n",

			   copybreak, priv->min_tx_copybreak);

		return -EINVAL;

	}

	return 0;

}



static int hns3_check_tx_spare_buf_size(struct net_device *netdev, u32 buf_size)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	if (buf_size < priv->min_tx_spare_buf_size) {

		netdev_err(netdev,

			   "tx spare buf size %u should be no less than %u!\n",

			   buf_size, priv->min_tx_spare_buf_size);

		return -EINVAL;

	}

	return 0;

}



static int hns3_set_tunable(struct net_device *netdev,

			    const struct ethtool_tunable *tuna,

			    const void *data)
@@ -2007,6 +2032,10 @@ static int hns3_set_tunable(struct net_device *netdev, 


	switch (tuna->id) {

	case ETHTOOL_TX_COPYBREAK:

		ret = hns3_check_tx_copybreak(netdev, *(u32 *)data);

		if (ret)

			return ret;



		priv->tx_copybreak = *(u32 *)data;



		for (i = 0; i < h->kinfo.num_tqps; i++)
@@ -2021,6 +2050,10 @@ static int hns3_set_tunable(struct net_device *netdev, 


		break;

	case ETHTOOL_TX_COPYBREAK_BUF_SIZE:

		ret = hns3_check_tx_spare_buf_size(netdev, *(u32 *)data);

		if (ret)

			return ret;



		old_tx_spare_buf_size = h->kinfo.tx_spare_buf_size;

		new_tx_spare_buf_size = *(u32 *)data;

		netdev_info(netdev, "request to set tx spare buf size from %u to %u\n",

drivers/net/ethernet/hisilicon/hns3/hns3_roh.c

+9 −2
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ int hns3_handle_roh_arp_req(struct sk_buff *skb, struct hns3_nic_priv *priv) 
	if (skb_vlan_tagged(skb)) {

		ring->arp_reply[reply_idx].has_vlan = true;

		ring->arp_reply[reply_idx].vlan_tci = skb_vlan_tag_get(skb);

		skb_vlan_pop(skb);

		if (likely(!skb_vlan_pop(skb)))

			len += VLAN_HLEN;

		else

			goto err_vlan_head;

	} else {

		ring->arp_reply[reply_idx].has_vlan = false;

	}
@@ -108,6 +110,11 @@ int hns3_handle_roh_arp_req(struct sk_buff *skb, struct hns3_nic_priv *priv) 
	dev_kfree_skb_any(skb);

	napi_schedule(&ring->tqp_vector->napi);

	return NETDEV_TX_OK;



err_vlan_head:

	hns3_ring_stats_update(ring, tx_vlan_err);

	dev_kfree_skb_any(skb);

	return NETDEV_TX_OK;

}



static struct sk_buff *setup_arp_reply_skb(struct hns3_arp_reply *arp_reply,