Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] madvise(MADV_REMOVE): remove pages from tmpfs shm backing store

Here is the patch to implement madvise(MADV_REMOVE) - which frees up a
given range of pages & its associated backing store. Current
implementation supports only shmfs/tmpfs and other filesystems return
-ENOSYS.

"Some app allocates large tmpfs files, then when some task quits and some
client disconnect, some memory can be released. However the only way to
release tmpfs-swap is to MADV_REMOVE". - Andrea Arcangeli

Databases want to use this feature to drop a section of their bufferpool
(shared memory segments) - without writing back to disk/swap space.

This feature is also useful for supporting hot-plug memory on UML.

Concerns raised by Andrew Morton:

- "We have no plan for holepunching! If we _do_ have such a plan (or
might in the future) then what would the API look like? I think
sys_holepunch(fd, start, len), so we should start out with that."

- Using madvise is very weird, because people will ask "why do I need to
mmap my file before I can stick a hole in it?"

- None of the other madvise operations call into the filesystem in this
manner. A broad question is: is this capability an MM operation or a
filesytem operation? truncate, for example, is a filesystem operation
which sometimes has MM side-effects. madvise is an mm operation and with
this patch, it gains FS side-effects, only they're really, really
significant ones."

Comments:

- Andrea suggested the fs operation too but then it's more efficient to
have it as a mm operation with fs side effects, because they don't
immediatly know fd and physical offset of the range. It's possible to
fixup in userland and to use the fs operation but it's more expensive,
the vmas are already in the kernel and we can use them.

Short term plan & Future Direction:

- We seem to need this interface only for shmfs/tmpfs files in the short
term. We have to add hooks into the filesystem for correctness and
completeness. This is what this patch does.

- In the future, plan is to support both fs and mmap apis also. This
also involves (other) filesystem specific functions to be implemented.

- Current patch doesn't support VM_NONLINEAR - which can be addressed in
the future.

Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Andrea Arcangeli <andrea@suse.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Badari Pulavarty and committed by
Linus Torvalds
f6b3ec23 d7339071

