From: Konstantin Khlebnikov <koct9i@gmail.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] shmem: update memory reservation on truncate
Date: Wed, 25 Jun 2014 00:16:10 +0400 [thread overview]
Message-ID: <20140624201610.18273.93645.stgit@zurg> (raw)
In-Reply-To: <20140624201606.18273.44270.stgit@zurg>
Shared anonymous mapping created without MAP_NORESERVE holds memory
reservation for whole range of shmem segment. Usually there is no way to
change its size, but /proc/<pid>/map_files/...
(available if CONFIG_CHECKPOINT_RESTORE=y) allows to do that.
This patch adjust memory reservation in shmem_setattr().
Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
---
exploit:
#include <sys/mman.h>
#include <unistd.h>
#include <stdio.h>
int main(int argc, char **argv)
{
unsigned long addr;
char path[100];
/* charge 4KiB */
addr = (unsigned long)mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
sprintf(path, "/proc/self/map_files/%lx-%lx", addr, addr + 4096);
truncate(path, 1 << 30);
/* uncharge 1GiB */
}
---
mm/shmem.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/mm/shmem.c b/mm/shmem.c
index 0aabcbd..a3c49d6 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -149,6 +149,19 @@ static inline void shmem_unacct_size(unsigned long flags, loff_t size)
vm_unacct_memory(VM_ACCT(size));
}
+static inline int shmem_reacct_size(unsigned long flags,
+ loff_t oldsize, loff_t newsize)
+{
+ if (!(flags & VM_NORESERVE)) {
+ if (VM_ACCT(newsize) > VM_ACCT(oldsize))
+ return security_vm_enough_memory_mm(current->mm,
+ VM_ACCT(newsize) - VM_ACCT(oldsize));
+ else if (VM_ACCT(newsize) < VM_ACCT(oldsize))
+ vm_unacct_memory(VM_ACCT(oldsize) - VM_ACCT(newsize));
+ }
+ return 0;
+}
+
/*
* ... whereas tmpfs objects are accounted incrementally as
* pages are allocated, in order to allow huge sparse files.
@@ -543,6 +556,10 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr)
loff_t newsize = attr->ia_size;
if (newsize != oldsize) {
+ error = shmem_reacct_size(SHMEM_I(inode)->flags,
+ oldsize, newsize);
+ if (error)
+ return error;
i_size_write(inode, newsize);
inode->i_ctime = inode->i_mtime = CURRENT_TIME;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-06-24 20:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 20:16 [PATCH 1/3] shmem: fix double uncharge in __shmem_file_setup() Konstantin Khlebnikov
2014-06-24 20:16 ` Konstantin Khlebnikov [this message]
2014-06-26 3:53 ` [PATCH 2/3] shmem: update memory reservation on truncate Hugh Dickins
2014-06-26 11:27 ` Konstantin Khlebnikov
2014-06-24 20:16 ` [PATCH 3/3] mm: catch memory commitment underflow Konstantin Khlebnikov
2014-06-25 22:03 ` Andrew Morton
2014-06-26 4:08 ` Konstantin Khlebnikov
2014-06-25 22:23 ` Dave Hansen
2015-01-18 11:34 ` Sasha Levin
2015-01-18 18:36 ` Konstantin Khlebnikov
2015-04-25 2:15 ` Sasha Levin
2015-06-07 14:29 ` Sasha Levin
2014-06-26 3:44 ` [PATCH 1/3] shmem: fix double uncharge in __shmem_file_setup() Hugh Dickins
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=20140624201610.18273.93645.stgit@zurg \
--to=koct9i@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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).