Commit 641bb439 authored by Christian Brauner's avatar Christian Brauner
Browse files

fs: move FMODE_UNSIGNED_OFFSET to fop_flags 

This is another flag that is statically set and doesn't need to use up
an FMODE_* bit. Move it to ->fop_flags and free up another FMODE_* bit.

(1) mem_open() used from proc_mem_operations
(2) adi_open() used from adi_fops
(3) drm_open_helper():
    (3.1) accel_open() used from DRM_ACCEL_FOPS
    (3.2) drm_open() used from
    (3.2.1) amdgpu_driver_kms_fops
    (3.2.2) psb_gem_fops
    (3.2.3) i915_driver_fops
    (3.2.4) nouveau_driver_fops
    (3.2.5) panthor_drm_driver_fops
    (3.2.6) radeon_driver_kms_fops
    (3.2.7) tegra_drm_fops
    (3.2.8) vmwgfx_driver_fops
    (3.2.9) xe_driver_fops
    (3.2.10) DRM_GEM_FOPS
    (3.2.11) DEFINE_DRM_GEM_DMA_FOPS
(4) struct memdev sets fmode flags based on type of device opened. For
    devices using struct mem_fops unsigned offset is used.

Mark all these file operations as FOP_UNSIGNED_OFFSET and add asserts
into the open helper to ensure that the flag is always set.

Link: https://lore.kernel.org/r/20240809-work-fop_unsigned-v1-1-658e054d893e@kernel.org


Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 8447d848

drivers/char/adi.c

+1 −7
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ 


#define MAX_BUF_SZ	PAGE_SIZE



static int adi_open(struct inode *inode, struct file *file)

{

	file->f_mode |= FMODE_UNSIGNED_OFFSET;

	return 0;

}



static int read_mcd_tag(unsigned long addr)

{

	long err;
@@ -206,9 +200,9 @@ static loff_t adi_llseek(struct file *file, loff_t offset, int whence) 
static const struct file_operations adi_fops = {

	.owner		= THIS_MODULE,

	.llseek		= adi_llseek,

	.open		= adi_open,

	.read		= adi_read,

	.write		= adi_write,

	.fop_flags	= FOP_UNSIGNED_OFFSET,

};



static struct miscdevice adi_miscdev = {

drivers/char/mem.c

+2 −1
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ static const struct file_operations __maybe_unused mem_fops = { 
	.get_unmapped_area = get_unmapped_area_mem,

	.mmap_capabilities = memory_mmap_capabilities,

#endif

	.fop_flags	= FOP_UNSIGNED_OFFSET,

};



static const struct file_operations null_fops = {
@@ -693,7 +694,7 @@ static const struct memdev { 
	umode_t mode;

} devlist[] = {

#ifdef CONFIG_DEVMEM

	[DEVMEM_MINOR] = { "mem", &mem_fops, FMODE_UNSIGNED_OFFSET, 0 },

	[DEVMEM_MINOR] = { "mem", &mem_fops, 0, 0 },

#endif

	[3] = { "null", &null_fops, FMODE_NOWAIT, 0666 },

#ifdef CONFIG_DEVPORT

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -2908,6 +2908,7 @@ static const struct file_operations amdgpu_driver_kms_fops = { 
#ifdef CONFIG_PROC_FS

	.show_fdinfo = drm_show_fdinfo,

#endif

	.fop_flags = FOP_UNSIGNED_OFFSET,

};



int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)

drivers/gpu/drm/drm_file.c

+2 −1
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ int drm_open_helper(struct file *filp, struct drm_minor *minor) 
	if (dev->switch_power_state != DRM_SWITCH_POWER_ON &&

	    dev->switch_power_state != DRM_SWITCH_POWER_DYNAMIC_OFF)

		return -EINVAL;

	if (WARN_ON_ONCE(!(filp->f_op->fop_flags & FOP_UNSIGNED_OFFSET)))

		return -EINVAL;



	drm_dbg_core(dev, "comm=\"%s\", pid=%d, minor=%d\n",

		     current->comm, task_pid_nr(current), minor->index);
@@ -335,7 +337,6 @@ int drm_open_helper(struct file *filp, struct drm_minor *minor) 
	}



	filp->private_data = priv;

	filp->f_mode |= FMODE_UNSIGNED_OFFSET;

	priv->filp = filp;



	mutex_lock(&dev->filelist_mutex);

drivers/gpu/drm/gma500/psb_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static const struct file_operations psb_gem_fops = { 
	.mmap = drm_gem_mmap,

	.poll = drm_poll,

	.read = drm_read,

	.fop_flags = FOP_UNSIGNED_OFFSET,

};



static const struct drm_driver driver = {