Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9dd668 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: modify enet reinitialization interface 



hns3_reset_notify_init_enet and hns3_reset_notify_uninit_enet are the
reinitialization interface that will be called when the device reset,
the number of TC changed, or the queue length changed. So these two
function should call hns3_get_ring_config() and hns3_put_ring_config()
to allocate and free memory for the ring with the correct number.

Also this patch fixes a double free problem when
hns3_reset_notify_uninit_enet calling hns3_nic_dealloc_vector_data

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51a5365c

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -3185,6 +3185,9 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv) 
	for (i = 0; i < priv->vector_num; i++) {

	for (i = 0; i < priv->vector_num; i++) {

		tqp_vector = &priv->tqp_vector[i];

		tqp_vector = &priv->tqp_vector[i];





		if (!tqp_vector->rx_group.ring && !tqp_vector->tx_group.ring)

			continue;



		ret = hns3_get_vector_ring_chain(tqp_vector,

		ret = hns3_get_vector_ring_chain(tqp_vector,

						 &vector_ring_chain);

						 &vector_ring_chain);

		if (ret)

		if (ret)
@@ -3238,6 +3241,7 @@ static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv, 
{

{

	struct hns3_nic_ring_data *ring_data = priv->ring_data;

	struct hns3_nic_ring_data *ring_data = priv->ring_data;

	int queue_num = priv->ae_handle->kinfo.num_tqps;

	int queue_num = priv->ae_handle->kinfo.num_tqps;

	int desc_num = priv->ae_handle->kinfo.num_desc;

	struct pci_dev *pdev = priv->ae_handle->pdev;

	struct pci_dev *pdev = priv->ae_handle->pdev;

	struct hns3_enet_ring *ring;

	struct hns3_enet_ring *ring;
@@ -3263,7 +3267,7 @@ static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv, 
	ring->dev = priv->dev;

	ring->dev = priv->dev;

	ring->desc_dma_addr = 0;

	ring->desc_dma_addr = 0;

	ring->buf_size = q->buf_size;

	ring->buf_size = q->buf_size;

	ring->desc_num = q->desc_num;

	ring->desc_num = desc_num;

	ring->next_to_use = 0;

	ring->next_to_use = 0;

	ring->next_to_clean = 0;

	ring->next_to_clean = 0;
@@ -4045,10 +4049,14 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	/* Carrier off reporting is important to ethtool even BEFORE open */

	/* Carrier off reporting is important to ethtool even BEFORE open */

	netif_carrier_off(netdev);

	netif_carrier_off(netdev);





	ret = hns3_nic_alloc_vector_data(priv);

	ret = hns3_get_ring_config(priv);

	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = hns3_nic_alloc_vector_data(priv);

	if (ret)

		goto err_put_ring;



	hns3_restore_coal(priv);

	hns3_restore_coal(priv);





	ret = hns3_nic_init_vector_data(priv);

	ret = hns3_nic_init_vector_data(priv);
@@ -4068,6 +4076,9 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	priv->ring_data = NULL;

	priv->ring_data = NULL;

err_dealloc_vector:

err_dealloc_vector:

	hns3_nic_dealloc_vector_data(priv);

	hns3_nic_dealloc_vector_data(priv);

err_put_ring:

	hns3_put_ring_config(priv);

	priv->ring_data = NULL;





	return ret;

	return ret;

}

}
@@ -4101,6 +4112,9 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle) 
	if (ret)

	if (ret)

		netdev_err(netdev, "uninit ring error\n");

		netdev_err(netdev, "uninit ring error\n");





	hns3_put_ring_config(priv);

	priv->ring_data = NULL;



	clear_bit(HNS3_NIC_STATE_INITED, &priv->state);

	clear_bit(HNS3_NIC_STATE_INITED, &priv->state);





	return ret;

	return ret;