diff -u -rN -p linux-2.6.10-rbtx49/fs/Kconfig linux-2.6.10-cramfs/fs/Kconfig --- linux-2.6.10-rbtx49/fs/Kconfig 2005-04-22 14:47:49.000000000 +0900 +++ linux-2.6.10-cramfs/fs/Kconfig 2005-04-22 15:17:54.000000000 +0900 @@ -1308,6 +1308,51 @@ config CRAMFS_SIZE_WIDTH help If unsure, say 24. +config CRAMFS_LINEAR + bool "Use linear addressing for CramFs" + depends on CRAMFS + help + This option tells the CramFs driver to load data directly from + a linear adressed memory range (usually non volatile memory + like flash) instead of going through the block device layer. + This saves some memory since no intermediate buffering is + necessary. + + This is also a prerequisite for XIP of binaries stored on the + filesystem. + + The location of the CramFs image in memory is board + dependent. Therefore, if you say Y, you must know the proper + physical address where to store the CramFs image and specify + it using the physaddr=0x******** mount option (for example: + "mount -t cramfs -o physaddr=0x100000 none /mnt"). + + If unsure, say N. + +config CRAMFS_LINEAR_XIP + bool "Support XIP on linear CramFs" + depends on CRAMFS_LINEAR + help + You must say Y to this option if you want to be able to run + applications directly from non-volatile memory. XIP + applications are marked by setting the sticky bit (ie, "chmod + +t "). A cramfs file system then needs to be + created using mkcramfs (with XIP cramfs support in + it). Applications marked for XIP execution will not be + compressed since they have to run directly from flash. + +config ROOT_CRAMFS_LINEAR + bool "Root file system on linear CramFs" + depends on CRAMFS_LINEAR + help + Say Y if you have enabled linear CramFs, and you want to be + able to use the linear CramFs image as a root file system. To + actually have the kernel mount this CramFs image as a root + file system, you must also pass the command line parameter + "root=/dev/null rootflags=physaddr=0x********" to the kernel + (replace 0x******** with the physical address location of the + linear CramFs image to boot with). + config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" help diff -u -rN -p linux-2.6.10-rbtx49/fs/cramfs/inode.c linux-2.6.10-cramfs/fs/cramfs/inode.c --- linux-2.6.10-rbtx49/fs/cramfs/inode.c 2005-04-22 14:47:49.000000000 +0900 +++ linux-2.6.10-cramfs/fs/cramfs/inode.c 2005-04-22 15:34:26.000000000 +0900 @@ -11,6 +11,39 @@ * The actual compression is based on zlib, see the other files. */ +/* Linear Addressing code + * + * Copyright (C) 2000 Shane Nay. + * + * Allows you to have a linearly addressed cramfs filesystem. + * Saves the need for buffer, and the munging of the buffer. + * Savings a bit over 32k with default PAGE_SIZE, BUFFER_SIZE + * etc. Usefull on embedded platform with ROM :-). + * + * Downsides- Currently linear addressed cramfs partitions + * don't co-exist with block cramfs partitions. + * + */ + +/* + * 28-Dec-2000: XIP mode for linear cramfs + * Copyright (C) 2000 Robert Leslie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include #include #include @@ -25,6 +58,7 @@ #include #include +#include static struct super_operations cramfs_ops; static struct inode_operations cramfs_dir_inode_operations; @@ -39,6 +73,66 @@ static DECLARE_MUTEX(read_mutex); #define CRAMINO(x) ((x)->offset?(x)->offset<<2:1) #define OFFSET(x) ((x)->i_ino) +#ifdef CONFIG_CRAMFS_LINEAR_XIP +static int cramfs_mmap(struct file *file, struct vm_area_struct *vma) +{ + unsigned long address, length; + struct inode *inode = file->f_dentry->d_inode; + struct super_block *sb = inode->i_sb; + struct cramfs_sb_info *sbi = CRAMFS_SB(sb); + + /* this is only used in the case of read-only maps for XIP */ + + if (vma->vm_flags & VM_WRITE) + return generic_file_mmap(file, vma); + + if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_MAYWRITE)) + return -EINVAL; + + address = PAGE_ALIGN(sbi->linear_phys_addr + OFFSET(inode)); + address += vma->vm_pgoff << PAGE_SHIFT; + + length = vma->vm_end - vma->vm_start; + + if (length > inode->i_size) + length = inode->i_size; + + length = PAGE_ALIGN(length); + + /* + * Don't dump addresses that are not real memory to a core file. + */ + vma->vm_flags |= (VM_IO | VM_XIP); + flush_tlb_page(vma, address); + if (remap_page_range(vma, vma->vm_start, address, length, + vma->vm_page_prot)) + return -EAGAIN; + +#ifdef DEBUG_CRAMFS_XIP + printk("cramfs_mmap: mapped %s at 0x%08lx, length %lu to vma 0x%08lx" + ", page_prot 0x%08lx\n", + file->f_dentry->d_name.name, address, length, + vma->vm_start, pgprot_val(vma->vm_page_prot)); +#endif + + return 0; +} + +static struct file_operations cramfs_linear_xip_fops = { + read: generic_file_read, + mmap: cramfs_mmap, +}; + +#define CRAMFS_INODE_IS_XIP(x) ((x)->i_mode & S_ISVTX) + +#endif + +#ifdef CONFIG_CRAMFS_LINEAR +static struct backing_dev_info cramfs_backing_dev_info = { + .ra_pages = 0, /* No readahead */ +}; +#endif + static struct inode *get_cramfs_inode(struct super_block *sb, struct cramfs_inode * cramfs_inode) { struct inode * inode = new_inode(sb); @@ -51,6 +145,9 @@ static struct inode *get_cramfs_inode(st inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1; inode->i_blksize = PAGE_CACHE_SIZE; inode->i_gid = cramfs_inode->gid; +#ifdef CONFIG_CRAMFS_LINEAR + inode->i_mapping->backing_dev_info = &cramfs_backing_dev_info; +#endif /* Struct copy intentional */ inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime; inode->i_ino = CRAMINO(cramfs_inode); @@ -60,7 +157,11 @@ static struct inode *get_cramfs_inode(st without -noleaf option. */ insert_inode_hash(inode); if (S_ISREG(inode->i_mode)) { +#ifdef CONFIG_CRAMFS_LINEAR_XIP + inode->i_fop = CRAMFS_INODE_IS_XIP(inode) ? &cramfs_linear_xip_fops : &generic_ro_fops; +#else inode->i_fop = &generic_ro_fops; +#endif inode->i_data.a_ops = &cramfs_aops; } else if (S_ISDIR(inode->i_mode)) { inode->i_op = &cramfs_dir_inode_operations; @@ -77,6 +178,19 @@ static struct inode *get_cramfs_inode(st return inode; } +#ifdef CONFIG_CRAMFS_LINEAR +/* + * Return a pointer to the block in the linearly addressed cramfs image. + */ +static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned int len) +{ + struct cramfs_sb_info *sbi = CRAMFS_SB(sb); + + if (!len) + return NULL; + return (void*)(sbi->linear_virt_addr + offset); +} +#else /* Not linear addressing - aka regular block mode. */ /* * We have our own block cache: don't fill up the buffer cache * with the rom-image, because the way the filesystem is set @@ -186,6 +300,7 @@ static void *cramfs_read(struct super_bl } return read_buffers[buffer] + offset; } +#endif /* CONFIG_CRAMFS_LINEAR */ static void cramfs_put_super(struct super_block *sb) { @@ -201,7 +316,11 @@ static int cramfs_remount(struct super_b static int cramfs_fill_super(struct super_block *sb, void *data, int silent) { +#ifndef CONFIG_CRAMFS_LINEAR int i; +#else + char *p; +#endif struct cramfs_super super; unsigned long root_offset; struct cramfs_sb_info *sbi; @@ -215,11 +334,48 @@ static int cramfs_fill_super(struct supe sb->s_fs_info = sbi; memset(sbi, 0, sizeof(struct cramfs_sb_info)); +#ifndef CONFIG_CRAMFS_LINEAR /* Invalidate the read buffers on mount: think disk change.. */ down(&read_mutex); for (i = 0; i < READ_BUFFERS; i++) buffer_blocknr[i] = -1; +#else /* CONFIG_CRAMFS_LINEAR */ + /* + * The physical location of the cramfs image is specified as + * a mount parameter. This parameter is mandatory for obvious + * reasons. Some validation is made on the phys address but this + * is not exhaustive and we count on the fact that someone using + * this feature is supposed to know what he/she's doing. + */ + if (!data || !(p = strstr((char *)data, "physaddr="))) { + printk(KERN_ERR "cramfs: unknown physical address for linear cramfs image\n"); + goto out; + } + sbi->linear_phys_addr = simple_strtoul(p + 9, NULL, 0); + if (sbi->linear_phys_addr & (PAGE_SIZE-1)) { + printk(KERN_ERR "cramfs: physical address 0x%lx for linear cramfs isn't aligned to a page boundary\n", + sbi->linear_phys_addr); + goto out; + } + if (sbi->linear_phys_addr == 0) { + printk(KERN_ERR "cramfs: physical address for linear cramfs image can't be 0\n"); + goto out; + } + printk(KERN_INFO "cramfs: checking physical address 0x%lx for linear cramfs image\n", + sbi->linear_phys_addr); + + /* Map only one page for now. Will remap it when fs size is known. */ + sbi->linear_virt_addr = + ioremap(sbi->linear_phys_addr, PAGE_SIZE); + if (!sbi->linear_virt_addr) { + printk(KERN_ERR "cramfs: ioremap of the linear cramfs image failed\n"); + goto out; + } + + down(&read_mutex); +#endif /* CONFIG_CRAMFS_LINEAR */ + /* Read the first block and get the superblock from it */ memcpy(&super, cramfs_read(sb, 0, sizeof(super)), sizeof(super)); up(&read_mutex); @@ -280,8 +436,34 @@ static int cramfs_fill_super(struct supe iput(root); goto out; } + +#ifdef CONFIG_CRAMFS_LINEAR + /* Remap the whole filesystem now */ + iounmap(sbi->linear_virt_addr); + printk(KERN_INFO "cramfs: linear cramfs image appears to be %lu KB in size\n", + sbi->size/1024); +#ifdef CONFIG_ARM + sbi->linear_virt_addr = + __ioremap(sbi->linear_phys_addr, sbi->size, L_PTE_CACHEABLE, + 1); +#elif defined(CONFIG_MIPS) /* CONFIG_ARM */ + sbi->linear_virt_addr = + __ioremap(sbi->linear_phys_addr, sbi->size, PAGE_CACHABLE_DEFAULT); +#else /* CONFIG_ARM */ + sbi->linear_virt_addr = + ioremap(sbi->linear_phys_addr, sbi->size); +#endif /* CONFIG_ARM */ + if (!sbi->linear_virt_addr) { + printk(KERN_ERR "cramfs: ioremap of the linear cramfs image failed\n"); + goto out; + } +#endif /* CONFIG_CRAMFS_LINEAR */ return 0; out: +#ifdef CONFIG_CRAMFS_LINEAR + if (sbi->linear_virt_addr) + iounmap(sbi->linear_virt_addr); +#endif /* CONFIG_CRAMFS_LINEAR */ kfree(sbi); sb->s_fs_info = NULL; return -EINVAL; @@ -439,6 +621,20 @@ static int cramfs_readpage(struct file * u32 blkptr_offset = OFFSET(inode) + page->index*4; u32 start_offset, compr_len; +#ifdef CONFIG_CRAMFS_LINEAR_XIP + if(CRAMFS_INODE_IS_XIP(inode)) { + blkptr_offset = + PAGE_ALIGN(OFFSET(inode)) + + page->index * PAGE_CACHE_SIZE; + down(&read_mutex); + memcpy(page_address(page), + cramfs_read(sb, blkptr_offset, PAGE_CACHE_SIZE), + PAGE_CACHE_SIZE); + up(&read_mutex); + bytes_filled = PAGE_CACHE_SIZE; + pgdata = kmap(page); + } else { +#endif /* CONFIG_CRAMFS_LINEAR_XIP */ start_offset = OFFSET(inode) + maxblock*4; down(&read_mutex); if (page->index) @@ -456,6 +652,9 @@ static int cramfs_readpage(struct file * compr_len); up(&read_mutex); } +#ifdef CONFIG_CRAMFS_LINEAR_XIP + } +#endif /* CONFIG_CRAMFS_LINEAR_XIP */ } else pgdata = kmap(page); memset(pgdata + bytes_filled, 0, PAGE_CACHE_SIZE - bytes_filled); @@ -496,7 +695,11 @@ static struct super_operations cramfs_op static struct super_block *cramfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { +#ifdef CONFIG_CRAMFS_LINEAR + return get_sb_nodev(fs_type, flags, data, cramfs_fill_super); +#else return get_sb_bdev(fs_type, flags, dev_name, data, cramfs_fill_super); +#endif } static struct file_system_type cramfs_fs_type = { @@ -504,7 +707,9 @@ static struct file_system_type cramfs_fs .name = "cramfs", .get_sb = cramfs_get_sb, .kill_sb = kill_block_super, +#ifndef CONFIG_CRAMFS_LINEAR .fs_flags = FS_REQUIRES_DEV, +#endif /* CONFIG_CRAMFS_LINEAR */ }; static int __init init_cramfs_fs(void) diff -u -rN -p linux-2.6.10-rbtx49/include/linux/cramfs_fs_sb.h linux-2.6.10-cramfs/include/linux/cramfs_fs_sb.h --- linux-2.6.10-rbtx49/include/linux/cramfs_fs_sb.h 2005-04-22 14:47:49.000000000 +0900 +++ linux-2.6.10-cramfs/include/linux/cramfs_fs_sb.h 2005-04-22 15:17:54.000000000 +0900 @@ -10,6 +10,10 @@ struct cramfs_sb_info { unsigned long blocks; unsigned long files; unsigned long flags; +#ifdef CONFIG_CRAMFS_LINEAR + unsigned long linear_phys_addr; + char * linear_virt_addr; +#endif /* CONFIG_CRAMFS_LINEAR */ }; static inline struct cramfs_sb_info *CRAMFS_SB(struct super_block *sb) diff -u -rN -p linux-2.6.10-rbtx49/include/linux/mm.h linux-2.6.10-cramfs/include/linux/mm.h --- linux-2.6.10-rbtx49/include/linux/mm.h 2005-04-22 14:48:25.000000000 +0900 +++ linux-2.6.10-cramfs/include/linux/mm.h 2005-04-22 15:17:54.000000000 +0900 @@ -141,6 +141,7 @@ struct vm_area_struct { #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */ #define VM_RESERVED 0x00080000 /* Don't unmap it from swap_out */ #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */ +#define VM_XIP 0x00200000 /* Execute In Place from ROM/flash */ #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ diff -u -rN -p linux-2.6.10-rbtx49/init/do_mounts.c linux-2.6.10-cramfs/init/do_mounts.c --- linux-2.6.10-rbtx49/init/do_mounts.c 2005-04-22 14:49:12.000000000 +0900 +++ linux-2.6.10-cramfs/init/do_mounts.c 2005-04-22 15:22:31.000000000 +0900 @@ -331,6 +331,15 @@ static int __init mount_pramfs_root(void return 0; } #endif +#ifdef CONFIG_ROOT_CRAMFS_LINEAR +static int __init mount_cramfs_linear_root(void) +{ + create_dev("/dev/root", ROOT_DEV, root_device_name); + if (do_mount_root("/dev/root","cramfs",root_mountflags,root_mount_data) == 0) + return 1; + return 0; +} +#endif #if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD) void __init change_floppy(char *fmt, ...) @@ -364,6 +373,13 @@ void __init change_floppy(char *fmt, ... void __init mount_root(void) { +#ifdef CONFIG_ROOT_CRAMFS_LINEAR + if (ROOT_DEV == MKDEV(0, 0)) { + if (mount_cramfs_linear_root()) + return; + printk (KERN_ERR "VFS: Unable to mount linear cramfs root.\n"); + } +#endif #ifdef CONFIG_ROOT_NFS if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) { if (mount_nfs_root()) diff -u -rN -p linux-2.6.10-rbtx49/mm/memory.c linux-2.6.10-cramfs/mm/memory.c --- linux-2.6.10-rbtx49/mm/memory.c 2005-04-22 21:18:55.000000000 +0900 +++ linux-2.6.10-cramfs/mm/memory.c 2005-04-22 21:22:22.717925302 +0900 @@ -761,7 +761,8 @@ int get_user_pages(struct task_struct *t continue; } - if (!vma || (vma->vm_flags & VM_IO) + if (!vma || ((vma->vm_flags & VM_IO) + && !(vma->vm_flags & VM_XIP)) || !(flags & vma->vm_flags)) return i ? : -EFAULT; @@ -1060,6 +1061,46 @@ static int do_wp_page(struct mm_struct * pte_t entry; if (unlikely(!pfn_valid(pfn))) { + if ((vma->vm_flags & VM_XIP) && pte_present(pte) && + pte_read(pte)) { + /* + * Handle COW of XIP memory. + * Note that the source memory actually isn't a ram + * page so no struct page is associated to the source + * pte. + */ + char *dst; + int ret; + + spin_unlock(&mm->page_table_lock); + new_page = alloc_page(GFP_HIGHUSER); + if (!new_page) + return VM_FAULT_OOM; + + /* copy XIP data to memory */ + + dst = kmap_atomic(new_page, KM_USER0); + ret = copy_from_user(dst, (void*)address, PAGE_SIZE); + kunmap_atomic(dst, KM_USER0); + + /* make sure pte didn't change while we dropped the + lock */ + spin_lock(&mm->page_table_lock); + if (!ret && pte_same(*page_table, pte)) { + ++mm->rss; + break_cow(vma, new_page, address, page_table); + lru_cache_add(new_page); + page_add_file_rmap(new_page); + spin_unlock(&mm->page_table_lock); + return VM_FAULT_MINOR; /* Minor fault */ + } + + /* pte changed: back off */ + spin_unlock(&mm->page_table_lock); + page_cache_release(new_page); + return ret ? VM_FAULT_OOM : VM_FAULT_MINOR; + } + /* * This should really halt the system so it can be debugged or * at least the kernel stops what it's doing before it corrupts