From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751716AbcFWS20 (ORCPT ); Thu, 23 Jun 2016 14:28:26 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:41778 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255AbcFWS2Z (ORCPT ); Thu, 23 Jun 2016 14:28:25 -0400 Date: Thu, 23 Jun 2016 11:28:21 -0700 From: Darren Hart To: Thomas Gleixner Cc: "Michael Kerrisk (man-pages)" , Matthieu CASTET , linux-kernel@vger.kernel.org, Darren Hart , Peter Zijlstra , Davidlohr Bueso , Eric Dumazet Subject: Re: futex: Allow FUTEX_CLOCK_REALTIME with FUTEX_WAIT op Message-ID: <20160623182821.GB106079@f23x64.localdomain> References: <20160620162652.2c4619c3@perruche.parrot.biz> <20160623044828.GA3379@f23x64.localdomain> <520d203a-83ad-0277-79d5-2209d6853628@gmail.com> <20160623161643.GA106079@f23x64.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 23, 2016 at 07:26:52PM +0200, Thomas Gleixner wrote: > On Thu, 23 Jun 2016, Darren Hart wrote: > > On Thu, Jun 23, 2016 at 03:40:36PM +0200, Thomas Gleixner wrote: > > In my opinion, we should treat the timeout value as relative for FUTEX_WAIT > > regardless of the CLOCK used. > > Which requires even more changes as you have to select which clock you are > using for adding the base time. Right, something like the following? diff --git a/kernel/futex.c b/kernel/futex.c index 33664f7..c39d807 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3230,8 +3230,12 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, return -EINVAL; t = timespec_to_ktime(ts); - if (cmd == FUTEX_WAIT) - t = ktime_add_safe(ktime_get(), t); + if (cmd == FUTEX_WAIT) { + if (cmd & FUTEX_CLOCK_REALTIME) + t = ktime_add_safe(ktime_get_real(), t); + else + t = ktime_add_safe(ktime_get(), t); + } tp = &t; } /* And as a follow-on, what is the reason for FUTEX_LOCK_PI only using CLOCK_REALTIME? It seems reasonable to me that a user may want to wait a specific amount of time, regardless of wall time. -- Darren Hart Intel Open Source Technology Center