From: Ben Gras <ben@minix3.org>
Date: Thu, 31 Oct 2013 16:29:05 +0000 (+0100)
Subject: bigger message
X-Git-Tag: v3.3.0~509
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.named-checkzone.html?a=commitdiff_plain;h=25719b5d9290a362bd17fe06951afa0c67f9421a;p=minix.git

bigger message

Change-Id: Ie770140c55799bdc3bb8f0ad6994d59938155a1a
---

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index b24095d76..4e5bd54d9 100644
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -12,8 +12,8 @@
 #define M1                 1
 #define M3                 3
 #define M4                 4
-#define M3_STRING         16	/* legacy m3_ca1 size (must not be changed) */
-#define M3_LONG_STRING    16	/* current m3_ca1 size (may be increased) */
+#define M3_STRING         44	/* legacy m3_ca1 size (must not be changed) */
+#define M3_LONG_STRING    44	/* current m3_ca1 size (may be increased) */
 
 typedef struct {int m1i1, m1i2, m1i3; char *m1p1, *m1p2, *m1p3, *m1p4;} mess_1;
 typedef struct {int m2i1, m2i2, m2i3; long m2l1, m2l2; char *m2p1; 
@@ -74,6 +74,7 @@ typedef struct {
 	mess_vmmcp m_vmmcp;
 	mess_vmmcp_reply m_vmmcp_reply;
 	mess_vm_vfs_mmap m_vm_vfs;
+	u32_t size[14];		/* message payload may have 14 longs at most */
   } m_u;
 } message __aligned(16);
 
diff --git a/kernel/arch/earm/klib.S b/kernel/arch/earm/klib.S
index 0294be7dd..60b5046e3 100644
--- a/kernel/arch/earm/klib.S
+++ b/kernel/arch/earm/klib.S
@@ -18,8 +18,8 @@
 /*
  * int copy_msg_from_user(message * user_mbuf, message * dst);
  *
- * Copies a message of 36 bytes from user process space to a kernel buffer. This
- * function assumes that the process address space is installed (cr3 loaded).
+ * Copies a message of 64 bytes from user process space to a kernel buffer. This
+ * function assumes that the process address space is installed (ttbr loaded).
  *
  * This function from the callers point of view either succeeds or returns an
  * error which gives the caller a chance to respond accordingly. In fact it
@@ -36,9 +36,15 @@ ENTRY(copy_msg_from_user)
 	mov	r9, r0
 	/* load the destination pointer */
 	mov	r10, r1
-	/* do the copy */
-	ldm	r9,  {r0-r8}
-	stm	r10, {r0-r8}
+	/* do the copy, first 32 bytes */
+	ldm	r9,  {r0-r7}
+	stm	r10, {r0-r7}
+
+	/* next 32 bytes */
+	add	r9,  r9, #32
+	add	r10, r10, #32
+	ldm	r9,  {r0-r7}
+	stm	r10, {r0-r7}
 
 LABEL(__copy_msg_from_user_end)
 	pop	{r4-r10, lr}
@@ -51,7 +57,7 @@ LABEL(__copy_msg_from_user_end)
 /*
  * void copy_msg_to_user(message * src, message * user_mbuf);
  *
- * Copies a message of 36 bytes to user process space from a kernel buffer.
+ * Copies a message of 64 bytes to user process space from a kernel buffer.
  *
  * All the other copy_msg_from_user() comments apply here as well!
  */
@@ -61,9 +67,15 @@ ENTRY(copy_msg_to_user)
 	mov	r9, r0
 	/* load the destination pointer */
 	mov	r10, r1
-	/* do the copy */
-	ldm	r9,  {r0-r8}
-	stm	r10, {r0-r8}
+	/* do the copy, first 32 bytes */
+	ldm	r9,  {r0-r7}
+	stm	r10, {r0-r7}
+
+	/* next 32 bytes */
+	add	r9,  r9,  #32
+	add	r10, r10, #32
+	ldm	r9,  {r0-r7}
+	stm	r10, {r0-r7}
 
 LABEL(__copy_msg_to_user_end)
 	pop	{r4-r10, lr}
diff --git a/kernel/arch/i386/klib.S b/kernel/arch/i386/klib.S
index 83663a759..3d9f327d6 100644
--- a/kernel/arch/i386/klib.S
+++ b/kernel/arch/i386/klib.S
@@ -221,7 +221,7 @@ LABEL(phys_copy_fault_in_kernel)	/* kernel can send us here */
 /*
  * int copy_msg_from_user(message * user_mbuf, message * dst);
  *
- * Copies a message of 36 bytes from user process space to a kernel buffer. This
+ * Copies a message of 64 bytes from user process space to a kernel buffer. This
  * function assumes that the process address space is installed (cr3 loaded).
  *
  * This function from the callers point of view either succeeds or returns an
@@ -258,6 +258,21 @@ ENTRY(copy_msg_from_user)
 	mov	8*4(%ecx), %eax
 	mov	%eax, 8*4(%edx)
 
+	mov	 9*4(%ecx), %eax
+	mov	%eax,  9*4(%edx) 
+	mov	10*4(%ecx), %eax
+	mov	%eax, 10*4(%edx)
+	mov	11*4(%ecx), %eax
+	mov	%eax, 11*4(%edx)
+	mov	12*4(%ecx), %eax
+	mov	%eax, 12*4(%edx)
+	mov	13*4(%ecx), %eax
+	mov	%eax, 13*4(%edx)
+	mov	14*4(%ecx), %eax
+	mov	%eax, 14*4(%edx)
+	mov	15*4(%ecx), %eax
+	mov	%eax, 15*4(%edx)
+
 LABEL(__copy_msg_from_user_end)
 	movl	$0, %eax
 	ret
@@ -268,7 +283,7 @@ LABEL(__copy_msg_from_user_end)
 /*
  * void copy_msg_to_user(message * src, message * user_mbuf);
  *
- * Copies a message of 36 bytes to user process space from a kernel buffer.
+ * Copies a message of 64 bytes to user process space from a kernel buffer.
  *
  * All the other copy_msg_from_user() comments apply here as well!
  */
@@ -297,6 +312,22 @@ ENTRY(copy_msg_to_user)
 	mov	8*4(%ecx), %eax
 	mov	%eax, 8*4(%edx)
 
+
+	mov	9*4(%ecx), %eax
+	mov	%eax, 9*4(%edx)
+	mov	10*4(%ecx), %eax
+	mov	%eax, 10*4(%edx)
+	mov	11*4(%ecx), %eax
+	mov	%eax, 11*4(%edx)
+	mov	12*4(%ecx), %eax
+	mov	%eax, 12*4(%edx)
+	mov	13*4(%ecx), %eax
+	mov	%eax, 13*4(%edx)
+	mov	14*4(%ecx), %eax
+	mov	%eax, 14*4(%edx)
+	mov	15*4(%ecx), %eax
+	mov	%eax, 15*4(%edx)
+
 LABEL(__copy_msg_to_user_end)
 	movl	$0, %eax
 	ret
diff --git a/servers/vm/vfs.c b/servers/vm/vfs.c
index 9e7ceede1..ffb5bec96 100644
--- a/servers/vm/vfs.c
+++ b/servers/vm/vfs.c
@@ -29,7 +29,7 @@
 #include "region.h"
 #include "sanitycheck.h"
 
-#define STATELEN 50
+#define STATELEN 70
 
 static struct vfs_request_node {
 	message			reqmsg;