| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 7 Jan 2010 10:38:25 +0900
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
To: Wu Fengguang <fengguang.wu@...el.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Tejun Heo <tj@...nel.org>, Ingo Molnar <mingo@...e.hu>,
Nick Piggin <npiggin@...e.de>,
Andi Kleen <andi@...stfloor.org>,
Hugh Dickins <hugh.dickins@...cali.co.uk>,
Christoph Lameter <cl@...ux-foundation.org>,
Linux Memory Management List <linux-mm@...ck.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [RFC][PATCH] vmalloc: simplify vread()/vwrite()
On Thu, 7 Jan 2010 09:24:59 +0800
Wu Fengguang <fengguang.wu@...el.com> wrote:
> vread()/vwrite() is only called from kcore/kmem to access one page at
> a time. So the logic can be vastly simplified.
>
I recommend you to rename the function because safety of function is
changed and you can show what callers are influenced.
> The changes are:
> - remove the vmlist walk and rely solely on vmalloc_to_page()
> - replace the VM_IOREMAP check with (page && page_is_ram(pfn))
>
> The VM_IOREMAP check is introduced in commit d0107eb07320b for per-cpu
> alloc. Kame, would you double check if this change is OK for that
> purpose?
>
I think VM_IOREMAP is for avoiding access to device configuration area and
unexpected breakage in device. Then, VM_IOREMAP are should be skipped by
the caller. (My patch _just_ moves the avoidance of callers to vread()/vwrite())
> The page_is_ram() check is necessary because kmap_atomic() is not
> designed to work with non-RAM pages.
>
I think page_is_ram() is not a complete method...on x86, it just check
e820's memory range. checking VM_IOREMAP is better, I think.
> Even for a RAM page, we don't own the page, and cannot assume it's a
> _PAGE_CACHE_WB page. So I wonder whether it's necessary to do another
> patch to call reserve_memtype() before kmap_atomic() to ensure cache
> consistency?
>
> TODO: update comments accordingly
>
BTW, f->f_pos problem on 64bit machine still exists and this patch is still
hard to test. I stopped that because anyone doesn't show any interests.
I have no objection to your direction.
but please rewrite the function explanation as
"addr" should be page alinged and bufsize should be multiple of page size."
and change the function names.
Thanks,
-Kame
> CC: Tejun Heo <tj@...nel.org>
> CC: Ingo Molnar <mingo@...e.hu>
> CC: Nick Piggin <npiggin@...e.de>
> CC: Andi Kleen <andi@...stfloor.org>
> CC: Hugh Dickins <hugh.dickins@...cali.co.uk>
> CC: Christoph Lameter <cl@...ux-foundation.org>
> CC: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
> Signed-off-by: Wu Fengguang <fengguang.wu@...el.com>
> ---
> mm/vmalloc.c | 196 ++++++++++---------------------------------------
> 1 file changed, 40 insertions(+), 156 deletions(-)
>
> --- linux-mm.orig/mm/vmalloc.c 2010-01-04 10:23:12.000000000 +0800
> +++ linux-mm/mm/vmalloc.c 2010-01-05 12:42:40.000000000 +0800
> @@ -1646,87 +1646,6 @@ void *vmalloc_32_user(unsigned long size
> }
> EXPORT_SYMBOL(vmalloc_32_user);
>
> -/*
> - * small helper routine , copy contents to buf from addr.
> - * If the page is not present, fill zero.
> - */
> -
> -static int aligned_vread(char *buf, char *addr, unsigned long count)
> -{
> - struct page *p;
> - int copied = 0;
> -
> - while (count) {
> - unsigned long offset, length;
> -
> - offset = (unsigned long)addr & ~PAGE_MASK;
> - length = PAGE_SIZE - offset;
> - if (length > count)
> - length = count;
> - p = vmalloc_to_page(addr);
> - /*
> - * To do safe access to this _mapped_ area, we need
> - * lock. But adding lock here means that we need to add
> - * overhead of vmalloc()/vfree() calles for this _debug_
> - * interface, rarely used. Instead of that, we'll use
> - * kmap() and get small overhead in this access function.
> - */
> - if (p) {
> - /*
> - * we can expect USER0 is not used (see vread/vwrite's
> - * function description)
> - */
> - void *map = kmap_atomic(p, KM_USER0);
> - memcpy(buf, map + offset, length);
> - kunmap_atomic(map, KM_USER0);
> - } else
> - memset(buf, 0, length);
> -
> - addr += length;
> - buf += length;
> - copied += length;
> - count -= length;
> - }
> - return copied;
> -}
> -
> -static int aligned_vwrite(char *buf, char *addr, unsigned long count)
> -{
> - struct page *p;
> - int copied = 0;
> -
> - while (count) {
> - unsigned long offset, length;
> -
> - offset = (unsigned long)addr & ~PAGE_MASK;
> - length = PAGE_SIZE - offset;
> - if (length > count)
> - length = count;
> - p = vmalloc_to_page(addr);
> - /*
> - * To do safe access to this _mapped_ area, we need
> - * lock. But adding lock here means that we need to add
> - * overhead of vmalloc()/vfree() calles for this _debug_
> - * interface, rarely used. Instead of that, we'll use
> - * kmap() and get small overhead in this access function.
> - */
> - if (p) {
> - /*
> - * we can expect USER0 is not used (see vread/vwrite's
> - * function description)
> - */
> - void *map = kmap_atomic(p, KM_USER0);
> - memcpy(map + offset, buf, length);
> - kunmap_atomic(map, KM_USER0);
> - }
> - addr += length;
> - buf += length;
> - copied += length;
> - count -= length;
> - }
> - return copied;
> -}
> -
> /**
> * vread() - read vmalloc area in a safe way.
> * @buf: buffer for reading data
> @@ -1757,49 +1676,34 @@ static int aligned_vwrite(char *buf, cha
>
> long vread(char *buf, char *addr, unsigned long count)
> {
> - struct vm_struct *tmp;
> - char *vaddr, *buf_start = buf;
> - unsigned long buflen = count;
> - unsigned long n;
> -
> - /* Don't allow overflow */
> - if ((unsigned long) addr + count < count)
> - count = -(unsigned long) addr;
> + struct page *p;
> + void *map;
> + int offset = (unsigned long)addr & (PAGE_SIZE - 1);
>
> - read_lock(&vmlist_lock);
> - for (tmp = vmlist; count && tmp; tmp = tmp->next) {
> - vaddr = (char *) tmp->addr;
> - if (addr >= vaddr + tmp->size - PAGE_SIZE)
> - continue;
> - while (addr < vaddr) {
> - if (count == 0)
> - goto finished;
> - *buf = '\0';
> - buf++;
> - addr++;
> - count--;
> - }
> - n = vaddr + tmp->size - PAGE_SIZE - addr;
> - if (n > count)
> - n = count;
> - if (!(tmp->flags & VM_IOREMAP))
> - aligned_vread(buf, addr, n);
> - else /* IOREMAP area is treated as memory hole */
> - memset(buf, 0, n);
> - buf += n;
> - addr += n;
> - count -= n;
> - }
> -finished:
> - read_unlock(&vmlist_lock);
> + /* Assume subpage access */
> + BUG_ON(count > PAGE_SIZE - offset);
>
> - if (buf == buf_start)
> + p = vmalloc_to_page(addr);
> + if (!p || !page_is_ram(page_to_pfn(p))) {
> + memset(buf, 0, count);
> return 0;
> - /* zero-fill memory holes */
> - if (buf != buf_start + buflen)
> - memset(buf, 0, buflen - (buf - buf_start));
> + }
>
> - return buflen;
> + /*
> + * To do safe access to this _mapped_ area, we need
> + * lock. But adding lock here means that we need to add
> + * overhead of vmalloc()/vfree() calles for this _debug_
> + * interface, rarely used. Instead of that, we'll use
> + * kmap() and get small overhead in this access function.
> + *
> + * we can expect USER0 is not used (see vread/vwrite's
> + * function description)
> + */
> + map = kmap_atomic(p, KM_USER0);
> + memcpy(buf, map + offset, count);
> + kunmap_atomic(map, KM_USER0);
> +
> + return count;
> }
>
> /**
> @@ -1834,44 +1738,24 @@ finished:
>
> long vwrite(char *buf, char *addr, unsigned long count)
> {
> - struct vm_struct *tmp;
> - char *vaddr;
> - unsigned long n, buflen;
> - int copied = 0;
> -
> - /* Don't allow overflow */
> - if ((unsigned long) addr + count < count)
> - count = -(unsigned long) addr;
> - buflen = count;
> + struct page *p;
> + void *map;
> + int offset = (unsigned long)addr & (PAGE_SIZE - 1);
>
> - read_lock(&vmlist_lock);
> - for (tmp = vmlist; count && tmp; tmp = tmp->next) {
> - vaddr = (char *) tmp->addr;
> - if (addr >= vaddr + tmp->size - PAGE_SIZE)
> - continue;
> - while (addr < vaddr) {
> - if (count == 0)
> - goto finished;
> - buf++;
> - addr++;
> - count--;
> - }
> - n = vaddr + tmp->size - PAGE_SIZE - addr;
> - if (n > count)
> - n = count;
> - if (!(tmp->flags & VM_IOREMAP)) {
> - aligned_vwrite(buf, addr, n);
> - copied++;
> - }
> - buf += n;
> - addr += n;
> - count -= n;
> - }
> -finished:
> - read_unlock(&vmlist_lock);
> - if (!copied)
> + /* Assume subpage access */
> + BUG_ON(count > PAGE_SIZE - offset);
> +
> + p = vmalloc_to_page(addr);
> + if (!p)
> + return 0;
> + if (!page_is_ram(page_to_pfn(p)))
> return 0;
> - return buflen;
> +
> + map = kmap_atomic(p, KM_USER0);
> + memcpy(map + offset, buf, count);
> + kunmap_atomic(map, KM_USER0);
> +
> + return count;
> }
>
> /**
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists