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

Commit aeb24294 authored by Dexuan Cui's avatar Dexuan Cui Committed by Greg Kroah-Hartman
Browse files

HID: hyperv: Use in-place iterator API in the channel callback 



[ Upstream commit 6a297c90efa68b2864483193b8bfb0d19478600c ]

Simplify the ring buffer handling with the in-place API.

Also avoid the dynamic allocation and the memory leak in the channel
callback function.

Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9c75c230

drivers/hid/hid-hyperv.c

+10 −46
Original line number Diff line number Diff line
@@ -322,31 +322,10 @@ static void mousevsc_on_receive(struct hv_device *device, 


static void mousevsc_on_channel_callback(void *context)

{

	const int packet_size = 0x100;

	int ret;

	struct hv_device *device = context;

	u32 bytes_recvd;

	u64 req_id;

	struct vmpacket_descriptor *desc;

	unsigned char	*buffer;

	int	bufferlen = packet_size;



	buffer = kmalloc(bufferlen, GFP_ATOMIC);

	if (!buffer)

		return;



	do {

		ret = vmbus_recvpacket_raw(device->channel, buffer,

					bufferlen, &bytes_recvd, &req_id);



		switch (ret) {

		case 0:

			if (bytes_recvd <= 0) {

				kfree(buffer);

				return;

			}

			desc = (struct vmpacket_descriptor *)buffer;



	foreach_vmbus_pkt(desc, device->channel) {

		switch (desc->type) {

		case VM_PKT_COMP:

			break;
@@ -356,26 +335,11 @@ static void mousevsc_on_channel_callback(void *context) 
			break;



		default:

				pr_err("unhandled packet type %d, tid %llx len %d\n",

					desc->type, req_id, bytes_recvd);

			pr_err("Unhandled packet type %d, tid %llx len %d\n",

			       desc->type, desc->trans_id, desc->len8 * 8);

			break;

		}



			break;



		case -ENOBUFS:

			kfree(buffer);

			/* Handle large packet */

			bufferlen = bytes_recvd;

			buffer = kmalloc(bytes_recvd, GFP_ATOMIC);



			if (!buffer)

				return;



			break;

	}

	} while (1);



}



static int mousevsc_connect_to_vsp(struct hv_device *device)