From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH] drm/i915: compute wait_ioctl timeout correctly Date: Wed, 03 Dec 2014 12:28:14 +0200 Message-ID: <1417602494.2642.0.camel@intelbox> References: <1417533733-2289-1-git-send-email-daniel.vetter@ffwll.ch> <1417534582-2977-1-git-send-email-daniel.vetter@ffwll.ch> <20141202163506.GG18921@nuc-i3427.alporthouse.com> <20141203092216.GZ32117@phenom.ffwll.local> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A4CB6FCF2 for ; Wed, 3 Dec 2014 02:28:18 -0800 (PST) In-Reply-To: <20141203092216.GZ32117@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Daniel Vetter , Intel Graphics Development , LKML , John Stultz , Daniel Vetter , Thomas Gleixner List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAyMDE0LTEyLTAzIGF0IDEwOjIyICswMTAwLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+ IE9uIFR1ZSwgRGVjIDAyLCAyMDE0IGF0IDA4OjU0OjEzQU0gLTA4MDAsIEpvaG4gU3R1bHR6IHdy b3RlOgo+ID4gT24gVHVlLCBEZWMgMiwgMjAxNCBhdCA4OjM1IEFNLCBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4gd3JvdGU6Cj4gPiA+IE9uIFR1ZSwgRGVjIDAyLCAyMDE0 IGF0IDA0OjM2OjIyUE0gKzAxMDAsIERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gPiA+PiArc3RhdGlj IGlubGluZSB1bnNpZ25lZCBsb25nIG5zZWNzX3RvX2ppZmZpZXNfdGltZW91dChjb25zdCB1NjQg bSkKPiA+ID4+ICt7Cj4gPiA+PiArICAgICB1NjQgdXNlY3MgPSBkaXZfdTY0KG0gKyA5OTksIDEw MDApOwo+ID4gPj4gKyAgICAgdW5zaWduZWQgbG9uZyBqID0gdXNlY3NfdG9famlmZmllcyh1c2Vj cyk7Cj4gPiA+PiArCj4gPiA+PiArICAgICByZXR1cm4gbWluX3QodW5zaWduZWQgbG9uZywgTUFY X0pJRkZZX09GRlNFVCwgaiArIDEpOwo+ID4gPgo+ID4gPiBPciBtb3JlIGNvbmNpc2VseSBhbmQg cmV2aWV3IGZyaWVuZGx5Ogo+ID4gPgo+ID4gPiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcg bnNlY3NfdG9famlmZmllc190aW1lb3V0KGNvbnN0IHU2NCBuKQo+ID4gPiB7Cj4gPiA+ICAgICAg ICAgcmV0dXJuIG1pbl90KHU2NCwgTUFYX0pJRkZZX09GRlNFVCwgbnNlY3NfdG9famlmZmllczY0 KG4pICsgMSk7Cj4gPiA+IH0KPiA+IAo+ID4gWWVhLiBUaGlzIGxvb2tzIG11Y2ggbmljZXIuIFNl ZW1zIGdlbmVyaWMgZW5vdWdoIGl0IG1pZ2h0IGJlIGJldHRlcgo+ID4gYWRkZWQgbmV4dCB0byBu c2VjX3RvX2ppZmZpZXM2NCgpIGluIGtlcm5lbC90aW1lL3RpbWUuYyBvciBqaWZmaWVzLmgKPiA+ IHJhdGhlciB0aGVuIGluIGEgZHJpdmVyIGhlYWRlci4KPiA+IAo+ID4gQW5kIGNsZWFybHkgdGhl IGhlYWRlciBjb21tZW50IGluIG5zZWNfdG9famlmZmllcygpIHdhcm5pbmcgaXRzIG9ubHkKPiA+ IGZvciB0aGUgc2NoZWR1bGVyIGFuZCBub3QgZm9yIHVzZSBmb3IgZHJpdmVycyAoZm9yIGV4YWN0 bHkgdGhlIHJlYXNvbgo+ID4gb2YgdGhpcyBwYXRjaCkgYXJlIG5vdCBvYnZpb3VzL21lbW9yYWJs ZSBlbm91Z2ggZm9yIG1lIGFuZCBUaG9tYXMKPiA+IG1ha2VzIG1lIHdvbmRlciBpZiB3ZSBzaG91 bGQgY2hhbmdlIGl0cyBuYW1lIHRvIGJlIG1vcmUgY2xlYXIgdGhhdCBpdHMKPiA+IGEgc2NoZWQg b25seSBmdW5jdGlvbi4KPiAKPiBUaGlzIGJ1ZyBoZXJlIGlzbid0IGFib3V0IG5zZWN0X3RvX2pp ZmZpZXMgdnMgdGhlIDY0IGJpdCB2YXJpYW50LCBidXQKPiBhYm91dCB0aGUgKzEgdGhhdCB3ZSBu ZWVkIHRvIG5vdCBoYXZlIGEgc2hvcnQgc2xlZXAuIEluIGk5MTUgd2UgaGF2ZSBhCj4gYnVuY2gg b2YgamlmZmllc190aW1lb3V0IGZ1bmN0aW9ucyB3aGljaCBkbyBqdXN0IHRoZSArMSBjb21wYXJl ZCB0byB0aGUKPiB2ZXJzaW9ucyBpbiB0aW1lLmMgYmVjYXVzZSB3ZSBzY3Jld2VkIHRoaXMgdXAg dG9vIG9mdGVuLgo+IAo+IElpcmMgSSBkaWQgZmxvYXQgYW4gcmZjIHRvIG1vdmUgdGhlc2UgdG8g dGltZS5jIG9uY2UgYnV0IGl0IHJlc3VsdGVkIGluCj4gc29tZSBiaWtlc2hlZCBmZXN0IChubywg SSdtIG5vdCBnb2luZyB0byBhdWRpdCBldmVyeSBzaW5nbGUgdXNlciBvZgo+IGV4aXN0aW5nIF90 b19qaWZmaWVzIGZ1bmN0aW9ucykuIElmIHRoZXJlJ3MgaW50ZXJlc3QgSSBjb3VsZCB0cnkgYWdh aW4sCj4gdGhlIGk5MTUgdmVyc2lvbnMgYXJlIGluIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmguCgpUaGVyZSB3YXMgYXQgbGVhc3QgdGhpcyBhdHRlbXB0OgpodHRwczovL2xrbWwub3Jn L2xrbWwvMjAxMy81LzEwLzE4NwoKLS1JbXJlCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751999AbaLCK2U (ORCPT ); Wed, 3 Dec 2014 05:28:20 -0500 Received: from mga14.intel.com ([192.55.52.115]:14045 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751924AbaLCK2S (ORCPT ); Wed, 3 Dec 2014 05:28:18 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="424484303" Message-ID: <1417602494.2642.0.camel@intelbox> Subject: Re: [Intel-gfx] [PATCH] drm/i915: compute wait_ioctl timeout correctly From: Imre Deak Reply-To: imre.deak@intel.com To: Daniel Vetter Cc: John Stultz , Daniel Vetter , Intel Graphics Development , LKML , Daniel Vetter , Thomas Gleixner Date: Wed, 03 Dec 2014 12:28:14 +0200 In-Reply-To: <20141203092216.GZ32117@phenom.ffwll.local> References: <1417533733-2289-1-git-send-email-daniel.vetter@ffwll.ch> <1417534582-2977-1-git-send-email-daniel.vetter@ffwll.ch> <20141202163506.GG18921@nuc-i3427.alporthouse.com> <20141203092216.GZ32117@phenom.ffwll.local> Organization: Intel Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2014-12-03 at 10:22 +0100, Daniel Vetter wrote: > On Tue, Dec 02, 2014 at 08:54:13AM -0800, John Stultz wrote: > > On Tue, Dec 2, 2014 at 8:35 AM, Chris Wilson wrote: > > > On Tue, Dec 02, 2014 at 04:36:22PM +0100, Daniel Vetter wrote: > > >> +static inline unsigned long nsecs_to_jiffies_timeout(const u64 m) > > >> +{ > > >> + u64 usecs = div_u64(m + 999, 1000); > > >> + unsigned long j = usecs_to_jiffies(usecs); > > >> + > > >> + return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1); > > > > > > Or more concisely and review friendly: > > > > > > static inline unsigned long nsecs_to_jiffies_timeout(const u64 n) > > > { > > > return min_t(u64, MAX_JIFFY_OFFSET, nsecs_to_jiffies64(n) + 1); > > > } > > > > Yea. This looks much nicer. Seems generic enough it might be better > > added next to nsec_to_jiffies64() in kernel/time/time.c or jiffies.h > > rather then in a driver header. > > > > And clearly the header comment in nsec_to_jiffies() warning its only > > for the scheduler and not for use for drivers (for exactly the reason > > of this patch) are not obvious/memorable enough for me and Thomas > > makes me wonder if we should change its name to be more clear that its > > a sched only function. > > This bug here isn't about nsect_to_jiffies vs the 64 bit variant, but > about the +1 that we need to not have a short sleep. In i915 we have a > bunch of jiffies_timeout functions which do just the +1 compared to the > versions in time.c because we screwed this up too often. > > Iirc I did float an rfc to move these to time.c once but it resulted in > some bikeshed fest (no, I'm not going to audit every single user of > existing _to_jiffies functions). If there's interest I could try again, > the i915 versions are in drivers/gpu/drm/i915/i915_drv.h. There was at least this attempt: https://lkml.org/lkml/2013/5/10/187 --Imre