From: Michal Nazarewicz <mina86@mina86.com> To: Thomas Gleixner <tglx@linutronix.de> Cc: Michal Nazarewicz <m.nazarewicz@samsung.com>, linux-usb@vger.kernel.org, Davide Libenzi <davidel@xmailserver.org>, Greg KH <greg@kroah.com>, Kyungmin Park <kyungmin.park@samsung.com>, Marek Szyprowski <m.szyprowski@samsung.com>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv2 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq() Date: Sun, 11 Apr 2010 21:16:17 +0200 [thread overview] Message-ID: <87ochplrzy.fsf@erwin.mina86.com> (raw) In-Reply-To: <alpine.LFD.2.00.1004111618000.32352@localhost.localdomain> (Thomas Gleixner's message of "Sun, 11 Apr 2010 16:31:50 +0200 (CEST)") > On Fri, 9 Apr 2010, Michal Nazarewicz wrote: >> diff --git a/fs/timerfd.c b/fs/timerfd.c >> index 1bfc95a..4d2c371 100644 >> --- a/fs/timerfd.c >> +++ b/fs/timerfd.c >> @@ -109,31 +109,13 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count, >> struct timerfd_ctx *ctx = file->private_data; >> ssize_t res; >> u64 ticks = 0; >> - DECLARE_WAITQUEUE(wait, current); >> >> if (count < sizeof(ticks)) >> return -EINVAL; >> spin_lock_irq(&ctx->wqh.lock); >> res = -EAGAIN; >> - if (!ctx->ticks && !(file->f_flags & O_NONBLOCK)) { >> - __add_wait_queue(&ctx->wqh, &wait); >> - for (res = 0;;) { >> - set_current_state(TASK_INTERRUPTIBLE); >> - if (ctx->ticks) { >> - res = 0; >> - break; >> - } >> - if (signal_pending(current)) { >> - res = -ERESTARTSYS; >> - break; >> - } >> - spin_unlock_irq(&ctx->wqh.lock); >> - schedule(); >> - spin_lock_irq(&ctx->wqh.lock); >> - } >> - __remove_wait_queue(&ctx->wqh, &wait); >> - __set_current_state(TASK_RUNNING); >> - } >> + if (!(file->f_flags & O_NONBLOCK)) >> + wait_event_interruptible_locked_irq(ctx->wqh, ctx->ticks); Thomas Gleixner <tglx@linutronix.de> writes: > With this change we return -EAGAIN instead of -ERESTARTSYS when the > wait got interrupted by a signal. That means instead of restarting the > syscall we return -EAGAIN to user space. Stupid mistake, the following should fix it: + res = wait_event_interruptible_locked_irq(ctx->wqh, ctx->ticks); Sorry about that. I'll resubmit an updated patchset by the end of the week. -- Best regards, _ _ .o. | Liege of Serenly Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Michal "mina86" Nazarewicz (o o) ooo +--<mina86-tlen.pl>--<jid:mina86-jabber.org>--ooO--(_)--Ooo--
WARNING: multiple messages have this Message-ID (diff)
From: Michal Nazarewicz <mina86-deATy8a+UHjQT0dZR+AlfA@public.gmane.org> To: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Michal Nazarewicz <m.nazarewicz-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Davide Libenzi <davidel-AhlLAIvw+VEjIGhXcJzhZg@public.gmane.org>, Greg KH <greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>, Kyungmin Park <kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCHv2 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq() Date: Sun, 11 Apr 2010 21:16:17 +0200 [thread overview] Message-ID: <87ochplrzy.fsf@erwin.mina86.com> (raw) In-Reply-To: <alpine.LFD.2.00.1004111618000.32352-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org> (Thomas Gleixner's message of "Sun, 11 Apr 2010 16:31:50 +0200 (CEST)") > On Fri, 9 Apr 2010, Michal Nazarewicz wrote: >> diff --git a/fs/timerfd.c b/fs/timerfd.c >> index 1bfc95a..4d2c371 100644 >> --- a/fs/timerfd.c >> +++ b/fs/timerfd.c >> @@ -109,31 +109,13 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count, >> struct timerfd_ctx *ctx = file->private_data; >> ssize_t res; >> u64 ticks = 0; >> - DECLARE_WAITQUEUE(wait, current); >> >> if (count < sizeof(ticks)) >> return -EINVAL; >> spin_lock_irq(&ctx->wqh.lock); >> res = -EAGAIN; >> - if (!ctx->ticks && !(file->f_flags & O_NONBLOCK)) { >> - __add_wait_queue(&ctx->wqh, &wait); >> - for (res = 0;;) { >> - set_current_state(TASK_INTERRUPTIBLE); >> - if (ctx->ticks) { >> - res = 0; >> - break; >> - } >> - if (signal_pending(current)) { >> - res = -ERESTARTSYS; >> - break; >> - } >> - spin_unlock_irq(&ctx->wqh.lock); >> - schedule(); >> - spin_lock_irq(&ctx->wqh.lock); >> - } >> - __remove_wait_queue(&ctx->wqh, &wait); >> - __set_current_state(TASK_RUNNING); >> - } >> + if (!(file->f_flags & O_NONBLOCK)) >> + wait_event_interruptible_locked_irq(ctx->wqh, ctx->ticks); Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> writes: > With this change we return -EAGAIN instead of -ERESTARTSYS when the > wait got interrupted by a signal. That means instead of restarting the > syscall we return -EAGAIN to user space. Stupid mistake, the following should fix it: + res = wait_event_interruptible_locked_irq(ctx->wqh, ctx->ticks); Sorry about that. I'll resubmit an updated patchset by the end of the week. -- Best regards, _ _ .o. | Liege of Serenly Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Michal "mina86" Nazarewicz (o o) ooo +--<mina86-tlen.pl>--<jid:mina86-jabber.org>--ooO--(_)--Ooo-- -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-04-11 19:16 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-04-09 19:21 [PATCH 0/7] The FunctionFS composite function Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 1/8] wait_event_interruptible_locked() interface Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq() Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 3/8] USB: gadget: __init and __exit tags removed Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 4/8] USB: f_fs: the FunctionFS driver Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 5/8] USB: g_ffs: the FunctionFS gadget driver Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 6/8] USB: ffs-test: FunctionFS testing program Michal Nazarewicz 2010-04-29 22:15 ` [PATCHv2 3/8] USB: gadget: __init and __exit tags removed Greg KH 2010-04-29 23:02 ` Michal Nazarewicz 2010-04-29 23:22 ` Greg KH 2010-04-30 5:41 ` Michal Nazarewicz 2010-04-11 14:31 ` [PATCHv2 2/8] fs/timerfd.c: make use of wait_event_interruptible_locked_irq() Thomas Gleixner 2010-04-11 19:16 ` Michal Nazarewicz [this message] 2010-04-11 19:16 ` Michal Nazarewicz 2010-04-11 15:02 ` [PATCHv2 1/8] wait_event_interruptible_locked() interface Thomas Gleixner 2010-04-11 15:02 ` Thomas Gleixner 2010-04-11 19:27 ` Michal Nazarewicz -- strict thread matches above, loose matches on Subject: below -- 2010-04-07 13:41 [PATCH 0/7] The FunctionFS composite function Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 1/8] USB: composite: allow optional removal of __init and __exit tags Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 2/8] sched: __wake_up_locked() exported Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 3/8] USB: f_fs: the FunctionFS driver Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 4/8] USB: Ethernet: allow optional removal of __init and __init_data tags Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 5/8] USB: g_ffs: the FunctionFS gadget driver Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 6/8] USB: ffs-test: FunctionFS testing program Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 7/8] USB: testusb: imported David Brownell's USB testing application Michal Nazarewicz 2010-04-07 13:41 ` [PATCH 8/8] USB: testusb: testusb compatibility with FunctionFS gadget Michal Nazarewicz 2010-04-08 0:30 ` Greg KH 2010-04-08 0:29 ` [PATCH 7/8] USB: testusb: imported David Brownell's USB testing application Greg KH 2010-04-09 19:21 ` [PATCHv2 7/8] USB: testusb: an " Michal Nazarewicz 2010-04-09 19:21 ` [PATCHv2 8/8] USB: testusb: testusb compatibility with FunctionFS gadget Michal Nazarewicz 2010-04-10 22:51 ` [PATCHv2 7/8] USB: testusb: an USB testing application David Brownell 2010-04-14 9:30 ` [PATCH 7/8] USB: testusb: imported David Brownell's " David Brownell 2010-04-14 16:46 ` Greg KH 2010-04-14 16:47 ` Greg KH 2010-04-08 6:10 ` Heikki Krogerus 2010-04-08 6:18 ` Greg KH 2010-04-08 6:34 ` Heikki Krogerus 2010-04-14 9:41 ` David Brownell 2010-04-14 12:50 ` Michał Nazarewicz 2010-04-14 16:47 ` Greg KH 2010-04-07 17:11 ` [PATCH 3/8] USB: f_fs: the FunctionFS driver Michał Nazarewicz 2010-04-07 15:29 ` [PATCH 2/8] sched: __wake_up_locked() exported Greg KH 2010-04-07 17:11 ` Michał Nazarewicz 2010-04-08 0:28 ` Greg KH 2010-04-07 15:28 ` [PATCH 1/8] USB: composite: allow optional removal of __init and __exit tags Greg KH 2010-04-07 15:39 ` Michał Nazarewicz 2010-04-08 0:26 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87ochplrzy.fsf@erwin.mina86.com \ --to=mina86@mina86.com \ --cc=davidel@xmailserver.org \ --cc=greg@kroah.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=m.nazarewicz@samsung.com \ --cc=m.szyprowski@samsung.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.