diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2011-08-13 10:58:32 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2011-08-13 10:58:32 +0000 |
| commit | 5afdb549b0ee58757e6debbbf667bbd5a3bc1fa1 (patch) | |
| tree | e1f7543e3a828388dfecf93e2741e1dd09c5246e /sys | |
| parent | c9527827c9b8ca9a64a133aca0a71a0f902ce69c (diff) | |
call lddone from a softint instead of the signal handler, now reading from
disk works:
ld0 at mainbus0: /home/jmcneill/test.fs (33554432)
ld0: 32768 KB, 65 cyl, 16 head, 63 sec, 512 bytes/sect x 65536 sectors
boot device: ld0
root on ld0a dumps on ld0b
root file system type: ffs
WARNING: no TOD clock present
WARNING: using filesystem time
WARNING: CHECK AND RESET THE DATE!
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/usermode/dev/ld_thunkbus.c | 58 |
1 files changed, 38 insertions, 20 deletions
diff --git a/sys/arch/usermode/dev/ld_thunkbus.c b/sys/arch/usermode/dev/ld_thunkbus.c index f96bd6659c6..ce543bf23ca 100644 --- a/sys/arch/usermode/dev/ld_thunkbus.c +++ b/sys/arch/usermode/dev/ld_thunkbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_thunkbus.c,v 1.2 2011/08/13 10:33:52 jmcneill Exp $ */ +/* $NetBSD: ld_thunkbus.c,v 1.3 2011/08/13 10:58:32 jmcneill Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.2 2011/08/13 10:33:52 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.3 2011/08/13 10:58:32 jmcneill Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -49,13 +49,19 @@ static int ld_thunkbus_ldstart(struct ld_softc *, struct buf *); static int ld_thunkbus_lddump(struct ld_softc *, void *, int, int); static int ld_thunkbus_ldflush(struct ld_softc *, int); -static void ld_thunkbus_complete(int, siginfo_t *, void *); +static void ld_thunkbus_sig(int, siginfo_t *, void *); +static void ld_thunkbus_complete(void *); + +struct ld_thunkbus_transfer; struct ld_thunkbus_softc { struct ld_softc sc_ld; int sc_fd; struct stat sc_st; + void *sc_ih; + + struct ld_thunkbus_transfer *sc_curtt; }; struct ld_thunkbus_transfer { @@ -113,9 +119,12 @@ ld_thunkbus_attach(device_t parent, device_t self, void *opaque) ld->sc_dump = ld_thunkbus_lddump; ld->sc_flush = ld_thunkbus_ldflush; + sc->sc_ih = softint_establish(SOFTINT_BIO, + ld_thunkbus_complete, sc); + sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART|SA_SIGINFO; - sa.sa_sigaction = ld_thunkbus_complete; + sa.sa_sigaction = ld_thunkbus_sig; if (thunk_sigaction(SIGIO, &sa, NULL) == -1) panic("couldn't register SIGIO handler: %d", errno); @@ -123,35 +132,44 @@ ld_thunkbus_attach(device_t parent, device_t self, void *opaque) } static void -ld_thunkbus_complete(int sig, siginfo_t *info, void *ctx) +ld_thunkbus_sig(int sig, siginfo_t *info, void *ctx) { struct ld_thunkbus_transfer *tt; struct ld_thunkbus_softc *sc; - struct buf *bp; curcpu()->ci_idepth++; if (info->si_signo == SIGIO) { tt = info->si_value.sival_ptr; sc = tt->tt_sc; - bp = tt->tt_bp; - if (thunk_aio_error(&tt->tt_aio) == 0 && - thunk_aio_return(&tt->tt_aio) != -1) { - bp->b_resid = 0; - } else { - bp->b_error = errno; - bp->b_resid = bp->b_bcount; - } - - kmem_free(tt, sizeof(*tt)); + sc->sc_curtt = tt; + softint_schedule(sc->sc_ih); + } - if (bp->b_error) - printf("errpr!\n"); + curcpu()->ci_idepth--; +} - lddone(&sc->sc_ld, bp); +static void +ld_thunkbus_complete(void *arg) +{ + struct ld_thunkbus_softc *sc = arg; + struct ld_thunkbus_transfer *tt = sc->sc_curtt; + struct buf *bp = tt->tt_bp; + + if (thunk_aio_error(&tt->tt_aio) == 0 && + thunk_aio_return(&tt->tt_aio) != -1) { + bp->b_resid = 0; + } else { + bp->b_error = errno; + bp->b_resid = bp->b_bcount; } - curcpu()->ci_idepth--; + kmem_free(tt, sizeof(*tt)); + + if (bp->b_error) + printf("errpr!\n"); + + lddone(&sc->sc_ld, bp); } static int |
