Skip to contentSkip to conversation

staging: android: vsoc: Remove VSOC_WAIT_FOR_INCOMING_INTERRUPT

PATCH In review Souptick Joarder 4 participants 9 messages Feb 11, 2019 – Feb 12, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: android: vsoc: Remove VSOC_WAIT_FOR_INCOMING_INTERRUPT

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)
drivers/staging/android/uapi/vsoc_shm.h +0 -7
index 6291fb2..69090cc 100644
@@ -232,13 +232,6 @@ struct vsoc_shm_layout_descriptor {
 #define VSOC_MAYBE_SEND_INTERRUPT_TO_HOST _IO(0xF5, 2)
 
 /*
- * When this returns the guest will scan host_to_guest_signal_table to
- * check for new futexes to wake.
- */
-/* TODO(ghartman): Consider moving this to the bottom half */
-#define VSOC_WAIT_FOR_INCOMING_INTERRUPT _IO(0xF5, 3)
-
-/*
  * Guest HALs will use this to retrieve the region description after
  * opening their device node.
  */
drivers/staging/android/vsoc.c +0 -5
index 22571ab..a842ff7 100644
@@ -592,11 +592,6 @@ static long vsoc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	case VSOC_SEND_INTERRUPT_TO_HOST:
 		writel(reg_num, vsoc_dev.regs + DOORBELL);
 		return 0;
-	case VSOC_WAIT_FOR_INCOMING_INTERRUPT:
-		wait_event_interruptible
-			(reg_data->interrupt_wait_queue,
-			 (atomic_read(reg_data->incoming_signalled) != 0));
-		break;
 
 	case VSOC_DESCRIBE_REGION:
 		return do_vsoc_describe_region
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

thanks,

greg k-h

#2 lore raw
Quoted 6 lines · Greg KH
Quoted 4 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

Quoted 8 lines
Quoted 5 lines
---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

I am not sure about user space part.

maintainer
#3 lore raw
Quoted 13 lines · Souptick Joarder
Quoted 12 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)
Quoted 4 lines
Quoted 2 lines

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

I am not sure about user space part.

Then we can not just delete the ioctl :)

#4 lore raw
Quoted 15 lines · Greg KH
Quoted 13 lines · Souptick Joarder
Quoted 12 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

I am not sure about user space part.

Then we can not just delete the ioctl :)

Agree, but where to verify the user space commit ? Any pointer to the source code path ?

maintainer
#5 lore raw
Quoted 19 lines · Souptick Joarder
Quoted 18 lines · Greg KH
Quoted 16 lines · Souptick Joarder
Quoted 14 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

I am not sure about user space part.

Then we can not just delete the ioctl :)

Agree, but where to verify the user space commit ? Any pointer to the source code path ?

Please work with the android developers to solve this. It should be in AOSP "somewhere" :(

good luck,

greg k-h

#6 lore raw

+Alistair Strachan

Quoted 34 lines · Greg KH
Quoted 19 lines · Souptick Joarder
Quoted 18 lines · Greg KH
Quoted 16 lines · Souptick Joarder
Quoted 14 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

I am not sure about user space part.

Then we can not just delete the ioctl :)

Agree, but where to verify the user space commit ? Any pointer to the source code path ?

Please work with the android developers to solve this. It should be in AOSP "somewhere" :(

good luck,

greg k-h

#7 lore raw
Quoted 24 lines · Todd Kjos

+Alistair Strachan

Quoted 20 lines · Greg KH
Quoted 18 lines · Souptick Joarder
Quoted 17 lines · Greg KH
Quoted 15 lines · Souptick Joarder
Quoted 14 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

The ioctl is still being used and cannot be removed.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

I am not sure about user space part.

Then we can not just delete the ioctl :)

Agree, but where to verify the user space commit ? Any pointer to the source code path ?

The userspace code using the Linux 'vsoc' staging driver can be cloned from here:

https://android.googlesource.com/device/google/cuttlefish_common

Quoted 3 lines
Quoted 3 lines

Please work with the android developers to solve this. It should be in AOSP "somewhere" :(

I'm working on documenting this better on source.android.com. Stay tuned.

Quoted 4 lines
Quoted 4 lines

good luck,

greg k-h

#8 lore raw
Quoted 24 lines · Alistair Strachan
Quoted 22 lines · Todd Kjos

+Alistair Strachan

Quoted 18 lines · Greg KH
Quoted 16 lines · Souptick Joarder
Quoted 15 lines · Greg KH
Quoted 13 lines · Souptick Joarder
Quoted 12 lines · Greg KH
Quoted 9 lines · Souptick Joarder

As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons.

---
 drivers/staging/android/uapi/vsoc_shm.h | 7 -------
 drivers/staging/android/vsoc.c          | 5 -----
 2 files changed, 12 deletions(-)
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

So userspace is all fixed up now and this ioctl can be dropped? Any pointers to the userspace commit that did this?

The ioctl is still being used and cannot be removed.

I think, it's good to add this info in TODO file. I can edit it if you are ok.

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines

I am not sure about user space part.

Then we can not just delete the ioctl :)

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Agree, but where to verify the user space commit ? Any pointer to the source code path ?

The userspace code using the Linux 'vsoc' staging driver can be cloned from here:

https://android.googlesource.com/device/google/cuttlefish_common

Thanks.

Quoted 11 lines
Quoted 4 lines
Quoted 4 lines

Please work with the android developers to solve this. It should be in AOSP "somewhere" :(

I'm working on documenting this better on source.android.com. Stay tuned.

Quoted 4 lines
Quoted 4 lines

good luck,

greg k-h