Page MenuHomeFreeBSD
Files F160467267

D57688.id180203.diff
No OneTemporary
Actions

D57688.id180203.diff
View Options

diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/uio_machdep.c
@@ -96,38 +96,14 @@
&ma[offset >> PAGE_SHIFT], &vaddr, 1, true);
cp = (char *)vaddr + page_offset;
}
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error)
- goto out;
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
if (__predict_false(mapped)) {
pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT],
&vaddr, 1, true);
mapped = false;
}
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
@@ -135,10 +111,6 @@
offset += cnt;
n -= cnt;
}
-out:
- if (__predict_false(mapped))
- pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT], &vaddr, 1,
- true);
if (save == 0)
td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -91,36 +91,10 @@
cnt = min(cnt, PAGE_SIZE - page_offset);
sf = sf_buf_alloc(ma[offset >> PAGE_SHIFT], 0);
cp = (char*)sf_buf_kva(sf) + page_offset;
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error) {
- sf_buf_free(sf);
- goto out;
- }
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
sf_buf_free(sf);
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
@@ -128,7 +102,6 @@
offset += cnt;
n -= cnt;
}
-out:
if (save == 0)
td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c
--- a/sys/arm64/arm64/uio_machdep.c
+++ b/sys/arm64/arm64/uio_machdep.c
@@ -92,38 +92,14 @@
&ma[offset >> PAGE_SHIFT], &vaddr, 1, true);
cp = (char *)vaddr + page_offset;
}
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error)
- goto out;
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
if (__predict_false(mapped)) {
pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT],
&vaddr, 1, true);
mapped = false;
}
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
@@ -131,12 +107,6 @@
offset += cnt;
n -= cnt;
}
-out:
- if (__predict_false(mapped)) {
- panic("ARM64TODO: uiomove_fromphys");
- pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT], &vaddr, 1,
- true);
- }
if (save == 0)
td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/uio_machdep.c
@@ -91,38 +91,11 @@
sched_pin();
sf = sf_buf_alloc(ma[offset >> PAGE_SHIFT], SFB_CPUPRIVATE);
cp = (char *)sf_buf_kva(sf) + page_offset;
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error) {
- sf_buf_free(sf);
- sched_unpin();
- goto out;
- }
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
sf_buf_free(sf);
sched_unpin();
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c
--- a/sys/kern/subr_uio.c
+++ b/sys/kern/subr_uio.c
@@ -200,6 +200,40 @@
return (uiomove_faultflag(cp, n, uio, 1));
}
+int
+uiomove_step(void *cp, void *base, size_t len, struct uio *uio)
+{
+ int error = 0;
+
+ switch (uio->uio_segflg) {
+ case UIO_USERSPACE:
+ maybe_yield();
+ switch (uio->uio_rw) {
+ case UIO_READ:
+ error = copyout(cp, base, len);
+ break;
+ case UIO_WRITE:
+ error = copyin(base, cp, len);
+ break;
+ }
+ break;
+ case UIO_SYSSPACE:
+ switch (uio->uio_rw) {
+ case UIO_READ:
+ memcpy(base, cp, len);
+ break;
+ case UIO_WRITE:
+ memcpy(cp, base, len);
+ break;
+ }
+ break;
+ case UIO_NOCOPY:
+ break;
+ }
+
+ return (error);
+}
+
static int
uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault)
{
@@ -246,34 +280,9 @@
if (cnt > n)
cnt = n;
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error)
- goto out;
- break;
-
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
+ if (error != 0)
+ goto out;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c
--- a/sys/powerpc/powerpc/uio_machdep.c
+++ b/sys/powerpc/powerpc/uio_machdep.c
@@ -97,36 +97,10 @@
sf = sf_buf_alloc(m, 0);
cp = (char*)sf_buf_kva(sf) + page_offset;
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error) {
- sf_buf_free(sf);
- goto out;
- }
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
sf_buf_free(sf);
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
@@ -134,7 +108,6 @@
offset += cnt;
n -= cnt;
}
-out:
if (save == 0)
td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c
--- a/sys/riscv/riscv/uio_machdep.c
+++ b/sys/riscv/riscv/uio_machdep.c
@@ -92,38 +92,14 @@
&ma[offset >> PAGE_SHIFT], &vaddr, 1, true);
cp = (char *)vaddr + page_offset;
}
- switch (uio->uio_segflg) {
- case UIO_USERSPACE:
- maybe_yield();
- switch (uio->uio_rw) {
- case UIO_READ:
- error = copyout(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- error = copyin(iov->iov_base, cp, cnt);
- break;
- }
- if (error)
- goto out;
- break;
- case UIO_SYSSPACE:
- switch (uio->uio_rw) {
- case UIO_READ:
- bcopy(cp, iov->iov_base, cnt);
- break;
- case UIO_WRITE:
- bcopy(iov->iov_base, cp, cnt);
- break;
- }
- break;
- case UIO_NOCOPY:
- break;
- }
+ error = uiomove_step(cp, iov->iov_base, cnt, uio);
if (__predict_false(mapped)) {
pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT],
&vaddr, 1, true);
mapped = false;
}
+ if (error != 0)
+ break;
iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
@@ -131,12 +107,6 @@
offset += cnt;
n -= cnt;
}
-out:
- if (__predict_false(mapped)) {
- panic("TODO 3");
- pmap_unmap_io_transient(&ma[offset >> PAGE_SHIFT], &vaddr, 1,
- true);
- }
if (save == 0)
td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -98,6 +98,7 @@
struct uio *uio);
int uiomove_nofault(void *cp, int n, struct uio *uio);
int uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio);
+int uiomove_step(void *cp, void *base, size_t cnt, struct uio *uio);
#else /* !_KERNEL */

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 25, 7:36 PM (20 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34265883
Default Alt Text
D57688.id180203.diff (9 KB)

Event Timeline