+105 -9
+1
include/asm-alpha/mman.h
··· 42 42 #define MADV_WILLNEED 3 /* will need these pages */ 43 43 #define MADV_SPACEAVAIL 5 /* ensure resources are available */ 44 44 #define MADV_DONTNEED 6 /* don't need these pages */ 45 + #define MADV_REMOVE 7 /* remove these pages & resources */ 45 46 46 47 /* compatibility flags */ 47 48 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-arm/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-arm26/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-cris/mman.h
··· 37 37 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 38 38 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 39 39 #define MADV_DONTNEED 0x4 /* discard these pages */ 40 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 40 41 41 42 /* compatibility flags */ 42 43 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-frv/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-h8300/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-i386/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-ia64/mman.h
··· 43 43 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 44 44 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 45 45 #define MADV_DONTNEED 0x4 /* discard these pages */ 46 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 46 47 47 48 /* compatibility flags */ 48 49 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-m32r/mman.h
··· 37 37 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 38 38 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 39 39 #define MADV_DONTNEED 0x4 /* discard these pages */ 40 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 40 41 41 42 /* compatibility flags */ 42 43 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-m68k/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-mips/mman.h
··· 65 65 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 66 66 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 67 67 #define MADV_DONTNEED 0x4 /* discard these pages */ 68 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 68 69 69 70 /* compatibility flags */ 70 71 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-parisc/mman.h
··· 38 38 #define MADV_SPACEAVAIL 5 /* insure that resources are reserved */ 39 39 #define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */ 40 40 #define MADV_VPS_INHERIT 7 /* Inherit parents page size */ 41 + #define MADV_REMOVE 8 /* remove these pages & resources */ 41 42 42 43 /* The range 12-64 is reserved for page size specification. */ 43 44 #define MADV_4K_PAGES 12 /* Use 4K pages */
+1
include/asm-powerpc/mman.h
··· 44 44 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 45 45 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 46 46 #define MADV_DONTNEED 0x4 /* discard these pages */ 47 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 47 48 48 49 /* compatibility flags */ 49 50 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-s390/mman.h
··· 43 43 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 44 44 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 45 45 #define MADV_DONTNEED 0x4 /* discard these pages */ 46 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 46 47 47 48 /* compatibility flags */ 48 49 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-sh/mman.h
··· 35 35 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 36 36 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 37 37 #define MADV_DONTNEED 0x4 /* discard these pages */ 38 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 38 39 39 40 /* compatibility flags */ 40 41 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-sparc/mman.h
··· 54 54 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 55 55 #define MADV_DONTNEED 0x4 /* discard these pages */ 56 56 #define MADV_FREE 0x5 /* (Solaris) contents can be freed */ 57 + #define MADV_REMOVE 0x6 /* remove these pages & resources */ 57 58 58 59 /* compatibility flags */ 59 60 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-sparc64/mman.h
··· 54 54 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 55 55 #define MADV_DONTNEED 0x4 /* discard these pages */ 56 56 #define MADV_FREE 0x5 /* (Solaris) contents can be freed */ 57 + #define MADV_REMOVE 0x6 /* remove these pages & resources */ 57 58 58 59 /* compatibility flags */ 59 60 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-v850/mman.h
··· 32 32 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 33 33 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 34 34 #define MADV_DONTNEED 0x4 /* discard these pages */ 35 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 35 36 36 37 /* compatibility flags */ 37 38 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-x86_64/mman.h
··· 36 36 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 37 37 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 38 38 #define MADV_DONTNEED 0x4 /* discard these pages */ 39 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 39 40 40 41 /* compatibility flags */ 41 42 #define MAP_ANON MAP_ANONYMOUS
+1
include/asm-xtensa/mman.h
··· 72 72 #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ 73 73 #define MADV_WILLNEED 0x3 /* pre-fault pages */ 74 74 #define MADV_DONTNEED 0x4 /* discard these pages */ 75 + #define MADV_REMOVE 0x5 /* remove these pages & resources */ 75 76 76 77 /* compatibility flags */ 77 78 #define MAP_ANON MAP_ANONYMOUS
+1
include/linux/fs.h
··· 1050 1050 ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); 1051 1051 ssize_t (*listxattr) (struct dentry *, char *, size_t); 1052 1052 int (*removexattr) (struct dentry *, const char *); 1053 + void (*truncate_range)(struct inode *, loff_t, loff_t); 1053 1054 }; 1054 1055 1055 1056 struct seq_file;
+1
include/linux/mm.h
··· 690 690 } 691 691 692 692 extern int vmtruncate(struct inode * inode, loff_t offset); 693 + extern int vmtruncate_range(struct inode * inode, loff_t offset, loff_t end); 693 694 extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot); 694 695 extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot); 695 696 extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
+35
mm/madvise.c
··· 140 140 return 0; 141 141 } 142 142 143 + /* 144 + * Application wants to free up the pages and associated backing store. 145 + * This is effectively punching a hole into the middle of a file. 146 + * 147 + * NOTE: Currently, only shmfs/tmpfs is supported for this operation. 148 + * Other filesystems return -ENOSYS. 149 + */ 150 + static long madvise_remove(struct vm_area_struct *vma, 151 + unsigned long start, unsigned long end) 152 + { 153 + struct address_space *mapping; 154 + loff_t offset, endoff; 155 + 156 + if (vma->vm_flags & (VM_LOCKED|VM_NONLINEAR|VM_HUGETLB)) 157 + return -EINVAL; 158 + 159 + if (!vma->vm_file || !vma->vm_file->f_mapping 160 + || !vma->vm_file->f_mapping->host) { 161 + return -EINVAL; 162 + } 163 + 164 + mapping = vma->vm_file->f_mapping; 165 + 166 + offset = (loff_t)(start - vma->vm_start) 167 + + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); 168 + endoff = (loff_t)(end - vma->vm_start - 1) 169 + + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); 170 + return vmtruncate_range(mapping->host, offset, endoff); 171 + } 172 + 143 173 static long 144 174 madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev, 145 175 unsigned long start, unsigned long end, int behavior) ··· 181 151 case MADV_SEQUENTIAL: 182 152 case MADV_RANDOM: 183 153 error = madvise_behavior(vma, prev, start, end, behavior); 154 + break; 155 + case MADV_REMOVE: 156 + error = madvise_remove(vma, start, end); 184 157 break; 185 158 186 159 case MADV_WILLNEED: ··· 223 190 * some pages ahead. 224 191 * MADV_DONTNEED - the application is finished with the given range, 225 192 * so the kernel can free resources associated with it. 193 + * MADV_REMOVE - the application wants to free up the given range of 194 + * pages and associated backing store. 226 195 * 227 196 * return values: 228 197 * zero - success
+24 -1
mm/memory.c
··· 1770 1770 out_busy: 1771 1771 return -ETXTBSY; 1772 1772 } 1773 - 1774 1773 EXPORT_SYMBOL(vmtruncate); 1774 + 1775 + int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end) 1776 + { 1777 + struct address_space *mapping = inode->i_mapping; 1778 + 1779 + /* 1780 + * If the underlying filesystem is not going to provide 1781 + * a way to truncate a range of blocks (punch a hole) - 1782 + * we should return failure right now. 1783 + */ 1784 + if (!inode->i_op || !inode->i_op->truncate_range) 1785 + return -ENOSYS; 1786 + 1787 + down(&inode->i_sem); 1788 + down_write(&inode->i_alloc_sem); 1789 + unmap_mapping_range(mapping, offset, (end - offset), 1); 1790 + truncate_inode_pages_range(mapping, offset, end); 1791 + inode->i_op->truncate_range(inode, offset, end); 1792 + up_write(&inode->i_alloc_sem); 1793 + up(&inode->i_sem); 1794 + 1795 + return 0; 1796 + } 1797 + EXPORT_SYMBOL(vmtruncate_range); 1775 1798 1776 1799 /* 1777 1800 * Primitive swap readahead code. We simply read an aligned block of
+24 -8
mm/shmem.c
··· 457 457 } while (next); 458 458 } 459 459 460 - static void shmem_truncate(struct inode *inode) 460 + static void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end) 461 461 { 462 462 struct shmem_inode_info *info = SHMEM_I(inode); 463 463 unsigned long idx; ··· 475 475 long nr_swaps_freed = 0; 476 476 int offset; 477 477 int freed; 478 + int punch_hole = 0; 478 479 479 480 inode->i_ctime = inode->i_mtime = CURRENT_TIME; 480 - idx = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 481 + idx = (start + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 481 482 if (idx >= info->next_index) 482 483 return; 483 484 484 485 spin_lock(&info->lock); 485 486 info->flags |= SHMEM_TRUNCATE; 486 - limit = info->next_index; 487 - info->next_index = idx; 487 + if (likely(end == (loff_t) -1)) { 488 + limit = info->next_index; 489 + info->next_index = idx; 490 + } else { 491 + limit = (end + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 492 + if (limit > info->next_index) 493 + limit = info->next_index; 494 + punch_hole = 1; 495 + } 496 + 488 497 topdir = info->i_indirect; 489 - if (topdir && idx <= SHMEM_NR_DIRECT) { 498 + if (topdir && idx <= SHMEM_NR_DIRECT && !punch_hole) { 490 499 info->i_indirect = NULL; 491 500 nr_pages_to_free++; 492 501 list_add(&topdir->lru, &pages_to_free); ··· 582 573 set_page_private(subdir, page_private(subdir) - freed); 583 574 if (offset) 584 575 spin_unlock(&info->lock); 585 - BUG_ON(page_private(subdir) > offset); 576 + if (!punch_hole) 577 + BUG_ON(page_private(subdir) > offset); 586 578 } 587 579 if (offset) 588 580 offset = 0; 589 - else if (subdir) { 581 + else if (subdir && !page_private(subdir)) { 590 582 dir[diroff] = NULL; 591 583 nr_pages_to_free++; 592 584 list_add(&subdir->lru, &pages_to_free); ··· 604 594 * Also, though shmem_getpage checks i_size before adding to 605 595 * cache, no recheck after: so fix the narrow window there too. 606 596 */ 607 - truncate_inode_pages(inode->i_mapping, inode->i_size); 597 + truncate_inode_pages_range(inode->i_mapping, start, end); 608 598 } 609 599 610 600 spin_lock(&info->lock); ··· 622 612 pages_to_free.prev->next = NULL; 623 613 shmem_free_pages(pages_to_free.next); 624 614 } 615 + } 616 + 617 + static void shmem_truncate(struct inode *inode) 618 + { 619 + shmem_truncate_range(inode, inode->i_size, (loff_t)-1); 625 620 } 626 621 627 622 static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) ··· 2098 2083 static struct inode_operations shmem_inode_operations = { 2099 2084 .truncate = shmem_truncate, 2100 2085 .setattr = shmem_notify_change, 2086 + .truncate_range = shmem_truncate_range, 2101 2087 }; 2102 2088 2103 2089 static struct inode_operations shmem_dir_inode_operations = {