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

Commit 35fbbccf authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

netvsc: save pointer to parent netvsc_device in channel table 



Keep back pointer in the per-channel data structure to
avoid any possible RCU related issues when napi poll is
called but netvsc_device is in RCU limbo.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a926f79

drivers/net/hyperv/hyperv_net.h

+1 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ struct net_device_context { 
/* Per channel data */

struct netvsc_channel {

	struct vmbus_channel *channel;

	struct netvsc_device *net_device;

	const struct vmpacket_descriptor *desc;

	struct napi_struct napi;

	struct multi_send_data msd;

drivers/net/hyperv/netvsc.c

+2 −1
Original line number Diff line number Diff line
@@ -1224,11 +1224,11 @@ int netvsc_poll(struct napi_struct *napi, int budget) 
{

	struct netvsc_channel *nvchan

		= container_of(napi, struct netvsc_channel, napi);

	struct netvsc_device *net_device = nvchan->net_device;

	struct vmbus_channel *channel = nvchan->channel;

	struct hv_device *device = netvsc_channel_to_device(channel);

	u16 q_idx = channel->offermsg.offer.sub_channel_index;

	struct net_device *ndev = hv_get_drvdata(device);

	struct netvsc_device *net_device = net_device_to_netvsc_device(ndev);

	int work_done = 0;



	/* If starting a new interval */
@@ -1307,6 +1307,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, 
		struct netvsc_channel *nvchan = &net_device->chan_table[i];



		nvchan->channel = device->channel;

		nvchan->net_device = net_device;

	}



	/* Enable NAPI handler before init callbacks */