Skip to contentSkip to conversation

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

PATCH Applied Dexuan Cui 3 participants 4 messages Aug 20, 2019 – Sep 5, 2019

Subsystems (3)
lore
Share & tools
lore

Dexuan Cui

author maintainer
#0 lore raw

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

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

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

---

Hi Jiri, Benjamin, can this patch go through Sasha's hyperv tree:
https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

This is a purely Hyper-V specific change.

 drivers/hid/hid-hyperv.c | 56 +++++++++---------------------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)
drivers/hid/hid-hyperv.c +10 -46
index 7795831..f363163 100644
@@ -314,60 +314,24 @@ 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;
-
-			switch (desc->type) {
-			case VM_PKT_COMP:
-				break;
-
-			case VM_PKT_DATA_INBAND:
-				mousevsc_on_receive(device, desc);
-				break;
-
-			default:
-				pr_err("unhandled packet type %d, tid %llx len %d\n",
-					desc->type, req_id, bytes_recvd);
-				break;
-			}
 
+	foreach_vmbus_pkt(desc, device->channel) {
+		switch (desc->type) {
+		case VM_PKT_COMP:
 			break;
 
-		case -ENOBUFS:
-			kfree(buffer);
-			/* Handle large packet */
-			bufferlen = bytes_recvd;
-			buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
-
-			if (!buffer)
-				return;
+		case VM_PKT_DATA_INBAND:
+			mousevsc_on_receive(device, desc);
+			break;
 
+		default:
+			pr_err("Unhandled packet type %d, tid %llx len %d\n",
+			       desc->type, desc->trans_id, desc->len8 * 8);
 			break;
 		}
-	} while (1);
-
+	}
 }
 
 static int mousevsc_connect_to_vsp(struct hv_device *device)
Signature · 1 line
1.8.3.1
author maintainer
#1 lore raw
Quoted 18 lines

-----Original Message-----
From: Dexuan Cui <[email protected]>
Sent: Monday, August 19, 2019 7:57 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; Stephen Hemminger <[email protected]>; Sasha Levin <[email protected]>; [email protected]; Haiyang Zhang <[email protected]>; KY Srinivasan <[email protected]>; Michael Kelley <[email protected]>
Cc: [email protected]; [email protected]; Dexuan Cui <[email protected]>
Subject: [PATCH] HID: hyperv: Use in-place iterator API in the channel callback

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

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

Quoted 7 lines

---

Hi Jiri, Benjamin, can this patch go through Sasha's hyperv tree:
https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

This is a purely Hyper-V specific change.

Hi Jiri, Benjamin,
Are you OK if this patch for the Hyper-V HID driver goes through the Hyper-V tree maintained by Sasha Levin? It's a purely Hyper-V change, and I have been using the patch for several months and there is no regression.

Thanks,
-- Dexuan

maintainer Acked-by
#2 lore raw
Quoted 9 lines · Dexuan Cui
Quoted 4 lines

Hi Jiri, Benjamin, can this patch go through Sasha's hyperv tree:
https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

This is a purely Hyper-V specific change.

Hi Jiri, Benjamin,
Are you OK if this patch for the Hyper-V HID driver goes through the Hyper-V tree maintained by Sasha Levin? It's a purely Hyper-V change, and I have been using the patch for several months and there is no regression.

No problem with that. Feel free to add

in that case.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
Applied
#3 lore raw
Quoted 12 lines · Jiri Kosina
Quoted 9 lines · Dexuan Cui
Quoted 4 lines

Hi Jiri, Benjamin, can this patch go through Sasha's hyperv tree:
https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

This is a purely Hyper-V specific change.

Hi Jiri, Benjamin,
Are you OK if this patch for the Hyper-V HID driver goes through the Hyper-V tree maintained by Sasha Levin? It's a purely Hyper-V change, and I have been using the patch for several months and there is no regression.

Quoted 5 lines

No problem with that. Feel free to add

in that case.

I've queued it up for hyperv-fixes, thank you!

--
Thanks,
Sasha