original development tree for Linux kernel GTP module; now long in mainline.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

333 lines
7.3 KiB

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
12 years ago
[PATCH] cpuset memory spread: slab cache filesystems Mark file system inode and similar slab caches subject to SLAB_MEM_SPREAD memory spreading. If a slab cache is marked SLAB_MEM_SPREAD, then anytime that a task that's in a cpuset with the 'memory_spread_slab' option enabled goes to allocate from such a slab cache, the allocations are spread evenly over all the memory nodes (task->mems_allowed) allowed to that task, instead of favoring allocation on the node local to the current cpu. The following inode and similar caches are marked SLAB_MEM_SPREAD: file cache ==== ===== fs/adfs/super.c adfs_inode_cache fs/affs/super.c affs_inode_cache fs/befs/linuxvfs.c befs_inode_cache fs/bfs/inode.c bfs_inode_cache fs/block_dev.c bdev_cache fs/cifs/cifsfs.c cifs_inode_cache fs/coda/inode.c coda_inode_cache fs/dquot.c dquot fs/efs/super.c efs_inode_cache fs/ext2/super.c ext2_inode_cache fs/ext2/xattr.c (fs/mbcache.c) ext2_xattr fs/ext3/super.c ext3_inode_cache fs/ext3/xattr.c (fs/mbcache.c) ext3_xattr fs/fat/cache.c fat_cache fs/fat/inode.c fat_inode_cache fs/freevxfs/vxfs_super.c vxfs_inode fs/hpfs/super.c hpfs_inode_cache fs/isofs/inode.c isofs_inode_cache fs/jffs/inode-v23.c jffs_fm fs/jffs2/super.c jffs2_i fs/jfs/super.c jfs_ip fs/minix/inode.c minix_inode_cache fs/ncpfs/inode.c ncp_inode_cache fs/nfs/direct.c nfs_direct_cache fs/nfs/inode.c nfs_inode_cache fs/ntfs/super.c ntfs_big_inode_cache_name fs/ntfs/super.c ntfs_inode_cache fs/ocfs2/dlm/dlmfs.c dlmfs_inode_cache fs/ocfs2/super.c ocfs2_inode_cache fs/proc/inode.c proc_inode_cache fs/qnx4/inode.c qnx4_inode_cache fs/reiserfs/super.c reiser_inode_cache fs/romfs/inode.c romfs_inode_cache fs/smbfs/inode.c smb_inode_cache fs/sysv/inode.c sysv_inode_cache fs/udf/super.c udf_inode_cache fs/ufs/super.c ufs_inode_cache net/socket.c sock_inode_cache net/sunrpc/rpc_pipe.c rpc_inode_cache The choice of which slab caches to so mark was quite simple. I marked those already marked SLAB_RECLAIM_ACCOUNT, except for fs/xfs, dentry_cache, inode_cache, and buffer_head, which were marked in a previous patch. Even though SLAB_RECLAIM_ACCOUNT is for a different purpose, it marks the same potentially large file system i/o related slab caches as we need for memory spreading. Given that the rule now becomes "wherever you would have used a SLAB_RECLAIM_ACCOUNT slab cache flag before (usually the inode cache), use the SLAB_MEM_SPREAD flag too", this should be easy enough to maintain. Future file system writers will just copy one of the existing file system slab cache setups and tend to get it right without thinking. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago
fs: Limit sys_mount to only request filesystem modules. Modify the request_module to prefix the file system type with "fs-" and add aliases to all of the filesystems that can be built as modules to match. A common practice is to build all of the kernel code and leave code that is not commonly needed as modules, with the result that many users are exposed to any bug anywhere in the kernel. Looking for filesystems with a fs- prefix limits the pool of possible modules that can be loaded by mount to just filesystems trivially making things safer with no real cost. Using aliases means user space can control the policy of which filesystem modules are auto-loaded by editing /etc/modprobe.d/*.conf with blacklist and alias directives. Allowing simple, safe, well understood work-arounds to known problematic software. This also addresses a rare but unfortunate problem where the filesystem name is not the same as it's module name and module auto-loading would not work. While writing this patch I saw a handful of such cases. The most significant being autofs that lives in the module autofs4. This is relevant to user namespaces because we can reach the request module in get_fs_type() without having any special permissions, and people get uncomfortable when a user specified string (in this case the filesystem type) goes all of the way to request_module. After having looked at this issue I don't think there is any particular reason to perform any filtering or permission checks beyond making it clear in the module request that we want a filesystem module. The common pattern in the kernel is to call request_module() without regards to the users permissions. In general all a filesystem module does once loaded is call register_filesystem() and go to sleep. Which means there is not much attack surface exposed by loading a filesytem module unless the filesystem is mounted. In a user namespace filesystems are not mounted unless .fs_flags = FS_USERNS_MOUNT, which most filesystems do not set today. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Acked-by: Kees Cook <keescook@chromium.org> Reported-by: Kees Cook <keescook@google.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
9 years ago
  1. /*
  2. * Super block/filesystem wide operations
  3. *
  4. * Copyright (C) 1996 Peter J. Braam <braam@maths.ox.ac.uk> and
  5. * Michael Callahan <callahan@maths.ox.ac.uk>
  6. *
  7. * Rewritten for Linux 2.1. Peter Braam <braam@cs.cmu.edu>
  8. * Copyright (C) Carnegie Mellon University
  9. */
  10. #include <linux/module.h>
  11. #include <linux/kernel.h>
  12. #include <linux/mm.h>
  13. #include <linux/string.h>
  14. #include <linux/stat.h>
  15. #include <linux/errno.h>
  16. #include <linux/unistd.h>
  17. #include <linux/mutex.h>
  18. #include <linux/spinlock.h>
  19. #include <linux/file.h>
  20. #include <linux/vfs.h>
  21. #include <linux/slab.h>
  22. #include <linux/pid_namespace.h>
  23. #include <asm/uaccess.h>
  24. #include <linux/fs.h>
  25. #include <linux/vmalloc.h>
  26. #include <linux/coda.h>
  27. #include <linux/coda_psdev.h>
  28. #include "coda_linux.h"
  29. #include "coda_cache.h"
  30. #include "coda_int.h"
  31. /* VFS super_block ops */
  32. static void coda_evict_inode(struct inode *);
  33. static void coda_put_super(struct super_block *);
  34. static int coda_statfs(struct dentry *dentry, struct kstatfs *buf);
  35. static struct kmem_cache * coda_inode_cachep;
  36. static struct inode *coda_alloc_inode(struct super_block *sb)
  37. {
  38. struct coda_inode_info *ei;
  39. ei = kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL);
  40. if (!ei)
  41. return NULL;
  42. memset(&ei->c_fid, 0, sizeof(struct CodaFid));
  43. ei->c_flags = 0;
  44. ei->c_uid = GLOBAL_ROOT_UID;
  45. ei->c_cached_perm = 0;
  46. spin_lock_init(&ei->c_lock);
  47. return &ei->vfs_inode;
  48. }
  49. static void coda_i_callback(struct rcu_head *head)
  50. {
  51. struct inode *inode = container_of(head, struct inode, i_rcu);
  52. kmem_cache_free(coda_inode_cachep, ITOC(inode));
  53. }
  54. static void coda_destroy_inode(struct inode *inode)
  55. {
  56. call_rcu(&inode->i_rcu, coda_i_callback);
  57. }
  58. static void init_once(void *foo)
  59. {
  60. struct coda_inode_info *ei = (struct coda_inode_info *) foo;
  61. inode_init_once(&ei->vfs_inode);
  62. }
  63. int coda_init_inodecache(void)
  64. {
  65. coda_inode_cachep = kmem_cache_create("coda_inode_cache",
  66. sizeof(struct coda_inode_info),
  67. 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
  68. init_once);
  69. if (coda_inode_cachep == NULL)
  70. return -ENOMEM;
  71. return 0;
  72. }
  73. void coda_destroy_inodecache(void)
  74. {
  75. /*
  76. * Make sure all delayed rcu free inodes are flushed before we
  77. * destroy cache.
  78. */
  79. rcu_barrier();
  80. kmem_cache_destroy(coda_inode_cachep);
  81. }
  82. static int coda_remount(struct super_block *sb, int *flags, char *data)
  83. {
  84. *flags |= MS_NOATIME;
  85. return 0;
  86. }
  87. /* exported operations */
  88. static const struct super_operations coda_super_operations =
  89. {
  90. .alloc_inode = coda_alloc_inode,
  91. .destroy_inode = coda_destroy_inode,
  92. .evict_inode = coda_evict_inode,
  93. .put_super = coda_put_super,
  94. .statfs = coda_statfs,
  95. .remount_fs = coda_remount,
  96. };
  97. static int get_device_index(struct coda_mount_data *data)
  98. {
  99. struct fd f;
  100. struct inode *inode;
  101. int idx;
  102. if (data == NULL) {
  103. printk("coda_read_super: Bad mount data\n");
  104. return -1;
  105. }
  106. if (data->version != CODA_MOUNT_VERSION) {
  107. printk("coda_read_super: Bad mount version\n");
  108. return -1;
  109. }
  110. f = fdget(data->fd);
  111. if (!f.file)
  112. goto Ebadf;
  113. inode = file_inode(f.file);
  114. if (!S_ISCHR(inode->i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {
  115. fdput(f);
  116. goto Ebadf;
  117. }
  118. idx = iminor(inode);
  119. fdput(f);
  120. if (idx < 0 || idx >= MAX_CODADEVS) {
  121. printk("coda_read_super: Bad minor number\n");
  122. return -1;
  123. }
  124. return idx;
  125. Ebadf:
  126. printk("coda_read_super: Bad file\n");
  127. return -1;
  128. }
  129. static int coda_fill_super(struct super_block *sb, void *data, int silent)
  130. {
  131. struct inode *root = NULL;
  132. struct venus_comm *vc;
  133. struct CodaFid fid;
  134. int error;
  135. int idx;
  136. if (task_active_pid_ns(current) != &init_pid_ns)
  137. return -EINVAL;
  138. idx = get_device_index((struct coda_mount_data *) data);
  139. /* Ignore errors in data, for backward compatibility */
  140. if(idx == -1)
  141. idx = 0;
  142. printk(KERN_INFO "coda_read_super: device index: %i\n", idx);
  143. vc = &coda_comms[idx];
  144. mutex_lock(&vc->vc_mutex);
  145. if (!vc->vc_inuse) {
  146. printk("coda_read_super: No pseudo device\n");
  147. error = -EINVAL;
  148. goto unlock_out;
  149. }
  150. if (vc->vc_sb) {
  151. printk("coda_read_super: Device already mounted\n");
  152. error = -EBUSY;
  153. goto unlock_out;
  154. }
  155. error = bdi_setup_and_register(&vc->bdi, "coda", BDI_CAP_MAP_COPY);
  156. if (error)
  157. goto unlock_out;
  158. vc->vc_sb = sb;
  159. mutex_unlock(&vc->vc_mutex);
  160. sb->s_fs_info = vc;
  161. sb->s_flags |= MS_NOATIME;
  162. sb->s_blocksize = 4096; /* XXXXX what do we put here?? */
  163. sb->s_blocksize_bits = 12;
  164. sb->s_magic = CODA_SUPER_MAGIC;
  165. sb->s_op = &coda_super_operations;
  166. sb->s_d_op = &coda_dentry_operations;
  167. sb->s_bdi = &vc->bdi;
  168. /* get root fid from Venus: this needs the root inode */
  169. error = venus_rootfid(sb, &fid);
  170. if ( error ) {
  171. printk("coda_read_super: coda_get_rootfid failed with %d\n",
  172. error);
  173. goto error;
  174. }
  175. printk("coda_read_super: rootfid is %s\n", coda_f2s(&fid));
  176. /* make root inode */
  177. root = coda_cnode_make(&fid, sb);
  178. if (IS_ERR(root)) {
  179. error = PTR_ERR(root);
  180. printk("Failure of coda_cnode_make for root: error %d\n", error);
  181. goto error;
  182. }
  183. printk("coda_read_super: rootinode is %ld dev %s\n",
  184. root->i_ino, root->i_sb->s_id);
  185. sb->s_root = d_make_root(root);
  186. if (!sb->s_root) {
  187. error = -EINVAL;
  188. goto error;
  189. }
  190. return 0;
  191. error:
  192. mutex_lock(&vc->vc_mutex);
  193. bdi_destroy(&vc->bdi);
  194. vc->vc_sb = NULL;
  195. sb->s_fs_info = NULL;
  196. unlock_out:
  197. mutex_unlock(&vc->vc_mutex);
  198. return error;
  199. }
  200. static void coda_put_super(struct super_block *sb)
  201. {
  202. struct venus_comm *vcp = coda_vcp(sb);
  203. mutex_lock(&vcp->vc_mutex);
  204. bdi_destroy(&vcp->bdi);
  205. vcp->vc_sb = NULL;
  206. sb->s_fs_info = NULL;
  207. mutex_unlock(&vcp->vc_mutex);
  208. printk("Coda: Bye bye.\n");
  209. }
  210. static void coda_evict_inode(struct inode *inode)
  211. {
  212. truncate_inode_pages(&inode->i_data, 0);
  213. clear_inode(inode);
  214. coda_cache_clear_inode(inode);
  215. }
  216. int coda_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
  217. {
  218. int err = coda_revalidate_inode(dentry);
  219. if (!err)
  220. generic_fillattr(dentry->d_inode, stat);
  221. return err;
  222. }
  223. int coda_setattr(struct dentry *de, struct iattr *iattr)
  224. {
  225. struct inode *inode = de->d_inode;
  226. struct coda_vattr vattr;
  227. int error;
  228. memset(&vattr, 0, sizeof(vattr));
  229. inode->i_ctime = CURRENT_TIME_SEC;
  230. coda_iattr_to_vattr(iattr, &vattr);
  231. vattr.va_type = C_VNON; /* cannot set type */
  232. /* Venus is responsible for truncating the container-file!!! */
  233. error = venus_setattr(inode->i_sb, coda_i2f(inode), &vattr);
  234. if (!error) {
  235. coda_vattr_to_iattr(inode, &vattr);
  236. coda_cache_clear_inode(inode);
  237. }
  238. return error;
  239. }
  240. const struct inode_operations coda_file_inode_operations = {
  241. .permission = coda_permission,
  242. .getattr = coda_getattr,
  243. .setattr = coda_setattr,
  244. };
  245. static int coda_statfs(struct dentry *dentry, struct kstatfs *buf)
  246. {
  247. int error;
  248. error = venus_statfs(dentry, buf);
  249. if (error) {
  250. /* fake something like AFS does */
  251. buf->f_blocks = 9000000;
  252. buf->f_bfree = 9000000;
  253. buf->f_bavail = 9000000;
  254. buf->f_files = 9000000;
  255. buf->f_ffree = 9000000;
  256. }
  257. /* and fill in the rest */
  258. buf->f_type = CODA_SUPER_MAGIC;
  259. buf->f_bsize = 4096;
  260. buf->f_namelen = CODA_MAXNAMLEN;
  261. return 0;
  262. }
  263. /* init_coda: used by filesystems.c to register coda */
  264. static struct dentry *coda_mount(struct file_system_type *fs_type,
  265. int flags, const char *dev_name, void *data)
  266. {
  267. return mount_nodev(fs_type, flags, data, coda_fill_super);
  268. }
  269. struct file_system_type coda_fs_type = {
  270. .owner = THIS_MODULE,
  271. .name = "coda",
  272. .mount = coda_mount,
  273. .kill_sb = kill_anon_super,
  274. .fs_flags = FS_BINARY_MOUNTDATA,
  275. };
  276. MODULE_ALIAS_FS("coda");