mm: unify shmem and tiny-shmem
Subsystems (2)
PATCH 1/1 mm: unify shmem and tiny-shmem
(This applies on top of Nick's second tiny-shmem patch, which hasn't made it to mainline yet(!). But as this deletes tiny-shmem.c, you can probably ignore the rejects.)
tiny-shmem shares most of its 130 lines of code with shmem and tends to break when particular bits of shmem get modified. Unifying saves code and makes keeping these two in sync much easier.
before:
14367 392 24 14783 39bf mm/shmem.o
396 72 8 476 1dc mm/tiny-shmem.o
after:
14367 392 24 14783 39bf mm/shmem.o
412 72 8 492 1ec mm/shmem.o tiny
init/Kconfig +0 -4
@@ -805,10 +805,6 @@ boolean select PLIST -config TINY_SHMEM - default !SHMEM - bool - config BASE_SMALL int default 0 if BASE_FULL
mm/Makefile +1 -3
@@ -9,7 +9,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ maccess.o page_alloc.o page-writeback.o pdflush.o \ - readahead.o swap.o truncate.o vmscan.o \ + readahead.o swap.o truncate.o vmscan.o shmem.o \ prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ page_isolation.o mm_init.o $(mmu-y)
@@ -21,9 +21,7 @@ obj-$(CONFIG_NUMA) += mempolicy.o obj-$(CONFIG_SPARSEMEM) += sparse.o obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o -obj-$(CONFIG_SHMEM) += shmem.o obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o -obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o obj-$(CONFIG_SLOB) += slob.o obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o obj-$(CONFIG_SLAB) += slab.o
mm/shmem.c +82 -10
142 lines not on this page · raw message
mm/tiny-shmem.c deleted +0 -133
133 lines not on this page · raw message
Signature · 1 line
Mathematics is the supreme nostalgia of our time.
Quoted 10 lines · Matt Mackall
(This applies on top of Nick's second tiny-shmem patch, which hasn't made it to mainline yet(!). But as this deletes
tiny-shmem.c, you can probably ignore the rejects.)tiny-shmem shares most of its 130 lines of code with shmem and tends to break when particular bits of shmem get modified. Unifying saves code and makes keeping these two in sync much easier.
before:
14367 392 24 14783 39bfmm/shmem.o
Quoted 7 lines
396 72 8 476 1dc mm/tiny-shmem.oafter:
14367 392 24 14783 39bfmm/shmem.o412 72 8 492 1ec mm/shmem.o tinySigned-off-by Matt Mackall <[email protected]>
Works with my test program:
http://people.redhat.com/~dhowells/doshm.c
Compile and run:
doshm sysv
warthog>size mm/tiny-shmem.o
text data bss dec hex filename
788 36 4 828 33c mm/tiny-shmem.o
warthog>size mm/shmem.o
text data bss dec hex filename
832 36 4 872 368 mm/shmem.oQuoted 2 lines · Matt Mackall
(This applies on top of Nick's second tiny-shmem patch, which hasn't made it to mainline yet(!).
Gosh, thanks for mentioning that, you're right, it hasn't. I saw git pull updating mm/tiny-shmem.c a few days ago, and took it for granted that that was the #ifndef CONFIG_MMU fixed version; but it was the earlier one without that fix, despite us all knowing that fix was needed. I'd have pushed it myself for -rc8 if I'd realized it was still missing: Nick, please push it to Linus a.s.a.p. (with Acks from Matt and David and me) - or ask me to do so (I'm not sure when Andrew is back up and running).
Quoted 9 lines
But as this deletes
tiny-shmem.c, you can
probably ignore the rejects.)tiny-shmem shares most of its 130 lines of code with shmem and tends to break when particular bits of shmem get modified. Unifying saves code and makes keeping these two in sync much easier.
before:
14367 392 24 14783 39bfmm/shmem.o
Quoted 7 lines
396 72 8 476 1dc mm/tiny-shmem.oafter:
14367 392 24 14783 39bfmm/shmem.o412 72 8 492 1ec mm/shmem.o tinySigned-off-by Matt Mackall <[email protected]>
That's much nicer than I'd been imagining, thanks Matt: I've no qualms about the few #ifdefs you're adding to mm/shmem.c, it does seem an outright improvement that you're bringing them together.
A few minor points.
init/Kconfig line 811
Quoted 12 lines
diff -r
04ceba0d1126-r4d75a71b1e9dinit/Kconfiginit/Kconfig +0
-4@@ -805,10 +805,6 @@ boolean select PLIST -config TINY_SHMEM - default !SHMEM - bool -
(It's slightly confusing that !CONFIG_SHMEM now builds mm/shmem.c; but never mind, it's much more important to propagate oldconfigs aright.)
Quoted 123 lines
init/Kconfig +0
-0config BASE_SMALL int default 0 if BASE_FULLdiff -r
04ceba0d1126-r4d75a71b1e9dmm/Makefilemm/Makefile +1
-3@@ -9,7 +9,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ maccess.o page_alloc.o page-writeback.o pdflush.o \ - readahead.o swap.o truncate.o vmscan.o \ + readahead.o swap.o truncate.o vmscan.o shmem.o \ prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ page_isolation.o mm_init.o $(mmu-y)@@ -21,9 +21,7 @@ obj-$(CONFIG_NUMA) += mempolicy.o obj-$(CONFIG_SPARSEMEM) += sparse.o obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o -obj-$(CONFIG_SHMEM) += shmem.o obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o -obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o obj-$(CONFIG_SLOB) += slob.o obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o obj-$(CONFIG_SLAB) += slab.odiff -r
04ceba0d1126-r4d75a71b1e9dmm/shmem.cmm/shmem.c +50
-9@@ -14,31 +14,39 @@* Copyright (c) 2004, Luke Kenneth Casson Leighton <[email protected]> * Copyright (c) 2004 Red Hat, Inc., James Morris <[email protected]> * +* tiny-shmem: +* Copyright (c) 2004, 2008 Matt Mackall <[email protected]> +* * This file is released under the GPL. */ +#include <linux/fs.h> +#include <linux/init.h> +#include <linux/vfs.h> +#include <linux/mount.h> +#include <linux/file.h> +#include <linux/mm.h> +#include <linux/module.h> +#include <linux/swap.h> + +static struct vfsmount *shm_mnt; + +#ifdef CONFIG_SHMEM /* * This virtual memory filesystem is heavily based on the ramfs. It * extends ramfs by the ability to use swap and honor resource limits * which makes it a completely usable filesystem. */ -#include <linux/module.h> -#include <linux/init.h> -#include <linux/fs.h> #include <linux/xattr.h> #include <linux/exportfs.h> #include <linux/generic_acl.h> -#include <linux/mm.h> #include <linux/mman.h> -#include <linux/file.h> -#include <linux/swap.h> #include <linux/pagemap.h> #include <linux/string.h> #include <linux/slab.h> #include <linux/backing-dev.h> #include <linux/shmem_fs.h> -#include <linux/mount.h> #include <linux/writeback.h> #include <linux/vfs.h> #include <linux/blkdev.h> @@ -2483,7 +2491,6 @@ .get_sb = shmem_get_sb, .kill_sb = kill_litter_super, }; -static struct vfsmount *shm_mnt;static int __init init_tmpfs (void ) {@@ -2522,7 +2529,62 @@ shm_mnt =ERR_PTR (error);return error; } -module_init (init_tmpfs) + +#else /* !CONFIG_SHMEM */ + +/* +* tiny-shmem: simple shmemfs and tmpfs using ramfs code +* +* This is intended for small system where the benefits of the full +* shmem code (swap-backed and resource-limited) are outweighed by +* their complexity. On systems without swap this code should be +* effectively equivalent, but much lighter weight. +*/ + +#include <linux/ramfs.h> + +static struct file_system_type tmpfs_fs_type = { + .name ="tmpfs" , + .get_sb = ramfs_get_sb, + .kill_sb = kill_litter_super, +}; + +static int __init init_tmpfs (void ) +{ +BUG_ON (register_filesystem (&tmpfs_fs_type) !=0 ); + + shm_mnt =kern_mount (&tmpfs_fs_type); +BUG_ON (IS_ERR (shm_mnt)); + +return 0 ; +} + +int shmem_unuse (swp_entry_t entry,struct page *page) +{ +return 0 ; +} +
mm/shmem.c line 2576
Quoted 10 lines
mm/shmem.c +10
-0+#ifndef CONFIG_MMU +unsigned long shmem_get_unmapped_area (struct file *file, +unsigned long addr, +unsigned long len, +unsigned long pgoff, +unsigned long flags) +{ +return ramfs_nommu_get_unmapped_area (file, addr, len, pgoff, flags); +} +#endif
This ifndef is the ugliest part of it: and looking into it, guess what, shmem_get_unmapped_area() hasn't been used since 2.6.20 - that's right, isn't it, David?
So please make a separate preliminary patch to remove it from mm/tiny-shmem.c and include/linux/mm.h, so that little ugliness never gets here - or if you think that's the wrong way around, leave it to me to remove from mm/shmem.c later on.
mm/shmem.c line 2583
Quoted 7 lines
mm/shmem.c +7
-0+ +#define shmem_file_operations ramfs_file_operations +#define shmem_unacct_size (a, b) +#define shmem_vm_ops generic_file_vm_ops +#define shmem_get_inode ramfs_get_inode +#define SHMEM_MAX_BYTES LONG_MAX +#define shmem_acct_size (a, b) 0
I'd prefer to rearrange that:
#define shmem_vm_ops generic_file_vm_ops
#define shmem_file_operations ramfs_file_operations
#define shmem_get_inode ramfs_get_inode
#define shmem_acct_size(a, b) 0
#define shmem_unacct_size(a, b) do { } while (0)
#define SHMEM_MAX_BYTES LLONG_MAX
Your LONG_MAX is too limiting, since it's on a loff_t:CONFIG_SHMEM limits files according to the range of its swap tables, but ramfs doesn't require that extra limitation, and LONG_MAX could be too small on 32-bit. And hopefully gcc will optimize away the > LLONG_MAX test entirely.
Quoted 10 lines
mm/shmem.c +4
-0+ +#endif /* CONFIG_SHMEM */ + +/* common code */ /** * shmem_file_setup - get an unlinked file living in tmpfs @@ -2566,12 +2628,20 @@if (!inode) goto close_file;
mm/shmem.c line 2638
Quoted 10 lines
mm/shmem.c +3
-1+#ifdef CONFIG_SHMEM SHMEM_I (inode)->flags = flags &VM_ACCOUNT ; +#endif d_instantiate (dentry, inode); inode->i_size = size; inode->i_nlink =0 ;/* It is unlinked */ init_file (file, shm_mnt, dentry,FMODE_WRITE |FMODE_READ , - &shmem_file_operations); + &shmem_file_operations);
Hey! you didn't need to change that ;)
Quoted 142 lines
mm/shmem.c +8
-0+ +#ifndef CONFIG_MMU + error =ramfs_nommu_expand_for_mapping (inode, size); +if (error) + goto close_file; +#endif return file; close_file:@@ -2602,3 +2672,5 @@ vma->vm_ops = &shmem_vm_ops;return 0 ; } + +module_init (init_tmpfs)diff -r
04ceba0d1126-r4d75a71b1e9dmm/tiny-shmem.cmm/tiny-shmem.c deleted +0
-123@@ -1,133 +0,0 @@ -/* -* tiny-shmem.c: simple shmemfs and tmpfs using ramfs code -* -* Matt Mackall <[email protected]> January, 2004 -* derived from mm/shmem.c and fs/ramfs/inode.c -* -* This is intended for small system where the benefits of the full -* shmem code (swap-backed and resource-limited) are outweighed by -* their complexity. On systems without swap this code should be -* effectively equivalent, but much lighter weight. -*/ - -#include <linux/fs.h> -#include <linux/init.h> -#include <linux/vfs.h> -#include <linux/mount.h> -#include <linux/file.h> -#include <linux/mm.h> -#include <linux/module.h> -#include <linux/swap.h> -#include <linux/ramfs.h> - -static struct file_system_type tmpfs_fs_type = { - .name ="tmpfs" , - .get_sb = ramfs_get_sb, - .kill_sb = kill_litter_super, -}; - -static struct vfsmount *shm_mnt; - -static int __init init_tmpfs (void ) -{ -BUG_ON (register_filesystem (&tmpfs_fs_type) !=0 ); - - shm_mnt =kern_mount (&tmpfs_fs_type); -BUG_ON (IS_ERR (shm_mnt)); - -return 0 ; -} -module_init (init_tmpfs) - -/** -* shmem_file_setup - get an unlinked file living in tmpfs -* @name: name for dentry (to be seen in /proc/<pid>/maps -* @size: size to be set for the file -* @flags: vm_flags -*/ -struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) -{ -int error; -struct file *file; -struct inode *inode; -struct dentry *dentry, *root; -struct qstr this; - -if (IS_ERR (shm_mnt)) -return (void *)shm_mnt; - - error = -ENOMEM ; - this.name = name; - this.len =strlen (name); - this.hash =0 ;/* will go */ - root = shm_mnt->mnt_root; - dentry =d_alloc (root, &this); -if (!dentry) - goto put_memory; - - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto put_dentry; - - error = -ENOSPC ; - inode =ramfs_get_inode (root->d_sb,S_IFREG |S_IRWXUGO ,0 ); -if (!inode) - goto close_file; - -d_instantiate (dentry, inode); - inode->i_size = size; - inode->i_nlink =0 ;/* It is unlinked */ -init_file (file, shm_mnt, dentry,FMODE_WRITE |FMODE_READ , - &ramfs_file_operations); - -#ifndef CONFIG_MMU - error =ramfs_nommu_expand_for_mapping (inode, size); -if (error) - goto close_file; -#endif -return file; - -close_file: -put_filp (file); -put_dentry: -dput (dentry); -put_memory: -return ERR_PTR (error); -} - -/** -* shmem_zero_setup - setup a shared anonymous mapping -* @vma: the vma to be mmapped is prepared by do_mmap_pgoff -*/ -int shmem_zero_setup (struct vm_area_struct *vma) -{ -struct file *file; -loff_t size = vma->vm_end - vma->vm_start; - - file =shmem_file_setup ("dev/zero" , size, vma->vm_flags); -if (IS_ERR (file)) -return PTR_ERR (file); - -if (vma->vm_file) -fput (vma->vm_file); - vma->vm_file = file; - vma->vm_ops = &generic_file_vm_ops; -return 0 ; -} - -int shmem_unuse (swp_entry_t entry,struct page *page) -{ -return 0 ; -} -
mm/tiny-shmem.c line 133
Quoted 10 lines
mm/tiny-shmem.c deleted +0
-10-#ifndef CONFIG_MMU -unsigned long shmem_get_unmapped_area (struct file *file, -unsigned long addr, -unsigned long len, -unsigned long pgoff, -unsigned long flags) -{ -return ramfs_nommu_get_unmapped_area (file, addr, len, pgoff, flags); -} -#endif
On a different but related subject:
do you think we need to retain the CONFIG_TMPFS option? It's rather odd these days, since everybody gets ramfs, and you give them tmpfs via ramfs without CONFIG_SHMEM. If anybody wants to cut out the TMPFS code overhead these days, wouldn't they be using !CONFIG_SHMEM?
Hugh
Quoted 4 lines · Hugh Dickins
Quoted 2 lines · Matt Mackall
(This applies on top of Nick's second tiny-shmem patch, which hasn't made it to mainline yet(!).
Quoted 8 lines
Gosh, thanks for mentioning that, you're right, it hasn't. I saw git pull updating
mm/tiny-shmem.ca few days ago, and took it for granted that that was the #ifndefCONFIG_MMUfixed version; but it was the earlier one without that fix, despite us all knowing that fix was needed. I'd have pushed it myself for -rc8 if I'd realized it was still missing: Nick, please push it to Linus a.s.a.p. (with Acks from Matt and David and me) - or ask me to do so (I'm not sure when Andrew is back up and running).
Linus must have missed it I guess, because I think I did address it to him.
If you or Matt or Andrew push it up, it might get taken seriously ;)
Quoted 5 lines · Hugh Dickins
On a different but related subject:
do you think we need to retain theCONFIG_TMPFSoption? It's rather odd these days, since everybody gets ramfs, and you give them tmpfs via ramfs withoutCONFIG_SHMEM. If anybody wants to cut out the TMPFS code overhead these days, wouldn't they be using !CONFIG_SHMEM?
I agree, it's pretty hard to see a situation where you'd want full swap-backed shm and not full swap-backed tmpfs. I'll spin up a patch to follow on my unification.
Signature · 1 line
Mathematics is the supreme nostalgia of our time.
Quoted 3 lines · Hugh Dickins
That's much nicer than I'd been imagining, thanks Matt: I've no qualms about the few #ifdefs you're adding to
mm/shmem.c, it does seem an outright improvement that you're bringing them together.
It's not an outright improvement. shmem.o is still larger than tiny-shmem.o, albeit not a lot; however, some embedded people really do count the bytes.
Quoted 3 lines
This ifndef is the ugliest part of it: and looking into it, guess what,
shmem_get_unmapped_area()hasn't been used since 2.6.20 - that's right, isn't it, David?
Ummm... It seems to be. I think it used to be used by SYSV SHM. Certainly deleting that function causes no link problems.
David
Quoted 8 lines · David Howells
Quoted 3 lines · Hugh Dickins
That's much nicer than I'd been imagining, thanks Matt: I've no qualms about the few #ifdefs you're adding to
mm/shmem.c, it does seem an outright improvement that you're bringing them together.It's not an outright improvement. shmem.o is still larger than tiny-shmem.o, albeit not a lot; however, some embedded people really do count the bytes.
Here the difference comes down to 16 bytes for the "if (size < 0)" check/branch, which is a worthwhile check.
Quoted 6 lines
Quoted 3 lines
This ifndef is the ugliest part of it: and looking into it, guess what,
shmem_get_unmapped_area()hasn't been used since 2.6.20 - that's right, isn't it, David?Ummm... It seems to be. I think it used to be used by SYSV SHM. Certainly deleting that function causes no link problems.
I've got a patch queued to drop it, will post shortly.
Signature · 1 line
Mathematics is the supreme nostalgia of our time.