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

!11154 xen/netfront: destroy queues before real_num_tx_queues is zeroed 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3MSTLMP5U7DL3OI36ITF4EFMNP2OOUED/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALPSX 
 
Link:https://gitee.com/openeuler/kernel/pulls/11154

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 9b147854 c570972e

drivers/net/xen-netfront.c

+23 −16
Original line number Diff line number Diff line
@@ -801,6 +801,28 @@ static int xennet_close(struct net_device *dev) 
	return 0;

}



static void xennet_destroy_queues(struct netfront_info *info)

{

	unsigned int i;



	for (i = 0; i < info->netdev->real_num_tx_queues; i++) {

		struct netfront_queue *queue = &info->queues[i];



		if (netif_running(info->netdev))

			napi_disable(&queue->napi);

		netif_napi_del(&queue->napi);

	}



	kfree(info->queues);

	info->queues = NULL;

}



static void xennet_uninit(struct net_device *dev)

{

	struct netfront_info *np = netdev_priv(dev);

	xennet_destroy_queues(np);

}



static void xennet_set_rx_rsp_cons(struct netfront_queue *queue, RING_IDX val)

{

	unsigned long flags;
@@ -1421,6 +1443,7 @@ static void xennet_poll_controller(struct net_device *dev) 
#endif



static const struct net_device_ops xennet_netdev_ops = {

	.ndo_uninit          = xennet_uninit,

	.ndo_open            = xennet_open,

	.ndo_stop            = xennet_close,

	.ndo_start_xmit      = xennet_start_xmit,
@@ -1910,22 +1933,6 @@ static int write_queue_xenstore_keys(struct netfront_queue *queue, 
	return err;

}



static void xennet_destroy_queues(struct netfront_info *info)

{

	unsigned int i;



	for (i = 0; i < info->netdev->real_num_tx_queues; i++) {

		struct netfront_queue *queue = &info->queues[i];



		if (netif_running(info->netdev))

			napi_disable(&queue->napi);

		netif_napi_del(&queue->napi);

	}



	kfree(info->queues);

	info->queues = NULL;

}



static int xennet_create_queues(struct netfront_info *info,

				unsigned int *num_queues)

{