diff options
author | Konstantin Khlebnikov <koct9i@gmail.com> | 2014-08-06 19:06:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:19 -0400 |
commit | 77142517990fd3d982678c2945ea2c4188ec5f9a (patch) | |
tree | 9ad927b6f48ad2e6a89830ae4f3ee3fa99976646 /mm/shmem.c | |
parent | 66ee4b8887ec5ce04bae3e840d206db7b7ad34d1 (diff) |
shmem: update memory reservation on truncate
A 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 that.
This patch adjusts the memory reservation in shmem_setattr().
Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r-- | mm/shmem.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 3609d31ad0dd..57fd82a5af7a 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) | |||
149 | vm_unacct_memory(VM_ACCT(size)); | 149 | vm_unacct_memory(VM_ACCT(size)); |
150 | } | 150 | } |
151 | 151 | ||
152 | static inline int shmem_reacct_size(unsigned long flags, | ||
153 | loff_t oldsize, loff_t newsize) | ||
154 | { | ||
155 | if (!(flags & VM_NORESERVE)) { | ||
156 | if (VM_ACCT(newsize) > VM_ACCT(oldsize)) | ||
157 | return security_vm_enough_memory_mm(current->mm, | ||
158 | VM_ACCT(newsize) - VM_ACCT(oldsize)); | ||
159 | else if (VM_ACCT(newsize) < VM_ACCT(oldsize)) | ||
160 | vm_unacct_memory(VM_ACCT(oldsize) - VM_ACCT(newsize)); | ||
161 | } | ||
162 | return 0; | ||
163 | } | ||
164 | |||
152 | /* | 165 | /* |
153 | * ... whereas tmpfs objects are accounted incrementally as | 166 | * ... whereas tmpfs objects are accounted incrementally as |
154 | * pages are allocated, in order to allow huge sparse files. | 167 | * pages are allocated, in order to allow huge sparse files. |
@@ -549,6 +562,10 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr) | |||
549 | loff_t newsize = attr->ia_size; | 562 | loff_t newsize = attr->ia_size; |
550 | 563 | ||
551 | if (newsize != oldsize) { | 564 | if (newsize != oldsize) { |
565 | error = shmem_reacct_size(SHMEM_I(inode)->flags, | ||
566 | oldsize, newsize); | ||
567 | if (error) | ||
568 | return error; | ||
552 | i_size_write(inode, newsize); | 569 | i_size_write(inode, newsize); |
553 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; | 570 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; |
554 | } | 571 | } |