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

Commit 72bded3b authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

netvsc: Deal with rescinded channels correctly 




[ Upstream commit 73e64fa4f417b22d8d5521999a631ced8e2d442e ]

We will not be able to send packets over a channel that has been
rescinded. Make necessary adjustments so we can properly cleanup
even when the channel is rescinded. This issue can be trigerred
in the NIC hot-remove path.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a049986

drivers/net/hyperv/netvsc.c

+16 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ static void netvsc_destroy_buf(struct hv_device *device) 
				       sizeof(struct nvsp_message),

				       (unsigned long)revoke_packet,

				       VM_PKT_DATA_INBAND, 0);

		/* If the failure is because the channel is rescinded;

		 * ignore the failure since we cannot send on a rescinded

		 * channel. This would allow us to properly cleanup

		 * even when the channel is rescinded.

		 */

		if (device->channel->rescind)

			ret = 0;

		/*

		 * If we failed here, we might as well return and

		 * have a leak rather than continue and a bugchk
@@ -211,6 +218,15 @@ static void netvsc_destroy_buf(struct hv_device *device) 
				       sizeof(struct nvsp_message),

				       (unsigned long)revoke_packet,

				       VM_PKT_DATA_INBAND, 0);



		/* If the failure is because the channel is rescinded;

		 * ignore the failure since we cannot send on a rescinded

		 * channel. This would allow us to properly cleanup

		 * even when the channel is rescinded.

		 */

		if (device->channel->rescind)

			ret = 0;



		/* If we failed here, we might as well return and

		 * have a leak rather than continue and a bugchk

		 */