[src/trunk]: src/sys/arch/vax/vsa Fix bug causing DMA to/from user space fail...

[ragge <ragge%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e3c673f753af
branches:  trunk
changeset: 831747:e3c673f753af
user:      ragge <ragge%NetBSD.org@localhost>
date:      Thu Apr 12 18:45:57 2018 +0000

description:
Fix bug causing DMA to/from user space fail. Fixes PR#49517.
This bug has been around since 2003.
Thanks to Martin Husemann for providing hardware to debug on!

diffstat:

 sys/arch/vax/vsa/vsbus.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r 97880262b2b1 -r e3c673f753af sys/arch/vax/vsa/vsbus.c
--- a/sys/arch/vax/vsa/vsbus.c  Thu Apr 12 18:44:59 2018 +0000
+++ b/sys/arch/vax/vsa/vsbus.c  Thu Apr 12 18:45:57 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vsbus.c,v 1.63 2017/05/22 17:17:25 ragge Exp $ */
+/*     $NetBSD: vsbus.c,v 1.64 2018/04/12 18:45:57 ragge Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.63 2017/05/22 17:17:25 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.64 2018/04/12 18:45:57 ragge Exp $");
 
 #include "opt_cputype.h"
 
@@ -261,6 +261,11 @@
        *sc->sc_intclr = mask;
 }
 
+#define puvtopte(va, pmap) \
+       (((vaddr_t)va < 0x40000000) ? \
+       &(((pmap)->pm_p0br)[PG_PFNUM(va)]) : \
+       &(((pmap)->pm_p1br)[PG_PFNUM(va)]))
+
 /*
  * Copy data from/to a user process' space from the DMA area.
  * Use the physical memory directly.
@@ -269,6 +274,7 @@
 vsbus_copytoproc(struct proc *p, void *fromv, void *tov, int len)
 {
        char *from = fromv, *to = tov;
+       struct pmap *pm;
        struct pte *pte;
        paddr_t pa;
 
@@ -282,10 +288,8 @@
                panic("vsbus_copytoproc: no proc");
 #endif
 
-       if ((vaddr_t)to & 0x40000000)
-               pte = &p->p_vmspace->vm_map.pmap->pm_p1br[vax_btop((vaddr_t)to & ~0x40000000)];
-       else
-               pte = &p->p_vmspace->vm_map.pmap->pm_p0br[vax_btop((vaddr_t)to)];
+       pm = p->p_vmspace->vm_map.pmap;
+       pte = puvtopte(trunc_page((vaddr_t)to), pm);
        if ((vaddr_t)to & PGOFSET) {
                int cz = round_page((vaddr_t)to) - (vaddr_t)to;
 
@@ -310,6 +314,7 @@
 vsbus_copyfromproc(struct proc *p, void *fromv, void *tov, int len)
 {
        char *from = fromv, *to = tov;
+       struct pmap *pm;
        struct pte *pte;
        paddr_t pa;
 
@@ -323,10 +328,8 @@
                panic("vsbus_copyfromproc: no proc");
 #endif
 
-       if ((vaddr_t)from & 0x40000000)
-               pte = &p->p_vmspace->vm_map.pmap->pm_p1br[vax_btop((vaddr_t)from & ~0x40000000)];
-       else
-               pte = &p->p_vmspace->vm_map.pmap->pm_p0br[vax_btop((vaddr_t)from)];
+       pm = p->p_vmspace->vm_map.pmap;
+       pte = puvtopte(trunc_page((vaddr_t)from), pm);
        if ((vaddr_t)from & PGOFSET) {
                int cz = round_page((vaddr_t)from) - (vaddr_t)from;