On Tue, 8 Jan 2008 16:53:09 +1100
Neil Brown <[EMAIL PROTECTED]> wrote:
> On Saturday January 5, [EMAIL PROTECTED] wrote:
> > Move the initialzation in __svc_create_thread that happens prior to
> > thread creation to a new function. Export the function to allow
> > services to have better control over the svc_rqst structs.
> >
> > Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
> > ---
> > include/linux/sunrpc/svc.h | 2 ++
> > net/sunrpc/svc.c | 43
> > +++++++++++++++++++++++++++++++------------ 2 files changed, 33
> > insertions(+), 12 deletions(-)
> >
> > diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
> > index 8531a70..5f07300 100644
> > --- a/include/linux/sunrpc/svc.h
> > +++ b/include/linux/sunrpc/svc.h
> > @@ -382,6 +382,8 @@ struct svc_procedure {
> > */
> > struct svc_serv * svc_create(struct svc_program *, unsigned int,
> > void (*shutdown)(struct svc_serv*));
> > +struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
> > + struct svc_pool *pool);
> > int svc_create_thread(svc_thread_fn, struct
> > svc_serv *); void svc_exit_thread(struct svc_rqst
> > *); struct svc_serv * svc_create_pooled(struct svc_program *,
> > unsigned int, diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> > index fca17d0..b29ed43 100644
> > --- a/net/sunrpc/svc.c
> > +++ b/net/sunrpc/svc.c
> > @@ -538,23 +538,14 @@ svc_release_buffer(struct svc_rqst *rqstp)
> > put_page(rqstp->rq_pages[i]);
> > }
> >
> > -/*
> > - * Create a thread in the given pool. Caller must hold BKL.
> > - * On a NUMA or SMP machine, with a multi-pool serv, the thread
> > - * will be restricted to run on the cpus belonging to the pool.
> > - */
> > -static int
> > -__svc_create_thread(svc_thread_fn func, struct svc_serv *serv,
> > - struct svc_pool *pool)
> > +struct svc_rqst *
> > +svc_prepare_thread(struct svc_serv *serv, struct svc_pool *pool)
> > {
> > struct svc_rqst *rqstp;
> > - int error = -ENOMEM;
> > - int have_oldmask = 0;
> > - cpumask_t oldmask;
> >
> > rqstp = kzalloc(sizeof(*rqstp), GFP_KERNEL);
> > if (!rqstp)
> > - goto out;
> > + goto out_enomem;
> >
> > init_waitqueue_head(&rqstp->rq_wait);
> >
> > @@ -570,6 +561,34 @@ __svc_create_thread(svc_thread_fn func, struct
> > svc_serv *serv, spin_unlock_bh(&pool->sp_lock);
> > rqstp->rq_server = serv;
> > rqstp->rq_pool = pool;
> > + return rqstp;
> > +
> > +out_thread:
> > + svc_exit_thread(rqstp);
>
> I realise that the bug existed before your change, but calling
> svc_exit_thread at this point is not good.
> The 'goto out_thread' is *before* "pool->sp_nrthreads++", but
> svc_exit_thread does "pool->sp_nrthreads--;". Not good.
>
> As you are playing is this code, do you feel like fixing that error
> path??
>
>
> Otherwise, patch looks good.
> Acked-By: NeilBrown <[EMAIL PROTECTED]>
>
> Thanks,
> NeilBrown
Good catch. That bug will be a NULL pointer dereference since
rqstp->rq_pool isn't even set yet. There's a similar bug with
serv->sv_nrthreads too.
Still looking over your other comments, but I'll plan to post an
updated patchset that includes a fix for that.
--
Jeff Layton <[EMAIL PROTECTED]>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
