Skip to content

Commit 590d356

Browse files
ljskernelakpm00
authored andcommitted
mm: update shmem_[kernel]_file_*() functions to use vma_flags_t
In order to be able to use only vma_flags_t in vm_area_desc we must adjust shmem file setup functions to operate in terms of vma_flags_t rather than vm_flags_t. This patch makes this change and updates all callers to use the new functions. No functional changes intended. [akpm@linux-foundation.org: comment fixes, per Baolin] Link: https://lkml.kernel.org/r/736febd280eb484d79cef5cf55b8a6f79ad832d2.1769097829.git.lorenzo.stoakes@oracle.com Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> Cc: Barry Song <baohua@kernel.org> Cc: David Hildenbrand <david@kernel.org> Cc: Dev Jain <dev.jain@arm.com> Cc: Jason Gunthorpe <jgg@nvidia.com> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Zi Yan <ziy@nvidia.com> Cc: "Darrick J. Wong" <djwong@kernel.org> Cc: Damien Le Moal <dlemoal@kernel.org> Cc: Yury Norov <ynorov@nvidia.com> Cc: Chris Mason <clm@fb.com> Cc: Pedro Falcato <pfalcato@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent fd3196e commit 590d356

15 files changed

Lines changed: 57 additions & 49 deletions

File tree

arch/x86/kernel/cpu/sgx/ioctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
8383
encl_size = secs->size + PAGE_SIZE;
8484

8585
backing = shmem_file_setup("SGX backing", encl_size + (encl_size >> 5),
86-
VM_NORESERVE);
86+
mk_vma_flags(VMA_NORESERVE_BIT));
8787
if (IS_ERR(backing)) {
8888
ret = PTR_ERR(backing);
8989
goto err_out_shrink;

drivers/gpu/drm/drm_gem.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,15 @@ int drm_gem_object_init_with_mnt(struct drm_device *dev,
130130
struct vfsmount *gemfs)
131131
{
132132
struct file *filp;
133+
const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);
133134

134135
drm_gem_private_object_init(dev, obj, size);
135136

136137
if (gemfs)
137138
filp = shmem_file_setup_with_mnt(gemfs, "drm mm object", size,
138-
VM_NORESERVE);
139+
flags);
139140
else
140-
filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
141+
filp = shmem_file_setup("drm mm object", size, flags);
141142

142143
if (IS_ERR(filp))
143144
return PTR_ERR(filp);

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ static int __create_shmem(struct drm_i915_private *i915,
496496
struct drm_gem_object *obj,
497497
resource_size_t size)
498498
{
499-
unsigned long flags = VM_NORESERVE;
499+
const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);
500500
struct file *filp;
501501

502502
drm_gem_private_object_init(&i915->drm, obj, size);

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,
200200
struct address_space *mapping;
201201
gfp_t mask;
202202

203-
filp = shmem_file_setup("i915-shmem-tt", size, VM_NORESERVE);
203+
filp = shmem_file_setup("i915-shmem-tt", size,
204+
mk_vma_flags(VMA_NORESERVE_BIT));
204205
if (IS_ERR(filp))
205206
return PTR_ERR(filp);
206207

drivers/gpu/drm/i915/gt/shmem_utils.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ struct file *shmem_create_from_data(const char *name, void *data, size_t len)
1919
struct file *file;
2020
int err;
2121

22-
file = shmem_file_setup(name, PAGE_ALIGN(len), VM_NORESERVE);
22+
file = shmem_file_setup(name, PAGE_ALIGN(len),
23+
mk_vma_flags(VMA_NORESERVE_BIT));
2324
if (IS_ERR(file))
2425
return file;
2526

drivers/gpu/drm/ttm/tests/ttm_tt_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void ttm_tt_fini_shmem(struct kunit *test)
143143
err = ttm_tt_init(tt, bo, 0, caching, 0);
144144
KUNIT_ASSERT_EQ(test, err, 0);
145145

146-
shmem = shmem_file_setup("ttm swap", BO_SIZE, 0);
146+
shmem = shmem_file_setup("ttm swap", BO_SIZE, EMPTY_VMA_FLAGS);
147147
tt->swap_storage = shmem;
148148

149149
ttm_tt_fini(tt);

drivers/gpu/drm/ttm/ttm_backup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,6 @@ EXPORT_SYMBOL_GPL(ttm_backup_bytes_avail);
178178
*/
179179
struct file *ttm_backup_shmem_create(loff_t size)
180180
{
181-
return shmem_file_setup("ttm shmem backup", size, 0);
181+
return shmem_file_setup("ttm shmem backup", size,
182+
EMPTY_VMA_FLAGS);
182183
}

drivers/gpu/drm/ttm/ttm_tt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ int ttm_tt_swapout(struct ttm_device *bdev, struct ttm_tt *ttm,
330330
struct page *to_page;
331331
int i, ret;
332332

333-
swap_storage = shmem_file_setup("ttm swap", size, 0);
333+
swap_storage = shmem_file_setup("ttm swap", size, EMPTY_VMA_FLAGS);
334334
if (IS_ERR(swap_storage)) {
335335
pr_err("Failed allocating swap storage\n");
336336
return PTR_ERR(swap_storage);

fs/xfs/scrub/xfile.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ xfile_create(
6161
if (!xf)
6262
return -ENOMEM;
6363

64-
xf->file = shmem_kernel_file_setup(description, isize, VM_NORESERVE);
64+
xf->file = shmem_kernel_file_setup(description, isize,
65+
mk_vma_flags(VMA_NORESERVE_BIT));
6566
if (IS_ERR(xf->file)) {
6667
error = PTR_ERR(xf->file);
6768
goto out_xfile;

fs/xfs/xfs_buf_mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ xmbuf_alloc(
6262
if (!btp)
6363
return -ENOMEM;
6464

65-
file = shmem_kernel_file_setup(descr, 0, 0);
65+
file = shmem_kernel_file_setup(descr, 0, EMPTY_VMA_FLAGS);
6666
if (IS_ERR(file)) {
6767
error = PTR_ERR(file);
6868
goto out_free_btp;

0 commit comments

Comments
 (0)