On 1/23/26 12:06 AM, Lorenzo Stoakes wrote:
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.
Signed-off-by: Lorenzo Stoakes <[email protected]>
(reduced distribution list too)
Thanks. The shmem part looks good to me with some nits below.
Reviewed-by: Baolin Wang <[email protected]>
---
arch/x86/kernel/cpu/sgx/ioctl.c | 2 +-
drivers/gpu/drm/drm_gem.c | 5 +-
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 3 +-
drivers/gpu/drm/i915/gt/shmem_utils.c | 3 +-
drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 2 +-
drivers/gpu/drm/ttm/ttm_backup.c | 3 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
fs/xfs/scrub/xfile.c | 3 +-
fs/xfs/xfs_buf_mem.c | 2 +-
include/linux/shmem_fs.h | 8 ++-
ipc/shm.c | 6 +--
mm/memfd.c | 2 +-
mm/memfd_luo.c | 2 +-
mm/shmem.c | 59 +++++++++++++----------
security/keys/big_key.c | 2 +-
16 files changed, 57 insertions(+), 49 deletions(-)
[snip]
inode->i_flags |= i_flags;
@@ -5864,9 +5869,10 @@ static struct file *__shmem_file_setup(struct vfsmount
*mnt, const char *name,
* checks are provided at the key or shm level rather than the inode.
* @name: name for dentry (to be seen in /proc/<pid>/maps)
* @size: size to be set for the file
- * @flags: VM_NORESERVE suppresses pre-accounting of the entire object size
+ * @vma_flags: VMA_NORESERVE_BIT suppresses pre-accounting of the entire
object size
nit: s/vma_flags/flags
*/
-struct file *shmem_kernel_file_setup(const char *name, loff_t size, unsigned
long flags)
+struct file *shmem_kernel_file_setup(const char *name, loff_t size,
+ vma_flags_t flags)
{
return __shmem_file_setup(shm_mnt, name, size, flags, S_PRIVATE);
}
@@ -5878,7 +5884,7 @@ EXPORT_SYMBOL_GPL(shmem_kernel_file_setup);
* @size: size to be set for the file
* @flags: VM_NORESERVE suppresses pre-accounting of the entire object size
nit: s/VM_NORESERVE/VMA_NORESERVE_BIT
*/
-struct file *shmem_file_setup(const char *name, loff_t size, unsigned long
flags)
+struct file *shmem_file_setup(const char *name, loff_t size, vma_flags_t flags)
{
return __shmem_file_setup(shm_mnt, name, size, flags, 0);
}
@@ -5889,16 +5895,17 @@ EXPORT_SYMBOL_GPL(shmem_file_setup);
* @mnt: the tmpfs mount where the file will be created
* @name: name for dentry (to be seen in /proc/<pid>/maps)
* @size: size to be set for the file
- * @flags: VM_NORESERVE suppresses pre-accounting of the entire object size
+ * @flags: VMA_NORESERVE_BIT suppresses pre-accounting of the entire object
size
*/
struct file *shmem_file_setup_with_mnt(struct vfsmount *mnt, const char *name,
- loff_t size, unsigned long flags)
+ loff_t size, vma_flags_t flags)
{
return __shmem_file_setup(mnt, name, size, flags, 0);
}
EXPORT_SYMBOL_GPL(shmem_file_setup_with_mnt);
-static struct file *__shmem_zero_setup(unsigned long start, unsigned long end, vm_flags_t vm_flags)
+static struct file *__shmem_zero_setup(unsigned long start, unsigned long end,
+ vma_flags_t flags)
{
loff_t size = end - start;
@@ -5908,7 +5915,7 @@ static struct file *__shmem_zero_setup(unsigned long start, unsigned long end, v
* accessible to the user through its mapping, use S_PRIVATE flag to
* bypass file security, in the same way as shmem_kernel_file_setup().
*/
- return shmem_kernel_file_setup("dev/zero", size, vm_flags);
+ return shmem_kernel_file_setup("dev/zero", size, flags);
}
/**
@@ -5918,7 +5925,7 @@ static struct file *__shmem_zero_setup(unsigned long
start, unsigned long end, v
*/
int shmem_zero_setup(struct vm_area_struct *vma)
{
- struct file *file = __shmem_zero_setup(vma->vm_start, vma->vm_end,
vma->vm_flags);
+ struct file *file = __shmem_zero_setup(vma->vm_start, vma->vm_end,
vma->flags);
if (IS_ERR(file))
return PTR_ERR(file);
@@ -5939,7 +5946,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
*/
int shmem_zero_setup_desc(struct vm_area_desc *desc)
{
- struct file *file = __shmem_zero_setup(desc->start, desc->end,
desc->vm_flags);
+ struct file *file = __shmem_zero_setup(desc->start, desc->end,
desc->vma_flags);
if (IS_ERR(file))
return PTR_ERR(file);
diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index d46862ab90d6..268f702df380 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -103,7 +103,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
0, enckey);
/* save aligned data to file */
- file = shmem_kernel_file_setup("", enclen, 0);
+ file = shmem_kernel_file_setup("", enclen, EMPTY_VMA_FLAGS);
if (IS_ERR(file)) {
ret = PTR_ERR(file);
goto err_enckey;
