Skip to contentSkip to conversation

staging: android: ashmem: add 32bit compat support

PATCH In review Serban Constantinescu 4 participants 11 messages Feb 25, 2013 – Mar 5, 2013 1 message not in the archive Staging

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): staging: android: ashmem: add 32bit compat support

#1 lore raw

PATCH 1/1 staging: android: ashmem: add 32bit compat support

Hi all,

As disussed with the Android kernel team I am resubmitting this patch without any modifications to the structure exchanged between kernel and userspace.

The patch has been tested on 32(VExpress 4xA9) and 64bit platforms(RTSMv8) running 32bit Android userspace and 64bit Linux + ashmem unit tests.

Thanks for your help,
Serban Constantinescu
PDSW Engineer ARM Ltd.

Serban Constantinescu (1):
staging: android: ashmem: Add support for 32bit ashmem calls in a
64bit kernel

 drivers/staging/android/ashmem.c |   21 ++++++++++++++++++++-
 drivers/staging/android/ashmem.h |    6 ++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

---
 drivers/staging/android/ashmem.c |   21 ++++++++++++++++++++-
 drivers/staging/android/ashmem.h |    6 ++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +20 -1
index 72064fc..268f0b4 100644
@@ -674,6 +674,23 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	return ret;
 }
 
+/* support of 32bit userspace on 64bit platforms */
+#ifdef CONFIG_COMPAT
+static long compat_ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+
+	switch (cmd) {
+	case COMPAT_ASHMEM_SET_SIZE:
+		cmd = ASHMEM_SET_SIZE;
+		break;
+	case COMPAT_ASHMEM_SET_PROT_MASK:
+		cmd = ASHMEM_SET_PROT_MASK;
+		break;
+	}
+	return ashmem_ioctl(file, cmd, arg);
+}
+#endif
+
 static const struct file_operations ashmem_fops = {
 	.owner = THIS_MODULE,
 	.open = ashmem_open,
@@ -682,7 +699,9 @@ static const struct file_operations ashmem_fops = {
 	.llseek = ashmem_llseek,
 	.mmap = ashmem_mmap,
 	.unlocked_ioctl = ashmem_ioctl,
-	.compat_ioctl = ashmem_ioctl,
+#ifdef CONFIG_COMPAT
+	.compat_ioctl = compat_ashmem_ioctl,
+#endif
 };
 
 static struct miscdevice ashmem_misc = {
drivers/staging/android/ashmem.h +6 -0
index 1976b10..2809d31 100644
@@ -45,4 +45,10 @@ struct ashmem_pin {
 #define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)
 #define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)
 
+/* support of 32bit userspace on 64bit platforms */
+#ifdef CONFIG_COMPAT
+#define COMPAT_ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, compat_size_t)
+#define COMPAT_ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned int)
+#endif
+
 #endif	/* _LINUX_ASHMEM_H */
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#3 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Quoted 8 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

thanks
-john

Acked-by on v1 1/1
#4 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

In reply to Serban Constantinescu
Quoted 8 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

maintainer
#5 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

In reply to Serban Constantinescu
Quoted 10 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

This patch breaks the build on my machine:
drivers/staging/android/ashmem.c: In function ‘compat_ashmem_ioctl’:
drivers/staging/android/ashmem.c:711:7: error: ‘compat_size_t’ undeclared (first use in this function) drivers/staging/android/ashmem.c:711:7: note: each undeclared identifier is reported only once for each function it appears in

so of course, I can't take it :(

greg k-h

#6 lore raw

PATCH 1/1 staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

---
 drivers/staging/android/ashmem.c |   22 +++++++++++++++++++++-
 drivers/staging/android/ashmem.h |    6 ++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +21 -1
index 72064fc..e96f381 100644
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/shmem_fs.h>
+#include <linux/compat.h>
 #include "ashmem.h"
 
 #define ASHMEM_NAME_PREFIX "dev/ashmem/"
@@ -674,6 +675,23 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	return ret;
 }
 
+/* support of 32bit userspace on 64bit platforms */
+#ifdef CONFIG_COMPAT
+static long compat_ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+
+	switch (cmd) {
+	case COMPAT_ASHMEM_SET_SIZE:
+		cmd = ASHMEM_SET_SIZE;
+		break;
+	case COMPAT_ASHMEM_SET_PROT_MASK:
+		cmd = ASHMEM_SET_PROT_MASK;
+		break;
+	}
+	return ashmem_ioctl(file, cmd, arg);
+}
+#endif
+
 static const struct file_operations ashmem_fops = {
 	.owner = THIS_MODULE,
 	.open = ashmem_open,
@@ -682,7 +700,9 @@ static const struct file_operations ashmem_fops = {
 	.llseek = ashmem_llseek,
 	.mmap = ashmem_mmap,
 	.unlocked_ioctl = ashmem_ioctl,
-	.compat_ioctl = ashmem_ioctl,
+#ifdef CONFIG_COMPAT
+	.compat_ioctl = compat_ashmem_ioctl,
+#endif
 };
 
 static struct miscdevice ashmem_misc = {
drivers/staging/android/ashmem.h +6 -0
index 1976b10..2809d31 100644
@@ -45,4 +45,10 @@ struct ashmem_pin {
 #define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)
 #define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)
 
+/* support of 32bit userspace on 64bit platforms */
+#ifdef CONFIG_COMPAT
+#define COMPAT_ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, compat_size_t)
+#define COMPAT_ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned int)
+#endif
+
 #endif	/* _LINUX_ASHMEM_H */
Signature · 1 line
1.7.9.5
maintainer
#7 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Quoted 4 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

Quoted 8 lines

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

---
 drivers/staging/android/ashmem.c |   22 +++++++++++++++++++++-
 drivers/staging/android/ashmem.h |    6 ++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

Ok, what has changed from your previous version that I rejected that is going to actually allow this to build?

Hint, you gotta tell me what version of the patch this is, and what changed, otherwise I'll just assume this is a resend of the previous patch and go ahead and delete it from my queue.

In fact, I might as well do that, now deleted :)

greg k-h

#8 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Quoted 8 lines · Greg KH
Quoted 7 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

Quoted 8 lines
Quoted 5 lines
---
  drivers/staging/android/ashmem.c |   22 +++++++++++++++++++++-
  drivers/staging/android/ashmem.h |    6 ++++++
  2 files changed, 27 insertions(+), 1 deletion(-)

Ok, what has changed from your previous version that I rejected that is going to actually allow this to build?

I had to add <linux/compat.h> for a successful build on x86_64. The attached hunk is the only change added.

Quoted 15 lines
drivers/staging/android/ashmem.c +1 -0
index 72064fc..e96f381 100644
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/shmem_fs.h>
+#include <linux/compat.h>
 #include "ashmem.h"
 
 #define ASHMEM_NAME_PREFIX "dev/ashmem/"
Quoted 3 lines

Hint, you gotta tell me what version of the patch this is, and what changed, otherwise I'll just assume this is a resend of the previous patch and go ahead and delete it from my queue.

Sorry - same patch as before, the one that had John and Arve's ack, plus the above hunk.

Quoted 5 lines

In fact, I might as well do that, now deleted :)

greg k-h

Thanks,
Serban

maintainer
#9 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

Quoted 15 lines · Serban Constantinescu
Quoted 14 lines · Greg KH
Quoted 12 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

---
 drivers/staging/android/ashmem.c |   22 +++++++++++++++++++++-
 drivers/staging/android/ashmem.h |    6 ++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
Quoted 5 lines
Quoted 2 lines

Ok, what has changed from your previous version that I rejected that is going to actually allow this to build?

I had to add <linux/compat.h> for a successful build on x86_64. The attached hunk is the only change added.

Ok, please say that. I deal with over 7000 patches a year, there is no way I can remember what the difference is between this one, and the previous one I rejected. Especially as I reviewed about 30 patches inbetween the time I rejected it and you sent this update.

Quoted 15 lines
Quoted 15 lines
drivers/staging/android/ashmem.c +1 -0
index 72064fc..e96f381 100644
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/shmem_fs.h>
+#include <linux/compat.h>
 #include "ashmem.h"
 
 #define ASHMEM_NAME_PREFIX "dev/ashmem/"
Quoted 6 lines
Quoted 3 lines

Hint, you gotta tell me what version of the patch this is, and what changed, otherwise I'll just assume this is a resend of the previous patch and go ahead and delete it from my queue.

Sorry - same patch as before, the one that had John and Arve's ack, plus the above hunk.

That is not what I meant, please go read Section 2 of the Documentation/SubmittingPatches file for what I need to see here.

thanks,

greg k-h

#10 lore raw

Re: [PATCH] staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel

In reply to Greg KH
Quoted 8 lines · Greg KH
Quoted 7 lines · Serban Constantinescu

Android's shared memory subsystem, Ashmem, does not support calls from a 32bit userspace in a 64 bit kernel. This patch adds support for syscalls coming from a 32bit userspace in a 64bit kernel.

The patch has been successfully tested on ARMv8 AEM(64bit platform model) and Versatile Express A9(32bit platform).

Quoted 8 lines
Quoted 3 lines

This patch breaks the build on my machine:
drivers/staging/android/ashmem.c: In function ‘compat_ashmem_ioctl’:
drivers/staging/android/ashmem.c:711:7: error: ‘compat_size_t’ undeclared (first use in this function) drivers/staging/android/ashmem.c:711:7: note: each undeclared identifier is reported only once for each function it appears in

When building for x86_64 we need <linux/compat.h>. Sorry I forgot it, should build fine now.

Quoted 2 lines

so of course, I can't take it :(

Thanks,
Serban

maintainer
#11 lore raw
In reply to Serban Constantinescu
Quoted 5 lines · Serban Constantinescu

Hi all,

As disussed with the Android kernel team I am resubmitting this patch without any modifications to the structure exchanged between kernel and userspace.

I'll need some acks or signed-off-by: on the patch from them, before I can take this patch, thanks.

Oh, it's also too late for 3.9, 3.10 is the soonest this can go in, just to set your expectations properly.

thanks,

greg k-h