From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>,
Andi Kleen <andi@firstfloor.org>, Ingo Molnar <mingo@redhat.com>,
Arjan van de Ven <arjan@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH, RFC, v2] shmat: introduce flag SHM_MAP_HINT
Date: Tue, 7 Oct 2008 09:57:50 +0300 [thread overview]
Message-ID: <1223362670-5187-1-git-send-email-kirill@shutemov.name> (raw)
In-Reply-To: <20081006192923.GJ3180@one.firstfloor.org>
It allows interpret attach address as a hint, not as exact address.
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/shm.h | 1 +
ipc/shm.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/shm.h b/include/linux/shm.h
index eca6235..2a637b8 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -55,6 +55,7 @@ struct shmid_ds {
#define SHM_RND 020000 /* round attach address to SHMLBA boundary */
#define SHM_REMAP 040000 /* take-over region on attach */
#define SHM_EXEC 0100000 /* execution access */
+#define SHM_MAP_HINT 0200000 /* interpret attach address as a hint */
/* super user shmctl commands */
#define SHM_LOCK 11
diff --git a/ipc/shm.c b/ipc/shm.c
index e77ec69..765de74 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -819,7 +819,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
if (shmid < 0)
goto out;
else if ((addr = (ulong)shmaddr)) {
- if (addr & (SHMLBA-1)) {
+ if (!(shmflg & SHM_MAP_HINT) && (addr & (SHMLBA-1))) {
if (shmflg & SHM_RND)
addr &= ~(SHMLBA-1); /* round down */
else
@@ -828,7 +828,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
#endif
goto out;
}
- flags = MAP_SHARED | MAP_FIXED;
+ flags = (shmflg & SHM_MAP_HINT ? 0 : MAP_FIXED) | MAP_SHARED;
} else {
if ((shmflg & SHM_REMAP))
goto out;
@@ -892,7 +892,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
sfd->vm_ops = NULL;
down_write(¤t->mm->mmap_sem);
- if (addr && !(shmflg & SHM_REMAP)) {
+ if (addr && !(shmflg & (SHM_REMAP|SHM_MAP_HINT))) {
err = -EINVAL;
if (find_vma_intersection(current->mm, addr, addr + size))
goto invalid;
--
1.5.6.5.GIT
next prev parent reply other threads:[~2008-10-07 6:56 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-03 7:04 [PATCH] x86_64: Implement personality ADDR_LIMIT_32BIT Kirill A. Shutemov
2008-10-03 8:02 ` Ingo Molnar
2008-10-03 9:25 ` Kirill A. Shutemov
2008-10-03 12:44 ` Arjan van de Ven
2008-10-03 12:58 ` Kirill A. Shutemov
2008-10-06 6:13 ` Andi Kleen
2008-10-06 8:17 ` Kirill A. Shutemov
2008-10-06 8:42 ` Andi Kleen
2008-10-06 9:17 ` Kirill A. Shutemov
2008-10-06 9:56 ` Andi Kleen
2008-10-06 10:12 ` Kirill A. Shutemov
2008-10-06 13:26 ` Andi Kleen
2008-10-06 14:37 ` [PATCH, RFC] shmat: introduce flag SHM_MAP_HINT Kirill A. Shutemov
2008-10-06 19:29 ` Andi Kleen
2008-10-07 6:57 ` Kirill A. Shutemov
2008-10-07 6:57 ` Kirill A. Shutemov [this message]
2008-10-07 8:20 ` [PATCH, RFC, v2] " Andi Kleen
2008-10-07 10:09 ` Kirill A. Shutemov
2008-10-07 11:26 ` Andi Kleen
2008-10-07 11:23 ` Kirill A. Shutemov
2008-10-07 14:38 ` Hugh Dickins
2008-10-07 15:10 ` Andi Kleen
2008-10-07 11:08 ` [PATCH, RFC] " KOSAKI Motohiro
2008-10-07 11:21 ` Andi Kleen
2008-10-07 11:21 ` Kirill A. Shutemov
2008-10-07 11:26 ` KOSAKI Motohiro
2008-10-07 11:30 ` Kirill A. Shutemov
2008-10-07 11:50 ` Andi Kleen
2008-10-07 11:24 ` Kirill A. Shutemov
2008-10-07 12:31 ` Alan Cox
2008-10-07 13:14 ` Andi Kleen
2008-10-03 9:33 ` [PATCH] x86_64: Implement personality ADDR_LIMIT_32BIT Kirill A. Shutemov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1223362670-5187-1-git-send-email-kirill@shutemov.name \
--to=kirill@shutemov.name \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=arjan@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).