From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Arnd Bergmann <arnd@arndb.de>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
David Airlie <airlied@linux.ie>
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
Matthew Auld <matthew.auld@intel.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] drm/i915: allocate mock file pointer dynamically
Date: Mon, 20 Mar 2017 14:00:36 +0200 [thread overview]
Message-ID: <1490011236.3600.5.camel@linux.intel.com> (raw)
In-Reply-To: <20170320094335.1266306-1-arnd@arndb.de>
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 <arnd@arndb.de>
<SNIP>
> ---
> 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
next prev parent reply other threads:[~2017-03-20 12:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 9:40 [PATCH 1/3] drm/i915: allocate mock file pointer dynamically Arnd Bergmann
2017-03-20 9:40 ` [PATCH 2/3] drm/i915: split out check for noncontiguous pfn range Arnd Bergmann
2017-03-21 9:56 ` Chris Wilson
2017-03-21 10:23 ` [Intel-gfx] " Chris Wilson
2017-03-20 9:40 ` [PATCH 3/3] [RFC] Revert "drm/i915: use variadic macros and arrays to choose port/pipe based registers" Arnd Bergmann
2017-03-20 10:08 ` Jani Nikula
2017-03-20 10:39 ` Arnd Bergmann
2017-03-20 11:24 ` Jani Nikula
2017-03-20 9:54 ` [PATCH 1/3] drm/i915: allocate mock file pointer dynamically Daniel Vetter
2017-03-20 12:00 ` Joonas Lahtinen [this message]
2017-03-20 12:02 ` Arnd Bergmann
2017-03-20 12:07 ` Arnd Bergmann
2017-03-21 10:16 ` Chris Wilson
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=1490011236.3600.5.camel@linux.intel.com \
--to=joonas.lahtinen@linux.intel.com \
--cc=airlied@linux.ie \
--cc=arnd@arndb.de \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=tvrtko.ursulin@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).