From: Chris Wilson <chris@chris-wilson.co.uk>
To: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: David Airlie <airlied@linux.ie>,
intel-gfx@lists.freedesktop.org, Hugh Dickins <hughd@google.com>,
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
linux-mm@kvack.org, dri-devel@lists.freedesktop.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [Intel-gfx] [linux-next] mm/i915: i915_gemfs_init() NULL dereference
Date: Thu, 01 Aug 2019 18:30:45 +0100 [thread overview]
Message-ID: <156468064507.12570.1311173864105235053@skylake-alporthouse-com> (raw)
In-Reply-To: <20190731164829.GA399@tigerII.localdomain>
Quoting Sergey Senozhatsky (2019-07-31 17:48:29)
> @@ -36,19 +38,35 @@ int i915_gemfs_init(struct drm_i915_private *i915)
> struct super_block *sb = gemfs->mnt_sb;
> /* FIXME: Disabled until we get W/A for read BW issue. */
> char options[] = "huge=never";
> - int flags = 0;
> int err;
>
> - err = sb->s_op->remount_fs(sb, &flags, options);
> - if (err) {
> - kern_unmount(gemfs);
> - return err;
> - }
> + fc = fs_context_for_reconfigure(sb->s_root, 0, 0);
> + if (IS_ERR(fc))
> + goto err;
> +
> + if (!fc->ops->parse_monolithic)
> + goto err;
> +
> + err = fc->ops->parse_monolithic(fc, options);
> + if (err)
> + goto err;
> +
> + if (!fc->ops->reconfigure)
It would be odd for fs_context_for_reconfigure() to allow creation of a
context if that context couldn't perform a reconfigre, nevertheless that
seems to be the case.
> + goto err;
> +
> + err = fc->ops->reconfigure(fc);
> + if (err)
> + goto err;
Only thing that stands out is that we should put_fs_context() here as
well. I guess it's better than poking at the SB_INFO directly ourselves.
I think though we shouldn't bail if we can't change the thp setting, and
just accept whatever with a warning.
Looks like the API is already available in dinq, so we can apply this
ahead of the next merge window.
-Chris
next prev parent reply other threads:[~2019-08-01 17:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 14:29 Sergey Senozhatsky
2019-07-31 16:48 ` Sergey Senozhatsky
2019-08-01 17:30 ` Chris Wilson [this message]
2019-08-02 5:37 ` [Intel-gfx] " Sergey Senozhatsky
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=156468064507.12570.1311173864105235053@skylake-alporthouse-com \
--to=chris@chris-wilson.co.uk \
--cc=airlied@linux.ie \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hughd@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=sergey.senozhatsky@gmail.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