Skip to contentSkip to conversation

Restore MSGPOOL original value

PATCH In review [email protected] 3 participants 4 messages May 26, 2008 – May 29, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

author
#1 lore raw

PATCH 1/1 Restore MSGPOOL original value

Hi,

When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://article.gmane.org/gmane.linux.kernel/637849/), I have changed the MSGPOOL value to make it fit what is said in the man pages (i.e. a size in bytes).

But Michael Kerrisk rightly complained that this change could affect the ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes. Michael, on his side, has fixed the man page.

This patch applies to 2.6.26-rc2-mm1.

Signed-off-by Nadia Derbey <[email protected]>
---
 include/linux/msg.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/msg.h +2 -2
Index: linux-2.6.26-rc2-mm1/include/linux/msg.h
===================================================================
@@ -64,11 +64,11 @@ struct msginfo {
 #define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
 
 /* unused */
-#define MSGPOOL (MSGMNI * MSGMNB) /* size in bytes of message pool */
+#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
 #define MSGTQL  MSGMNB            /* number of system message headers */
 #define MSGMAP  MSGMNB            /* number of entries in message map */
 #define MSGSSZ  16                /* message segment size */
-#define __MSGSEG (MSGPOOL / MSGSSZ) /* max no. of segments */
+#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
 #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
 
 #ifdef __KERNEL__

--

Acked-by on v1 1/1
#2 lore raw
Quoted 28 lines · On Mon, May 26, 2008 at 11:17 AM, <[email protected]> wrote:

Hi,

When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://article.gmane.org/gmane.linux.kernel/637849/), I have changed the MSGPOOL value to make it fit what is said in the man pages (i.e. a size in bytes).

But Michael Kerrisk rightly complained that this change could affect the ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes. Michael, on his side, has fixed the man page.

This patch applies to 2.6.26-rc2-mm1.

Signed-off-by Nadia Derbey <[email protected]>
---
 include/linux/msg.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.26-rc2-mm1/include/linux/msg.h
===================================================================

include/linux/msg.h 2008-05-26 11:18:34.000000000 +0200 renamed from include/linux/msg.h 2008-05-26 11:06:53.000000000 +0200 +0 -0
@@ -64,11 +64,11 @@ struct msginfo {
 #define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
 
 /* unused */

include/linux/msg.h 2008-05-26 11:18:34.000000000 +0200 struct msginfo { · line 74

Quoted 10 lines
include/linux/msg.h 2008-05-26 11:18:34.000000000 +0200 renamed from include/linux/msg.h 2008-05-26 11:06:53.000000000 +0200 +2 -2
-#define MSGPOOL (MSGMNI * MSGMNB) /* size in bytes of message pool */
+#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
 #define MSGTQL  MSGMNB            /* number of system message headers */
 #define MSGMAP  MSGMNB            /* number of entries in message map */
 #define MSGSSZ  16                /* message segment size */
-#define __MSGSEG (MSGPOOL / MSGSSZ) /* max no. of segments */
+#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
 #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
 
 #ifdef __KERNEL__
Acked-by Michael Kerrisk <[email protected]>
Signature · 3 lines
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Found a bug? http://www.kernel.org/doc/man-pages/reporting_bugs.html
#3 lore raw
In reply to [email protected]
Quoted 1 line · On Mon, 26 May 2008 11:17:17 +0200 [email protected] wrote:

Subject: [PATCH] Restore MSGPOOL original value

Please prefer to include the subsystem identifier in the patch title. ie:

[patch] ipc: restore MSGPOOL original value

It saves me from having to do it ;)

Quoted 11 lines

Date: Mon, 26 May 2008 11:17:17 +0200
User-Agent: quilt/0.45-1

Hi,

When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://article.gmane.org/gmane.linux.kernel/637849/), I have changed the MSGPOOL value to make it fit what is said in the man pages (i.e. a size in bytes).

Quoted 5 lines

But Michael Kerrisk rightly complained that this change could affect the ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes. Michael, on his side, has fixed the man page.

This patch applies to 2.6.26-rc2-mm1.

But it is needed in 2.6.26, yes?

author
#4 lore raw
Quoted 4 lines · Andrew Morton

On Mon, 26 May 2008 11:17:17 +0200
[email protected] wrote:

Quoted 8 lines
Quoted 1 line

Subject: [PATCH] Restore MSGPOOL original value

Please prefer to include the subsystem identifier in the patch title. ie:

[patch] ipc: restore MSGPOOL original value

It saves me from having to do it ;)

Sorry for that.

Quoted 13 lines
Quoted 13 lines

Date: Mon, 26 May 2008 11:17:17 +0200
User-Agent: quilt/0.45-1

Hi,

When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://article.gmane.org/gmane.linux.kernel/637849/), I have changed the MSGPOOL value to make it fit what is said in the man pages (i.e. a size in bytes).

Quoted 9 lines
Quoted 5 lines

But Michael Kerrisk rightly complained that this change could affect the ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes. Michael, on his side, has fixed the man page.

This patch applies to 2.6.26-rc2-mm1.

But it is needed in 2.6.26, yes?

Yes.

Regards,
Nadia