Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use kmem from softint context

Browse Source
This commit is contained in:
jmcneill 2011-08-23 15:56:12 +00:00
parent 6613ea22ef
commit f95d0b07fa
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/arch/usermode/dev/ld_thunkbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ld_thunkbus.c,v 1.3 2011/08/13 10:58:32 jmcneill Exp $ */ /* $NetBSD: ld_thunkbus.c,v 1.4 2011/08/23 15:56:12 jmcneill Exp $ */
/*- /*-
* Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca> * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.3 2011/08/13 10:58:32 jmcneill Exp $"); __KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.4 2011/08/23 15:56:12 jmcneill Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/proc.h> #include <sys/proc.h>
@ -52,7 +52,13 @@ static int ld_thunkbus_ldflush(struct ld_softc *, int);
static void ld_thunkbus_sig(int, siginfo_t *, void *); static void ld_thunkbus_sig(int, siginfo_t *, void *);
static void ld_thunkbus_complete(void *); static void ld_thunkbus_complete(void *);
struct ld_thunkbus_transfer; struct ld_thunkbus_softc;
struct ld_thunkbus_transfer {
struct ld_thunkbus_softc *tt_sc;
struct aiocb tt_aio;
struct buf *tt_bp;
};
struct ld_thunkbus_softc { struct ld_thunkbus_softc {
struct ld_softc sc_ld; struct ld_softc sc_ld;
@ -61,13 +67,7 @@ struct ld_thunkbus_softc {
struct stat sc_st; struct stat sc_st;
void *sc_ih; void *sc_ih;
struct ld_thunkbus_transfer *sc_curtt; struct ld_thunkbus_transfer sc_tt;
};
struct ld_thunkbus_transfer {
struct ld_thunkbus_softc *tt_sc;
struct aiocb tt_aio;
struct buf *tt_bp;
}; };
CFATTACH_DECL_NEW(ld_thunkbus, sizeof(struct ld_thunkbus_softc), CFATTACH_DECL_NEW(ld_thunkbus, sizeof(struct ld_thunkbus_softc),
@ -142,7 +142,6 @@ ld_thunkbus_sig(int sig, siginfo_t *info, void *ctx)
if (info->si_signo == SIGIO) { if (info->si_signo == SIGIO) {
tt = info->si_value.sival_ptr; tt = info->si_value.sival_ptr;
sc = tt->tt_sc; sc = tt->tt_sc;
sc->sc_curtt = tt;
softint_schedule(sc->sc_ih); softint_schedule(sc->sc_ih);
} }
@ -153,7 +152,7 @@ static void
ld_thunkbus_complete(void *arg) ld_thunkbus_complete(void *arg)
{ {
struct ld_thunkbus_softc *sc = arg; struct ld_thunkbus_softc *sc = arg;
struct ld_thunkbus_transfer *tt = sc->sc_curtt; struct ld_thunkbus_transfer *tt = &sc->sc_tt;
struct buf *bp = tt->tt_bp; struct buf *bp = tt->tt_bp;
if (thunk_aio_error(&tt->tt_aio) == 0 && if (thunk_aio_error(&tt->tt_aio) == 0 &&
@ -164,8 +163,6 @@ ld_thunkbus_complete(void *arg)
bp->b_resid = bp->b_bcount; bp->b_resid = bp->b_bcount;
} }
kmem_free(tt, sizeof(*tt));
if (bp->b_error) if (bp->b_error)
printf("errpr!\n"); printf("errpr!\n");
@ -176,13 +173,9 @@ static int
ld_thunkbus_ldstart(struct ld_softc *ld, struct buf *bp) ld_thunkbus_ldstart(struct ld_softc *ld, struct buf *bp)
{ {
struct ld_thunkbus_softc *sc = (struct ld_thunkbus_softc *)ld; struct ld_thunkbus_softc *sc = (struct ld_thunkbus_softc *)ld;
struct ld_thunkbus_transfer *tt; struct ld_thunkbus_transfer *tt = &sc->sc_tt;
int error; int error;
tt = kmem_alloc(sizeof(*tt), KM_SLEEP);
if (tt == NULL)
return ENOMEM;
tt->tt_sc = sc; tt->tt_sc = sc;
tt->tt_bp = bp; tt->tt_bp = bp;
memset(&tt->tt_aio, 0, sizeof(tt->tt_aio)); memset(&tt->tt_aio, 0, sizeof(tt->tt_aio));