On Tue, 29 Aug 2006 18:59:49 +0100
David Howells <[email protected]> wrote:
> From: David Howells <[email protected]>
>
> Set the backing device info capabilities for /dev/mem and /dev/kmem to permit
> direct sharing under no-MMU conditions.
>
> Also comment the capabilities for /dev/zero.
>
> Signed-Off-By: David Howells <[email protected]>
> ---
>
> drivers/char/mem.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 42 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/char/mem.c b/drivers/char/mem.c
> index 917b204..4c29619 100644
> --- a/drivers/char/mem.c
> +++ b/drivers/char/mem.c
> @@ -238,6 +238,19 @@ #endif
> }
> #endif
>
> +#ifndef CONFIG_MMU
> +static unsigned long get_unmapped_area_mem(struct file *file,
> + unsigned long addr,
> + unsigned long len,
> + unsigned long pgoff,
> + unsigned long flags)
> +{
> + if (!valid_mmap_phys_addr_range(pgoff, len))
> + return (unsigned long) -EINVAL;
> + return pgoff;
> +}
#else
#define get_unmapped_area_mem NULL
#endif
> @@ -782,6 +801,9 @@ static const struct file_operations mem_
> .write = write_mem,
> .mmap = mmap_mem,
> .open = open_mem,
> +#ifndef CONFIG_MMU
> + .get_unmapped_area = get_unmapped_area_mem,
> +#endif
> };
zap ifdefs.
> static const struct file_operations kmem_fops = {
> @@ -790,6 +812,9 @@ static const struct file_operations kmem
> .write = write_kmem,
> .mmap = mmap_kmem,
> .open = open_kmem,
> +#ifndef CONFIG_MMU
> + .get_unmapped_area = get_unmapped_area_mem,
> +#endif
> };
Ditto.
> +/*
> + * capabilities for /dev/zero
> + * - permits private mappings, "copies" are taken of the source of zeros
> + */
> static struct backing_dev_info zero_bdi = {
> .capabilities = BDI_CAP_MAP_COPY,
> };
>
> +/*
> + * capabilities for /dev/mem and /dev/kmem
> + * - permits shared mmap for read, write and/or exec
> + * - does not permit private mmap (add BDI_CAP_MAP_COPY to permit this)
> + */
> +static struct backing_dev_info mem_bdi = {
> + .capabilities = (BDI_CAP_MAP_DIRECT |
> + BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP |
> + BDI_CAP_EXEC_MAP),
> +};
This changes behaviour, doesn't it? But only for !CONFIG_MMU kernels?
Perhaps some additional commentary around this is needed.
> static const struct file_operations full_fops = {
> .llseek = full_lseek,
> .read = read_full,
> @@ -861,9 +901,11 @@ static int memory_open(struct inode * in
> {
> switch (iminor(inode)) {
> case 1:
> + filp->f_mapping->backing_dev_info = &mem_bdi;
> filp->f_op = &mem_fops;
> break;
> case 2:
> + filp->f_mapping->backing_dev_info = &mem_bdi;
> filp->f_op = &kmem_fops;
> break;
> case 3:
Perhaps one could make mem_bdi==NULL if !CONFIG_MMU, for a minor space
saving.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]