diff options
author | David Rientjes <rientjes@google.com> | 2012-03-21 19:34:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 20:54:59 -0400 |
commit | 21a3c273f88c9cbbaf7e14505df0131d95c8f262 (patch) | |
tree | f3fbc0ebe490b6a339fcea3baa8b39f2260c0b1e /fs | |
parent | ea48cf7863c789579b170ef28e7fc62728365d6e (diff) |
mm, hugetlb: add thread name and pid to SHM_HUGETLB mlock rlimit warning
Add the thread name and pid of the application that is allocating shm
segments with MAP_HUGETLB without being a part of
/proc/sys/vm/hugetlb_shm_group or having CAP_IPC_LOCK.
This identifies the application so it may be fixed by avoiding using the
deprecated exception (see Documentation/feature-removal-schedule.txt).
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hugetlbfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 7913e3252167..79408159a001 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -953,7 +953,11 @@ struct file *hugetlb_file_setup(const char *name, size_t size, | |||
953 | if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) { | 953 | if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) { |
954 | *user = current_user(); | 954 | *user = current_user(); |
955 | if (user_shm_lock(size, *user)) { | 955 | if (user_shm_lock(size, *user)) { |
956 | printk_once(KERN_WARNING "Using mlock ulimits for SHM_HUGETLB is deprecated\n"); | 956 | task_lock(current); |
957 | printk_once(KERN_WARNING | ||
958 | "%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n", | ||
959 | current->comm, current->pid); | ||
960 | task_unlock(current); | ||
957 | } else { | 961 | } else { |
958 | *user = NULL; | 962 | *user = NULL; |
959 | return ERR_PTR(-EPERM); | 963 | return ERR_PTR(-EPERM); |