From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH 1/3] drm/i915: allocate mock file pointer dynamically Date: Mon, 20 Mar 2017 14:00:36 +0200 Message-ID: <1490011236.3600.5.camel@linux.intel.com> References: <20170320094335.1266306-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170320094335.1266306-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Arnd Bergmann , Daniel Vetter , Jani Nikula , David Airlie Cc: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Matthew Auld List-Id: dri-devel@lists.freedesktop.org T24gbWEsIDIwMTctMDMtMjAgYXQgMTA6NDAgKzAxMDAsIEFybmQgQmVyZ21hbm4gd3JvdGU6Cj4g QSBzdHJ1Y3QgZmlsZSBpcyBhIGJpdCB0b28gbGFyZ2UgdG8gcHV0IG9uIHRoZSBrZXJuZWwgc3Rh Y2sgaW4gZ2VuZXJhbAo+IGFuZCB0cmlnZ2VycyBhIHdhcm5pbmcgZm9yIGxvdyBzZXR0aW5ncyBv ZiBDT05GSUdfRlJBTUVfV0FSTjoKPiAKPiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv bW9ja19kcm0uYzogSW4gZnVuY3Rpb24gJ21vY2tfZmlsZSc6Cj4gZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL21vY2tfZHJtLmM6NDY6MTogZXJyb3I6IHRoZSBmcmFtZSBzaXplIG9mIDEz MjggYnl0ZXMgaXMgbGFyZ2VyIHRoYW4gMTI4MCBieXRlcyBbLVdlcnJvcj1mcmFtZS1sYXJnZXIt dGhhbj1dCj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZHJtLmM6IEluIGZ1 bmN0aW9uICdtb2NrX2ZpbGVfZnJlZSc6Cj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3Rz L21vY2tfZHJtLmM6NTQ6MTogZXJyb3I6IHRoZSBmcmFtZSBzaXplIG9mIDEzMTIgYnl0ZXMgaXMg bGFyZ2VyIHRoYW4gMTI4MCBieXRlcyBbLVdlcnJvcj1mcmFtZS1sYXJnZXItdGhhbj1dCj4gCj4g SXQncyBhbHNvIHNsaWdodGx5IGRhbmdlcm91cyB0byBsZWF2ZSBhIHJlZmVyZW5jZSB0byBhIHN0 YWNrIG9iamVjdAo+IGluIHRoZSBkcm1fZmlsZSBzdHJ1Y3R1cmUgYWZ0ZXIgbGVhdmluZyB0aGUg c3RhY2sgZnJhbWUuCj4gVGhpcyBjaGFuZ2VzIHRoZSBjb2RlIHRvIGp1c3QgYWxsb2NhdGUgdGhl IG9iamVjdCBkeW5hbWljYWxseQo+IGFuZCByZWxlYXNlIGl0IHdoZW4gd2UgYXJlIGRvbmUgd2l0 aCBpdC4KPiAKPiBGaXhlczogNjZkOWNiNWQ4MDVhICgiZHJtL2k5MTU6IE1vY2sgdGhlIEdFTSBk ZXZpY2UgZm9yIHNlbGYtdGVzdGluZyIpCj4gU2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8 YXJuZEBhcm5kYi5kZT4KCjxTTklQPgoKPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9tb2NrX2RybS5jIHwgMTIgKysrKysrKy0tLS0tCj4gwqAxIGZpbGUgY2hhbmdlZCwg NyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19kcm0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L3NlbGZ0ZXN0cy9tb2NrX2RybS5jCj4gaW5kZXggMTEzZGVjMDVjN2RjLi4xODUxNDA2NWM5M2Qg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZHJtLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19kcm0uYwo+IEBAIC0z MiwxNSArMzIsMTUgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgaW5vZGUgZmFrZV9pbm9kZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiDCoHN0cnVjdCBkcm1fZmlsZSAqbW9ja19maWxl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQo+IMKgewo+ID4gwqAJc3RydWN0IGlub2Rl IGlub2RlID0gZmFrZV9pbm9kZShpOTE1KTsKPiA+IC0Jc3RydWN0IGZpbGUgZmlscCA9IHt9Owo+ ID4gKwlzdHJ1Y3QgZmlsZSAqZmlscCA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCBmaWxlKSwgR0ZQ X0tFUk5FTCk7Cj4gPiDCoAlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGU7Cj4gPiDCoAlpbnQgZXJyOwo+ IMKgCgoJZmlscCA9IGt6YWxsb2Moc2l6ZW9mKCpmaWxwKSwgR0ZQX0tFUk5FTCk7CglpZiAodW5s aWtlbHkoIWZpbHApKSB7CgkJZXJyID0gLUVOT01FTTsKCQlnb3RvIGVycjsKCX0KCkFuZCBhcHBy b3ByaWF0ZSBvbmlvbiB0ZWFyZG93biBpbiBjYXNlIGRybV9vcGVuIGZhaWxzLCBzbyB0aGF0IHdl IGRvbid0CmxlYWsgbWVtb3J5LgoKUmVnYXJkcywgSm9vbmFzCi0tIApKb29uYXMgTGFodGluZW4K T3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKSW50ZWwgQ29ycG9yYXRpb24KX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754605AbdCTMHy (ORCPT ); Mon, 20 Mar 2017 08:07:54 -0400 Received: from mga03.intel.com ([134.134.136.65]:60341 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbdCTMHw (ORCPT ); Mon, 20 Mar 2017 08:07:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,194,1486454400"; d="scan'208";a="238238579" Message-ID: <1490011236.3600.5.camel@linux.intel.com> Subject: Re: [PATCH 1/3] drm/i915: allocate mock file pointer dynamically From: Joonas Lahtinen To: Arnd Bergmann , Daniel Vetter , Jani Nikula , David Airlie Cc: Chris Wilson , Tvrtko Ursulin , Matthew Auld , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Mon, 20 Mar 2017 14:00:36 +0200 In-Reply-To: <20170320094335.1266306-1-arnd@arndb.de> References: <20170320094335.1266306-1-arnd@arndb.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On ma, 2017-03-20 at 10:40 +0100, Arnd Bergmann wrote: > A struct file is a bit too large to put on the kernel stack in general > and triggers a warning for low settings of CONFIG_FRAME_WARN: > > drivers/gpu/drm/i915/selftests/mock_drm.c: In function 'mock_file': > drivers/gpu/drm/i915/selftests/mock_drm.c:46:1: error: the frame size of 1328 bytes is larger than 1280 bytes [-Werror=frame-larger-than=] > drivers/gpu/drm/i915/selftests/mock_drm.c: In function 'mock_file_free': > drivers/gpu/drm/i915/selftests/mock_drm.c:54:1: error: the frame size of 1312 bytes is larger than 1280 bytes [-Werror=frame-larger-than=] > > It's also slightly dangerous to leave a reference to a stack object > in the drm_file structure after leaving the stack frame. > This changes the code to just allocate the object dynamically > and release it when we are done with it. > > Fixes: 66d9cb5d805a ("drm/i915: Mock the GEM device for self-testing") > Signed-off-by: Arnd Bergmann > --- >  drivers/gpu/drm/i915/selftests/mock_drm.c | 12 +++++++----- >  1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/mock_drm.c b/drivers/gpu/drm/i915/selftests/mock_drm.c > index 113dec05c7dc..18514065c93d 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_drm.c > +++ b/drivers/gpu/drm/i915/selftests/mock_drm.c > @@ -32,15 +32,15 @@ static inline struct inode fake_inode(struct drm_i915_private *i915) >  struct drm_file *mock_file(struct drm_i915_private *i915) >  { > >   struct inode inode = fake_inode(i915); > > - struct file filp = {}; > > + struct file *filp = kzalloc(sizeof(struct file), GFP_KERNEL); > >   struct drm_file *file; > >   int err; >   filp = kzalloc(sizeof(*filp), GFP_KERNEL); if (unlikely(!filp)) { err = -ENOMEM; goto err; } And appropriate onion teardown in case drm_open fails, so that we don't leak memory. Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation