[Intel-gfx] [PATCH] drm/i915/gemfs: don't mark huge_opt as static

[Tvrtko Ursulin]

On 26/11/2021 11:08, Matthew Auld wrote:
> vfs_kernel_mount() modifies the passed in mount options, leaving us with
> "huge", instead of "huge=within_size". Normally this shouldn't matter
> with the usual module load/unload flow, however with the core_hotunplug
> IGT we are hitting the following, when re-probing the memory regions:

Doh and thanks for fixing it. I obviously figured out it changes the 
string but did not grasp all the consequences.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko

> i915 0000:00:02.0: [drm] Transparent Hugepage mode 'huge'
> tmpfs: Bad value for 'huge'
> [drm] Unable to create a private tmpfs mount, hugepage support will be disabled(-22).
> 
> References: https://gitlab.freedesktop.org/drm/intel/-/issues/4651
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c
> index dbdbdc344d87..182da3c04771 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gemfs.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c
> @@ -12,6 +12,7 @@
>   
>   int i915_gemfs_init(struct drm_i915_private *i915)
>   {
> +	char huge_opt[] = "huge=within_size"; /* r/w */
>   	struct file_system_type *type;
>   	struct vfsmount *gemfs;
>   	char *opts;
> @@ -33,8 +34,6 @@ int i915_gemfs_init(struct drm_i915_private *i915)
>   	opts = NULL;
>   	if (intel_vtd_active()) {
>   		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
> -			static char huge_opt[] = "huge=within_size"; /* r/w */
> -
>   			opts = huge_opt;
>   			drm_info(&i915->drm,
>   				 "Transparent Hugepage mode '%s'\n",
>