Commit 70688e4d authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

xip: support non-struct page backed memory

Convert XIP to support non-struct page backed memory, using VM_MIXEDMAP for
the user mappings.

This requires the get_xip_page API to be changed to an address based one.
Improve the API layering a little bit too, while we're here.

This is required in order to support XIP filesystems on memory that isn't
backed with struct page (but memory with struct page is still supported too).
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarCarsten Otte <cotte@de.ibm.com>
Cc: Jared Hulbert <jaredeh@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30afcb4b
...@@ -796,7 +796,7 @@ const struct address_space_operations ext2_aops = { ...@@ -796,7 +796,7 @@ const struct address_space_operations ext2_aops = {
const struct address_space_operations ext2_aops_xip = { const struct address_space_operations ext2_aops_xip = {
.bmap = ext2_bmap, .bmap = ext2_bmap,
.get_xip_page = ext2_get_xip_page, .get_xip_mem = ext2_get_xip_mem,
}; };
const struct address_space_operations ext2_nobh_aops = { const struct address_space_operations ext2_nobh_aops = {
......
...@@ -15,26 +15,28 @@ ...@@ -15,26 +15,28 @@
#include "xip.h" #include "xip.h"
static inline int static inline int
__inode_direct_access(struct inode *inode, sector_t sector, __inode_direct_access(struct inode *inode, sector_t block,
void **kaddr, unsigned long *pfn) void **kaddr, unsigned long *pfn)
{ {
struct block_device *bdev = inode->i_sb->s_bdev; struct block_device *bdev = inode->i_sb->s_bdev;
struct block_device_operations *ops = bdev->bd_disk->fops; struct block_device_operations *ops = bdev->bd_disk->fops;
sector_t sector;
sector = block * (PAGE_SIZE / 512); /* ext2 block to bdev sector */
BUG_ON(!ops->direct_access); BUG_ON(!ops->direct_access);
return ops->direct_access(bdev, sector, kaddr, pfn); return ops->direct_access(bdev, sector, kaddr, pfn);
} }
static inline int static inline int
__ext2_get_sector(struct inode *inode, sector_t offset, int create, __ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,
sector_t *result) sector_t *result)
{ {
struct buffer_head tmp; struct buffer_head tmp;
int rc; int rc;
memset(&tmp, 0, sizeof(struct buffer_head)); memset(&tmp, 0, sizeof(struct buffer_head));
rc = ext2_get_block(inode, offset/ (PAGE_SIZE/512), &tmp, rc = ext2_get_block(inode, pgoff, &tmp, create);
create);
*result = tmp.b_blocknr; *result = tmp.b_blocknr;
/* did we get a sparse block (hole in the file)? */ /* did we get a sparse block (hole in the file)? */
...@@ -47,14 +49,13 @@ __ext2_get_sector(struct inode *inode, sector_t offset, int create, ...@@ -47,14 +49,13 @@ __ext2_get_sector(struct inode *inode, sector_t offset, int create,
} }
int int
ext2_clear_xip_target(struct inode *inode, int block) ext2_clear_xip_target(struct inode *inode, sector_t block)
{ {
sector_t sector = block * (PAGE_SIZE/512);
void *kaddr; void *kaddr;
unsigned long pfn; unsigned long pfn;
int rc; int rc;
rc = __inode_direct_access(inode, sector, &kaddr, &pfn); rc = __inode_direct_access(inode, block, &kaddr, &pfn);
if (!rc) if (!rc)
clear_page(kaddr); clear_page(kaddr);
return rc; return rc;
...@@ -72,26 +73,18 @@ void ext2_xip_verify_sb(struct super_block *sb) ...@@ -72,26 +73,18 @@ void ext2_xip_verify_sb(struct super_block *sb)
} }
} }
struct page * int ext2_get_xip_mem(struct address_space *mapping, pgoff_t pgoff, int create,
ext2_get_xip_page(struct address_space *mapping, sector_t offset, void **kmem, unsigned long *pfn)
int create)
{ {
int rc; int rc;
void *kaddr; sector_t block;
unsigned long pfn;
sector_t sector;
/* first, retrieve the sector number */ /* first, retrieve the sector number */
rc = __ext2_get_sector(mapping->host, offset, create, &sector); rc = __ext2_get_block(mapping->host, pgoff, create, &block);
if (rc) if (rc)
goto error; return rc;
/* retrieve address of the target data */ /* retrieve address of the target data */
rc = __inode_direct_access rc = __inode_direct_access(mapping->host, block, kmem, pfn);
(mapping->host, sector * (PAGE_SIZE/512), &kaddr, &pfn); return rc;
if (!rc)
return pfn_to_page(pfn);
error:
return ERR_PTR(rc);
} }
...@@ -7,19 +7,20 @@ ...@@ -7,19 +7,20 @@
#ifdef CONFIG_EXT2_FS_XIP #ifdef CONFIG_EXT2_FS_XIP
extern void ext2_xip_verify_sb (struct super_block *); extern void ext2_xip_verify_sb (struct super_block *);
extern int ext2_clear_xip_target (struct inode *, int); extern int ext2_clear_xip_target (struct inode *, sector_t);
static inline int ext2_use_xip (struct super_block *sb) static inline int ext2_use_xip (struct super_block *sb)
{ {
struct ext2_sb_info *sbi = EXT2_SB(sb); struct ext2_sb_info *sbi = EXT2_SB(sb);
return (sbi->s_mount_opt & EXT2_MOUNT_XIP); return (sbi->s_mount_opt & EXT2_MOUNT_XIP);
} }
struct page* ext2_get_xip_page (struct address_space *, sector_t, int); int ext2_get_xip_mem(struct address_space *, pgoff_t, int,
#define mapping_is_xip(map) unlikely(map->a_ops->get_xip_page) void **, unsigned long *);
#define mapping_is_xip(map) unlikely(map->a_ops->get_xip_mem)
#else #else
#define mapping_is_xip(map) 0 #define mapping_is_xip(map) 0
#define ext2_xip_verify_sb(sb) do { } while (0) #define ext2_xip_verify_sb(sb) do { } while (0)
#define ext2_use_xip(sb) 0 #define ext2_use_xip(sb) 0
#define ext2_clear_xip_target(inode, chain) 0 #define ext2_clear_xip_target(inode, chain) 0
#define ext2_get_xip_page NULL #define ext2_get_xip_mem NULL
#endif #endif
...@@ -837,7 +837,7 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, ...@@ -837,7 +837,7 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
if (f->f_flags & O_DIRECT) { if (f->f_flags & O_DIRECT) {
if (!f->f_mapping->a_ops || if (!f->f_mapping->a_ops ||
((!f->f_mapping->a_ops->direct_IO) && ((!f->f_mapping->a_ops->direct_IO) &&
(!f->f_mapping->a_ops->get_xip_page))) { (!f->f_mapping->a_ops->get_xip_mem))) {
fput(f); fput(f);
f = ERR_PTR(-EINVAL); f = ERR_PTR(-EINVAL);
} }
......
...@@ -474,8 +474,8 @@ struct address_space_operations { ...@@ -474,8 +474,8 @@ struct address_space_operations {
int (*releasepage) (struct page *, gfp_t); int (*releasepage) (struct page *, gfp_t);
ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
loff_t offset, unsigned long nr_segs); loff_t offset, unsigned long nr_segs);
struct page* (*get_xip_page)(struct address_space *, sector_t, int (*get_xip_mem)(struct address_space *, pgoff_t, int,
int); void **, unsigned long *);
/* migrate the contents of a page to the specified target */ /* migrate the contents of a page to the specified target */
int (*migratepage) (struct address_space *, int (*migratepage) (struct address_space *,
struct page *, struct page *); struct page *, struct page *);
......
...@@ -49,7 +49,7 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) ...@@ -49,7 +49,7 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
goto out; goto out;
} }
if (mapping->a_ops->get_xip_page) { if (mapping->a_ops->get_xip_mem) {
switch (advice) { switch (advice) {
case POSIX_FADV_NORMAL: case POSIX_FADV_NORMAL:
case POSIX_FADV_RANDOM: case POSIX_FADV_RANDOM:
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/rmap.h> #include <linux/rmap.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/io.h>
/* /*
* We do use our own empty page to avoid interference with other users * We do use our own empty page to avoid interference with other users
...@@ -42,37 +43,41 @@ static struct page *xip_sparse_page(void) ...@@ -42,37 +43,41 @@ static struct page *xip_sparse_page(void)
/* /*
* This is a file read routine for execute in place files, and uses * This is a file read routine for execute in place files, and uses
* the mapping->a_ops->get_xip_page() function for the actual low-level * the mapping->a_ops->get_xip_mem() function for the actual low-level
* stuff. * stuff.
* *
* Note the struct file* is not used at all. It may be NULL. * Note the struct file* is not used at all. It may be NULL.
*/ */
static void static ssize_t
do_xip_mapping_read(struct address_space *mapping, do_xip_mapping_read(struct address_space *mapping,
struct file_ra_state *_ra, struct file_ra_state *_ra,
struct file *filp, struct file *filp,
loff_t *ppos, char __user *buf,
read_descriptor_t *desc, size_t len,
read_actor_t actor) loff_t *ppos)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
pgoff_t index, end_index; pgoff_t index, end_index;
unsigned long offset; unsigned long offset;
loff_t isize; loff_t isize, pos;
size_t copied = 0, error = 0;
BUG_ON(!mapping->a_ops->get_xip_page); BUG_ON(!mapping->a_ops->get_xip_mem);
index = *ppos >> PAGE_CACHE_SHIFT; pos = *ppos;
offset = *ppos & ~PAGE_CACHE_MASK; index = pos >> PAGE_CACHE_SHIFT;
offset = pos & ~PAGE_CACHE_MASK;
isize = i_size_read(inode); isize = i_size_read(inode);
if (!isize) if (!isize)
goto out; goto out;
end_index = (isize - 1) >> PAGE_CACHE_SHIFT; end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
for (;;) { do {
struct page *page; unsigned long nr, left;
unsigned long nr, ret; void *xip_mem;
unsigned long xip_pfn;
int zero = 0;
/* nr is the maximum number of bytes to copy from this page */ /* nr is the maximum number of bytes to copy from this page */
nr = PAGE_CACHE_SIZE; nr = PAGE_CACHE_SIZE;
...@@ -85,19 +90,17 @@ do_xip_mapping_read(struct address_space *mapping, ...@@ -85,19 +90,17 @@ do_xip_mapping_read(struct address_space *mapping,
} }
} }
nr = nr - offset; nr = nr - offset;
if (nr > len)
nr = len;
page = mapping->a_ops->get_xip_page(mapping, error = mapping->a_ops->get_xip_mem(mapping, index, 0,
index*(PAGE_SIZE/512), 0); &xip_mem, &xip_pfn);
if (!page) if (unlikely(error)) {
goto no_xip_page; if (error == -ENODATA) {
if (unlikely(IS_ERR(page))) {
if (PTR_ERR(page) == -ENODATA) {
/* sparse */ /* sparse */
page = ZERO_PAGE(0); zero = 1;
} else { } else
desc->error = PTR_ERR(page);
goto out; goto out;
}
} }
/* If users can be writing to this page using arbitrary /* If users can be writing to this page using arbitrary
...@@ -105,10 +108,10 @@ do_xip_mapping_read(struct address_space *mapping, ...@@ -105,10 +108,10 @@ do_xip_mapping_read(struct address_space *mapping,
* before reading the page on the kernel side. * before reading the page on the kernel side.
*/ */
if (mapping_writably_mapped(mapping)) if (mapping_writably_mapped(mapping))
flush_dcache_page(page); /* address based flush */ ;
/* /*
* Ok, we have the page, so now we can copy it to user space... * Ok, we have the mem, so now we can copy it to user space...
* *
* The actor routine returns how many bytes were actually used.. * The actor routine returns how many bytes were actually used..
* NOTE! This may not be the same as how much of a user buffer * NOTE! This may not be the same as how much of a user buffer
...@@ -116,47 +119,38 @@ do_xip_mapping_read(struct address_space *mapping, ...@@ -116,47 +119,38 @@ do_xip_mapping_read(struct address_space *mapping,
* "pos" here (the actor routine has to update the user buffer * "pos" here (the actor routine has to update the user buffer
* pointers and the remaining count). * pointers and the remaining count).
*/ */
ret = actor(desc, page, offset, nr); if (!zero)
offset += ret; left = __copy_to_user(buf+copied, xip_mem+offset, nr);
index += offset >> PAGE_CACHE_SHIFT; else
offset &= ~PAGE_CACHE_MASK; left = __clear_user(buf + copied, nr);
if (ret == nr && desc->count) if (left) {
continue; error = -EFAULT;
goto out; goto out;
}
no_xip_page: copied += (nr - left);
/* Did not get the page. Report it */ offset += (nr - left);
desc->error = -EIO; index += offset >> PAGE_CACHE_SHIFT;
goto out; offset &= ~PAGE_CACHE_MASK;
} } while (copied < len);
out: out:
*ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset; *ppos = pos + copied;
if (filp) if (filp)
file_accessed(filp); file_accessed(filp);
return (copied ? copied : error);
} }
ssize_t ssize_t
xip_file_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos) xip_file_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
{ {
read_descriptor_t desc;
if (!access_ok(VERIFY_WRITE, buf, len)) if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT; return -EFAULT;
desc.written = 0; return do_xip_mapping_read(filp->f_mapping, &filp->f_ra, filp,
desc.arg.buf = buf; buf, len, ppos);
desc.count = len;
desc.error = 0;
do_xip_mapping_read(filp->f_mapping, &filp->f_ra, filp,
ppos, &desc, file_read_actor);
if (desc.written)
return desc.written;
else
return desc.error;
} }
EXPORT_SYMBOL_GPL(xip_file_read); EXPORT_SYMBOL_GPL(xip_file_read);
...@@ -211,13 +205,16 @@ __xip_unmap (struct address_space * mapping, ...@@ -211,13 +205,16 @@ __xip_unmap (struct address_space * mapping,
* *
* This function is derived from filemap_fault, but used for execute in place * This function is derived from filemap_fault, but used for execute in place
*/ */
static int xip_file_fault(struct vm_area_struct *area, struct vm_fault *vmf) static int xip_file_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
struct file *file = area->vm_file; struct file *file = vma->vm_file;
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct page *page;
pgoff_t size; pgoff_t size;
void *xip_mem;
unsigned long xip_pfn;
struct page *page;
int error;
/* XXX: are VM_FAULT_ codes OK? */ /* XXX: are VM_FAULT_ codes OK? */
...@@ -225,35 +222,44 @@ static int xip_file_fault(struct vm_area_struct *area, struct vm_fault *vmf) ...@@ -225,35 +222,44 @@ static int xip_file_fault(struct vm_area_struct *area, struct vm_fault *vmf)
if (vmf->pgoff >= size) if (vmf->pgoff >= size)
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
page = mapping->a_ops->get_xip_page(mapping, error = mapping->a_ops->get_xip_mem(mapping, vmf->pgoff, 0,
vmf->pgoff*(PAGE_SIZE/512), 0); &xip_mem, &xip_pfn);
if (!IS_ERR(page)) if (likely(!error))
goto out; goto found;
if (PTR_ERR(page) != -ENODATA) if (error != -ENODATA)
return VM_FAULT_OOM; return VM_FAULT_OOM;
/* sparse block */ /* sparse block */
if ((area->vm_flags & (VM_WRITE | VM_MAYWRITE)) && if ((vma->vm_flags & (VM_WRITE | VM_MAYWRITE)) &&
(area->vm_flags & (VM_SHARED| VM_MAYSHARE)) && (vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) &&
(!(mapping->host->i_sb->s_flags & MS_RDONLY))) { (!(mapping->host->i_sb->s_flags & MS_RDONLY))) {
int err;
/* maybe shared writable, allocate new block */ /* maybe shared writable, allocate new block */
page = mapping->a_ops->get_xip_page(mapping, error = mapping->a_ops->get_xip_mem(mapping, vmf->pgoff, 1,
vmf->pgoff*(PAGE_SIZE/512), 1); &xip_mem, &xip_pfn);
if (IS_ERR(page)) if (error)
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
/* unmap page at pgoff from all other vmas */ /* unmap sparse mappings at pgoff from all other vmas */
__xip_unmap(mapping, vmf->pgoff); __xip_unmap(mapping, vmf->pgoff);
found:
err = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
xip_pfn);
if (err == -ENOMEM)
return VM_FAULT_OOM;
BUG_ON(err);
return VM_FAULT_NOPAGE;
} else { } else {
/* not shared and writable, use xip_sparse_page() */ /* not shared and writable, use xip_sparse_page() */
page = xip_sparse_page(); page = xip_sparse_page();
if (!page) if (!page)
return VM_FAULT_OOM; return VM_FAULT_OOM;
}
out: page_cache_get(page);
page_cache_get(page); vmf->page = page;
vmf->page = page; return 0;
return 0; }
} }
static struct vm_operations_struct xip_file_vm_ops = { static struct vm_operations_struct xip_file_vm_ops = {
...@@ -262,11 +268,11 @@ static struct vm_operations_struct xip_file_vm_ops = { ...@@ -262,11 +268,11 @@ static struct vm_operations_struct xip_file_vm_ops = {
int xip_file_mmap(struct file * file, struct vm_area_struct * vma) int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
{ {
BUG_ON(!file->f_mapping->a_ops->get_xip_page); BUG_ON(!file->f_mapping->a_ops->get_xip_mem);
file_accessed(file); file_accessed(file);
vma->vm_ops = &xip_file_vm_ops; vma->vm_ops = &xip_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR; vma->vm_flags |= VM_CAN_NONLINEAR | VM_MIXEDMAP;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xip_file_mmap); EXPORT_SYMBOL_GPL(xip_file_mmap);
...@@ -279,17 +285,17 @@ __xip_file_write(struct file *filp, const char __user *buf, ...@@ -279,17 +285,17 @@ __xip_file_write(struct file *filp, const char __user *buf,
const struct address_space_operations *a_ops = mapping->a_ops; const struct address_space_operations *a_ops = mapping->a_ops;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
long status = 0; long status = 0;
struct page *page;
size_t bytes; size_t bytes;
ssize_t written = 0; ssize_t written = 0;
BUG_ON(!mapping->a_ops->get_xip_page); BUG_ON(!mapping->a_ops->get_xip_mem);
do { do {
unsigned long index; unsigned long index;
unsigned long offset; unsigned long offset;
size_t copied; size_t copied;
char *kaddr; void *xip_mem;
unsigned long xip_pfn;
offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */ offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
index = pos >> PAGE_CACHE_SHIFT; index = pos >> PAGE_CACHE_SHIFT;
...@@ -297,28 +303,22 @@ __xip_file_write(struct file *filp, const char __user *buf, ...@@ -297,28 +303,22 @@ __xip_file_write(struct file *filp, const char __user *buf,
if (bytes > count) if (bytes > count)
bytes = count; bytes = count;
page = a_ops->get_xip_page(mapping, status = a_ops->get_xip_mem(mapping, index, 0,
index*(PAGE_SIZE/512), 0); &xip_mem, &xip_pfn);
if (IS_ERR(page) && (PTR_ERR(page) == -ENODATA)) { if (status == -ENODATA) {
/* we allocate a new page unmap it */ /* we allocate a new page unmap it */
page = a_ops->get_xip_page(mapping, status = a_ops->get_xip_mem(mapping, index, 1,
index*(PAGE_SIZE/512), 1); &xip_mem, &xip_pfn);
if (!IS_ERR(page)) if (!status)
/* unmap page at pgoff from all other vmas */ /* unmap page at pgoff from all other vmas */
__xip_unmap(mapping, index); __xip_unmap(mapping, index);
} }
if (IS_ERR(page)) { if (status)
status = PTR_ERR(page);
break; break;
}
fault_in_pages_readable(buf, bytes);
kaddr = kmap_atomic(page, KM_USER0);
copied = bytes - copied = bytes -
__copy_from_user_inatomic_nocache(kaddr + offset, buf, bytes); __copy_from_user_nocache(xip_mem + offset, buf, bytes);
kunmap_atomic(kaddr, KM_USER0);
flush_dcache_page(page);
if (likely(copied > 0)) { if (likely(copied > 0)) {
status = copied; status = copied;
...@@ -398,7 +398,7 @@ EXPORT_SYMBOL_GPL(xip_file_write); ...@@ -398,7 +398,7 @@ EXPORT_SYMBOL_GPL(xip_file_write);
/* /*
* truncate a page used for execute in place * truncate a page used for execute in place
* functionality is analog to block_truncate_page but does use get_xip_page * functionality is analog to block_truncate_page but does use get_xip_mem
* to get the page instead of page cache * to get the page instead of page cache
*/ */
int int
...@@ -408,9 +408,11 @@ xip_truncate_page(struct address_space *mapping, loff_t from) ...@@ -408,9 +408,11 @@ xip_truncate_page(struct address_space *mapping, loff_t from)
unsigned offset = from & (PAGE_CACHE_SIZE-1); unsigned offset = from & (PAGE_CACHE_SIZE-1);
unsigned blocksize; unsigned blocksize;
unsigned length; unsigned length;
struct page *page; void *xip_mem;
unsigned long xip_pfn;
int err;
BUG_ON(!mapping->a_ops->get_xip_page); BUG_ON(!mapping->a_ops->get_xip_mem);
blocksize = 1 << mapping->host->i_blkbits; blocksize = 1 << mapping->host->i_blkbits;
length = offset & (blocksize - 1); length = offset & (blocksize - 1);
...@@ -421,18 +423,16 @@ xip_truncate_page(struct address_space *mapping, loff_t from) ...@@ -421,18 +423,16 @@ xip_truncate_page(struct address_space *mapping, loff_t from)
length = blocksize - length; length = blocksize - length;
page = mapping->a_ops->get_xip_page(mapping, err = mapping->a_ops->get_xip_mem(mapping, index, 0,
index*(PAGE_SIZE/512), 0); &xip_mem, &xip_pfn);
if (!page) if (unlikely(err)) {
return -ENOMEM; if (err == -ENODATA)
if (unlikely(IS_ERR(page))) {
if (PTR_ERR(page) == -ENODATA)
/* Hole? No need to truncate */ /* Hole? No need to truncate */
return 0; return 0;
else else
return PTR_ERR(page); return err;
} }
zero_user(page, offset, length); memset(xip_mem + offset, 0, length);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xip_truncate_page); EXPORT_SYMBOL_GPL(xip_truncate_page);
...@@ -112,7 +112,7 @@ static long madvise_willneed(struct vm_area_struct * vma, ...@@ -112,7 +112,7 @@ static long madvise_willneed(struct vm_area_struct * vma,
if (!file) if (!file)
return -EBADF; return -EBADF;
if (file->f_mapping->a_ops->get_xip_page) { if (file->f_mapping->a_ops->get_xip_mem) {
/* no bad return value, but ignore advice */ /* no bad return value, but ignore advice */
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment