Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-vc0-f182.google.com ([209.85.220.182]:54847 "EHLO mail-vc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbaIYD2v (ORCPT ); Wed, 24 Sep 2014 23:28:51 -0400 Received: by mail-vc0-f182.google.com with SMTP id le20so7533000vcb.13 for ; Wed, 24 Sep 2014 20:28:49 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20140925132339.2629ffaa@notabene.brown> References: <20140924012422.4838.29188.stgit@notabene.brown> <20140924012832.4838.59410.stgit@notabene.brown> <20140924070418.GA990@gmail.com> <20140925132339.2629ffaa@notabene.brown> Date: Wed, 24 Sep 2014 23:28:49 -0400 Message-ID: Subject: Re: [PATCH 1/5] SCHED: add some "wait..on_bit...timeout()" interfaces. From: Trond Myklebust To: NeilBrown Cc: Ingo Molnar , Linux NFS Mailing List , Linux Kernel mailing list , linux-mm@kvack.org, Ingo Molnar , Devel FS Linux , Andrew Morton , Jeff Layton , Peter Zijlstra Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, Sep 24, 2014 at 11:23 PM, NeilBrown wrote: > On Wed, 24 Sep 2014 09:04:18 +0200 Ingo Molnar wrote: > >> >> * NeilBrown wrote: >> >> > @@ -859,6 +860,8 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); >> > >> > extern int bit_wait(struct wait_bit_key *); >> > extern int bit_wait_io(struct wait_bit_key *); >> > +extern int bit_wait_timeout(struct wait_bit_key *); >> > +extern int bit_wait_io_timeout(struct wait_bit_key *); >> > >> > /** >> > * wait_on_bit - wait for a bit to be cleared >> > diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c >> > index 15cab1a4f84e..380678b3cba4 100644 >> > --- a/kernel/sched/wait.c >> > +++ b/kernel/sched/wait.c >> > @@ -343,6 +343,18 @@ int __sched out_of_line_wait_on_bit(void *word, int bit, >> > } >> > EXPORT_SYMBOL(out_of_line_wait_on_bit); >> > >> > +int __sched out_of_line_wait_on_bit_timeout( >> > + void *word, int bit, wait_bit_action_f *action, >> > + unsigned mode, unsigned long timeout) >> > +{ >> > + wait_queue_head_t *wq = bit_waitqueue(word, bit); >> > + DEFINE_WAIT_BIT(wait, word, bit); >> > + >> > + wait.key.timeout = jiffies + timeout; >> > + return __wait_on_bit(wq, &wait, action, mode); >> > +} >> > +EXPORT_SYMBOL(out_of_line_wait_on_bit_timeout); >> > + >> > int __sched >> > __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, >> > wait_bit_action_f *action, unsigned mode) >> > @@ -520,3 +532,27 @@ __sched int bit_wait_io(struct wait_bit_key *word) >> > return 0; >> > } >> > EXPORT_SYMBOL(bit_wait_io); >> > + >> > +__sched int bit_wait_timeout(struct wait_bit_key *word) >> > +{ >> > + unsigned long now = ACCESS_ONCE(jiffies); >> > + if (signal_pending_state(current->state, current)) >> > + return 1; >> > + if (time_after_eq(now, word->timeout)) >> > + return -EAGAIN; >> > + schedule_timeout(word->timeout - now); >> > + return 0; >> > +} >> > +EXPORT_SYMBOL(bit_wait_timeout); >> > + >> > +__sched int bit_wait_io_timeout(struct wait_bit_key *word) >> > +{ >> > + unsigned long now = ACCESS_ONCE(jiffies); >> > + if (signal_pending_state(current->state, current)) >> > + return 1; >> > + if (time_after_eq(now, word->timeout)) >> > + return -EAGAIN; >> > + io_schedule_timeout(word->timeout - now); >> > + return 0; >> > +} >> > +EXPORT_SYMBOL(bit_wait_io_timeout); >> >> New scheduler APIs should be exported via EXPORT_SYMBOL_GPL(). >> > > Fine with me. > > Trond, can you just edit that into the patch you have, or do you want me to > re-send? > Also maybe added Jeff's > Acked-by: Jeff Layton > to the NFS bits. > Can you please resend just this patch so that the final version goes out to linux-mm, linux-kernel etc? I can edit in the Acked-by Jeff to the NFS bits as I apply. -- Trond Myklebust Linux NFS client maintainer, PrimaryData trond.myklebust@primarydata.com