All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: linux-mm@kvack.org, Hugh Dickins <hughd@google.com>,
	Dave Hansen <dave.hansen@intel.com>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 03/22] mm/shmem: parse mount options for MS_KERNMOUNT
Date: Mon, 25 Sep 2017 19:47:18 +0100	[thread overview]
Message-ID: <20170925184737.8807-4-matthew.auld@intel.com> (raw)
In-Reply-To: <20170925184737.8807-1-matthew.auld@intel.com>

In i915 we now have our own tmpfs mount, so ensure that shmem_fill_super
also calls shmem_parse_options when dealing with a kernel mount.
Otherwise we have to clumsily call remount_fs when we want to supply our
mount options.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org
---
 mm/shmem.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index ae2e46291ffa..6074e527b9b9 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3781,13 +3781,15 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
 	if (!(sb->s_flags & MS_KERNMOUNT)) {
 		sbinfo->max_blocks = shmem_default_max_blocks();
 		sbinfo->max_inodes = shmem_default_max_inodes();
-		if (shmem_parse_options(data, sbinfo, false)) {
-			err = -EINVAL;
-			goto failed;
-		}
 	} else {
 		sb->s_flags |= MS_NOUSER;
 	}
+
+	if (shmem_parse_options(data, sbinfo, false)) {
+		err = -EINVAL;
+		goto failed;
+	}
+
 	sb->s_export_op = &shmem_export_ops;
 	sb->s_flags |= MS_NOSEC;
 #else
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Dave Hansen <dave.hansen@intel.com>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	Andrew Morton <akpm@linux-foundation.org>,
	Hugh Dickins <hughd@google.com>,
	linux-mm@kvack.org
Subject: [PATCH 03/22] mm/shmem: parse mount options for MS_KERNMOUNT
Date: Mon, 25 Sep 2017 19:47:18 +0100	[thread overview]
Message-ID: <20170925184737.8807-4-matthew.auld@intel.com> (raw)
In-Reply-To: <20170925184737.8807-1-matthew.auld@intel.com>

In i915 we now have our own tmpfs mount, so ensure that shmem_fill_super
also calls shmem_parse_options when dealing with a kernel mount.
Otherwise we have to clumsily call remount_fs when we want to supply our
mount options.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org
---
 mm/shmem.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index ae2e46291ffa..6074e527b9b9 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3781,13 +3781,15 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
 	if (!(sb->s_flags & MS_KERNMOUNT)) {
 		sbinfo->max_blocks = shmem_default_max_blocks();
 		sbinfo->max_inodes = shmem_default_max_inodes();
-		if (shmem_parse_options(data, sbinfo, false)) {
-			err = -EINVAL;
-			goto failed;
-		}
 	} else {
 		sb->s_flags |= MS_NOUSER;
 	}
+
+	if (shmem_parse_options(data, sbinfo, false)) {
+		err = -EINVAL;
+		goto failed;
+	}
+
 	sb->s_export_op = &shmem_export_ops;
 	sb->s_flags |= MS_NOSEC;
 #else
-- 
2.13.5

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2017-09-25 18:47 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-25 18:47 [PATCH 00/22] huge gtt pages Matthew Auld
2017-09-25 18:47 ` [PATCH 01/22] mm/shmem: support passing mnt to shmem_file_setup Matthew Auld
2017-09-25 18:47   ` Matthew Auld
2017-09-25 18:58   ` Chris Wilson
2017-09-25 18:47 ` [PATCH 02/22] drm/i915: introduce simple gemfs Matthew Auld
2017-09-25 18:47   ` Matthew Auld
2017-09-25 19:01   ` Chris Wilson
2017-09-26  7:52   ` Greg Kroah-Hartman
2017-09-26  7:52     ` Greg Kroah-Hartman
2017-09-26 13:21     ` Joonas Lahtinen
2017-09-26 13:21       ` Joonas Lahtinen
2017-09-26 21:34       ` Greg Kroah-Hartman
2017-09-26 21:34         ` Greg Kroah-Hartman
2017-09-27  7:50         ` Joonas Lahtinen
2017-09-27  7:50           ` Joonas Lahtinen
2017-09-25 18:47 ` Matthew Auld [this message]
2017-09-25 18:47   ` [PATCH 03/22] mm/shmem: parse mount options for MS_KERNMOUNT Matthew Auld
2017-09-25 19:28   ` Chris Wilson
2017-09-25 18:47 ` [PATCH 04/22] drm/i915/gemfs: enable THP Matthew Auld
2017-09-25 18:47   ` Matthew Auld
2017-09-25 19:11   ` Chris Wilson
2017-09-25 18:47 ` [PATCH 05/22] drm/i915: introduce page_sizes field to dev_info Matthew Auld
2017-09-25 18:47 ` [PATCH 06/22] drm/i915: push set_pages down to the callers Matthew Auld
2017-09-25 18:47 ` [PATCH 07/22] drm/i915: introduce page_size members Matthew Auld
2017-09-25 18:47 ` [PATCH 08/22] drm/i915: introduce vm set_pages/clear_pages Matthew Auld
2017-09-25 18:47 ` [PATCH 09/22] drm/i915: align the vma start to the largest gtt page size Matthew Auld
2017-09-25 18:47 ` [PATCH 10/22] drm/i915: align 64K objects to 2M Matthew Auld
2017-09-25 18:47 ` [PATCH 11/22] drm/i915: enable IPS bit for 64K pages Matthew Auld
2017-09-25 18:47 ` [PATCH 12/22] drm/i915: disable GTT cache for 2M pages Matthew Auld
2017-09-25 18:47 ` [PATCH 13/22] drm/i915: support 2M pages for the 48b PPGTT Matthew Auld
2017-09-25 18:47 ` [PATCH 14/22] drm/i915: add support for 64K scratch page Matthew Auld
2017-09-25 18:47 ` [PATCH 15/22] drm/i915: support 64K pages for the 48b PPGTT Matthew Auld
2017-09-25 18:47 ` [PATCH 16/22] drm/i915: accurate page size tracking for the ppgtt Matthew Auld
2017-09-25 18:47 ` [PATCH 17/22] drm/i915/debugfs: include some gtt page size metrics Matthew Auld
2017-09-25 18:47 ` [PATCH 18/22] drm/i915/selftests: huge page tests Matthew Auld
2017-09-25 19:17   ` Chris Wilson
2017-09-25 18:47 ` [PATCH 19/22] drm/i915/selftests: mix huge pages Matthew Auld
2017-09-25 18:47 ` [PATCH 20/22] drm/i915: disable platform support for vGPU huge gtt pages Matthew Auld
2017-09-25 18:47 ` [PATCH 21/22] drm/i915: enable platform support for 64K pages Matthew Auld
2017-09-25 18:47 ` [PATCH 22/22] drm/i915: enable platform support for 2M pages Matthew Auld
2017-09-25 19:13 ` ✓ Fi.CI.BAT: success for huge gtt pages (rev9) Patchwork
2017-09-25 23:03 ` ✓ Fi.CI.IGT: " Patchwork

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=20170925184737.8807-4-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=dave.hansen@intel.com \
    --cc=hughd@google.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kirill@shutemov.name \
    --cc=linux-mm@kvack.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.