From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Convert timers to use timer_setup() Date: Fri, 06 Oct 2017 11:34:31 +0300 Message-ID: <87h8vc4qug.fsf@intel.com> References: <20171005005407.GA23894@beast> <1507211119.3851.3.camel@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kees Cook , Joonas Lahtinen Cc: Oscar Mateo , Tvrtko Ursulin , intel-gfx@lists.freedesktop.org, LKML , Maling list - DRI developers , Daniel Vetter , Thomas Gleixner List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAwNSBPY3QgMjAxNywgS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+IHdy b3RlOgo+IE9uIFRodSwgT2N0IDUsIDIwMTcgYXQgNjo0NSBBTSwgSm9vbmFzIExhaHRpbmVuCj4g PGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+IHdyb3RlOgo+PiBPbiBXZWQsIDIwMTct MTAtMDQgYXQgMTc6NTQgLTA3MDAsIEtlZXMgQ29vayB3cm90ZToKPj4+IEluIHByZXBhcmF0aW9u IGZvciB1bmNvbmRpdGlvbmFsbHkgcGFzc2luZyB0aGUgc3RydWN0IHRpbWVyX2xpc3QgcG9pbnRl ciB0bwo+Pj4gYWxsIHRpbWVyIGNhbGxiYWNrcywgc3dpdGNoIHRvIHVzaW5nIHRoZSBuZXcgdGlt ZXJfc2V0dXAoKSBhbmQgZnJvbV90aW1lcigpCj4+PiB0byBwYXNzIHRoZSB0aW1lciBwb2ludGVy IGV4cGxpY2l0bHkuCj4+Pgo+Pj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50 ZWwuY29tPgo+Pj4gQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+ Cj4+PiBDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgo+Pj4gQ2M6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+Pj4gQ2M6IEpvb25hcyBMYWh0aW5lbiA8 am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KPj4+IENjOiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgo+Pj4gQ2M6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRl b0BpbnRlbC5jb20+Cj4+PiBDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+Pj4g Q2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPj4+IENjOiBUaG9tYXMgR2xlaXhu ZXIgPHRnbHhAbGludXRyb25peC5kZT4KPj4+IFNpZ25lZC1vZmYtYnk6IEtlZXMgQ29vayA8a2Vl c2Nvb2tAY2hyb21pdW0ub3JnPgo+Pgo+PiA8U05JUD4KPj4KPj4+IEBAIC0zMiw5ICszMiw5IEBA IHN0YXRpYyBzdHJ1Y3QgbW9ja19yZXF1ZXN0ICpmaXJzdF9yZXF1ZXN0KHN0cnVjdCBtb2NrX2Vu Z2luZSAqZW5naW5lKQo+Pj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs aW5rKTsKPj4+ICB9Cj4+Pgo+Pj4gLXN0YXRpYyB2b2lkIGh3X2RlbGF5X2NvbXBsZXRlKHVuc2ln bmVkIGxvbmcgZGF0YSkKPj4+ICtzdGF0aWMgdm9pZCBod19kZWxheV9jb21wbGV0ZShzdHJ1Y3Qg dGltZXJfbGlzdCAqdCkKPj4+ICB7Cj4+PiAtICAgICBzdHJ1Y3QgbW9ja19lbmdpbmUgKmVuZ2lu ZSA9ICh0eXBlb2YoZW5naW5lKSlkYXRhOwo+Pj4gKyAgICAgc3RydWN0IG1vY2tfZW5naW5lICpl bmdpbmUgPSBmcm9tX3RpbWVyKGVuZ2luZSwgdCwgaHdfZGVsYXkpOwo+Pgo+PiBUaGUgb3JkZXIg aXMgYml0IHN0cmFuZ2UgdG8gbWUsIGl0J3Mgbm90IHNhbWUgYXMgd2l0aCBjb250YWluZXJfb2Ys IGJ1dAo+PiBJIGd1ZXNzIEdDQyB3aWxsIGNvbXBsYWluIGZvciBnZXR0aW5nIGl0IHdyb25nLiBJ dCdzIGFsc28gc2xpZ2h0bHkKPj4gZGlmZmVyZW50IGRvaW5nIHRoZSB0eXBlb2YgZm9yIHlvdSwg c28gSSBndWVzcyBpdCBtYWtlcyBzZW5zZSwgc286Cj4KPiBZZWFoLCB0aGlzIHNlZW1lZCB0byBi ZSB0aGUgbGVhc3QgYmFkIG9mIHNldmVyYWwgb3B0aW9ucy4gT3RoZXIgdGhpbmdzCj4gZW5kZWQg dXAgYmVpbmcgZWl0aGVyIHZlcnkgbG9uZywgbmFtZWQgdW5saWtlIGFueXRoaW5nIGVsc2UgYWxy ZWFkeSBpbgo+IHRoZSBrZXJuZWwsIGV0Yy4KPgo+PiBSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRp bmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgo+Cj4gVGhhbmtzIQo+Cj4+IERv IHlvdSBleHBlY3QgZm9yIHVzIHRvIG1lcmdlIG9yIGFyZSB5b3UgbG9va2luZyB0byBtZXJnZSBh bGwgdGltZXIKPj4gY2hhbmdlcyBmcm9tIHNpbmdsZSB0cmVlPwo+Cj4gSWYgeW91IGhhdmUgLXJj MyBpbiB5b3VyIHRyZWUgYWxyZWFkeSwgcGxlYXNlIHRha2UgdGhpcyBpbnRvIHlvdXIKPiB0cmVl LiBJZiB5b3UgcHJlZmVyIHRoZSB0aW1lciB0cmVlIHRvIGNhcnJ5IGl0LCB0aGF0IGNhbiBoYXBw ZW4gdG9vLgo+IHRnbHggc3VnZ2VzdGVkIHRvIG1lIHRoYXQgaXQgd2FzIGJldHRlciBmb3IgbWFp bnRhaW5lcnMgdG8gY2FycnkgdGhlCj4gY2hhbmdlcy4KCldlJ2xsIHBpY2sgdGhpcyB3aGVuIHdl IGhhdmUgLXJjMy4KClRoYW5rcywKSmFuaS4KCgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVu IFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751924AbdJFIfF (ORCPT ); Fri, 6 Oct 2017 04:35:05 -0400 Received: from mga02.intel.com ([134.134.136.20]:29665 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdJFIfE (ORCPT ); Fri, 6 Oct 2017 04:35:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,482,1500966000"; d="scan'208";a="907350810" From: Jani Nikula To: Kees Cook , Joonas Lahtinen Cc: LKML , Daniel Vetter , David Airlie , Chris Wilson , Tvrtko Ursulin , Oscar Mateo , intel-gfx@lists.freedesktop.org, Maling list - DRI developers , Thomas Gleixner Subject: Re: [PATCH] drm/i915: Convert timers to use timer_setup() In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20171005005407.GA23894@beast> <1507211119.3851.3.camel@linux.intel.com> Date: Fri, 06 Oct 2017 11:34:31 +0300 Message-ID: <87h8vc4qug.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 05 Oct 2017, Kees Cook wrote: > On Thu, Oct 5, 2017 at 6:45 AM, Joonas Lahtinen > wrote: >> On Wed, 2017-10-04 at 17:54 -0700, Kees Cook wrote: >>> In preparation for unconditionally passing the struct timer_list pointer to >>> all timer callbacks, switch to using the new timer_setup() and from_timer() >>> to pass the timer pointer explicitly. >>> >>> Cc: Daniel Vetter >>> Cc: Jani Nikula >>> Cc: David Airlie >>> Cc: Chris Wilson >>> Cc: Joonas Lahtinen >>> Cc: Tvrtko Ursulin >>> Cc: Oscar Mateo >>> Cc: intel-gfx@lists.freedesktop.org >>> Cc: dri-devel@lists.freedesktop.org >>> Cc: Thomas Gleixner >>> Signed-off-by: Kees Cook >> >> >> >>> @@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine) >>> link); >>> } >>> >>> -static void hw_delay_complete(unsigned long data) >>> +static void hw_delay_complete(struct timer_list *t) >>> { >>> - struct mock_engine *engine = (typeof(engine))data; >>> + struct mock_engine *engine = from_timer(engine, t, hw_delay); >> >> The order is bit strange to me, it's not same as with container_of, but >> I guess GCC will complain for getting it wrong. It's also slightly >> different doing the typeof for you, so I guess it makes sense, so: > > Yeah, this seemed to be the least bad of several options. Other things > ended up being either very long, named unlike anything else already in > the kernel, etc. > >> Reviewed-by: Joonas Lahtinen > > Thanks! > >> Do you expect for us to merge or are you looking to merge all timer >> changes from single tree? > > If you have -rc3 in your tree already, please take this into your > tree. If you prefer the timer tree to carry it, that can happen too. > tglx suggested to me that it was better for maintainers to carry the > changes. We'll pick this when we have -rc3. Thanks, Jani. -- Jani Nikula, Intel Open Source Technology Center