stop using ->read and ->write for kernel access
Subsystems (180)
Christoph Hellwig
maintainerHi Al and Linus,
as part of removing set_fs entirely (for which I have a working prototype), we need to stop calling ->read and ->write with kernel pointers under set_fs.
My previous "clean up kernel_{read,write} & friends v5" series, on which this one builds, consolidate those calls into the __ḵernel_{read,write} helpers. This series goes further and removes the option to call ->read and ->write with kernel pointers entirely. The replacement options are either the existing ->read_iter and ->write_iter methods which cope with kvecs and kernel pointers just fine and are used by many instances including all the "real" file systems. For for other files like devices they are not suitable. Fortunately we don't really do pure kernel reads and writes to any of those. Traditionally the only real exception has been splice, which could be used every file for the last few years, although initially it was optional.
So in addition to some more cleanup like moving the seq_file code to the iter interface this series introduces a new uptr_t type for a "universal" pointer that can point to either user or kernel memory in a properly tagged way, and then adds new read_uptr an write_uptr ops based on that. It then converts over the sysctl code as 5.8 added new code that actually does a kernel_write to it. Any driver that really wants splice to work can also be converted over to it, although I haven't run into one yet.
A git branch is available here:
git://git.infradead.org/users/hch/misc.git uptr
Gitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/uptr
Diffstat:
Documentation/filesystems/seq_file.rst | 2 Documentation/process/clang-format.rst | 4 Documentation/translations/it_IT/process/clang-format.rst | 4 arch/alpha/kernel/srm_env.c | 2 arch/arm/mm/alignment.c | 2 arch/arm/mm/ptdump_debugfs.c | 2 arch/arm64/kvm/vgic/vgic-debug.c | 2 arch/c6x/platforms/pll.c | 2 arch/mips/cavium-octeon/oct_ilm.c | 2 arch/mips/kernel/segment.c | 2 arch/mips/ralink/bootrom.c | 2 arch/powerpc/kernel/rtas-proc.c | 10 - arch/powerpc/kvm/book3s_xive_native.c | 2 arch/powerpc/kvm/timing.c | 2 arch/powerpc/mm/numa.c | 2 arch/powerpc/mm/ptdump/bats.c | 2 arch/powerpc/mm/ptdump/hashpagetable.c | 2 arch/powerpc/mm/ptdump/ptdump.c | 2 arch/powerpc/mm/ptdump/segment_regs.c | 2 arch/powerpc/platforms/cell/spufs/file.c | 8 - arch/powerpc/platforms/pseries/hvCall_inst.c | 2 arch/powerpc/platforms/pseries/lpar.c | 4 arch/powerpc/platforms/pseries/lparcfg.c | 2 arch/s390/kernel/diag.c | 2 arch/s390/mm/dump_pagetables.c | 2 arch/s390/pci/pci_debug.c | 2 arch/sh/mm/alignment.c | 2 arch/sh/mm/asids-debugfs.c | 2 arch/sh/mm/cache-debugfs.c | 2 arch/sh/mm/pmb.c | 2 arch/sh/mm/tlb-debugfs.c | 2 arch/sparc/kernel/led.c | 2 arch/um/kernel/exitcode.c | 2 arch/um/kernel/process.c | 2 arch/x86/kernel/cpu/mce/severity.c | 2 arch/x86/kernel/cpu/mtrr/if.c | 2 arch/x86/mm/pat/memtype.c | 2 arch/x86/mm/pat/set_memory.c | 2 arch/x86/platform/uv/tlb_uv.c | 2 arch/x86/xen/p2m.c | 2 block/blk-mq-debugfs.c | 2 drivers/acpi/battery.c | 2 drivers/acpi/proc.c | 2 drivers/base/power/wakeup.c | 2 drivers/block/aoe/aoeblk.c | 2 drivers/block/drbd/drbd_debugfs.c | 10 - drivers/block/nbd.c | 4 drivers/block/pktcdvd.c | 2 drivers/block/rsxx/core.c | 4 drivers/bus/mvebu-mbus.c | 4 drivers/char/tpm/eventlog/common.c | 2 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 drivers/crypto/amlogic/amlogic-gxl-core.c | 2 drivers/crypto/caam/dpseci-debugfs.c | 2 drivers/crypto/cavium/zip/zip_main.c | 6 drivers/crypto/hisilicon/qm.c | 2 drivers/crypto/qat/qat_common/adf_cfg.c | 2 drivers/crypto/qat/qat_common/adf_transport_debug.c | 4 drivers/firmware/tegra/bpmp-debugfs.c | 2 drivers/gpio/gpiolib.c | 2 drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 4 drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 2 drivers/gpu/drm/arm/malidp_drv.c | 2 drivers/gpu/drm/armada/armada_debugfs.c | 2 drivers/gpu/drm/drm_debugfs.c | 6 drivers/gpu/drm/drm_debugfs_crc.c | 2 drivers/gpu/drm/drm_mipi_dbi.c | 2 drivers/gpu/drm/i915/display/intel_display_debugfs.c | 16 +- drivers/gpu/drm/i915/gt/debugfs_gt.h | 2 drivers/gpu/drm/i915/i915_debugfs_params.c | 12 - drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 2 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 drivers/gpu/drm/msm/msm_debugfs.c | 2 drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 drivers/gpu/drm/omapdrm/dss/dss.c | 2 drivers/gpu/host1x/debug.c | 4 drivers/gpu/vga/vga_switcheroo.c | 2 drivers/hid/hid-picolcd_debugfs.c | 2 drivers/hid/hid-wiimote-debug.c | 2 drivers/hwmon/dell-smm-hwmon.c | 2 drivers/ide/ide-proc.c | 4 drivers/infiniband/hw/cxgb4/device.c | 4 drivers/infiniband/hw/qib/qib_debugfs.c | 2 drivers/infiniband/ulp/ipoib/ipoib_fs.c | 4 drivers/input/input.c | 4 drivers/macintosh/via-pmu.c | 2 drivers/md/bcache/closure.c | 2 drivers/md/md.c | 2 drivers/media/cec/core/cec-core.c | 2 drivers/media/pci/saa7164/saa7164-core.c | 2 drivers/memory/emif.c | 4 drivers/memory/tegra/tegra124-emc.c | 2 drivers/memory/tegra/tegra186-emc.c | 2 drivers/memory/tegra/tegra20-emc.c | 2 drivers/memory/tegra/tegra30-emc.c | 2 drivers/mfd/ab3100-core.c | 2 drivers/mfd/ab3100-otp.c | 2 drivers/mfd/ab8500-debugfs.c | 14 - drivers/mfd/tps65010.c | 2 drivers/misc/habanalabs/debugfs.c | 2 drivers/misc/sgi-gru/gruprocfs.c | 6 drivers/mmc/core/mmc_test.c | 2 drivers/mtd/mtdcore.c | 4 drivers/mtd/ubi/debug.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 38 ++--- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 - drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 6 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 2 drivers/net/wireless/ath/ath5k/debug.c | 2 drivers/net/wireless/ath/wil6210/debugfs.c | 14 - drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c | 2 drivers/net/wireless/intel/ipw2x00/libipw_module.c | 2 drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 drivers/net/wireless/intersil/hostap/hostap_download.c | 2 drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c | 2 drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c | 2 drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c | 4 drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c | 4 drivers/net/wireless/mediatek/mt7601u/debugfs.c | 4 drivers/net/wireless/realtek/rtlwifi/debug.c | 2 drivers/net/wireless/realtek/rtw88/debug.c | 4 drivers/net/wireless/rsi/rsi_91x_debugfs.c | 4 drivers/net/xen-netback/xenbus.c | 2 drivers/nvme/host/fabrics.c | 2 drivers/parisc/led.c | 2 drivers/pci/controller/pci-tegra.c | 2 drivers/platform/x86/asus-wmi.c | 2 drivers/platform/x86/intel_pmc_core.c | 2 drivers/platform/x86/intel_telemetry_debugfs.c | 4 drivers/platform/x86/thinkpad_acpi.c | 2 drivers/platform/x86/toshiba_acpi.c | 8 - drivers/pnp/pnpbios/proc.c | 2 drivers/power/supply/da9030_battery.c | 2 drivers/pwm/core.c | 2 drivers/ras/cec.c | 2 drivers/ras/debugfs.c | 2 drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_proc.c | 2 drivers/s390/cio/blacklist.c | 2 drivers/s390/cio/qdio_debug.c | 2 drivers/scsi/hisi_sas/hisi_sas_main.c | 32 ++-- drivers/scsi/qedf/qedf_dbg.h | 2 drivers/scsi/qedi/qedi_dbg.h | 2 drivers/scsi/qla2xxx/qla_dfs.c | 12 - drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/scsi_proc.c | 4 drivers/scsi/sg.c | 4 drivers/scsi/snic/snic_debugfs.c | 4 drivers/sh/intc/virq-debugfs.c | 2 drivers/soc/qcom/cmd-db.c | 2 drivers/soc/qcom/socinfo.c | 4 drivers/soc/ti/knav_dma.c | 2 drivers/soc/ti/knav_qmss_queue.c | 2 drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 2 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c | 4 drivers/usb/chipidea/debug.c | 4 drivers/usb/dwc2/debugfs.c | 2 drivers/usb/dwc3/debugfs.c | 8 - drivers/usb/gadget/function/rndis.c | 2 drivers/usb/gadget/udc/lpc32xx_udc.c | 2 drivers/usb/gadget/udc/renesas_usb3.c | 2 drivers/usb/host/xhci-debugfs.c | 6 drivers/usb/mtu3/mtu3_debugfs.c | 8 - drivers/usb/musb/musb_debugfs.c | 4 drivers/video/fbdev/via/viafbdev.c | 14 - drivers/visorbus/visorbus_main.c | 2 drivers/xen/xenfs/xensyms.c | 2 fs/cifs/cifs_debug.c | 14 - fs/cifs/dfs_cache.c | 2 fs/debugfs/file.c | 4 fs/dlm/debug_fs.c | 8 - fs/file_table.c | 7 fs/fscache/object-list.c | 2 fs/gfs2/glock.c | 6 fs/internal.h | 10 + fs/jbd2/journal.c | 2 fs/jfs/jfs_debug.c | 2 fs/nfsd/nfs4state.c | 4 fs/nfsd/nfsctl.c | 12 - fs/nfsd/stats.c | 2 fs/ocfs2/cluster/netdebug.c | 6 fs/ocfs2/dlm/dlmdebug.c | 2 fs/ocfs2/dlmglue.c | 2 fs/open.c | 8 - fs/openpromfs/inode.c | 2 fs/orangefs/orangefs-debugfs.c | 2 fs/proc/array.c | 2 fs/proc/base.c | 24 +-- fs/proc/cpuinfo.c | 2 fs/proc/fd.c | 2 fs/proc/generic.c | 4 fs/proc/inode.c | 28 +++ fs/proc/proc_net.c | 4 fs/proc/proc_sysctl.c | 41 +++-- fs/proc/stat.c | 2 fs/proc/task_mmu.c | 8 - fs/proc/task_nommu.c | 2 fs/proc_namespace.c | 6 fs/read_write.c | 49 ++++-- fs/seq_file.c | 34 ++-- fs/splice.c | 40 +++-- include/linux/fs.h | 10 + include/linux/proc_fs.h | 1 include/linux/seq_file.h | 7 include/linux/uptr.h | 72 ++++++++++ ipc/util.c | 2 kernel/bpf/inode.c | 2 kernel/fail_function.c | 2 kernel/gcov/fs.c | 2 kernel/irq/debugfs.c | 2 kernel/irq/proc.c | 6 kernel/kallsyms.c | 2 kernel/kcsan/debugfs.c | 2 kernel/latencytop.c | 2 kernel/locking/lockdep_proc.c | 2 kernel/module.c | 2 kernel/profile.c | 2 kernel/sched/debug.c | 2 kernel/sched/psi.c | 6 kernel/time/test_udelay.c | 2 kernel/trace/ftrace.c | 16 +- kernel/trace/trace.c | 20 +- kernel/trace/trace_dynevent.c | 2 kernel/trace/trace_events.c | 10 - kernel/trace/trace_events_hist.c | 4 kernel/trace/trace_events_synth.c | 2 kernel/trace/trace_events_trigger.c | 2 kernel/trace/trace_kprobe.c | 4 kernel/trace/trace_printk.c | 2 kernel/trace/trace_stack.c | 4 kernel/trace/trace_stat.c | 2 kernel/trace/trace_uprobe.c | 4 lib/debugobjects.c | 2 lib/dynamic_debug.c | 4 lib/error-inject.c | 2 lib/kunit/debugfs.c | 2 mm/kmemleak.c | 2 mm/slab_common.c | 2 mm/swapfile.c | 2 net/6lowpan/debugfs.c | 2 net/atm/mpoa_proc.c | 2 net/batman-adv/debugfs.c | 4 net/bluetooth/6lowpan.c | 2 net/core/pktgen.c | 6 net/hsr/hsr_debugfs.c | 2 net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 net/ipv4/route.c | 4 net/l2tp/l2tp_debugfs.c | 2 net/netfilter/xt_recent.c | 2 net/sunrpc/cache.c | 4 net/sunrpc/debugfs.c | 4 net/sunrpc/rpc_pipe.c | 2 net/sunrpc/stats.c | 2 security/apparmor/apparmorfs.c | 10 - security/integrity/ima/ima_fs.c | 6 security/selinux/selinuxfs.c | 2 security/smack/smackfs.c | 20 +- sound/core/info.c | 2 264 files changed, 700 insertions(+), 549 deletions(-)
Christoph Hellwig
maintainerPATCH 1/11 uptr: add a new "universal pointer" type
Add a uptr_t type that can hold a pointer to either a user or kernel memory region, and simply helpers to copy to and from it. For architectures like x86 that have non-overlapping user and kernel address space it just is a union and uses a TASK_SIZE check to select the proper copy routine. For architectures with overlapping address spaces a flag to indicate the address space is used instead.
--- include/linux/uptr.h | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 include/linux/uptr.h
include/linux/uptr.h new file +72 -0
@@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2020 Christoph Hellwig. +* +* Support for "universal" pointers that can point to either kernel or userspace +* memory. +*/ +#ifndef _LINUX_UPTR_H +#define _LINUX_UPTR_H + +#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE +typedef union { +void *kernel; +void __user *user; +}uptr_t ; + +static inline uptr_t USER_UPTR (void __user *p) +{ +return (uptr_t ) { .user = p }; +} + +static inline uptr_t KERNEL_UPTR (void *p) +{ +return (uptr_t ) { .kernel = p }; +} + +static inline bool uptr_is_kernel (uptr_t uptr) +{ +return (unsigned long )uptr.kernel >=TASK_SIZE ; +} +#else /* CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE */ +typedef struct { +union { +void *kernel; +void __user *user; + }; +bool is_kernel :1 ; +}uptr_t ; + +static inline uptr_t USER_UPTR (void __user *p) +{ +return (uptr_t ) { .user = p }; +} + +static inline uptr_t KERNEL_UPTR (void *p) +{ +return (uptr_t ) { .kernel = p, .is_kernel = true }; +} + +static inline bool uptr_is_kernel (uptr_t uptr) +{ +return uptr.is_kernel; +} +#endif /* CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE */ + +static inline int copy_from_uptr (void *dst,uptr_t src,size_t size) +{ +if (!uptr_is_kernel (src)) +return copy_from_user (dst, src.user, size); +memcpy (dst, src.kernel, size); +return 0 ; +} + +static inline int copy_to_uptr (uptr_t dst,const void *src,size_t size) +{ +if (!uptr_is_kernel (dst)) +return copy_to_user (dst.user, src, size); +memcpy (dst.kernel, src, size); +return 0 ; +} + +#endif /* _LINUX_UPTR_H */
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 2/11 fs: factor out a set_fmode_can_read_write helper
In reply to Christoph HellwigAdd a helper to set the FMODE_CAN_READ and FMODE_CAN_WRITE logic instead of duplicating it in two places.
--- fs/file_table.c | 7 +------ fs/internal.h | 10 ++++++++++ fs/open.c | 8 +------- 3 files changed, 12 insertions(+), 13 deletions(-)
fs/file_table.c +1 -6
@@ -199,16 +199,11 @@ static struct file *alloc_file(const struct path *path, int flags, file->f_mapping = path->dentry->d_inode->i_mapping; file->f_wb_err =filemap_sample_wb_err (file->f_mapping); file->f_sb_err =file_sample_sb_err (file); -if ((file->f_mode &FMODE_READ ) && -likely (fop->read || fop->read_iter)) - file->f_mode |=FMODE_CAN_READ ; -if ((file->f_mode &FMODE_WRITE ) && -likely (fop->write || fop->write_iter)) - file->f_mode |=FMODE_CAN_WRITE ; file->f_mode |=FMODE_OPENED ; file->f_op = fop;if ((file->f_mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ )i_readcount_inc (path->dentry->d_inode); +set_fmode_can_read_write (file);return file; }
fs/internal.h +10 -0
@@ -185,3 +185,13 @@ int sb_init_dio_done_wq(struct super_block *sb);*/ int do_statx (int dfd,const char __user *filename,unsigned flags,unsigned int mask,struct statx __user *buffer); + +static inline void set_fmode_can_read_write (struct file *f) +{ +if ((f->f_mode &FMODE_READ ) && + (f->f_op->read || f->f_op->read_iter)) + f->f_mode |=FMODE_CAN_READ ; +if ((f->f_mode &FMODE_WRITE ) && + (f->f_op->write || f->f_op->write_iter)) + f->f_mode |=FMODE_CAN_WRITE ; +}
fs/open.c +1 -7
@@ -832,13 +832,7 @@ static int do_dentry_open(struct file *f, f->f_mode |=FMODE_OPENED ;if ((f->f_mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ )i_readcount_inc (inode); -if ((f->f_mode &FMODE_READ ) && -likely (f->f_op->read || f->f_op->read_iter)) - f->f_mode |=FMODE_CAN_READ ; -if ((f->f_mode &FMODE_WRITE ) && -likely (f->f_op->write || f->f_op->write_iter)) - f->f_mode |=FMODE_CAN_WRITE ; - +set_fmode_can_read_write (f); f->f_write_hint =WRITE_LIFE_NOT_SET ; f->f_flags &= ~(O_CREAT |O_EXCL |O_NOCTTY |O_TRUNC );
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 3/11 fs: add new read_uptr and write_uptr file operations
In reply to Christoph HellwigAdd two new file operations that are identical to ->read and ->write except that they can also safely take kernel pointers using the uptr_t type.
--- fs/internal.h | 4 ++-- fs/read_write.c | 18 ++++++++++++++---- include/linux/fs.h | 3 +++ 3 files changed, 19 insertions(+), 6 deletions(-)
fs/internal.h +2 -2
@@ -189,9 +189,9 @@ int do_statx(int dfd, const char __user *filename, unsigned flags,static inline void set_fmode_can_read_write (struct file *f) {if ((f->f_mode &FMODE_READ ) && - (f->f_op->read || f->f_op->read_iter)) + (f->f_op->read || f->f_op->read_uptr || f->f_op->read_iter)) f->f_mode |=FMODE_CAN_READ ;if ((f->f_mode &FMODE_WRITE ) && - (f->f_op->write || f->f_op->write_iter)) + (f->f_op->write || f->f_op->write_uptr || f->f_op->write_iter)) f->f_mode |=FMODE_CAN_WRITE ; }
fs/read_write.c +14 -4
@@ -430,7 +430,9 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)if (count >MAX_RW_COUNT ) count =MAX_RW_COUNT ; -if (file->f_op->read) { +if (file->f_op->read_uptr) { + ret = file->f_op->read_uptr (file,KERNEL_UPTR (buf), count, pos); + }else if (file->f_op->read) {mm_segment_t old_fs =get_fs ();set_fs (KERNEL_DS );
@@ -485,7 +487,9 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)if (count >MAX_RW_COUNT ) count =MAX_RW_COUNT ; -if (file->f_op->read) +if (file->f_op->read_uptr) + ret = file->f_op->read_uptr (file,USER_UPTR (buf), count, pos); +else if (file->f_op->read) ret = file->f_op->read (file, buf, count, pos);else if (file->f_op->read_iter) ret =new_sync_read (file, buf, count, pos);
@@ -530,7 +534,10 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count,if (count >MAX_RW_COUNT ) count =MAX_RW_COUNT ; -if (file->f_op->write) { +if (file->f_op->write_uptr) { + ret = file->f_op->write_uptr (file,KERNEL_UPTR ((void *)buf), + count, pos); + }else if (file->f_op->write) {mm_segment_t old_fs =get_fs ();set_fs (KERNEL_DS );
@@ -592,7 +599,10 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_if (count >MAX_RW_COUNT ) count =MAX_RW_COUNT ;file_start_write (file); -if (file->f_op->write) +if (file->f_op->write_uptr) + ret = file->f_op->write_uptr (file, +USER_UPTR ((char __user *)buf), count, pos); +else if (file->f_op->write) ret = file->f_op->write (file, buf, count, pos);else if (file->f_op->write_iter) ret =new_sync_write (file, buf, count, pos);
include/linux/fs.h +3 -0
@@ -39,6 +39,7 @@#include <linux/fs_types.h> #include <linux/build_bug.h> #include <linux/stddef.h> +#include <linux/uptr.h> #include <asm/byteorder.h> #include <uapi/linux/fs.h>
@@ -1830,6 +1831,8 @@ struct file_operations {ssize_t (*write) (struct file *,const char __user *,size_t ,loff_t *);ssize_t (*read_iter) (struct kiocb *,struct iov_iter *);ssize_t (*write_iter) (struct kiocb *,struct iov_iter *); +ssize_t (*read_uptr) (struct file *,uptr_t ,size_t ,loff_t *); +ssize_t (*write_uptr) (struct file *,uptr_t ,size_t ,loff_t *);int (*iopoll)(struct kiocb *kiocb,bool spin);int (*iterate) (struct file *,struct dir_context *);int (*iterate_shared) (struct file *,struct dir_context *);
Signature · 1 line
2.26.2
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Christoph Hellwig
Add two new file operations that are identical to ->read and ->write except that they can also safely take kernel pointers using the
uptr_ttype.
Honestly, I think this is the wrong way to go.
All of this new complexity and messiness, just to remove a few unimportant final cases?
If somebody can't be bothered to convert a driver to iter_read/iter_write, why would they be bothered to convert it to read_uptr/write_uptr?
And this messiness will stay around for decades.
So let's not go down that path.
If you want to do "splice() and kernel_read() requires read_iter" (with a warning so that we find any cases), then that's fine. But let's not add yet _another_ read type.
Why did you care so much about sysctl, and why couldn't they use the iter ops?
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 11 lines · Linus Torvalds
Honestly, I think this is the wrong way to go.
All of this new complexity and messiness, just to remove a few unimportant final cases?
If somebody can't be bothered to convert a driver to iter_read/iter_write, why would they be bothered to convert it to read_uptr/write_uptr?
And this messiness will stay around for decades.
Quoted 7 lines
So let's not go down that path.
If you want to do "
splice()andkernel_read()requiresread_iter" (with a warning so that we find any cases), then that's fine. But let's not add yet _another_ read type.Why did you care so much about sysctl, and why couldn't they use the iter ops?
I don't care at all. Based on our previous chat I assumed you wanted something like this. We might still need the uptr_t for setsockopt, though.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Christoph Hellwig
I don't care at all. Based on our previous chat I assumed you wanted something like this. We might still need the
uptr_tfor setsockopt, though.
No.
What I mean was *not* something like uptr_t.
Just keep the existing "set_fs()". It's not harmful if it's only used occasionally. We should rename it once it's rare enough, though.
Then, make the following changes:
- all the normal user access functions stop caring. They useTASK_SIZE_MAX and are done with it. They basically stop reacting to set_fs().
- then, we can have a few *very* specific cases (like setsockopt,
maybe some random read/write) that we teach to use the new set_fs() thing.
So in *those* cases, we'd basically just do "oh, ok, we are supposed to use a kernel pointer" based on the setfs value.
IOW, I mean tto do something much more gradual. No new interfaces, no new types, just a couple of (very clearly marked!) cases of the legacy set_fs() behavior.
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 15 lines · Linus Torvalds
What I mean was *not* something like
uptr_t.Just keep the existing "
set_fs()". It's not harmful if it's only used occasionally. We should rename it once it's rare enough, though.Then, make the following changes:
- all the normal user access functions stop caring. They use
TASK_SIZE_MAXand are done with it. They basically stop reacting toset_fs().- then, we can have a few *very* specific cases (like setsockopt,
maybe some random read/write) that we teach to use the newset_fs()thing.
Quoted 6 lines
So in *those* cases, we'd basically just do "oh, ok, we are supposed to use a kernel pointer" based on the setfs value.
IOW, I mean tto do something much more gradual. No new interfaces, no new types, just a couple of (very clearly marked!) cases of the legacy
set_fs()behavior.
So we'd need new user copy functions for just those cases, and make sure everything below the potential get_fs-NG uses them. But without any kind of tape safety to easily validate all users below actually use them? I just don't see how that makes sense.
FYI, I think the only users where we really need it are setsockopt and a s390-specific driver from my audits so far. Everything else shouldn't need anything like that.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 2 lines · Christoph Hellwig
So we'd need new user copy functions for just those cases
No. We'd open-code them. They'd look at "oh, I'm supposed to use a kernel pointer" and just use those.
IOW, basically IN THE CODE that cares (and the whole argument is that this code is one or two special cases) you do
/* This has not been converted to the new world order */
if (get_fs() == KERNEL_DS) memcpy(..) else copy_from_user();You're overdesigning things. You're making them more complex than they need to be.
Basically, I do *NOT* want to pollute the VFS layer with new interfaces that shouldn't exist in the long run. I'd much rather make the eventual goal be to get rid of 'read/write' entirely in favour of the 'iter' things, but what I absolutely do *NOT* want to see is to make a _third_ interface for reading and writing. Quite the reverse. We should strive to make it a _single_ interface, not add a new one.
And I'd rather have a couple of ugly code details in odd places (that we can hopefully fix up later) than have new VFS infrastructure that will then hang around forever more.
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 7 lines · Linus Torvalds
Quoted 2 lines · Christoph Hellwig
So we'd need new user copy functions for just those cases
No. We'd open-code them. They'd look at "oh, I'm supposed to use a kernel pointer" and just use those.
Quoted 8 lines
IOW, basically IN THE CODE that cares (and the whole argument is that this code is one or two special cases) you do
/* This has not been converted to the new world order */ if (get_fs() == KERNEL_DS) memcpy(..) else copy_from_user();You're overdesigning things. You're making them more complex than they need to be.
I wish it was so simple. I really don't like overdesigns, trust me.
But please take a look at setsockopt and all the different instances (count 90 .setsockopt wireups, and they then branch out into various subroutines as well). I really don't want to open code that there, but we could do helper specific to setsockopt.
Honestly my preference would be to say that no eBPF isn't actually a user API and just rip out the crap added to it, but I fear that is not an option. Because in that case we'd basically be done.
Quoted 6 lines
Basically, I do *NOT* want to pollute the VFS layer with new interfaces that shouldn't exist in the long run. I'd much rather make the eventual goal be to get rid of 'read/write' entirely in favour of the 'iter' things, but what I absolutely do *NOT* want to see is to make a _third_ interface for reading and writing. Quite the reverse. We should strive to make it a _single_ interface, not add a new one.
Completele agreement on this. I actually hate the new fops, and only added them reluctantly as I mis-interpreted what you said.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 17 lines · Christoph Hellwig
Quoted 7 lines · Linus Torvalds
Quoted 2 lines · Christoph Hellwig
So we'd need new user copy functions for just those cases
No. We'd open-code them. They'd look at "oh, I'm supposed to use a kernel pointer" and just use those.
Quoted 8 lines
IOW, basically IN THE CODE that cares (and the whole argument is that this code is one or two special cases) you do
/* This has not been converted to the new world order */ if (get_fs() == KERNEL_DS) memcpy(..) else copy_from_user();You're overdesigning things. You're making them more complex than they need to be.
Quoted 6 lines
I wish it was so simple. I really don't like overdesigns, trust me.
But please take a look at setsockopt and all the different instances (count 90 .setsockopt wireups, and they then branch out into various subroutines as well). I really don't want to open code that there, but we could do helper specific to setsockopt.
Can we do a setsockopt_iter() which replaces optval/optlen with an iov_iter?
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 18 lines · Matthew Wilcox
Quoted 17 lines · Christoph Hellwig
Quoted 15 lines · Linus Torvalds
Quoted 2 lines · Christoph Hellwig
So we'd need new user copy functions for just those cases
No. We'd open-code them. They'd look at "oh, I'm supposed to use a kernel pointer" and just use those.
IOW, basically IN THE CODE that cares (and the whole argument is that this code is one or two special cases) you do
/* This has not been converted to the new world order */ if (get_fs() == KERNEL_DS) memcpy(..) else copy_from_user();You're overdesigning things. You're making them more complex than they need to be.
Quoted 8 lines
Quoted 6 lines
I wish it was so simple. I really don't like overdesigns, trust me.
But please take a look at setsockopt and all the different instances (count 90 .setsockopt wireups, and they then branch out into various subroutines as well). I really don't want to open code that there, but we could do helper specific to setsockopt.
Can we do a
setsockopt_iter()which replaces optval/optlen with aniov_iter?
We could. The only downside is int-sized sockopts are common, and used in the fast path of networking applications (e.g. cork,uncork) and this might introduce enough overhead to be noticable.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsQuoted 3 lines · Linus Torvalds
So in *those* cases, we'd basically just do "oh, ok, we are supposed to use a kernel pointer" based on the setfs value.
The important part here si that we don't need to change any interfaces, because we don't add that whole "carry the bit around with the pointer".
I agree that that would be the nice clean interface _if_ we intended for this to be something we care about. But we already _have_ that interface in the "iter" code, I absolutely do not think we should create a new one.
So that's why the (admittedly hacky) "just support the old model for special cases" kind of approach. Make it really easy to convert some very specific individual places that might care, and make it very obvious what those places are.
Maybe in a year or two, there's only a couple such places, and we can see if we can clean those up separately. But make it easy do the transition to the new model by _not_ changing the basic logic for now.
See what I'm aiming for?
In particular, for architectures that haven't been modified, this results in zero changes what-so-ever.
Linus
RE: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsFrom: Linus Torvalds
Quoted 7 lines
Sent: 24 June 2020 19:12
Quoted 4 lines · Christoph Hellwig
I don't care at all. Based on our previous chat I assumed you wanted something like this. We might still need the
uptr_tfor setsockopt, though.
Quoted 6 lines
No.
What I mean was *not* something like
uptr_t.Just keep the existing "
set_fs()". It's not harmful if it's only used occasionally. We should rename it once it's rare enough, though.
Am I right in thinking that it just sets a flag in 'current' ? Although I don't remember access_ok() doing a suitable check (would need to be (address - base) < limit).
Quoted 9 lines
Then, make the following changes:
- all the normal user access functions stop caring. They use
TASK_SIZE_MAXand are done with it. They basically stop reacting toset_fs().- then, we can have a few *very* specific cases (like setsockopt,
maybe some random read/write) that we teach to use the newset_fs()thing.
Certainly there is a 'BPF' hook in the setsockopt() syscall handler that can substitute a kernel buffer for any setsockopt() request.
If that is needed (I presume it was added for a purpose) then all the socket option code needs to be able to handle kernel buffers. (Actually given what some getsockopt() do, if there was a requirement to 'adjust' setsockopt() then there should be a hook in the getsockopt() code as well.)
If you are going to go through all the socket option code to change the name of all the buffer access functions then it is probably almost as easy to move the usercopies out into the wrappers.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 5 lines · David Laight
Quoted 3 lines
Just keep the existing "
set_fs()". It's not harmful if it's only used occasionally. We should rename it once it's rare enough, though.Am I right in thinking that it just sets a flag in 'current' ?
Basically, yes. That's what it has always done.
Well "always" is not true - it used to set the %fs segment register originally (thus the name), but _conceptually_ it sets a flag for "should user accesses be kernel accesses instead".
On x86 - and most other architectures where user space and kernel space are in the same address space and accessed with the same instructions, that has then been implemented as just a "what is the limit for an access".
On other architectures - architectures that need different access methods (or different flags to the load/store instruction) - it's an actual flag that changes which access method you use.
Quoted 2 lines
Although I don't remember
access_ok()doing a suitable check (would need to be (address - base) < limit).
So again, on the architectures with a unified address space, access_ok() is exactly that "address + access_size <= limit", although often done with some inline asm just to get the overflow case done efficiently.
On other architectures, there's no limit check, because _all_ addresses are either user space or kernel space addresses, and what changes isn't the address limit, but the access itself.
So what I was suggesting is literally
- keep this flag around as a flag
- but make all _normal_ user accesses ignore it, and always do user
accesses (so on a unified address space architecture like x86 it always checks the _fixed_ limit, and on something like sparc32 which has separate kernel and user address spaces, it just always does a user access with no conditionals at all)
- then make the really odd and hopefully very rare cases check that
flag explicitly and manually, and do
if (current->legacy_uptr_is_kernel)
memcpy(...);
else
copy_to/from_user(...);and my hope is that we'd have only a handful of cases (like the setsockopt thing: one for each protocol or whatever) that actually want this.
Note that the legacy behavior would still remain in architectures that haven't been modified to remove the use of set_fs(), so I would further suggest that the two approaches live side-by-side for at least a while. But _generic_ code (and with Christoph's patches at least x86) would make set_fs() cause a build error.
So we'd have a new
set_force_kernel_pointers();
....
clear_force_kernel_pointers();that would set/clear that 'current->legacy_uptr_is_kernel' variable, and we'd have a handful of places that would check it.
The naming above is all random, and I'm not claiming that any of this is particularly _clean_. I'm also not claiming that it's really any better than our current "set_fs()" mess conceptually.
The only thing that makes it better than our current "set_fs()" is
- there would hopefully be very few cases of this
- it would *not* affect random incidental user accesses that just
happen to be in the shadow of this thing.
That second point is the important one, I feel. The real problem with "set_fs()" has been that we've occasionally had bugs where we ended up running odd paths that we really didn't _intend_ to run with kernel pointers. The classic example is the SCSI "write as ioctl" example, where a write to a SCSI generic device would do various odd things and follow pointers and what-not. Then you get into real trouble when "splice()" ends up truiong to write a kernel buffer, and because of "set_fs()" suddenly the sg code started accessing kernel memory willy-nilly.
So my suggestion was basically a new version of set_fs(), but one that is just much more targeted, and doesn't affect all random user accesses, only those very special ones that are then very *explicitly* aware of the fact that "hey, I might be called in this situation where I'm going to get a kernel address instead".
Quoted 2 lines
If that is needed (I presume it was added for a purpose) then all the socket option code needs to be able to handle kernel buffers.
So that's very much what I'd like to avoid.
The plan would be that all the *normal* stuff would be handled by either (a) always having the data come from user space, or (b) the data has a known size (either fixed, or "optlen" or whatever) and then being copied to a kernel buffer and then always handled as a kernel field that bpf can then call with kernel data.
I thought there was just one very specific case of "oh, in certain cases of setsockopt we don't know what size this address is and optlen is ignored", so we have to just pass the pointer down to the protocol, which is the point that knows how much of an address it wants..
Was that a misunderstanding on my part?
Because if there are tons and tons of places that want this "either kernel or user" then we could still have a helper function for it, but it means that the whole "limit the cases" advantage to some degree goes away.
It would still fix the 99% of normal "copy/from/to_user()" cases, though. They'd be fixed and "safe" and coule never ever touch kernel memory even if there was some confusion about things. So it would be an improvement, but I was really hoping that the cases where there can be confusion would be pretty rare.
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Linus Torvalds
I thought there was just one very specific case of "oh, in certain cases of setsockopt we don't know what size this address is and optlen is ignored", so we have to just pass the pointer down to the protocol, which is the point that knows how much of an address it wants..
The setsock issue is a little more complicated. Let me try to summarize it:
- setsock takes a (user) pointer and len
- unfortunately while the designed of the BSD socket API designed the len to be correct some protocol implementations have been sloppy and just use a hardcoded len for the value plus some other funnies
- unfortunately there is some BPF magic that can attach to a socket and be run, and that (and only that in the latest kernel) can cause a setsockopt to take a kernel buffer. One that was copied from userspace earlier and had the BPF program run on it.
- unfortunately we have about 90 ->setsockopt instances, and the BPF hook is not specific to one particular of them. In fact the BPF program can run for options that don't even exist, and based on my previous dicussion Facebook has setups that rely on that.
Quoted 6 lines
Was that a misunderstanding on my part?
Because if there are tons and tons of places that want this "either kernel or user" then we could still have a helper function for it, but it means that the whole "limit the cases" advantage to some degree goes away.
But except for setsockopt we don't really have anything like that left. There is some alpha arch code that would need to be duplicated for user vs kernel pointers, but I suspect it will get cleaner by that, and the messy s390 crypto driver whіch will be a bit of work, but all internal to that driver.
So based on that I'd rather get away without our flag and tag the kernel pointer case in setsockopt explicitly.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 3 lines · Christoph Hellwig
So based on that I'd rather get away without our flag and tag the kernel pointer case in setsockopt explicitly.
Yeah, I'd be ok to pass that kind of flag around for setsockopt, in ways I _don't_ want to do for some very core vfs thing like 'read()'.
That said, is there no practical limit on how big "optlen" can be? Sure, I realize that a lot of setsockopt users may not use all of the data, but let's say that "optlen" is 128, but the actual low-level setsockopt operation only uses the first 16 bytes, maybe we could always just copy the 128 bytes from user space into kernel space, and just say "setsockopt() always gets a kernel pointer".
Then the bpf use is even simpler. It would just pass the kernel pointer natively.
Because that seems to be what the BPF code really wants to do: it takes the user optval, and munges it into a kernel optval, and then (if that has been done) runs the low-level sock_setsockopt() under KERNEL_DS.
Couldn't we switch things around instead, and just *always* copy things from user space, and sock_setsockopt (and sock->ops->setsockopt) _always_ get a kernel buffer?
And avoid the set_fs(KERNEL_DS) games entirely that way?
Attached it a RFC patch just for __sys_setsockopt() - note that it does *not* change all the low-level setsockopt callers to just do the kernel access instead, so this is completely broken, but you can kind of see what I mean.
Wouldn't this work? In fact, wouldn't this simplify all the setsockopt places that now don't need to do "get_user()" etc any more?
It would be better if we could limit "optlen" to something sane, but right now it just does a kmalloc() of whatever the user claims the opt len is..
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 1 line · Linus Torvalds
That said, is there no practical limit on how big "optlen" can be?
There are some pretty huge ones, like the sctp one that can take a basically unlimited list of sockaddr structures.
Quoted 5 lines
Sure, I realize that a lot of setsockopt users may not use all of the data, but let's say that "optlen" is 128, but the actual low-level setsockopt operation only uses the first 16 bytes, maybe we could always just copy the 128 bytes from user space into kernel space, and just say "
setsockopt()always gets a kernel pointer".
One issue is that a lot setsockopt calls are in the fast path, and even have micro-optimizations like putting an int on stack for the fast path to avoid the memory allocation. While I don't know for sure I fear that always doing a large allocation could end up having a performance impact. But otherwise I like that idea, and did in fact start some prep work until I realized what I did was futile.
Quoted 8 lines
Then the bpf use is even simpler. It would just pass the kernel pointer natively.
Because that seems to be what the BPF code really wants to do: it takes the user optval, and munges it into a kernel optval, and then (if that has been done) runs the low-level
sock_setsockopt()underKERNEL_DS.
Quoted 5 lines
Couldn't we switch things around instead, and just *always* copy things from user space, and
sock_setsockopt(andsock->ops->setsockopt) _always_ get a kernel buffer?And avoid the
set_fs(KERNEL_DS)games entirely that way?
I'd love to be able to do that. And now that we want through this whole mess than Nth time I have another idea:
- we assume optlen is correct, which should cover about 90% of the protocols
- but to override that a new setsockopt_len method is added that returns the correct length for all the messy ones.
Let me try if that works out.
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Christoph Hellwig
One issue is that a lot setsockopt calls are in the fast path, and even have micro-optimizations like putting an int on stack for the fast path to avoid the memory allocation.
Yeah., An the RFC patch I posted could easily be updated to do exactly that for small optlen values (say, avoid the kmalloc and use a stack buffer for oplen smaller than 16 bytes or whatever).
Most of the setsockopt's I'm aware of are just a single integer, so if that's the bulk of them, then we'd never actually need to do the kmalloc() in those cases, and only fall back to the kmalloc for the (hopefully quite unusual) bigger options..
Quoted 9 lines
I'd love to be able to do that. And now that we want through this whole mess than Nth time I have another idea:
- we assume optlen is correct, which should cover about 90% of the protocols
- but to override that a newsetsockopt_lenmethod is added that returns the correct length for all the messy ones.Let me try if that works out.
Doing a quick grep, there's about 100 different ".setsockopt" function initializers, but a quarter of them are just setting it to 'sock_no_setsockopt'.
A number of others are using 'sock_common_setsockopt'.
Which leaves something like 50 different implementations of the .setsockopt functions. But I didn't go any deeper than that - maybe they then have hundreds of different option cases each and this is all a nightmare.
Looking at a couple of them, the "int val" situation does seem to be the most common one by _far_, and is often handled by a common "get_user()" thing, so converting them to just getting the thing as a kernel pointer doesn't look _too_ nasty, because even when they have a lot of subcases, the actual optval accesses are much fewer.
Which is not to say that it looks all that much fun, but it doesn't look entirely undoable either.
The good news (I guess) is that any missed transformation will be fairly obvious (ie somebody uses a "get_user()" on what is now a kernel pointer, and returns -EFAULT. So it shouldn't cause any subtle failures, and it shouldn't cause any security issues.
I didn't look at the compat cases, but if anything I'd expect those to become simpler by having kernel pointers. And there doesn't actually seem to be that many of them (possibly because the "int" case si so common that it all ends up being the same?)
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Linus Torvalds
I didn't look at the compat cases, but if anything I'd expect those to become simpler by having kernel pointers. And there doesn't actually seem to be that many of them (possibly because the "int" case si so common that it all ends up being the same?)
Having resurrect my work there really are tons of int cases. Which makes me thing that splitting out a setsockopt_int method which gets passed value instead of a pointer, then converting all the simple cases to that first and then doing the real shit later sounds like a promіsing idea. Let me think a bit more about that.
And yes, a lot of the common methods have tons of cases and sub-dispatchers and everything else you'd expect from an ioctl-like interface..
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 6 lines · Christoph Hellwig
Having resurrect my work there really are tons of int cases. Which makes me thing that splitting out a
setsockopt_intmethod which gets passed value instead of a pointer, then converting all the simple cases to that first and then doing the real shit later sounds like a promіsing idea.
Try my hacky patch first, and just change the code that does
if (get_user(val, (int __user *)optval)) {
err = -EFAULT;to do
val = *(int *)optval;
In fact, that pattern seems to be so common that you can probably almost do it with a sed-script or something.
Linus
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Next fund one, in net/ipv6/ip6_flowlabel.c:ipv6_flowlabel_opt() we have this gem toward the end:
if (!freq->flr_label) {
if (copy_to_user(&((struct in6_flowlabel_req __user *)optval)->flr_label,
&fl->label, sizeof(fl->label))) {
/* Intentionally ignore fault. */so it writes back to what was supposed to be the input parameter, and only does it for a partial region. Not sure how we could handle that with any kind of copy to kernel in the caller scheme?
RE: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsFrom: Linus Torvalds
Quoted 24 lines
Sent: 29 June 2020 18:03
Quoted 3 lines · Christoph Hellwig
So based on that I'd rather get away without our flag and tag the kernel pointer case in setsockopt explicitly.
Yeah, I'd be ok to pass that kind of flag around for setsockopt, in ways I _don't_ want to do for some very core vfs thing like '
read()'.That said, is there no practical limit on how big "optlen" can be? Sure, I realize that a lot of setsockopt users may not use all of the data, but let's say that "optlen" is 128, but the actual low-level setsockopt operation only uses the first 16 bytes, maybe we could always just copy the 128 bytes from user space into kernel space, and just say "
setsockopt()always gets a kernel pointer".Then the bpf use is even simpler. It would just pass the kernel pointer natively.
Because that seems to be what the BPF code really wants to do: it takes the user optval, and munges it into a kernel optval, and then (if that has been done) runs the low-level
sock_setsockopt()underKERNEL_DS.
Quoted 5 lines
Couldn't we switch things around instead, and just *always* copy things from user space, and
sock_setsockopt(andsock->ops->setsockopt) _always_ get a kernel buffer?And avoid the
set_fs(KERNEL_DS)games entirely that way?
I did a patch for SCTP to do the copies in the protocol wrapper. Apart from the issue of bad applications providing overlarge buffers and effecting a local DoS attack there were some odd issues:
1) SCTP completely abuses both setsockopt and getsockopt to perform additional socket operations.
I suspect the original implementation didn't want to add new system calls.
2) SCTP treats getsockopt as RMW on the user buffer. Mostly it only needs 4 bytes, but it can in include a sockaddr_storage.
3) SCTP has one getsockopt that is really a setsockopt (ie changes things) but is implemented using getsockopt so that it can return a value.
4) One of the SCTP getsockopt calls has to return the 'wrong' value to userspace (ie not the length of the transferred data) for compatibility with the orginal broken code.
I'm wondering if the [sg]etsockopt wrapper should actually pass through a structure containing:
Kernel buffer address (on stack if short) User buffer address (may be NULL)
Length of buffer
copy_to_user length (normally zero)
flag: embedded pointers are user/kernel
Most code will just use the kernel buffer and return length/error.
Code that knows the supplied length is invalid can use the user pointer - but only support direct user requests.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
RE: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsFrom: Linus Torvalds
Quoted 9 lines
Sent: 27 June 2020 17:33
Quoted 5 lines · David Laight
Quoted 3 lines
Just keep the existing "
set_fs()". It's not harmful if it's only used occasionally. We should rename it once it's rare enough, though.Am I right in thinking that it just sets a flag in 'current' ?
Basically, yes. That's what it has always done.
I could check, but I suspect it sets what TASK_SIZE uses to ~0u so that access_ok() can't fail.
Quoted 13 lines
Well "always" is not true - it used to set the %fs segment register originally (thus the name), but _conceptually_ it sets a flag for "should user accesses be kernel accesses instead".
On x86 - and most other architectures where user space and kernel space are in the same address space and accessed with the same instructions, that has then been implemented as just a "what is the limit for an access".
On other architectures - architectures that need different access methods (or different flags to the load/store instruction) - it's an actual flag that changes which access method you use.
Quoted 7 lines
Quoted 2 lines
Although I don't remember
access_ok()doing a suitable check (would need to be (address - base) < limit).So again, on the architectures with a unified address space,
access_ok()is exactly that "address +access_size<= limit", although often done with some inline asm just to get the overflow case done efficiently.
I realised afterwards that the 'kernel address is actually user' check isn't really done on architectures like x86 until stac/clac.
I had another thought.
While setting up a full-blown scatter-gather 'iter' structure for functions like [gs]etsockopt, ioctl and fcntl is OTT and probably measurably expensive a lightweight 'buffer' structure that just contained address, length and user/kernel flag could be used.
Although the uses would need an extra level of indirection this would be offset by reducing the number of parameters passed through all the layers.
...
Quoted 4 lines
I thought there was just one very specific case of "oh, in certain cases of setsockopt we don't know what size this address is and optlen is ignored", so we have to just pass the pointer down to the protocol, which is the point that knows how much of an address it wants..
I can't help feeling that userspace passes a suitable length but the kernel doesn't verify it.
It is worse than that, one of the SCTP getsockopt() calls has to return a length that is shorter than the buffer it wrote.
So any buffer descriptor length would have to be advisory.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Luis Chamberlain
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsQuoted 9 lines · Linus Torvalds
The real problem with
"set_fs()" has been that we've occasionally had bugs where we ended up running odd paths that we really didn't _intend_ to run with kernel pointers. The classic example is the SCSI "write as ioctl" example, where a write to a SCSI generic device would do various odd things and follow pointers and what-not. Then you get into real trouble when "splice()" ends up truiong to write a kernel buffer, and because of "set_fs()" suddenly the sg code started accessing kernel memory willy-nilly.
So the semantics of this interface can create chaos fast if not used carefully and conservatively.
Christoph, it would be great if you're future series can include some version of a verbiage for the motivation for the culling of set_fs(). Maybe it was just me, but the original motivation wasn't clear at first and took some thread digging to get it.
Luis
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
In reply to Linus TorvaldsQuoted 17 lines · Linus Torvalds
Quoted 4 lines · Christoph Hellwig
Add two new file operations that are identical to ->read and ->write except that they can also safely take kernel pointers using the
uptr_ttype.Honestly, I think this is the wrong way to go.
All of this new complexity and messiness, just to remove a few unimportant final cases?
If somebody can't be bothered to convert a driver to iter_read/iter_write, why would they be bothered to convert it to read_uptr/write_uptr?
And this messiness will stay around for decades.
Quoted 7 lines
So let's not go down that path.
If you want to do "
splice()andkernel_read()requiresread_iter" (with a warning so that we find any cases), then that's fine. But let's not add yet _another_ read type.Why did you care so much about sysctl, and why couldn't they use the iter ops?
Heh, when I saw patch 4, I started working on that. It doesn't seem all that bad, except I've never used the iov_iter before, so I have no idea if I did this right. Also, this fixes a bug if 'count' is too large, which I should split out and send separately.
fs/proc/proc_sysctl.c +21 -24
@@ -12,6 +12,7 @@#include <linux/cred.h> #include <linux/namei.h> #include <linux/mm.h> +#include <linux/uio.h> #include <linux/module.h> #include <linux/bpf-cgroup.h> #include <linux/mount.h>
@@ -540,12 +541,13 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,return err; } -static ssize_t proc_sys_call_handler (struct file *filp,void __user *ubuf, -size_t count,loff_t *ppos,int write) +static ssize_t proc_sys_call_handler (struct kiocb *iocb,struct iov_iter *iter, +int write) { -struct inode *inode =file_inode (filp); +struct inode *inode =file_inode (iocb->ki_filp);struct ctl_table_header *head =grab_header (inode);struct ctl_table *table =PROC_I (inode)->sysctl_entry; +size_t count =iov_iter_count (iter);void *kbuf;ssize_t error;
@@ -566,35 +568,32 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out;/* don't even try if the size is too large */ + error = -ENOMEM ;if (count >KMALLOC_MAX_SIZE ) -return -ENOMEM ; + goto out; + kbuf =kzalloc (count,GFP_KERNEL ); +if (!kbuf) + goto out;if (write) { - kbuf =memdup_user_nul (ubuf, count); -if (IS_ERR (kbuf)) { - error =PTR_ERR (kbuf); - goto out; - } - }else { - error = -ENOMEM ; - kbuf =kzalloc (count,GFP_KERNEL ); -if (!kbuf) + error = -EFAULT ; +if (!copy_from_iter_full (kbuf, count, iter)) goto out; } error =BPF_CGROUP_RUN_PROG_SYSCTL (head, table, write, &kbuf, &count, - ppos); + &iocb->ki_pos);if (error) goto out_free_buf;/* careful: calling conventions are nasty here */ - error = table->proc_handler (table, write, kbuf, &count, ppos); + error = table->proc_handler (table, write, kbuf, &count, &iocb->ki_pos);if (error) goto out_free_buf;if (!write) { error = -EFAULT ; -if (copy_to_user (ubuf, kbuf, count)) +if (copy_to_iter (kbuf, count, iter) < count) goto out_free_buf; }
@@ -607,16 +606,14 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,return error; } -static ssize_t proc_sys_read (struct file *filp,char __user *buf, -size_t count,loff_t *ppos) +static ssize_t proc_sys_read (struct kiocb *iocb,struct iov_iter *iter) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,0 ); +return proc_sys_call_handler (iocb, iter,0 ); } -static ssize_t proc_sys_write (struct file *filp,const char __user *buf, -size_t count,loff_t *ppos) +static ssize_t proc_sys_write (struct kiocb *iocb,struct iov_iter *iter) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,1 ); +return proc_sys_call_handler (iocb, iter,1 ); }static int proc_sys_open (struct inode *inode,struct file *filp)
@@ -853,8 +850,8 @@ static int proc_sys_getattr(const struct path *path, struct kstat *stat,static const struct file_operations proc_sys_file_operations = { .open = proc_sys_open, .poll = proc_sys_poll, - .read = proc_sys_read, - .write = proc_sys_write, + .read_iter = proc_sys_read, + .write_iter = proc_sys_write, .llseek = default_llseek, };
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 4 lines · Matthew Wilcox
fs/proc/proc_sysctl.c +1
-1/* don't even try if the size is too large */ + error = -ENOMEM ;if (count >KMALLOC_MAX_SIZE ) -return -ENOMEM ;
fs/proc/proc_sysctl.c static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, · line 582
Quoted 10 lines
fs/proc/proc_sysctl.c +6
-0+ goto out; + kbuf =kzalloc (count,GFP_KERNEL ); +if (!kbuf) + goto out;if (write) { + error = -EFAULT ; +if (!copy_from_iter_full (kbuf, count, iter)) goto out; }
The nul-termination for the write cases seems to be lost here.
Christoph Hellwig
maintainerRe: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 10 lines · Christoph Hellwig
Quoted 9 lines · Matthew Wilcox
(quoted diff) +5
-1/* don't even try if the size is too large */ + error = -ENOMEM; if (count > KMALLOC_MAX_SIZE) - return -ENOMEM; + goto out; + kbuf = kzalloc(count, GFP_KERNEL); + if (!kbuf) + goto out;
Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +2
-0if (write) { + error = -EFAULT; + if (!copy_from_iter_full(kbuf, count, iter)) goto out; }The nul-termination for the write cases seems to be lost here.
Version with the count and termination fixed below. Can I get your signoff? If testing passes that means I can go back to my kernel_read/write version from the set_fs removal tree with it.
fs/proc/proc_sysctl.c +23 -25
@@ -12,6 +12,7 @@#include <linux/cred.h> #include <linux/namei.h> #include <linux/mm.h> +#include <linux/uio.h> #include <linux/module.h> #include <linux/bpf-cgroup.h> #include <linux/mount.h>
@@ -540,12 +541,13 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,return err; } -static ssize_t proc_sys_call_handler (struct file *filp,void __user *ubuf, -size_t count,loff_t *ppos,int write) +static ssize_t proc_sys_call_handler (struct kiocb *iocb,struct iov_iter *iter, +int write) { -struct inode *inode =file_inode (filp); +struct inode *inode =file_inode (iocb->ki_filp);struct ctl_table_header *head =grab_header (inode);struct ctl_table *table =PROC_I (inode)->sysctl_entry; +size_t count =iov_iter_count (iter);void *kbuf;ssize_t error;
@@ -566,35 +568,33 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out;/* don't even try if the size is too large */ -if (count >KMALLOC_MAX_SIZE ) -return -ENOMEM ; + error = -ENOMEM ; +if (count + !!write >KMALLOC_MAX_SIZE ) + goto out; + kbuf =kzalloc (count,GFP_KERNEL ); +if (!kbuf) + goto out;if (write) { - kbuf =memdup_user_nul (ubuf, count); -if (IS_ERR (kbuf)) { - error =PTR_ERR (kbuf); - goto out; - } - }else { - error = -ENOMEM ; - kbuf =kzalloc (count,GFP_KERNEL ); -if (!kbuf) + error = -EFAULT ; +if (!copy_from_iter_full (kbuf, count, iter)) goto out; + ((char *)kbuf)[count] ='\0' ; } error =BPF_CGROUP_RUN_PROG_SYSCTL (head, table, write, &kbuf, &count, - ppos); + &iocb->ki_pos);if (error) goto out_free_buf;/* careful: calling conventions are nasty here */ - error = table->proc_handler (table, write, kbuf, &count, ppos); + error = table->proc_handler (table, write, kbuf, &count, &iocb->ki_pos);if (error) goto out_free_buf;if (!write) { error = -EFAULT ; -if (copy_to_user (ubuf, kbuf, count)) +if (copy_to_iter (kbuf, count, iter) < count) goto out_free_buf; }
@@ -607,16 +607,14 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,return error; } -static ssize_t proc_sys_read (struct file *filp,char __user *buf, -size_t count,loff_t *ppos) +static ssize_t proc_sys_read (struct kiocb *iocb,struct iov_iter *iter) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,0 ); +return proc_sys_call_handler (iocb, iter,0 ); } -static ssize_t proc_sys_write (struct file *filp,const char __user *buf, -size_t count,loff_t *ppos) +static ssize_t proc_sys_write (struct kiocb *iocb,struct iov_iter *iter) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,1 ); +return proc_sys_call_handler (iocb, iter,1 ); }static int proc_sys_open (struct inode *inode,struct file *filp)
@@ -853,8 +851,8 @@ static int proc_sys_getattr(const struct path *path, struct kstat *stat,static const struct file_operations proc_sys_file_operations = { .open = proc_sys_open, .poll = proc_sys_poll, - .read = proc_sys_read, - .write = proc_sys_write, + .read_iter = proc_sys_read, + .write_iter = proc_sys_write, .llseek = default_llseek, };
Signature · 1 line
2.26.2
Re: [PATCH 03/11] fs: add new read_uptr and write_uptr file operations
Quoted 19 lines · Christoph Hellwig
Quoted 10 lines · Christoph Hellwig
Quoted 9 lines · Matthew Wilcox
(quoted diff) +5
-1/* don't even try if the size is too large */ + error = -ENOMEM; if (count > KMALLOC_MAX_SIZE) - return -ENOMEM; + goto out; + kbuf = kzalloc(count, GFP_KERNEL); + if (!kbuf) + goto out;Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +2
-0if (write) { + error = -EFAULT; + if (!copy_from_iter_full(kbuf, count, iter)) goto out; }The nul-termination for the write cases seems to be lost here.
Quoted 3 lines
Version with the count and termination fixed below. Can I get your signoff? If testing passes that means I can go back to my kernel_read/write version from the
set_fsremoval tree with it.
Sure!
I went with some slightly different fixes, but I'm having trouble sending email (the new infradead.org is not quite set up right yet). I've attached the two fixes to this email in case you want to incorporate them in some way.
From 3c68e4efcc50192962a8cd18c67fb6fad2493713 Mon Sep 17 00:00:00 2001
From: "Matthew Wilcox (Oracle)" <[email protected]>
Date: Wed, 24 Jun 2020 14:12:02 -0400
Subject: [PATCH 1/2] sysctl: Call sysctl_head_finish on error
To: [email protected]
This error path returned directly instead of calling sysctl_head_finish().
--- fs/proc/proc_sysctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/proc/proc_sysctl.c +3 -3
@@ -566,8 +566,9 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out;/* don't even try if the size is too large */ -if (count >KMALLOC_MAX_SIZE ) -return -ENOMEM ; + error = -ENOMEM ; +if (count >=KMALLOC_MAX_SIZE ) + goto out;if (write) { kbuf =memdup_user_nul (ubuf, count);
@@ -576,7 +577,6 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out; } }else { - error = -ENOMEM ; kbuf =kzalloc (count,GFP_KERNEL );if (!kbuf) goto out;
Signature · 1 line
2.27.0
From 93775b67bbc3e4f761808b216bc76127f89f9ad7 Mon Sep 17 00:00:00 2001
From: "Matthew Wilcox (Oracle)" <[email protected]>
Date: Wed, 24 Jun 2020 14:31:08 -0400
Subject: [PATCH 2/2] sysctl: Convert to iter interfaces
To: [email protected]
Using the read_iter/write_iter interfaces allows for in-kernel users to set sysctls without using set_fs(). Also, the buffer is a string, so give it the real type of 'char *', not void *.
--- fs/proc/proc_sysctl.c | 44 ++++++++++++++++++-------------------- include/linux/bpf-cgroup.h | 2 +- kernel/bpf/cgroup.c | 2 +- 3 files changed, 23 insertions(+), 25 deletions(-)
fs/proc/proc_sysctl.c +21 -23
96 lines not on this page · raw message
include/linux/bpf-cgroup.h +1 -1
@@ -132,7 +132,7 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor,int __cgroup_bpf_run_filter_sysctl (struct ctl_table_header *head,struct ctl_table *table,int write, -void **buf,size_t *pcount,loff_t *ppos, +char **buf,size_t *pcount,loff_t *ppos,enum bpf_attach_type type); int __cgroup_bpf_run_filter_setsockopt(struct sock *sock, int *level,
kernel/bpf/cgroup.c +1 -1
@@ -1202,7 +1202,7 @@ const struct bpf_verifier_ops cg_dev_verifier_ops = {*/ int __cgroup_bpf_run_filter_sysctl (struct ctl_table_header *head,struct ctl_table *table,int write, -void **buf,size_t *pcount,loff_t *ppos, +char **buf,size_t *pcount,loff_t *ppos,enum bpf_attach_type type) {struct bpf_sysctl_kern ctx = {
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 4/11 sysctl: switch to ->{read,write}_uptr
In reply to Christoph HellwigThis allows the sysctl handler to safely take kernel space pointers, as required for the new code to set sysctl parameters at boot time.
--- fs/proc/proc_sysctl.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
fs/proc/proc_sysctl.c +20 -19
@@ -540,7 +540,7 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,return err; } -static ssize_t proc_sys_call_handler (struct file *filp,void __user *ubuf, +static ssize_t proc_sys_call_handler (struct file *filp,uptr_t buf,size_t count,loff_t *ppos,int write) {struct inode *inode =file_inode (filp);
@@ -566,20 +566,21 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out;/* don't even try if the size is too large */ -if (count >KMALLOC_MAX_SIZE ) +if (count >=KMALLOC_MAX_SIZE )return -ENOMEM ; + error = -ENOMEM ; + +/* allow for NULL termination on writes */ + kbuf =kzalloc (count + (write ?1 :0 ),GFP_KERNEL ); +if (!kbuf) + goto out; +if (write) { - kbuf =memdup_user_nul (ubuf, count); -if (IS_ERR (kbuf)) { - error =PTR_ERR (kbuf); - goto out; - } - }else { - error = -ENOMEM ; - kbuf =kzalloc (count,GFP_KERNEL ); -if (!kbuf) - goto out; + error = -EFAULT ; +if (copy_from_uptr (kbuf, buf, count)) + goto out_free_buf; + ((char *)kbuf)[count] ='\0' ; } error = BPF_CGROUP_RUN_PROG_SYSCTL(head, table, write, &kbuf, &count,
@@ -594,7 +595,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,if (!write) { error = -EFAULT ; -if (copy_to_user (ubuf, kbuf, count)) +if (copy_to_uptr (buf, kbuf, count)) goto out_free_buf; }
@@ -607,16 +608,16 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,return error; } -static ssize_t proc_sys_read (struct file *filp,char __user *buf, +static ssize_t proc_sys_read (struct file *filp,uptr_t buf,size_t count,loff_t *ppos) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,0 ); +return proc_sys_call_handler (filp, buf, count, ppos,0 ); } -static ssize_t proc_sys_write (struct file *filp,const char __user *buf, +static ssize_t proc_sys_write (struct file *filp,uptr_t buf,size_t count,loff_t *ppos) { -return proc_sys_call_handler (filp, (void __user *)buf, count, ppos,1 ); +return proc_sys_call_handler (filp, buf, count, ppos,1 ); }static int proc_sys_open (struct inode *inode,struct file *filp)
@@ -853,8 +854,8 @@ static int proc_sys_getattr(const struct path *path, struct kstat *stat,static const struct file_operations proc_sys_file_operations = { .open = proc_sys_open, .poll = proc_sys_poll, - .read = proc_sys_read, - .write = proc_sys_write, + .read_uptr = proc_sys_read, + .write_uptr = proc_sys_write, .llseek = default_llseek, };
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 5/11 fs: refactor new_sync_read
In reply to Christoph HellwigPass the read_iter method as a parameter and mark the function non-static. This allows reusing it for additional callsites e.g. in procfs.
--- fs/read_write.c | 8 +++++--- include/linux/fs.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-)
fs/read_write.c +5 -3
@@ -401,7 +401,8 @@ int rw_verify_area(int read_write, struct file *file, const loff_t *ppos, size_t read_write == READ ? MAY_READ : MAY_WRITE); } -static ssize_t new_sync_read (struct file *filp,char __user *buf,size_t len,loff_t *ppos) +ssize_t iter_read (struct file *filp,char __user *buf,size_t len,loff_t *ppos, +ssize_t (*cb)(struct kiocb *iocb,struct iov_iter *iter)) {struct iovec iov = { .iov_base = buf, .iov_len = len };struct kiocb kiocb;
@@ -412,7 +413,7 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo kiocb.ki_pos = (ppos ? *ppos :0 );iov_iter_init (&iter,READ , &iov,1 , len); - ret =call_read_iter (filp, &kiocb, &iter); + ret =cb (&kiocb, &iter);BUG_ON (ret == -EIOCBQUEUED );if (ppos) *ppos = kiocb.ki_pos;
@@ -492,7 +493,8 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)else if (file->f_op->read) ret = file->f_op->read (file, buf, count, pos);else if (file->f_op->read_iter) - ret =new_sync_read (file, buf, count, pos); + ret =iter_read (file, buf, count, pos, + file->f_op->read_iter);else ret = -EINVAL ;if (ret >0 ) {
include/linux/fs.h +2 -0
@@ -1919,6 +1919,8 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); +ssize_t iter_read (struct file *filp,char __user *buf,size_t len,loff_t *ppos, +ssize_t (*cb)(struct kiocb *iocb,struct iov_iter *iter));extern ssize_t vfs_read (struct file *,char __user *,size_t ,loff_t *);extern ssize_t vfs_write (struct file *,const char __user *,size_t ,loff_t *);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 6/11 proc: add a read_iter method to proc proc_ops
In reply to Christoph HellwigThis will allow proc files to implement iter read semantics.
--- fs/proc/inode.c | 28 ++++++++++++++++++++++++++++ include/linux/proc_fs.h | 1 + 2 files changed, 29 insertions(+)
fs/proc/inode.c +28 -0
@@ -297,6 +297,29 @@ static loff_t proc_reg_llseek(struct file *file, loff_t offset, int whence)return rv; } +static ssize_t pde_read_iter (struct proc_dir_entry *pde,struct kiocb *iocb, +struct iov_iter *iter) +{ +if (!pde->proc_ops->proc_read_iter) +return -EINVAL ; +return pde->proc_ops->proc_read_iter (iocb, iter); +} + +static ssize_t proc_reg_read_iter (struct kiocb *iocb,struct iov_iter *iter) +{ +struct proc_dir_entry *pde =PDE (file_inode (iocb->ki_filp)); +ssize_t ret; + +if (pde_is_permanent (pde)) +return pde_read_iter (pde, iocb, iter); + +if (!use_pde (pde)) +return -EIO ; + ret =pde_read_iter (pde, iocb, iter); +unuse_pde (pde); +return ret; +} +static ssize_t pde_read (struct proc_dir_entry *pde,struct file *file,char __user *buf,size_t count,loff_t *ppos) { typeof_member(struct proc_ops, proc_read) read;
@@ -312,6 +335,9 @@ static ssize_t proc_reg_read(struct file *file, char __user *buf, size_t count,struct proc_dir_entry *pde =PDE (file_inode (file));ssize_t rv = -EIO ; +if (pde->proc_ops->proc_read_iter) +return iter_read (file, buf, count, ppos, proc_reg_read_iter); +if (pde_is_permanent (pde)) {return pde_read (pde, file, buf, count, ppos); }else if (use_pde (pde)) {
@@ -569,6 +595,7 @@ static int proc_reg_release(struct inode *inode, struct file *file)static const struct file_operations proc_reg_file_ops = { .llseek = proc_reg_llseek, .read = proc_reg_read, + .read_iter = proc_reg_read_iter, .write = proc_reg_write, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl,
@@ -585,6 +612,7 @@ static const struct file_operations proc_reg_file_ops = {static const struct file_operations proc_reg_file_ops_no_compat = { .llseek = proc_reg_llseek, .read = proc_reg_read, + .read_iter = proc_reg_read_iter, .write = proc_reg_write, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl,
include/linux/proc_fs.h +1 -0
@@ -30,6 +30,7 @@ struct proc_ops {unsigned int proc_flags;int (*proc_open)(struct inode *,struct file *);ssize_t (*proc_read)(struct file *,char __user *,size_t ,loff_t *); +ssize_t (*proc_read_iter)(struct kiocb *,struct iov_iter *);ssize_t (*proc_write)(struct file *,const char __user *,size_t ,loff_t *);loff_t (*proc_lseek)(struct file *,loff_t ,int );int (*proc_release)(struct inode *,struct file *);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 7/11 seq_file: add seq_read_iter
In reply to Christoph Hellwigiov_iter based variant for reading a seq_file. seq_read is reimplemented on top of the iter variant.
--- fs/seq_file.c | 34 +++++++++++++++++++++------------- include/linux/seq_file.h | 1 + 2 files changed, 22 insertions(+), 13 deletions(-)
fs/seq_file.c +21 -13
@@ -18,6 +18,7 @@#include <linux/mm.h> #include <linux/printk.h> #include <linux/string_helpers.h> +#include <linux/uio.h> #include <linux/uaccess.h> #include <asm/page.h>
@@ -146,7 +147,17 @@ static int traverse(struct seq_file *m, loff_t offset)*/ ssize_t seq_read (struct file *file,char __user *buf,size_t size,loff_t *ppos) { -struct seq_file *m = file->private_data; +return iter_read (file, buf, size, ppos, seq_read_iter); +} +EXPORT_SYMBOL (seq_read); + +/* +* Ready-made ->f_op->read_iter() +*/ +ssize_t seq_read_iter (struct kiocb *iocb,struct iov_iter *iter) +{ +struct seq_file *m = iocb->ki_filp->private_data; +size_t size =iov_iter_count (iter);size_t copied =0 ;size_t n;void *p;
@@ -158,14 +169,14 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)* if request is to read from zero offset, reset iterator to first * record as it might have been already advanced by previous requests */ -if (*ppos ==0 ) { +if (iocb->ki_pos ==0 ) { m->index =0 ; m->count =0 ; } -/* Don't assume *ppos is where we left it */ -if (unlikely (*ppos != m->read_pos)) { -while ((err =traverse (m, *ppos)) == -EAGAIN ) +/* Don't assume ki_pos is where we left it */ +if (unlikely (iocb->ki_pos != m->read_pos)) { +while ((err =traverse (m, iocb->ki_pos)) == -EAGAIN ) ;if (err) {/* With prejudice... */
@@ -174,7 +185,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) m->count =0 ; goto Done; }else { - m->read_pos = *ppos; + m->read_pos = iocb->ki_pos; } }
@@ -187,13 +198,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)/* if not empty - flush it first */ if (m->count) { n =min (m->count, size); - err =copy_to_user (buf, m->buf + m->from, n); -if (err) +if (copy_to_iter (m->buf + m->from, n, iter) != n) goto Efault; m->count -= n; m->from += n; size -= n; - buf += n; copied += n;if (!size) goto Done;
@@ -254,8 +263,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) } m->op->stop (m, p); n =min (m->count, size); - err =copy_to_user (buf, m->buf, n); -if (err) +if (copy_to_iter (m->buf, n, iter) != n) goto Efault; copied += n; m->count -= n;
@@ -264,7 +272,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)if (!copied) copied = err;else { - *ppos += copied; + iocb->ki_pos += copied; m->read_pos += copied; }mutex_unlock (&m->lock);
@@ -276,7 +284,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) err = -EFAULT ; goto Done; } -EXPORT_SYMBOL (seq_read); +EXPORT_SYMBOL (seq_read_iter);/** * seq_lseek - ->llseek() method for sequential files.
include/linux/seq_file.h +1 -0
@@ -107,6 +107,7 @@ void seq_pad(struct seq_file *m, char c);char *mangle_path (char *s,const char *p,const char *esc);int seq_open (struct file *,const struct seq_operations *);ssize_t seq_read (struct file *,char __user *,size_t ,loff_t *); +ssize_t seq_read_iter (struct kiocb *iocb,struct iov_iter *iter);loff_t seq_lseek (struct file *,loff_t ,int );int seq_release (struct inode *,struct file *);int seq_write (struct seq_file *seq,const void *data,size_t len);
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 8/11 seq_file: switch over direct seq_read method calls to seq_read_iter
In reply to Christoph HellwigSwitch over all instances used directly as methods using these sed expressions:
sed -i -e 's/\.read\(\s*=\s*\)seq_read/\.read_iter\1seq_read_iter/g'
--- Documentation/filesystems/seq_file.rst | 2 +- Documentation/process/clang-format.rst | 4 +- .../it_IT/process/clang-format.rst | 4 +- arch/arm/mm/ptdump_debugfs.c | 2 +- arch/arm64/kvm/vgic/vgic-debug.c | 2 +- arch/c6x/platforms/pll.c | 2 +- arch/mips/cavium-octeon/oct_ilm.c | 2 +- arch/mips/kernel/segment.c | 2 +- arch/mips/ralink/bootrom.c | 2 +- arch/powerpc/kvm/book3s_xive_native.c | 2 +- arch/powerpc/kvm/timing.c | 2 +- arch/powerpc/mm/ptdump/bats.c | 2 +- arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- arch/powerpc/mm/ptdump/ptdump.c | 2 +- arch/powerpc/mm/ptdump/segment_regs.c | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 8 ++-- arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- arch/s390/kernel/diag.c | 2 +- arch/s390/mm/dump_pagetables.c | 2 +- arch/s390/pci/pci_debug.c | 2 +- arch/sh/mm/asids-debugfs.c | 2 +- arch/sh/mm/cache-debugfs.c | 2 +- arch/sh/mm/pmb.c | 2 +- arch/sh/mm/tlb-debugfs.c | 2 +- arch/x86/kernel/cpu/mce/severity.c | 2 +- arch/x86/mm/pat/memtype.c | 2 +- arch/x86/mm/pat/set_memory.c | 2 +- arch/x86/xen/p2m.c | 2 +- block/blk-mq-debugfs.c | 2 +- drivers/base/power/wakeup.c | 2 +- drivers/block/aoe/aoeblk.c | 2 +- drivers/block/drbd/drbd_debugfs.c | 10 ++--- drivers/block/nbd.c | 4 +- drivers/block/pktcdvd.c | 2 +- drivers/block/rsxx/core.c | 4 +- drivers/bus/mvebu-mbus.c | 4 +- drivers/char/tpm/eventlog/common.c | 2 +- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +- drivers/crypto/amlogic/amlogic-gxl-core.c | 2 +- drivers/crypto/caam/dpseci-debugfs.c | 2 +- drivers/crypto/cavium/zip/zip_main.c | 6 +-- drivers/crypto/hisilicon/qm.c | 2 +- drivers/crypto/qat/qat_common/adf_cfg.c | 2 +- .../qat/qat_common/adf_transport_debug.c | 4 +- drivers/firmware/tegra/bpmp-debugfs.c | 2 +- drivers/gpio/gpiolib.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 4 +- .../gpu/drm/arm/display/komeda/komeda_dev.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_debugfs.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 6 +-- drivers/gpu/drm/drm_debugfs_crc.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- .../drm/i915/display/intel_display_debugfs.c | 16 ++++---- drivers/gpu/drm/i915/gt/debugfs_gt.h | 2 +- drivers/gpu/drm/i915/i915_debugfs_params.c | 12 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +- drivers/gpu/drm/msm/msm_debugfs.c | 2 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- drivers/gpu/host1x/debug.c | 4 +- drivers/gpu/vga/vga_switcheroo.c | 2 +- drivers/hid/hid-picolcd_debugfs.c | 2 +- drivers/hid/hid-wiimote-debug.c | 2 +- drivers/ide/ide-proc.c | 2 +- drivers/infiniband/hw/cxgb4/device.c | 4 +- drivers/infiniband/hw/qib/qib_debugfs.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_fs.c | 4 +- drivers/md/bcache/closure.c | 2 +- drivers/media/cec/core/cec-core.c | 2 +- drivers/media/pci/saa7164/saa7164-core.c | 2 +- drivers/memory/emif.c | 4 +- drivers/memory/tegra/tegra124-emc.c | 2 +- drivers/memory/tegra/tegra186-emc.c | 2 +- drivers/memory/tegra/tegra20-emc.c | 2 +- drivers/memory/tegra/tegra30-emc.c | 2 +- drivers/mfd/ab3100-core.c | 2 +- drivers/mfd/ab3100-otp.c | 2 +- drivers/mfd/ab8500-debugfs.c | 14 +++---- drivers/mfd/tps65010.c | 2 +- drivers/misc/habanalabs/debugfs.c | 2 +- drivers/mmc/core/mmc_test.c | 2 +- drivers/mtd/mtdcore.c | 4 +- drivers/mtd/ubi/debug.c | 2 +- .../ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 38 +++++++++---------- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 ++-- .../freescale/dpaa2/dpaa2-eth-debugfs.c | 6 +-- .../net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 +- .../marvell/octeontx2/af/rvu_debugfs.c | 2 +- drivers/net/wireless/ath/ath5k/debug.c | 2 +- drivers/net/wireless/ath/wil6210/debugfs.c | 14 +++---- .../broadcom/brcm80211/brcmsmac/debug.c | 2 +- .../net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- .../wireless/mediatek/mt76/mt7603/debugfs.c | 2 +- .../wireless/mediatek/mt76/mt7615/debugfs.c | 2 +- .../wireless/mediatek/mt76/mt76x02_debugfs.c | 4 +- .../wireless/mediatek/mt76/mt7915/debugfs.c | 4 +- .../net/wireless/mediatek/mt7601u/debugfs.c | 4 +- drivers/net/wireless/realtek/rtlwifi/debug.c | 2 +- drivers/net/wireless/realtek/rtw88/debug.c | 4 +- drivers/net/wireless/rsi/rsi_91x_debugfs.c | 4 +- drivers/net/xen-netback/xenbus.c | 2 +- drivers/nvme/host/fabrics.c | 2 +- drivers/pci/controller/pci-tegra.c | 2 +- drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/intel_pmc_core.c | 2 +- .../platform/x86/intel_telemetry_debugfs.c | 4 +- drivers/power/supply/da9030_battery.c | 2 +- drivers/pwm/core.c | 2 +- drivers/ras/cec.c | 2 +- drivers/ras/debugfs.c | 2 +- drivers/s390/block/dasd.c | 2 +- drivers/s390/cio/qdio_debug.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 32 ++++++++-------- drivers/scsi/qedf/qedf_dbg.h | 2 +- drivers/scsi/qedi/qedi_dbg.h | 2 +- drivers/scsi/qla2xxx/qla_dfs.c | 12 +++--- drivers/scsi/snic/snic_debugfs.c | 4 +- drivers/sh/intc/virq-debugfs.c | 2 +- drivers/soc/qcom/cmd-db.c | 2 +- drivers/soc/qcom/socinfo.c | 4 +- drivers/soc/ti/knav_dma.c | 2 +- drivers/soc/ti/knav_qmss_queue.c | 2 +- .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- drivers/usb/chipidea/debug.c | 4 +- drivers/usb/dwc2/debugfs.c | 2 +- drivers/usb/dwc3/debugfs.c | 8 ++-- drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 +- drivers/usb/host/xhci-debugfs.c | 6 +-- drivers/usb/mtu3/mtu3_debugfs.c | 8 ++-- drivers/usb/musb/musb_debugfs.c | 4 +- drivers/visorbus/visorbus_main.c | 2 +- drivers/xen/xenfs/xensyms.c | 2 +- fs/debugfs/file.c | 4 +- fs/dlm/debug_fs.c | 8 ++-- fs/gfs2/glock.c | 6 +-- fs/nfsd/nfs4state.c | 4 +- fs/nfsd/nfsctl.c | 10 ++--- fs/ocfs2/cluster/netdebug.c | 6 +-- fs/ocfs2/dlm/dlmdebug.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/openpromfs/inode.c | 2 +- fs/orangefs/orangefs-debugfs.c | 2 +- fs/proc/array.c | 2 +- fs/proc/base.c | 24 ++++++------ fs/proc/fd.c | 2 +- fs/proc/task_mmu.c | 8 ++-- fs/proc/task_nommu.c | 2 +- fs/proc_namespace.c | 6 +-- include/linux/seq_file.h | 4 +- kernel/bpf/inode.c | 2 +- kernel/fail_function.c | 2 +- kernel/gcov/fs.c | 2 +- kernel/irq/debugfs.c | 2 +- kernel/kcsan/debugfs.c | 2 +- kernel/sched/debug.c | 2 +- kernel/time/test_udelay.c | 2 +- kernel/trace/ftrace.c | 16 ++++---- kernel/trace/trace.c | 20 +++++----- kernel/trace/trace_dynevent.c | 2 +- kernel/trace/trace_events.c | 10 ++--- kernel/trace/trace_events_hist.c | 4 +- kernel/trace/trace_events_synth.c | 2 +- kernel/trace/trace_events_trigger.c | 2 +- kernel/trace/trace_kprobe.c | 4 +- kernel/trace/trace_printk.c | 2 +- kernel/trace/trace_stack.c | 4 +- kernel/trace/trace_stat.c | 2 +- kernel/trace/trace_uprobe.c | 4 +- lib/debugobjects.c | 2 +- lib/dynamic_debug.c | 2 +- lib/error-inject.c | 2 +- lib/kunit/debugfs.c | 2 +- mm/kmemleak.c | 2 +- net/6lowpan/debugfs.c | 2 +- net/batman-adv/debugfs.c | 4 +- net/bluetooth/6lowpan.c | 2 +- net/hsr/hsr_debugfs.c | 2 +- net/l2tp/l2tp_debugfs.c | 2 +- net/sunrpc/cache.c | 2 +- net/sunrpc/debugfs.c | 4 +- net/sunrpc/rpc_pipe.c | 2 +- security/apparmor/apparmorfs.c | 10 ++--- security/integrity/ima/ima_fs.c | 6 +-- security/selinux/selinuxfs.c | 2 +- security/smack/smackfs.c | 20 +++++----- 193 files changed, 375 insertions(+), 375 deletions(-)
Documentation/filesystems/seq_file.rst +1 -1
@@ -311,7 +311,7 @@ file_operations structure will look like:: static const struct file_operations ct_file_ops = { .owner = THIS_MODULE, .open = ct_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
Documentation/process/clang-format.rst +2 -2
@@ -136,7 +136,7 @@ In particular, some very common ones you will notice are: static const struct file_operations uprobe_events_ops = { .owner = THIS_MODULE, .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
@@ -147,7 +147,7 @@ In particular, some very common ones you will notice are: static const struct file_operations uprobe_events_ops = { .owner = THIS_MODULE, .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
Documentation/translations/it_IT/process/clang-format.rst +2 -2
@@ -149,7 +149,7 @@ In particolare, quelli più comuni che noterete sono: static const struct file_operations uprobe_events_ops = { .owner = THIS_MODULE, .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
@@ -160,7 +160,7 @@ In particolare, quelli più comuni che noterete sono: static const struct file_operations uprobe_events_ops = { .owner = THIS_MODULE, .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
arch/arm/mm/ptdump_debugfs.c +1 -1
@@ -19,7 +19,7 @@ static int ptdump_open(struct inode *inode, struct file *file)static const struct file_operations ptdump_fops = { .open = ptdump_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/arm64/kvm/vgic/vgic-debug.c +1 -1
@@ -284,7 +284,7 @@ static int debug_open(struct inode *inode, struct file *file)static const struct file_operations vgic_debug_fops = { .owner =THIS_MODULE , .open = debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
arch/c6x/platforms/pll.c +1 -1
@@ -424,7 +424,7 @@ static int c6x_ck_open(struct inode *inode, struct file *file)static const struct file_operations c6x_ck_operations = { .open = c6x_ck_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/mips/cavium-octeon/oct_ilm.c +1 -1
@@ -51,7 +51,7 @@ static int oct_ilm_open(struct inode *inode, struct file *file)static const struct file_operations oct_ilm_ops = { .open = oct_ilm_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/mips/kernel/segment.c +1 -1
@@ -88,7 +88,7 @@ static int segments_open(struct inode *inode, struct file *file)static const struct file_operations segments_fops = { .open = segments_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/mips/ralink/bootrom.c +1 -1
@@ -26,7 +26,7 @@ static int bootrom_open(struct inode *inode, struct file *file)static const struct file_operations bootrom_file_ops = { .open = bootrom_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/kvm/book3s_xive_native.c +1 -1
@@ -1234,7 +1234,7 @@ static int xive_native_debug_open(struct inode *inode, struct file *file)static const struct file_operations xive_native_debug_fops = { .open = xive_native_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/kvm/timing.c +1 -1
@@ -198,7 +198,7 @@ static int kvmppc_exit_timing_open(struct inode *inode, struct file *file)static const struct file_operations kvmppc_exit_timing_fops = { .owner =THIS_MODULE , .open = kvmppc_exit_timing_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = kvmppc_exit_timing_write, .llseek = seq_lseek, .release = single_release,
arch/powerpc/mm/ptdump/bats.c +1 -1
@@ -154,7 +154,7 @@ static int bats_open(struct inode *inode, struct file *file)static const struct file_operations bats_fops = { .open = bats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/mm/ptdump/hashpagetable.c +1 -1
@@ -533,7 +533,7 @@ static int ptdump_open(struct inode *inode, struct file *file)static const struct file_operations ptdump_fops = { .open = ptdump_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/mm/ptdump/ptdump.c +1 -1
@@ -407,7 +407,7 @@ static int ptdump_open(struct inode *inode, struct file *file)static const struct file_operations ptdump_fops = { .open = ptdump_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/mm/ptdump/segment_regs.c +1 -1
@@ -48,7 +48,7 @@ static int sr_open(struct inode *inode, struct file *file)static const struct file_operations sr_fops = { .open = sr_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/platforms/cell/spufs/file.c +4 -4
@@ -1943,7 +1943,7 @@ static int spufs_caps_open(struct inode *inode, struct file *file)static const struct file_operations spufs_caps_fops = { .open = spufs_caps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -2189,7 +2189,7 @@ static int spufs_tid_open(struct inode *inode, struct file *file)static const struct file_operations spufs_tid_fops = { .open = spufs_tid_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -2279,7 +2279,7 @@ static int spufs_stat_open(struct inode *inode, struct file *file)static const struct file_operations spufs_stat_fops = { .open = spufs_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -2532,7 +2532,7 @@ static int spufs_ctx_open(struct inode *inode, struct file *file)static const struct file_operations spufs_ctx_fops = { .open = spufs_ctx_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/powerpc/platforms/pseries/hvCall_inst.c +1 -1
@@ -91,7 +91,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file)static const struct file_operations hcall_inst_seq_fops = { .open = hcall_inst_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
arch/s390/kernel/diag.c +1 -1
@@ -111,7 +111,7 @@ static int show_diag_stat_open(struct inode *inode, struct file *file)static const struct file_operations show_diag_stat_fops = { .open = show_diag_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
arch/s390/mm/dump_pagetables.c +1 -1
@@ -268,7 +268,7 @@ static int ptdump_open(struct inode *inode, struct file *filp)static const struct file_operations ptdump_fops = { .open = ptdump_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/s390/pci/pci_debug.c +1 -1
@@ -163,7 +163,7 @@ static int pci_perf_seq_open(struct inode *inode, struct file *filp)static const struct file_operations debugfs_pci_perf_fops = { .open = pci_perf_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = pci_perf_seq_write, .llseek = seq_lseek, .release = single_release,
arch/sh/mm/asids-debugfs.c +1 -1
@@ -56,7 +56,7 @@ static int asids_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations asids_debugfs_fops = { .owner =THIS_MODULE , .open = asids_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/sh/mm/cache-debugfs.c +1 -1
@@ -102,7 +102,7 @@ static int cache_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations cache_debugfs_fops = { .owner =THIS_MODULE , .open = cache_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/sh/mm/pmb.c +1 -1
@@ -854,7 +854,7 @@ static int pmb_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations pmb_debugfs_fops = { .owner =THIS_MODULE , .open = pmb_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/sh/mm/tlb-debugfs.c +1 -1
@@ -142,7 +142,7 @@ static int tlb_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations tlb_debugfs_fops = { .owner =THIS_MODULE , .open = tlb_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/x86/kernel/cpu/mce/severity.c +1 -1
@@ -397,7 +397,7 @@ static ssize_t severities_coverage_write(struct file *file,static const struct file_operations severities_coverage_fops = { .open = severities_coverage_open, .release = seq_release, - .read = seq_read, + .read_iter = seq_read_iter, .write = severities_coverage_write, .llseek = seq_lseek, };
arch/x86/mm/pat/memtype.c +1 -1
@@ -1200,7 +1200,7 @@ static int memtype_seq_open(struct inode *inode, struct file *file)static const struct file_operations memtype_fops = { .open = memtype_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
arch/x86/mm/pat/set_memory.c +1 -1
@@ -173,7 +173,7 @@ static int cpastats_open(struct inode *inode, struct file *file)static const struct file_operations cpastats_fops = { .open = cpastats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
arch/x86/xen/p2m.c +1 -1
@@ -806,7 +806,7 @@ static int p2m_dump_open(struct inode *inode, struct file *filp)static const struct file_operations p2m_dump_fops = { .open = p2m_dump_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
block/blk-mq-debugfs.c +1 -1
@@ -770,7 +770,7 @@ static int blk_mq_debugfs_release(struct inode *inode, struct file *file)static const struct file_operations blk_mq_debugfs_fops = { .open = blk_mq_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = blk_mq_debugfs_write, .llseek = seq_lseek, .release = blk_mq_debugfs_release,
drivers/base/power/wakeup.c +1 -1
@@ -1172,7 +1172,7 @@ static int wakeup_sources_stats_open(struct inode *inode, struct file *file)static const struct file_operations wakeup_sources_stats_fops = { .owner =THIS_MODULE , .open = wakeup_sources_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };
drivers/block/aoe/aoeblk.c +1 -1
@@ -188,7 +188,7 @@ static const struct attribute_group *aoe_attr_groups[] = {static const struct file_operations aoe_debugfs_fops = { .open = aoe_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/block/drbd/drbd_debugfs.c +5 -5
@@ -457,7 +457,7 @@ static int in_flight_summary_release(struct inode *inode, struct file *file)static const struct file_operations in_flight_summary_fops = { .owner =THIS_MODULE , .open = in_flight_summary_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = in_flight_summary_release, };
@@ -565,7 +565,7 @@ static int callback_history_release(struct inode *inode, struct file *file)static const struct file_operations connection_callback_history_fops = { .owner =THIS_MODULE , .open = callback_history_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = callback_history_release, };
@@ -612,7 +612,7 @@ static int connection_oldest_requests_release(struct inode *inode, struct file *static const struct file_operations connection_oldest_requests_fops = { .owner =THIS_MODULE , .open = connection_oldest_requests_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = connection_oldest_requests_release, };
@@ -757,7 +757,7 @@ static int device_ ## name ## _release(struct inode *inode, struct file *file) \ static const struct file_operations device_ ## name ## _fops = { \ .owner = THIS_MODULE, \ .open = device_ ## name ## _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = device_ ## name ## _release, \ };
@@ -859,7 +859,7 @@ static const struct file_operations drbd_version_fops = { .owner = THIS_MODULE, .open = drbd_version_open, .llseek = seq_lseek, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
drivers/block/nbd.c +2 -2
@@ -1539,7 +1539,7 @@ static int nbd_dbg_tasks_open(struct inode *inode, struct file *file)static const struct file_operations nbd_dbg_tasks_ops = { .open = nbd_dbg_tasks_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -1574,7 +1574,7 @@ static int nbd_dbg_flags_open(struct inode *inode, struct file *file)static const struct file_operations nbd_dbg_flags_ops = { .open = nbd_dbg_flags_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/block/pktcdvd.c +1 -1
@@ -464,7 +464,7 @@ static int pkt_debugfs_fops_open(struct inode *inode, struct file *file)static const struct file_operations debug_fops = { .open = pkt_debugfs_fops_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
drivers/block/rsxx/core.c +2 -2
@@ -209,7 +209,7 @@ static const struct file_operations debugfs_cram_fops = {static const struct file_operations debugfs_stats_fops = { .owner =THIS_MODULE , .open = rsxx_attr_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -217,7 +217,7 @@ static const struct file_operations debugfs_stats_fops = {static const struct file_operations debugfs_pci_regs_fops = { .owner =THIS_MODULE , .open = rsxx_attr_pci_regs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/bus/mvebu-mbus.c +2 -2
@@ -477,7 +477,7 @@ static int mvebu_sdram_debug_open(struct inode *inode, struct file *file)static const struct file_operations mvebu_sdram_debug_fops = { .open = mvebu_sdram_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -527,7 +527,7 @@ static int mvebu_devs_debug_open(struct inode *inode, struct file *file)static const struct file_operations mvebu_devs_debug_fops = { .open = mvebu_devs_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/char/tpm/eventlog/common.c +1 -1
@@ -66,7 +66,7 @@ static int tpm_bios_measurements_release(struct inode *inode,static const struct file_operations tpm_bios_measurements_ops = { .owner =THIS_MODULE , .open = tpm_bios_measurements_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tpm_bios_measurements_release, };
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +1 -1
@@ -310,7 +310,7 @@ static int sun8i_ce_dbgfs_open(struct inode *inode, struct file *file)static const struct file_operations sun8i_ce_debugfs_fops = { .owner =THIS_MODULE , .open = sun8i_ce_dbgfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +1 -1
@@ -294,7 +294,7 @@ static int sun8i_ss_dbgfs_open(struct inode *inode, struct file *file)static const struct file_operations sun8i_ss_debugfs_fops = { .owner =THIS_MODULE , .open = sun8i_ss_dbgfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/crypto/amlogic/amlogic-gxl-core.c +1 -1
@@ -125,7 +125,7 @@ static int meson_dbgfs_open(struct inode *inode, struct file *file)static const struct file_operations meson_debugfs_fops = { .owner =THIS_MODULE , .open = meson_dbgfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/crypto/caam/dpseci-debugfs.c +1 -1
@@ -60,7 +60,7 @@ static int dpseci_dbg_fqs_open(struct inode *inode, struct file *file)static const struct file_operations dpseci_dbg_fq_ops = { .open = dpseci_dbg_fqs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/crypto/cavium/zip/zip_main.c +3 -3
@@ -592,7 +592,7 @@ static int zip_stats_open(struct inode *inode, struct file *file)static const struct file_operations zip_stats_fops = { .owner =THIS_MODULE , .open = zip_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
@@ -604,7 +604,7 @@ static int zip_clear_open(struct inode *inode, struct file *file)static const struct file_operations zip_clear_fops = { .owner =THIS_MODULE , .open = zip_clear_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
@@ -616,7 +616,7 @@ static int zip_regs_open(struct inode *inode, struct file *file)static const struct file_operations zip_regs_fops = { .owner =THIS_MODULE , .open = zip_regs_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
drivers/crypto/hisilicon/qm.c +1 -1
@@ -1054,7 +1054,7 @@ static int qm_regs_open(struct inode *inode, struct file *file)static const struct file_operations qm_regs_fops = { .owner =THIS_MODULE , .open = qm_regs_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
drivers/crypto/qat/qat_common/adf_cfg.c +1 -1
@@ -110,7 +110,7 @@ static int qat_dev_cfg_open(struct inode *inode, struct file *file)static const struct file_operations qat_dev_cfg_fops = { .open = qat_dev_cfg_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
drivers/crypto/qat/qat_common/adf_transport_debug.c +2 -2
@@ -142,7 +142,7 @@ static int adf_ring_open(struct inode *inode, struct file *file)static const struct file_operations adf_ring_debug_fops = { .open = adf_ring_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
@@ -253,7 +253,7 @@ static int adf_bank_open(struct inode *inode, struct file *file)static const struct file_operations adf_bank_debug_fops = { .open = adf_bank_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
drivers/firmware/tegra/bpmp-debugfs.c +1 -1
@@ -292,7 +292,7 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf,static const struct file_operations debugfs_fops = { .open = debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = debugfs_store, .release = single_release,
drivers/gpio/gpiolib.c +1 -1
@@ -5529,7 +5529,7 @@ static int gpiolib_open(struct inode *inode, struct file *file)static const struct file_operations gpiolib_operations = { .owner =THIS_MODULE , .open = gpiolib_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c +2 -2
@@ -69,7 +69,7 @@ static ssize_t kfd_debugfs_hang_hws_write(struct file *file,static const struct file_operations kfd_debugfs_fops = { .owner =THIS_MODULE , .open = kfd_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -77,7 +77,7 @@ static const struct file_operations kfd_debugfs_fops = {static const struct file_operations kfd_debugfs_hang_hws_fops = { .owner =THIS_MODULE , .open = kfd_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = kfd_debugfs_hang_hws_write, .llseek = seq_lseek, .release = single_release,
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +1 -1
@@ -49,7 +49,7 @@ static int komeda_register_open(struct inode *inode, struct file *filp)static const struct file_operations komeda_register_fops = { .owner =THIS_MODULE , .open = komeda_register_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/drm/arm/malidp_drv.c +1 -1
@@ -542,7 +542,7 @@ static ssize_t malidp_debugfs_write(struct file *file, const char __user *ubuf,static const struct file_operations malidp_debugfs_fops = { .owner =THIS_MODULE , .open = malidp_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = malidp_debugfs_write, .llseek = seq_lseek, .release = single_release,
drivers/gpu/drm/armada/armada_debugfs.c +1 -1
@@ -85,7 +85,7 @@ static int armada_debugfs_crtc_reg_write(struct file *file,static const struct file_operations armada_debugfs_crtc_reg_fops = { .owner =THIS_MODULE , .open = armada_debugfs_crtc_reg_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = armada_debugfs_crtc_reg_write, .llseek = seq_lseek, .release = single_release,
drivers/gpu/drm/drm_debugfs.c +3 -3
@@ -154,7 +154,7 @@ static int drm_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations drm_debugfs_fops = { .owner =THIS_MODULE , .open = drm_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -379,7 +379,7 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,static const struct file_operations drm_edid_fops = { .owner =THIS_MODULE , .open = edid_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = edid_write
@@ -389,7 +389,7 @@ static const struct file_operations drm_edid_fops = {static const struct file_operations drm_connector_fops = { .owner =THIS_MODULE , .open = connector_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = connector_write
drivers/gpu/drm/drm_debugfs_crc.c +1 -1
@@ -167,7 +167,7 @@ static ssize_t crc_control_write(struct file *file, const char __user *ubuf,static const struct file_operations drm_crtc_crc_control_fops = { .owner =THIS_MODULE , .open = crc_control_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = crc_control_write
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -1279,7 +1279,7 @@ static int mipi_dbi_debugfs_command_open(struct inode *inode,static const struct file_operations mipi_dbi_debugfs_command_fops = { .owner =THIS_MODULE , .open = mipi_dbi_debugfs_command_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = mipi_dbi_debugfs_command_write,
drivers/gpu/drm/i915/display/intel_display_debugfs.c +8 -8
@@ -1009,7 +1009,7 @@ static ssize_t i915_ipc_status_write(struct file *file, const char __user *ubuf,static const struct file_operations i915_ipc_status_fops = { .owner =THIS_MODULE , .open = i915_ipc_status_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = i915_ipc_status_write
@@ -1326,7 +1326,7 @@ static int i915_displayport_test_active_open(struct inode *inode,static const struct file_operations i915_displayport_test_active_fops = { .owner =THIS_MODULE , .open = i915_displayport_test_active_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = i915_displayport_test_active_write
@@ -1627,7 +1627,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,static const struct file_operations i915_pri_wm_latency_fops = { .owner =THIS_MODULE , .open = pri_wm_latency_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = pri_wm_latency_write
@@ -1636,7 +1636,7 @@ static const struct file_operations i915_pri_wm_latency_fops = {static const struct file_operations i915_spr_wm_latency_fops = { .owner =THIS_MODULE , .open = spr_wm_latency_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = spr_wm_latency_write
@@ -1645,7 +1645,7 @@ static const struct file_operations i915_spr_wm_latency_fops = {static const struct file_operations i915_cur_wm_latency_fops = { .owner =THIS_MODULE , .open = cur_wm_latency_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = cur_wm_latency_write
@@ -1728,7 +1728,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file)static const struct file_operations i915_hpd_storm_ctl_fops = { .owner =THIS_MODULE , .open = i915_hpd_storm_ctl_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = i915_hpd_storm_ctl_write
@@ -1801,7 +1801,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,static const struct file_operations i915_hpd_short_storm_ctl_fops = { .owner =THIS_MODULE , .open = i915_hpd_short_storm_ctl_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = i915_hpd_short_storm_ctl_write,
@@ -2179,7 +2179,7 @@ static int i915_dsc_fec_support_open(struct inode *inode,static const struct file_operations i915_dsc_fec_support_fops = { .owner =THIS_MODULE , .open = i915_dsc_fec_support_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = i915_dsc_fec_support_write
drivers/gpu/drm/i915/gt/debugfs_gt.h +1 -1
@@ -18,7 +18,7 @@ struct intel_gt; static const struct file_operations __name ## _fops = { \ .owner =THIS_MODULE , \ .open = __name ## _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
drivers/gpu/drm/i915/i915_debugfs_params.c +6 -6
@@ -48,7 +48,7 @@ static ssize_t i915_param_int_write(struct file *file,static const struct file_operations i915_param_int_fops = { .owner =THIS_MODULE , .open = i915_param_int_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = i915_param_int_write, .llseek = default_llseek, .release = single_release,
@@ -57,7 +57,7 @@ static const struct file_operations i915_param_int_fops = {static const struct file_operations i915_param_int_fops_ro = { .owner =THIS_MODULE , .open = i915_param_int_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = default_llseek, .release = single_release, };
@@ -101,7 +101,7 @@ static ssize_t i915_param_uint_write(struct file *file,static const struct file_operations i915_param_uint_fops = { .owner =THIS_MODULE , .open = i915_param_uint_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = i915_param_uint_write, .llseek = default_llseek, .release = single_release,
@@ -110,7 +110,7 @@ static const struct file_operations i915_param_uint_fops = {static const struct file_operations i915_param_uint_fops_ro = { .owner =THIS_MODULE , .open = i915_param_uint_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = default_llseek, .release = single_release, };
@@ -160,7 +160,7 @@ static ssize_t i915_param_charp_write(struct file *file,static const struct file_operations i915_param_charp_fops = { .owner =THIS_MODULE , .open = i915_param_charp_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = i915_param_charp_write, .llseek = default_llseek, .release = single_release,
@@ -169,7 +169,7 @@ static const struct file_operations i915_param_charp_fops = {static const struct file_operations i915_param_charp_fops_ro = { .owner =THIS_MODULE , .open = i915_param_charp_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = default_llseek, .release = single_release, };
drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c +1 -1
@@ -297,7 +297,7 @@ static const struct file_operations __prefix ## _fops = { \ .owner = THIS_MODULE, \ .open = __prefix ## _open, \ .release = single_release, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ }
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -2
@@ -1256,7 +1256,7 @@ static const struct file_operations __prefix ## _fops = { \ .owner = THIS_MODULE, \ .open = __prefix ## _open, \ .release = single_release, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ }
@@ -1283,7 +1283,7 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)static const struct file_operations debugfs_status_fops = { .open = _dpu_debugfs_status_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
@@ -1881,7 +1881,7 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)static const struct file_operations debugfs_status_fops = { .open = _dpu_encoder_debugfs_status_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -2
@@ -107,7 +107,7 @@ static const struct file_operations __prefix ## _fops = { \ .owner = THIS_MODULE, \ .open = __prefix ## _open, \ .release = single_release, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ }
@@ -176,7 +176,7 @@ static int dpu_debugfs_open_regset32(struct inode *inode,static const struct file_operations dpu_fops_regset32 = { .open = dpu_debugfs_open_regset32, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/drm/msm/msm_debugfs.c +1 -1
@@ -103,7 +103,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file)static const struct file_operations msm_gpu_fops = { .owner =THIS_MODULE , .open = msm_gpu_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = msm_gpu_release, };
drivers/gpu/drm/nouveau/nouveau_debugfs.c +1 -1
@@ -203,7 +203,7 @@ nouveau_debugfs_pstate_open(struct inode *inode, struct file *file)static const struct file_operations nouveau_pstate_fops = { .owner =THIS_MODULE , .open = nouveau_debugfs_pstate_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = nouveau_debugfs_pstate_set, };
drivers/gpu/drm/omapdrm/dss/dss.c +1 -1
@@ -912,7 +912,7 @@ static int dss_debug_open(struct inode *inode, struct file *file)static const struct file_operations dss_debug_fops = { .open = dss_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/host1x/debug.c +2 -2
@@ -141,7 +141,7 @@ static int host1x_debug_open_all(struct inode *inode, struct file *file)static const struct file_operations host1x_debug_all_fops = { .open = host1x_debug_open_all, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -153,7 +153,7 @@ static int host1x_debug_open(struct inode *inode, struct file *file)static const struct file_operations host1x_debug_fops = { .open = host1x_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/gpu/vga/vga_switcheroo.c +1 -1
@@ -900,7 +900,7 @@ static const struct file_operations vga_switcheroo_debugfs_fops = { .owner = THIS_MODULE, .open = vga_switcheroo_debugfs_open, .write = vga_switcheroo_debugfs_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/hid/hid-picolcd_debugfs.c +1 -1
@@ -60,7 +60,7 @@ static ssize_t picolcd_debug_reset_write(struct file *f, const char __user *userstatic const struct file_operations picolcd_debug_reset_fops = { .owner =THIS_MODULE , .open = picolcd_debug_reset_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = picolcd_debug_reset_write, .release = single_release,
drivers/hid/hid-wiimote-debug.c +1 -1
@@ -163,7 +163,7 @@ static ssize_t wiidebug_drm_write(struct file *f, const char __user *u,static const struct file_operations wiidebug_drm_fops = { .owner =THIS_MODULE , .open = wiidebug_drm_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = wiidebug_drm_write, .release = single_release,
drivers/ide/ide-proc.c +1 -1
@@ -457,7 +457,7 @@ static int ide_media_proc_open(struct inode *inode, struct file *file)static const struct file_operations ide_media_proc_fops = { .owner =THIS_MODULE , .open = ide_media_proc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/infiniband/hw/cxgb4/device.c +2 -2
@@ -191,7 +191,7 @@ static const struct file_operations wr_log_debugfs_fops = { .owner = THIS_MODULE, .open = wr_log_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = wr_log_clear, };
@@ -550,7 +550,7 @@ static const struct file_operations stats_debugfs_fops = { .owner = THIS_MODULE, .open = stats_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = stats_clear, };
drivers/infiniband/hw/qib/qib_debugfs.c +1 -1
@@ -61,7 +61,7 @@ static int _##name##_open(struct inode *inode, struct file *s) \ static const struct file_operations _##name##_file_ops = { \ .owner = THIS_MODULE, \ .open = _##name##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = seq_release \ };
drivers/infiniband/ulp/ipoib/ipoib_fs.c +2 -2
@@ -149,7 +149,7 @@ static int ipoib_mcg_open(struct inode *inode, struct file *file)static const struct file_operations ipoib_mcg_fops = { .owner =THIS_MODULE , .open = ipoib_mcg_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
@@ -254,7 +254,7 @@ static int ipoib_path_open(struct inode *inode, struct file *file)static const struct file_operations ipoib_path_fops = { .owner =THIS_MODULE , .open = ipoib_path_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
drivers/md/bcache/closure.c +1 -1
@@ -196,7 +196,7 @@ static int debug_seq_open(struct inode *inode, struct file *file)static const struct file_operations debug_ops = { .owner =THIS_MODULE , .open = debug_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release };
drivers/media/cec/core/cec-core.c +1 -1
@@ -226,7 +226,7 @@ static int cec_error_inj_open(struct inode *inode, struct file *file)static const struct file_operations cec_error_inj_fops = { .open = cec_error_inj_open, .write = cec_error_inj_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/media/pci/saa7164/saa7164-core.c +1 -1
@@ -1155,7 +1155,7 @@ static int saa7164_open(struct inode *inode, struct file *file)static const struct file_operations saa7164_operations = { .owner =THIS_MODULE , .open = saa7164_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/memory/emif.c +2 -2
@@ -138,7 +138,7 @@ static int emif_regdump_open(struct inode *inode, struct file *file)static const struct file_operations emif_regdump_fops = { .open = emif_regdump_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
@@ -157,7 +157,7 @@ static int emif_mr4_open(struct inode *inode, struct file *file)static const struct file_operations emif_mr4_fops = { .open = emif_mr4_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = single_release, };
drivers/memory/tegra/tegra124-emc.c +1 -1
@@ -1068,7 +1068,7 @@ static int tegra_emc_debug_available_rates_open(struct inode *inode,static const struct file_operations tegra_emc_debug_available_rates_fops = { .open = tegra_emc_debug_available_rates_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/memory/tegra/tegra186-emc.c +1 -1
@@ -94,7 +94,7 @@ static int tegra186_emc_debug_available_rates_open(struct inode *inode,static const struct file_operations tegra186_emc_debug_available_rates_fops = { .open = tegra186_emc_debug_available_rates_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/memory/tegra/tegra20-emc.c +1 -1
@@ -546,7 +546,7 @@ static int tegra_emc_debug_available_rates_open(struct inode *inode,static const struct file_operations tegra_emc_debug_available_rates_fops = { .open = tegra_emc_debug_available_rates_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/memory/tegra/tegra30-emc.c +1 -1
@@ -1174,7 +1174,7 @@ static int tegra_emc_debug_available_rates_open(struct inode *inode,static const struct file_operations tegra_emc_debug_available_rates_fops = { .open = tegra_emc_debug_available_rates_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/mfd/ab3100-core.c +1 -1
@@ -473,7 +473,7 @@ static int ab3100_registers_open(struct inode *inode, struct file *file)static const struct file_operations ab3100_registers_fops = { .open = ab3100_registers_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
drivers/mfd/ab3100-otp.c +1 -1
@@ -117,7 +117,7 @@ static int ab3100_otp_open(struct inode *inode, struct file *file)static const struct file_operations ab3100_otp_operations = { .open = ab3100_otp_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/mfd/ab8500-debugfs.c +7 -7
@@ -1376,7 +1376,7 @@ static int ab8500_all_banks_open(struct inode *inode, struct file *file)static const struct file_operations ab8500_all_banks_fops = { .open = ab8500_all_banks_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -1959,7 +1959,7 @@ static ssize_t ab8500_unsubscribe_write(struct file *file,static const struct file_operations ab8500_bank_fops = { .open = ab8500_bank_open, .write = ab8500_bank_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -1968,7 +1968,7 @@ static const struct file_operations ab8500_bank_fops = {static const struct file_operations ab8500_address_fops = { .open = ab8500_address_open, .write = ab8500_address_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -1977,7 +1977,7 @@ static const struct file_operations ab8500_address_fops = {static const struct file_operations ab8500_val_fops = { .open = ab8500_val_open, .write = ab8500_val_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -1986,7 +1986,7 @@ static const struct file_operations ab8500_val_fops = {static const struct file_operations ab8500_subscribe_fops = { .open = ab8500_subscribe_unsubscribe_open, .write = ab8500_subscribe_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -1995,7 +1995,7 @@ static const struct file_operations ab8500_subscribe_fops = {static const struct file_operations ab8500_unsubscribe_fops = { .open = ab8500_subscribe_unsubscribe_open, .write = ab8500_unsubscribe_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -2004,7 +2004,7 @@ static const struct file_operations ab8500_unsubscribe_fops = {static const struct file_operations ab8500_hwreg_fops = { .open = ab8500_hwreg_open, .write = ab8500_hwreg_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
drivers/mfd/tps65010.c +1 -1
@@ -290,7 +290,7 @@ static int dbg_tps_open(struct inode *inode, struct file *file)static const struct file_operations debug_fops = { .open = dbg_tps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/misc/habanalabs/debugfs.c +1 -1
@@ -1151,7 +1151,7 @@ static ssize_t hl_debugfs_write(struct file *file, const char __user *buf,static const struct file_operations hl_debugfs_fops = { .owner =THIS_MODULE , .open = hl_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hl_debugfs_write, .llseek = seq_lseek, .release = single_release,
drivers/mmc/core/mmc_test.c +1 -1
@@ -3148,7 +3148,7 @@ static ssize_t mtf_test_write(struct file *file, const char __user *buf,static const struct file_operations mmc_test_fops_test = { .open = mtf_test_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = mtf_test_write, .llseek = seq_lseek, .release = single_release,
drivers/mtd/mtdcore.c +2 -2
@@ -351,7 +351,7 @@ static int mtd_partid_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations mtd_partid_debug_fops = { .open = mtd_partid_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -372,7 +372,7 @@ static int mtd_partname_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations mtd_partname_debug_fops = { .open = mtd_partname_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/mtd/ubi/debug.c +1 -1
@@ -488,7 +488,7 @@ static int eraseblk_count_release(struct inode *inode, struct file *f)static const struct file_operations eraseblk_count_fops = { .owner =THIS_MODULE , .open = eraseblk_count_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = eraseblk_count_release, };
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +19 -19
@@ -229,7 +229,7 @@ static int cim_la_open(struct inode *inode, struct file *file)static const struct file_operations cim_la_fops = { .owner =THIS_MODULE , .open = cim_la_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -272,7 +272,7 @@ static int cim_pif_la_open(struct inode *inode, struct file *file)static const struct file_operations cim_pif_la_fops = { .owner =THIS_MODULE , .open = cim_pif_la_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -318,7 +318,7 @@ static int cim_ma_la_open(struct inode *inode, struct file *file)static const struct file_operations cim_ma_la_fops = { .owner =THIS_MODULE , .open = cim_ma_la_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -411,7 +411,7 @@ static int cim_ibq_open(struct inode *inode, struct file *file)static const struct file_operations cim_ibq_fops = { .owner =THIS_MODULE , .open = cim_ibq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -440,7 +440,7 @@ static int cim_obq_open(struct inode *inode, struct file *file)static const struct file_operations cim_obq_fops = { .owner =THIS_MODULE , .open = cim_obq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -686,7 +686,7 @@ static ssize_t tp_la_write(struct file *file, const char __user *buf,static const struct file_operations tp_la_fops = { .owner =THIS_MODULE , .open = tp_la_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, .write = tp_la_write
@@ -722,7 +722,7 @@ static int ulprx_la_open(struct inode *inode, struct file *file)static const struct file_operations ulprx_la_fops = { .owner =THIS_MODULE , .open = ulprx_la_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -812,7 +812,7 @@ static ssize_t pm_stats_clear(struct file *file, const char __user *buf,static const struct file_operations pm_stats_debugfs_fops = { .owner =THIS_MODULE , .open = pm_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = pm_stats_clear
@@ -1136,7 +1136,7 @@ static int devlog_open(struct inode *inode, struct file *file)static const struct file_operations devlog_fops = { .owner =THIS_MODULE , .open = devlog_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -1234,7 +1234,7 @@ static int mboxlog_open(struct inode *inode, struct file *file)static const struct file_operations mboxlog_fops = { .owner =THIS_MODULE , .open = mboxlog_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -1317,7 +1317,7 @@ static ssize_t mbox_write(struct file *file, const char __user *buf,static const struct file_operations mbox_debugfs_fops = { .owner =THIS_MODULE , .open = mbox_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = mbox_write
@@ -1610,7 +1610,7 @@ inval: count = -EINVAL;static const struct file_operations mps_trc_debugfs_fops = { .owner =THIS_MODULE , .open = mps_trc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = mps_trc_write
@@ -1930,7 +1930,7 @@ static int mps_tcam_open(struct inode *inode, struct file *file)static const struct file_operations mps_tcam_debugfs_fops = { .owner =THIS_MODULE , .open = mps_tcam_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -2007,7 +2007,7 @@ static int rss_open(struct inode *inode, struct file *file)static const struct file_operations rss_debugfs_fops = { .owner =THIS_MODULE , .open = rss_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -2226,7 +2226,7 @@ static ssize_t rss_key_write(struct file *file, const char __user *buf,static const struct file_operations rss_key_debugfs_fops = { .owner =THIS_MODULE , .open = rss_key_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = rss_key_write
@@ -2310,7 +2310,7 @@ static int rss_pf_config_open(struct inode *inode, struct file *file)static const struct file_operations rss_pf_config_debugfs_fops = { .owner =THIS_MODULE , .open = rss_pf_config_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -2373,7 +2373,7 @@ static int rss_vf_config_open(struct inode *inode, struct file *file)static const struct file_operations rss_vf_config_debugfs_fops = { .owner =THIS_MODULE , .open = rss_vf_config_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private };
@@ -2562,7 +2562,7 @@ static int dcb_info_open(struct inode *inode, struct file *file)static const struct file_operations dcb_info_debugfs_fops = { .owner =THIS_MODULE , .open = dcb_info_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -3184,7 +3184,7 @@ static int sge_qinfo_open(struct inode *inode, struct file *file)static const struct file_operations sge_qinfo_debugfs_fops = { .owner =THIS_MODULE , .open = sge_qinfo_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/net/ethernet/chelsio/cxgb4/l2t.c +1 -1
@@ -759,7 +759,7 @@ static int l2t_seq_open(struct inode *inode, struct file *file)const struct file_operations t4_l2t_fops = { .owner =THIS_MODULE , .open = l2t_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +4 -4
@@ -2040,7 +2040,7 @@ static int mboxlog_open(struct inode *inode, struct file *file)static const struct file_operations mboxlog_fops = { .owner =THIS_MODULE , .open = mboxlog_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -2193,7 +2193,7 @@ static int sge_qinfo_open(struct inode *inode, struct file *file)static const struct file_operations sge_qinfo_debugfs_fops = { .owner =THIS_MODULE , .open = sge_qinfo_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -2339,7 +2339,7 @@ static int sge_qstats_open(struct inode *inode, struct file *file)static const struct file_operations sge_qstats_proc_fops = { .owner =THIS_MODULE , .open = sge_qstats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -2437,7 +2437,7 @@ static int interfaces_open(struct inode *inode, struct file *file)static const struct file_operations interfaces_proc_fops = { .owner =THIS_MODULE , .open = interfaces_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c +3 -3
@@ -56,7 +56,7 @@ static int dpaa2_dbg_cpu_open(struct inode *inode, struct file *file)static const struct file_operations dpaa2_dbg_cpu_ops = { .open = dpaa2_dbg_cpu_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -116,7 +116,7 @@ static int dpaa2_dbg_fqs_open(struct inode *inode, struct file *file)static const struct file_operations dpaa2_dbg_fq_ops = { .open = dpaa2_dbg_fqs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -161,7 +161,7 @@ static int dpaa2_dbg_ch_open(struct inode *inode, struct file *file)static const struct file_operations dpaa2_dbg_ch_ops = { .open = dpaa2_dbg_ch_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c +1 -1
@@ -134,7 +134,7 @@ static int fm10k_dbg_desc_open(struct inode *inode, struct file *filep)static const struct file_operations fm10k_dbg_desc_fops = { .owner =THIS_MODULE , .open = fm10k_dbg_desc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +1 -1
@@ -123,7 +123,7 @@ static int rvu_dbg_open_##name(struct inode *inode, struct file *file) \ static const struct file_operations rvu_dbg_##name##_fops = { \ .owner = THIS_MODULE, \ .open = rvu_dbg_open_##name, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .write = rvu_dbg_##write_op, \ .llseek = seq_lseek, \ .release = single_release, \
drivers/net/wireless/ath/ath5k/debug.c +1 -1
@@ -182,7 +182,7 @@ static int open_file_registers(struct inode *inode, struct file *file)static const struct file_operations fops_registers = { .open = open_file_registers, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .owner =THIS_MODULE ,
drivers/net/wireless/ath/wil6210/debugfs.c +7 -7
@@ -957,7 +957,7 @@ static int wil_pmcring_seq_open(struct inode *inode, struct file *file)static const struct file_operations fops_pmcring = { .open = wil_pmcring_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, };
@@ -1833,7 +1833,7 @@ static ssize_t wil_tx_latency_write(struct file *file, const char __user *buf,static const struct file_operations fops_tx_latency = { .open = wil_tx_latency_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .write = wil_tx_latency_write, .llseek = seq_lseek, };
@@ -1996,7 +1996,7 @@ static ssize_t wil_link_stats_write(struct file *file, const char __user *buf,static const struct file_operations fops_link_stats = { .open = wil_link_stats_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .write = wil_link_stats_write, .llseek = seq_lseek, };
@@ -2050,7 +2050,7 @@ wil_link_stats_global_write(struct file *file, const char __user *buf,static const struct file_operations fops_link_stats_global = { .open = wil_link_stats_global_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .write = wil_link_stats_global_write, .llseek = seq_lseek, };
@@ -2187,7 +2187,7 @@ static int wil_fw_capabilities_seq_open(struct inode *inode, struct file *file)static const struct file_operations fops_fw_capabilities = { .open = wil_fw_capabilities_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, };
@@ -2213,7 +2213,7 @@ static int wil_fw_version_seq_open(struct inode *inode, struct file *file)static const struct file_operations fops_fw_version = { .open = wil_fw_version_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, };
@@ -2326,7 +2326,7 @@ wil_compressed_rx_status_seq_open(struct inode *inode, struct file *file)static const struct file_operations fops_compressed_rx_status = { .open = wil_compressed_rx_status_seq_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .write = wil_compressed_rx_status_write, .llseek = seq_lseek, };
drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c +1 -1
@@ -182,7 +182,7 @@ static const struct file_operations brcms_debugfs_def_ops = { .owner = THIS_MODULE, .open = brcms_debugfs_entry_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek };
drivers/net/wireless/intel/iwlwifi/fw/debugfs.c +1 -1
@@ -419,7 +419,7 @@ static int iwl_dbgfs_fw_info_open(struct inode *inode, struct file *filp)static const struct file_operations iwl_dbgfs_fw_info_ops = { .owner =THIS_MODULE , .open = iwl_dbgfs_fw_info_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -1
@@ -2947,7 +2947,7 @@ DEBUGFS_READ_WRITE_FILE_OPS(rfkill);static const struct file_operations iwl_dbgfs_tx_queue_ops = { .owner =THIS_MODULE , .open = iwl_dbgfs_tx_queue_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };
drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c +1 -1
@@ -99,7 +99,7 @@ mt7603_ampdu_stat_open(struct inode *inode, struct file *f)static const struct file_operations fops_ampdu_stat = { .open = mt7603_ampdu_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +1 -1
@@ -181,7 +181,7 @@ mt7615_ampdu_stat_open(struct inode *inode, struct file *f)static const struct file_operations fops_ampdu_stat = { .open = mt7615_ampdu_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c +2 -2
@@ -50,7 +50,7 @@ static int read_txpower(struct seq_file *file, void *data)static const struct file_operations fops_ampdu_stat = { .open = mt76x02_ampdu_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -89,7 +89,7 @@ mt76x02_dfs_stat_open(struct inode *inode, struct file *f)static const struct file_operations fops_dfs_stat = { .open = mt76x02_dfs_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +2 -2
@@ -224,7 +224,7 @@ mt7915_tx_stats_open(struct inode *inode, struct file *f)static const struct file_operations fops_tx_stats = { .open = mt7915_tx_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -450,7 +450,7 @@ mt7915_sta_stats_open(struct inode *inode, struct file *f)static const struct file_operations fops_sta_stats = { .open = mt7915_sta_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/mediatek/mt7601u/debugfs.c +2 -2
@@ -81,7 +81,7 @@ mt7601u_ampdu_stat_open(struct inode *inode, struct file *f)static const struct file_operations fops_ampdu_stat = { .open = mt7601u_ampdu_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -139,7 +139,7 @@ mt7601u_eeprom_param_open(struct inode *inode, struct file *f)static const struct file_operations fops_eeprom_param = { .open = mt7601u_eeprom_param_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/realtek/rtlwifi/debug.c +1 -1
@@ -86,7 +86,7 @@ static int dl_debug_open_common(struct inode *inode, struct file *file)static const struct file_operations file_ops_common = { .open = dl_debug_open_common, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/net/wireless/realtek/rtw88/debug.c +2 -2
@@ -76,7 +76,7 @@ static int rtw_debugfs_close(struct inode *inode, struct file *filp)static const struct file_operations file_ops_single_r = { .owner =THIS_MODULE , .open = rtw_debugfs_single_open_rw, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -85,7 +85,7 @@ static const struct file_operations file_ops_single_rw = { .owner = THIS_MODULE, .open = rtw_debugfs_single_open_rw, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = rtw_debugfs_single_write, };
drivers/net/wireless/rsi/rsi_91x_debugfs.c +2 -2
@@ -253,14 +253,14 @@ static ssize_t rsi_debug_zone_write(struct file *filp,#define FOPS (fopen) { \ .owner = THIS_MODULE, \ .open = (fopen), \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ }#define FOPS_RW (fopen, fwrite) { \ .owner = THIS_MODULE, \ .open = (fopen), \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .write = (fwrite), \ }
drivers/net/xen-netback/xenbus.c +1 -1
@@ -152,7 +152,7 @@ static int xenvif_io_ring_open(struct inode *inode, struct file *filp)static const struct file_operations xenvif_dbg_io_ring_ops_fops = { .owner =THIS_MODULE , .open = xenvif_io_ring_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = xenvif_write_io_ring,
drivers/nvme/host/fabrics.c +1 -1
@@ -1140,7 +1140,7 @@ static int nvmf_dev_release(struct inode *inode, struct file *file)static const struct file_operations nvmf_dev_fops = { .owner =THIS_MODULE , .write = nvmf_dev_write, - .read = seq_read, + .read_iter = seq_read_iter, .open = nvmf_dev_open, .release = nvmf_dev_release, };
drivers/pci/controller/pci-tegra.c +1 -1
@@ -2634,7 +2634,7 @@ static int tegra_pcie_ports_open(struct inode *inode, struct file *file)static const struct file_operations tegra_pcie_ports_ops = { .owner =THIS_MODULE , .open = tegra_pcie_ports_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/platform/x86/asus-wmi.c +1 -1
@@ -2502,7 +2502,7 @@ static int asus_wmi_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations asus_wmi_debugfs_io_ops = { .owner =THIS_MODULE , .open = asus_wmi_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/platform/x86/intel_pmc_core.c +1 -1
@@ -894,7 +894,7 @@ static int pmc_core_ltr_ignore_open(struct inode *inode, struct file *file)static const struct file_operations pmc_core_ltr_ignore_ops = { .open = pmc_core_ltr_ignore_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = pmc_core_ltr_ignore_write, .llseek = seq_lseek, .release = single_release,
drivers/platform/x86/intel_telemetry_debugfs.c +2 -2
@@ -706,7 +706,7 @@ static int telem_pss_trc_verb_open(struct inode *inode, struct file *file)static const struct file_operations telem_pss_trc_verb_ops = { .open = telem_pss_trc_verb_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = telem_pss_trc_verb_write, .llseek = seq_lseek, .release = single_release,
@@ -754,7 +754,7 @@ static int telem_ioss_trc_verb_open(struct inode *inode, struct file *file)static const struct file_operations telem_ioss_trc_verb_ops = { .open = telem_ioss_trc_verb_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = telem_ioss_trc_verb_write, .llseek = seq_lseek, .release = single_release,
drivers/power/supply/da9030_battery.c +1 -1
@@ -179,7 +179,7 @@ static int debug_open(struct inode *inode, struct file *file)static const struct file_operations bat_debug_fops = { .open = debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/pwm/core.c +1 -1
@@ -1342,7 +1342,7 @@ static int pwm_seq_open(struct inode *inode, struct file *file)static const struct file_operations pwm_debugfs_ops = { .owner =THIS_MODULE , .open = pwm_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/ras/cec.c +1 -1
@@ -475,7 +475,7 @@ static int array_open(struct inode *inode, struct file *filp)static const struct file_operations array_ops = { .owner =THIS_MODULE , .open = array_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/ras/debugfs.c +1 -1
@@ -32,7 +32,7 @@ static int trace_release(struct inode *inode, struct file *file)static const struct file_operations trace_fops = { .open = trace_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = trace_release, };
drivers/s390/block/dasd.c +1 -1
@@ -1089,7 +1089,7 @@ static int dasd_stats_open(struct inode *inode, struct file *file)static const struct file_operations dasd_stats_raw_fops = { .owner =THIS_MODULE , .open = dasd_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = dasd_stats_write,
drivers/s390/cio/qdio_debug.c +1 -1
@@ -281,7 +281,7 @@ static int qperf_seq_open(struct inode *inode, struct file *filp)static const struct file_operations debugfs_perf_fops = { .owner =THIS_MODULE , .open = qperf_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = qperf_seq_write, .llseek = seq_lseek, .release = single_release,
drivers/scsi/hisi_sas/hisi_sas_main.c +16 -16
@@ -2878,7 +2878,7 @@ static int hisi_sas_debugfs_global_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_global_fops = { .open = hisi_sas_debugfs_global_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -2905,7 +2905,7 @@ static int hisi_sas_debugfs_axi_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_axi_fops = { .open = hisi_sas_debugfs_axi_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -2932,7 +2932,7 @@ static int hisi_sas_debugfs_ras_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_ras_fops = { .open = hisi_sas_debugfs_ras_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -2958,7 +2958,7 @@ static int hisi_sas_debugfs_port_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_port_fops = { .open = hisi_sas_debugfs_port_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3026,7 +3026,7 @@ static int hisi_sas_debugfs_cq_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_cq_fops = { .open = hisi_sas_debugfs_cq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3059,7 +3059,7 @@ static int hisi_sas_debugfs_dq_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_dq_fops = { .open = hisi_sas_debugfs_dq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3087,7 +3087,7 @@ static int hisi_sas_debugfs_iost_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_iost_fops = { .open = hisi_sas_debugfs_iost_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3126,7 +3126,7 @@ static int hisi_sas_debugfs_iost_cache_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_iost_cache_fops = { .open = hisi_sas_debugfs_iost_cache_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3154,7 +3154,7 @@ static int hisi_sas_debugfs_itct_open(struct inode *inode, struct file *filp)static const struct file_operations hisi_sas_debugfs_itct_fops = { .open = hisi_sas_debugfs_itct_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3193,7 +3193,7 @@ static int hisi_sas_debugfs_itct_cache_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_itct_cache_fops = { .open = hisi_sas_debugfs_itct_cache_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .owner =THIS_MODULE ,
@@ -3422,7 +3422,7 @@ static int hisi_sas_debugfs_bist_linkrate_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_bist_linkrate_ops = { .open = hisi_sas_debugfs_bist_linkrate_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_bist_linkrate_write, .llseek = seq_lseek, .release = single_release,
@@ -3512,7 +3512,7 @@ static int hisi_sas_debugfs_bist_code_mode_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_bist_code_mode_ops = { .open = hisi_sas_debugfs_bist_code_mode_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_bist_code_mode_write, .llseek = seq_lseek, .release = single_release,
@@ -3561,7 +3561,7 @@ static int hisi_sas_debugfs_bist_phy_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_bist_phy_ops = { .open = hisi_sas_debugfs_bist_phy_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_bist_phy_write, .llseek = seq_lseek, .release = single_release,
@@ -3640,7 +3640,7 @@ static int hisi_sas_debugfs_bist_mode_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_bist_mode_ops = { .open = hisi_sas_debugfs_bist_mode_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_bist_mode_write, .llseek = seq_lseek, .release = single_release,
@@ -3696,7 +3696,7 @@ static int hisi_sas_debugfs_bist_enable_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_bist_enable_ops = { .open = hisi_sas_debugfs_bist_enable_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_bist_enable_write, .llseek = seq_lseek, .release = single_release,
@@ -3742,7 +3742,7 @@ static int hisi_sas_debugfs_phy_down_cnt_open(struct inode *inode,static const struct file_operations hisi_sas_debugfs_phy_down_cnt_ops = { .open = hisi_sas_debugfs_phy_down_cnt_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = hisi_sas_debugfs_phy_down_cnt_write, .llseek = seq_lseek, .release = single_release,
drivers/scsi/qedf/qedf_dbg.h +1 -1
@@ -141,7 +141,7 @@ struct qedf_list_of_funcs { { \ .owner = THIS_MODULE, \ .open = drv##_dbg_##ops##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
drivers/scsi/qedi/qedi_dbg.h +1 -1
@@ -124,7 +124,7 @@ struct qedi_debugfs_ops { { \ .owner = THIS_MODULE, \ .open = drv##_dbg_##ops##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
drivers/scsi/qla2xxx/qla_dfs.c +6 -6
@@ -47,7 +47,7 @@ qla2x00_dfs_tgt_sess_open(struct inode *inode, struct file *file)static const struct file_operations dfs_tgt_sess_ops = { .open = qla2x00_dfs_tgt_sess_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -116,7 +116,7 @@ qla2x00_dfs_tgt_port_database_open(struct inode *inode, struct file *file)static const struct file_operations dfs_tgt_port_database_ops = { .open = qla2x00_dfs_tgt_port_database_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -164,7 +164,7 @@ qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file)static const struct file_operations dfs_fw_resource_cnt_ops = { .open = qla_dfs_fw_resource_cnt_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -254,7 +254,7 @@ qla_dfs_tgt_counters_open(struct inode *inode, struct file *file)static const struct file_operations dfs_tgt_counters_ops = { .open = qla_dfs_tgt_counters_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -351,7 +351,7 @@ qla2x00_dfs_fce_release(struct inode *inode, struct file *file)static const struct file_operations dfs_fce_ops = { .open = qla2x00_dfs_fce_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = qla2x00_dfs_fce_release, };
@@ -424,7 +424,7 @@ qla_dfs_naqp_write(struct file *file, const char __user *buffer,static const struct file_operations dfs_naqp_ops = { .open = qla_dfs_naqp_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, .write = qla_dfs_naqp_write,
drivers/scsi/snic/snic_debugfs.c +2 -2
@@ -349,7 +349,7 @@ snic_stats_open(struct inode *inode, struct file *filp)static const struct file_operations snic_stats_fops = { .owner =THIS_MODULE , .open = snic_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -455,7 +455,7 @@ snic_trc_open(struct inode *inode, struct file *filp)static const struct file_operations snic_trc_fops = { .owner =THIS_MODULE , .open = snic_trc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
drivers/sh/intc/virq-debugfs.c +1 -1
@@ -44,7 +44,7 @@ static int intc_irq_xlate_open(struct inode *inode, struct file *file)static const struct file_operations intc_irq_xlate_fops = { .open = intc_irq_xlate_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/soc/qcom/cmd-db.c +1 -1
@@ -303,7 +303,7 @@ static const struct file_operations cmd_db_debugfs_ops = {#ifdef CONFIG_DEBUG_FS .open = open_cmd_db_debugfs, #endif - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/soc/qcom/socinfo.c +2 -2
@@ -228,7 +228,7 @@ static int qcom_open_##name(struct inode *inode, struct file *file) \ \ static const struct file_operations qcom_ ##name## _ops = { \ .open = qcom_open_##name, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
@@ -291,7 +291,7 @@ static int open_image_##type(struct inode *inode, struct file *file) \ \ static const struct file_operations qcom_image_##type##_ops = { \ .open = open_image_##type, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
drivers/soc/ti/knav_dma.c +1 -1
@@ -377,7 +377,7 @@ static int knav_dma_debug_open(struct inode *inode, struct file *file)static const struct file_operations knav_dma_debug_ops = { .open = knav_dma_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/soc/ti/knav_qmss_queue.c +1 -1
@@ -485,7 +485,7 @@ static int knav_queue_debug_open(struct inode *inode, struct file *file)static const struct file_operations knav_queue_debug_ops = { .open = knav_queue_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +2 -2
@@ -110,7 +110,7 @@ static const struct file_operations debugfs_log_fops = { .owner = THIS_MODULE, .open = debugfs_log_open, .write = debugfs_log_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -178,7 +178,7 @@ static const struct file_operations debugfs_trace_fops = { .owner = THIS_MODULE, .open = debugfs_trace_open, .write = debugfs_trace_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/chipidea/debug.c +2 -2
@@ -110,7 +110,7 @@ static int ci_port_test_open(struct inode *inode, struct file *file)static const struct file_operations ci_port_test_fops = { .open = ci_port_test_open, .write = ci_port_test_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -296,7 +296,7 @@ static int ci_role_open(struct inode *inode, struct file *file)static const struct file_operations ci_role_fops = { .open = ci_role_open, .write = ci_role_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/dwc2/debugfs.c +1 -1
@@ -109,7 +109,7 @@ static const struct file_operations testmode_fops = { .owner = THIS_MODULE, .open = testmode_open, .write = testmode_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/dwc3/debugfs.c +4 -4
@@ -380,7 +380,7 @@ static ssize_t dwc3_lsp_write(struct file *file, const char __user *ubuf,static const struct file_operations dwc3_lsp_fops = { .open = dwc3_lsp_open, .write = dwc3_lsp_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -445,7 +445,7 @@ static ssize_t dwc3_mode_write(struct file *file,static const struct file_operations dwc3_mode_fops = { .open = dwc3_mode_open, .write = dwc3_mode_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -528,7 +528,7 @@ static ssize_t dwc3_testmode_write(struct file *file,static const struct file_operations dwc3_testmode_fops = { .open = dwc3_testmode_open, .write = dwc3_testmode_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -620,7 +620,7 @@ static ssize_t dwc3_link_state_write(struct file *file,static const struct file_operations dwc3_link_state_fops = { .open = dwc3_link_state_open, .write = dwc3_link_state_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
@@ -532,7 +532,7 @@ static int proc_udc_open(struct inode *inode, struct file *file)static const struct file_operations proc_ops = { .owner =THIS_MODULE , .open = proc_udc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/gadget/udc/renesas_usb3.c +1 -1
@@ -2543,7 +2543,7 @@ static ssize_t renesas_usb3_b_device_write(struct file *file,static const struct file_operations renesas_usb3_b_device_fops = { .open = renesas_usb3_b_device_open, .write = renesas_usb3_b_device_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/host/xhci-debugfs.c +3 -3
@@ -248,7 +248,7 @@ static int xhci_ring_open(struct inode *inode, struct file *file)static const struct file_operations xhci_ring_fops = { .open = xhci_ring_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -329,7 +329,7 @@ static int xhci_context_open(struct inode *inode, struct file *file)static const struct file_operations xhci_context_fops = { .open = xhci_context_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -390,7 +390,7 @@ static ssize_t xhci_port_write(struct file *file, const char __user *ubuf,static const struct file_operations port_fops = { .open = xhci_port_open, .write = xhci_port_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/mtu3/mtu3_debugfs.c +4 -4
@@ -271,7 +271,7 @@ static int mtu3_ep_open(struct inode *inode, struct file *file)static const struct file_operations mtu3_ep_fops = { .open = mtu3_ep_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -341,7 +341,7 @@ static ssize_t mtu3_probe_write(struct file *file, const char __user *ubuf,static const struct file_operations mtu3_probe_fops = { .open = mtu3_probe_open, .write = mtu3_probe_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -467,7 +467,7 @@ static ssize_t ssusb_mode_write(struct file *file, const char __user *ubuf,static const struct file_operations ssusb_mode_fops = { .open = ssusb_mode_open, .write = ssusb_mode_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -513,7 +513,7 @@ static ssize_t ssusb_vbus_write(struct file *file, const char __user *ubuf,static const struct file_operations ssusb_vbus_fops = { .open = ssusb_vbus_open, .write = ssusb_vbus_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/usb/musb/musb_debugfs.c +2 -2
@@ -224,7 +224,7 @@ static ssize_t musb_test_mode_write(struct file *file,static const struct file_operations musb_test_mode_fops = { .open = musb_test_mode_open, .write = musb_test_mode_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -316,7 +316,7 @@ static ssize_t musb_softconnect_write(struct file *file,static const struct file_operations musb_softconnect_fops = { .open = musb_softconnect_open, .write = musb_softconnect_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/visorbus/visorbus_main.c +1 -1
@@ -479,7 +479,7 @@ static int bus_info_debugfs_open(struct inode *inode, struct file *file)static const struct file_operations bus_info_debugfs_fops = { .owner =THIS_MODULE , .open = bus_info_debugfs_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
drivers/xen/xenfs/xensyms.c +1 -1
@@ -146,7 +146,7 @@ static int xensyms_release(struct inode *inode, struct file *file)const struct file_operations xensyms_ops = { .open = xensyms_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = xensyms_release };
fs/debugfs/file.c +2 -2
@@ -1080,7 +1080,7 @@ static int debugfs_open_regset32(struct inode *inode, struct file *file)static const struct file_operations fops_regset32 = { .open = debugfs_open_regset32, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -1126,7 +1126,7 @@ static const struct file_operations debugfs_devm_entry_ops = { .owner = THIS_MODULE, .open = debugfs_devm_entry_open, .release = single_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek };
fs/dlm/debug_fs.c +4 -4
@@ -663,7 +663,7 @@ static int table_open4(struct inode *inode, struct file *file)static const struct file_operations format1_fops = { .owner =THIS_MODULE , .open = table_open1, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
@@ -671,7 +671,7 @@ static const struct file_operations format1_fops = {static const struct file_operations format2_fops = { .owner =THIS_MODULE , .open = table_open2, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
@@ -679,7 +679,7 @@ static const struct file_operations format2_fops = {static const struct file_operations format3_fops = { .owner =THIS_MODULE , .open = table_open3, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
@@ -687,7 +687,7 @@ static const struct file_operations format3_fops = {static const struct file_operations format4_fops = { .owner =THIS_MODULE , .open = table_open4, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release };
fs/gfs2/glock.c +3 -3
@@ -2470,7 +2470,7 @@ static int gfs2_sbstats_open(struct inode *inode, struct file *file)static const struct file_operations gfs2_glocks_fops = { .owner =THIS_MODULE , .open = gfs2_glocks_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = gfs2_glocks_release, };
@@ -2478,7 +2478,7 @@ static const struct file_operations gfs2_glocks_fops = {static const struct file_operations gfs2_glstats_fops = { .owner =THIS_MODULE , .open = gfs2_glstats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = gfs2_glocks_release, };
@@ -2486,7 +2486,7 @@ static const struct file_operations gfs2_glstats_fops = {static const struct file_operations gfs2_sbstats_fops = { .owner =THIS_MODULE , .open = gfs2_sbstats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
fs/nfsd/nfs4state.c +2 -2
@@ -2364,7 +2364,7 @@ static int client_info_open(struct inode *inode, struct file *file)static const struct file_operations client_info_fops = { .open = client_info_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -2611,7 +2611,7 @@ static int client_opens_release(struct inode *inode, struct file *file)static const struct file_operations client_states_fops = { .open = client_states_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = client_opens_release, };
fs/nfsd/nfsctl.c +5 -5
@@ -171,7 +171,7 @@ static int exports_nfsd_open(struct inode *inode, struct file *file)static const struct file_operations exports_nfsd_operations = { .open = exports_nfsd_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -189,7 +189,7 @@ static int export_features_open(struct inode *inode, struct file *file)static const struct file_operations export_features_operations = { .open = export_features_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -208,7 +208,7 @@ static int supported_enctypes_open(struct inode *inode, struct file *file)static const struct file_operations supported_enctypes_ops = { .open = supported_enctypes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -216,14 +216,14 @@ static const struct file_operations supported_enctypes_ops = {static const struct file_operations pool_stats_operations = { .open = nfsd_pool_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = nfsd_pool_stats_release, };static const struct file_operations reply_cache_stats_operations = { .open = nfsd_reply_cache_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
fs/ocfs2/cluster/netdebug.c +3 -3
@@ -186,7 +186,7 @@ static int nst_fop_release(struct inode *inode, struct file *file)static const struct file_operations nst_seq_fops = { .open = nst_fop_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = nst_fop_release, };
@@ -418,7 +418,7 @@ static int stats_fop_open(struct inode *inode, struct file *file)static const struct file_operations stats_seq_fops = { .open = stats_fop_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = sc_fop_release, };
@@ -430,7 +430,7 @@ static int sc_fop_open(struct inode *inode, struct file *file)static const struct file_operations sc_seq_fops = { .open = sc_fop_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = sc_fop_release, };
fs/ocfs2/dlm/dlmdebug.c +1 -1
@@ -653,7 +653,7 @@ static int debug_lockres_release(struct inode *inode, struct file *file)static const struct file_operations debug_lockres_fops = { .open = debug_lockres_open, .release = debug_lockres_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, };/* end - debug lockres funcs */
fs/ocfs2/dlmglue.c +1 -1
@@ -3269,7 +3269,7 @@ static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file)static const struct file_operations ocfs2_dlm_debug_fops = { .open = ocfs2_dlm_debug_open, .release = ocfs2_dlm_debug_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, };
fs/openpromfs/inode.c +1 -1
@@ -159,7 +159,7 @@ static int property_open(struct inode *inode, struct file *file)static const struct file_operations openpromfs_prop_ops = { .open = property_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
fs/orangefs/orangefs-debugfs.c +1 -1
@@ -116,7 +116,7 @@ static const struct seq_operations help_debug_ops = {static const struct file_operations debug_help_fops = { .owner =THIS_MODULE , .open = orangefs_debug_help_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = seq_release, .llseek = seq_lseek, };
fs/proc/array.c +1 -1
@@ -766,7 +766,7 @@ static int children_seq_open(struct inode *inode, struct file *file)const struct file_operations proc_tid_children_operations = { .open = children_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
fs/proc/base.c +12 -12
@@ -538,7 +538,7 @@ static ssize_t lstats_write(struct file *file, const char __user *buf,static const struct file_operations proc_lstats_operations = { .open = lstats_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = lstats_write, .llseek = seq_lseek, .release = single_release,
@@ -776,7 +776,7 @@ static int proc_single_open(struct inode *inode, struct file *filp)static const struct file_operations proc_single_file_operations = { .open = proc_single_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -1460,7 +1460,7 @@ static int sched_open(struct inode *inode, struct file *filp)static const struct file_operations proc_pid_sched_operations = { .open = sched_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = sched_write, .llseek = seq_lseek, .release = single_release,
@@ -1535,7 +1535,7 @@ static int sched_autogroup_open(struct inode *inode, struct file *filp)static const struct file_operations proc_pid_sched_autogroup_operations = { .open = sched_autogroup_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = sched_autogroup_write, .llseek = seq_lseek, .release = single_release,
@@ -1638,7 +1638,7 @@ static int timens_offsets_open(struct inode *inode, struct file *filp)static const struct file_operations proc_timens_offsets_operations = { .open = timens_offsets_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = timens_offsets_write, .llseek = seq_lseek, .release = single_release,
@@ -1695,7 +1695,7 @@ static int comm_open(struct inode *inode, struct file *filp)static const struct file_operations proc_pid_set_comm_operations = { .open = comm_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = comm_write, .llseek = seq_lseek, .release = single_release,
@@ -2484,7 +2484,7 @@ static int proc_timers_open(struct inode *inode, struct file *file)static const struct file_operations proc_timers_operations = { .open = proc_timers_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };
@@ -2576,7 +2576,7 @@ static int timerslack_ns_open(struct inode *inode, struct file *filp)static const struct file_operations proc_pid_set_timerslack_ns_operations = { .open = timerslack_ns_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = timerslack_ns_write, .llseek = seq_lseek, .release = single_release,
@@ -3028,7 +3028,7 @@ static int proc_projid_map_open(struct inode *inode, struct file *file)static const struct file_operations proc_uid_map_operations = { .open = proc_uid_map_open, .write = proc_uid_map_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_id_map_release, };
@@ -3036,7 +3036,7 @@ static const struct file_operations proc_uid_map_operations = {static const struct file_operations proc_gid_map_operations = { .open = proc_gid_map_open, .write = proc_gid_map_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_id_map_release, };
@@ -3044,7 +3044,7 @@ static const struct file_operations proc_gid_map_operations = {static const struct file_operations proc_projid_map_operations = { .open = proc_projid_map_open, .write = proc_projid_map_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_id_map_release, };
@@ -3095,7 +3095,7 @@ static int proc_setgroups_release(struct inode *inode, struct file *file)static const struct file_operations proc_setgroups_operations = { .open = proc_setgroups_open, .write = proc_setgroups_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_setgroups_release, };
fs/proc/fd.c +1 -1
@@ -76,7 +76,7 @@ static int seq_fdinfo_open(struct inode *inode, struct file *file)static const struct file_operations proc_fdinfo_file_operations = { .open = seq_fdinfo_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
fs/proc/task_mmu.c +4 -4
@@ -351,7 +351,7 @@ static int pid_maps_open(struct inode *inode, struct file *file)const struct file_operations proc_pid_maps_operations = { .open = pid_maps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_map_release, };
@@ -933,14 +933,14 @@ static int smaps_rollup_release(struct inode *inode, struct file *file)const struct file_operations proc_pid_smaps_operations = { .open = pid_smaps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_map_release, };const struct file_operations proc_pid_smaps_rollup_operations = { .open = smaps_rollup_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = smaps_rollup_release, };
@@ -1879,7 +1879,7 @@ static int pid_numa_maps_open(struct inode *inode, struct file *file)const struct file_operations proc_pid_numa_maps_operations = { .open = pid_numa_maps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = proc_map_release, };
fs/proc/task_nommu.c +1 -1
@@ -295,7 +295,7 @@ static int pid_maps_open(struct inode *inode, struct file *file)const struct file_operations proc_pid_maps_operations = { .open = pid_maps_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = map_release, };
fs/proc_namespace.c +3 -3
@@ -319,7 +319,7 @@ static int mountstats_open(struct inode *inode, struct file *file)const struct file_operations proc_mounts_operations = { .open = mounts_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = mounts_release, .poll = mounts_poll,
@@ -327,7 +327,7 @@ const struct file_operations proc_mounts_operations = {const struct file_operations proc_mountinfo_operations = { .open = mountinfo_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = mounts_release, .poll = mounts_poll,
@@ -335,7 +335,7 @@ const struct file_operations proc_mountinfo_operations = {const struct file_operations proc_mountstats_operations = { .open = mountstats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = mounts_release, };
include/linux/seq_file.h +2 -2
@@ -160,7 +160,7 @@ static int __name ## _open(struct inode *inode, struct file *file) \ static const struct file_operations __name ## _fops = { \ .owner =THIS_MODULE , \ .open = __name ## _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = seq_release, \ }
@@ -174,7 +174,7 @@ static int __name ## _open(struct inode *inode, struct file *file) \ static const struct file_operations __name ## _fops = { \ .owner =THIS_MODULE , \ .open = __name ## _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }
kernel/bpf/inode.c +1 -1
@@ -311,7 +311,7 @@ static int bpffs_map_release(struct inode *inode, struct file *file)*/ static const struct file_operations bpffs_map_fops = { .open = bpffs_map_open, - .read = seq_read, + .read_iter = seq_read_iter, .release = bpffs_map_release, };
kernel/fail_function.c +1 -1
@@ -314,7 +314,7 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,static const struct file_operations fei_ops = { .open = fei_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = fei_write, .llseek = seq_lseek, .release = seq_release,
kernel/gcov/fs.c +1 -1
@@ -401,7 +401,7 @@ static void add_links(struct gcov_node *node, struct dentry *parent)static const struct file_operations gcov_data_fops = { .open = gcov_seq_open, .release = gcov_seq_release, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = gcov_seq_write, };
kernel/irq/debugfs.c +1 -1
@@ -201,7 +201,7 @@ static ssize_t irq_debug_write(struct file *file, const char __user *user_buf,static const struct file_operations dfs_irq_ops = { .open = irq_debug_open, .write = irq_debug_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
kernel/kcsan/debugfs.c +1 -1
@@ -337,7 +337,7 @@ debugfs_write(struct file *file, const char __user *buf, size_t count, loff_t *ostatic const struct file_operations debugfs_ops = { - .read = seq_read, + .read_iter = seq_read_iter, .open = debugfs_open, .write = debugfs_write, .release = single_release
kernel/sched/debug.c +1 -1
@@ -164,7 +164,7 @@ static int sched_feat_open(struct inode *inode, struct file *filp)static const struct file_operations sched_feat_fops = { .open = sched_feat_open, .write = sched_feat_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
kernel/time/test_udelay.c +1 -1
@@ -129,7 +129,7 @@ static ssize_t udelay_test_write(struct file *file, const char __user *buf,static const struct file_operations udelay_test_debugfs_ops = { .owner =THIS_MODULE , .open = udelay_test_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = udelay_test_write, .llseek = seq_lseek, .release = single_release,
kernel/trace/ftrace.c +8 -8
@@ -5561,21 +5561,21 @@ int ftrace_regex_release(struct inode *inode, struct file *file)static const struct file_operations ftrace_avail_fops = { .open = ftrace_avail_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };static const struct file_operations ftrace_enabled_fops = { .open = ftrace_enabled_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, };static const struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_filter_write, .llseek = tracing_lseek, .release = ftrace_regex_release,
@@ -5583,7 +5583,7 @@ static const struct file_operations ftrace_filter_fops = {static const struct file_operations ftrace_notrace_fops = { .open = ftrace_notrace_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_notrace_write, .llseek = tracing_lseek, .release = ftrace_regex_release,
@@ -5981,7 +5981,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,static const struct file_operations ftrace_graph_fops = { .open = ftrace_graph_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_graph_write, .llseek = tracing_lseek, .release = ftrace_graph_release,
@@ -5989,7 +5989,7 @@ static const struct file_operations ftrace_graph_fops = {static const struct file_operations ftrace_graph_notrace_fops = { .open = ftrace_graph_notrace_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_graph_write, .llseek = tracing_lseek, .release = ftrace_graph_release,
@@ -7306,7 +7306,7 @@ ftrace_pid_release(struct inode *inode, struct file *file)static const struct file_operations ftrace_pid_fops = { .open = ftrace_pid_open, .write = ftrace_pid_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = tracing_lseek, .release = ftrace_pid_release, };
@@ -7314,7 +7314,7 @@ static const struct file_operations ftrace_pid_fops = {static const struct file_operations ftrace_no_pid_fops = { .open = ftrace_no_pid_open, .write = ftrace_no_pid_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = tracing_lseek, .release = ftrace_pid_release, };
kernel/trace/trace.c +10 -10
@@ -4611,7 +4611,7 @@ loff_t tracing_lseek(struct file *file, loff_t offset, int whence)static const struct file_operations tracing_fops = { .open = tracing_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = tracing_write_stub, .llseek = tracing_lseek, .release = tracing_release,
@@ -4619,7 +4619,7 @@ static const struct file_operations tracing_fops = {static const struct file_operations show_traces_fops = { .open = show_traces_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = show_traces_release, };
@@ -4957,7 +4957,7 @@ static int tracing_trace_options_open(struct inode *inode, struct file *file)static const struct file_operations tracing_iter_fops = { .open = tracing_trace_options_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tracing_single_release_tr, .write = tracing_trace_options_write,
@@ -5297,7 +5297,7 @@ static int tracing_saved_tgids_open(struct inode *inode, struct file *filp)static const struct file_operations tracing_saved_tgids_fops = { .open = tracing_saved_tgids_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -5376,7 +5376,7 @@ static int tracing_saved_cmdlines_open(struct inode *inode, struct file *filp)static const struct file_operations tracing_saved_cmdlines_fops = { .open = tracing_saved_cmdlines_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -5542,7 +5542,7 @@ static int tracing_eval_map_open(struct inode *inode, struct file *filp)static const struct file_operations tracing_eval_map_fops = { .open = tracing_eval_map_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -7119,7 +7119,7 @@ static const struct file_operations tracing_mark_raw_fops = {static const struct file_operations trace_clock_fops = { .open = tracing_clock_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tracing_single_release_tr, .write = tracing_clock_write,
@@ -7127,7 +7127,7 @@ static const struct file_operations trace_clock_fops = {static const struct file_operations trace_time_stamp_mode_fops = { .open = tracing_time_stamp_mode_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tracing_single_release_tr, };
@@ -7135,7 +7135,7 @@ static const struct file_operations trace_time_stamp_mode_fops = {#ifdef CONFIG_TRACER_SNAPSHOT static const struct file_operations snapshot_fops = { .open = tracing_snapshot_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = tracing_snapshot_write, .llseek = tracing_lseek, .release = tracing_snapshot_release,
@@ -7391,7 +7391,7 @@ static int tracing_err_log_release(struct inode *inode, struct file *file)static const struct file_operations tracing_err_log_fops = { .open = tracing_err_log_open, .write = tracing_err_log_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tracing_err_log_release, };
kernel/trace/trace_dynevent.c +1 -1
@@ -197,7 +197,7 @@ static ssize_t dyn_event_write(struct file *file, const char __user *buffer,static const struct file_operations dynamic_events_ops = { .owner =THIS_MODULE , .open = dyn_event_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = dyn_event_write,
kernel/trace/trace_events.c +5 -5
@@ -1828,14 +1828,14 @@ static const struct seq_operations show_set_no_pid_seq_ops = {static const struct file_operations ftrace_avail_fops = { .open = ftrace_event_avail_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };static const struct file_operations ftrace_set_event_fops = { .open = ftrace_event_set_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_event_write, .llseek = seq_lseek, .release = ftrace_event_release,
@@ -1843,7 +1843,7 @@ static const struct file_operations ftrace_set_event_fops = {static const struct file_operations ftrace_set_event_pid_fops = { .open = ftrace_event_set_pid_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_event_pid_write, .llseek = seq_lseek, .release = ftrace_event_release,
@@ -1851,7 +1851,7 @@ static const struct file_operations ftrace_set_event_pid_fops = {static const struct file_operations ftrace_set_event_notrace_pid_fops = { .open = ftrace_event_set_npid_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_event_npid_write, .llseek = seq_lseek, .release = ftrace_event_release,
@@ -1866,7 +1866,7 @@ static const struct file_operations ftrace_enable_fops = {static const struct file_operations ftrace_event_format_fops = { .open = trace_format_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
kernel/trace/trace_events_hist.c +2 -2
@@ -4724,7 +4724,7 @@ static int event_hist_open(struct inode *inode, struct file *file)const struct file_operations event_hist_fops = { .open = event_hist_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -4996,7 +4996,7 @@ static int event_hist_debug_open(struct inode *inode, struct file *file)const struct file_operations event_hist_debug_fops = { .open = event_hist_debug_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
kernel/trace/trace_events_synth.c +1 -1
@@ -1749,7 +1749,7 @@ static ssize_t synth_events_write(struct file *file,static const struct file_operations synth_events_fops = { .open = synth_events_open, .write = synth_events_write, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
kernel/trace/trace_events_trigger.c +1 -1
@@ -310,7 +310,7 @@ event_trigger_release(struct inode *inode, struct file *file)const struct file_operations event_trigger_fops = { .open = event_trigger_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = event_trigger_write, .llseek = tracing_lseek, .release = event_trigger_release,
kernel/trace/trace_kprobe.c +2 -2
@@ -1148,7 +1148,7 @@ static ssize_t probes_write(struct file *file, const char __user *buffer,static const struct file_operations kprobe_events_ops = { .owner =THIS_MODULE , .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
@@ -1193,7 +1193,7 @@ static int profile_open(struct inode *inode, struct file *file)static const struct file_operations kprobe_profile_ops = { .owner =THIS_MODULE , .open = profile_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
kernel/trace/trace_printk.c +1 -1
@@ -360,7 +360,7 @@ ftrace_formats_open(struct inode *inode, struct file *file)static const struct file_operations ftrace_formats_fops = { .open = ftrace_formats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
kernel/trace/trace_stack.c +2 -2
@@ -487,7 +487,7 @@ static int stack_trace_open(struct inode *inode, struct file *file)static const struct file_operations stack_trace_fops = { .open = stack_trace_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -506,7 +506,7 @@ stack_trace_filter_open(struct inode *inode, struct file *file)static const struct file_operations stack_trace_filter_fops = { .open = stack_trace_filter_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = ftrace_filter_write, .llseek = tracing_lseek, .release = ftrace_regex_release,
kernel/trace/trace_stat.c +1 -1
@@ -269,7 +269,7 @@ static int tracing_stat_release(struct inode *i, struct file *f)static const struct file_operations tracing_stat_fops = { .open = tracing_stat_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tracing_stat_release };
kernel/trace/trace_uprobe.c +2 -2
@@ -786,7 +786,7 @@ static ssize_t probes_write(struct file *file, const char __user *buffer,static const struct file_operations uprobe_events_ops = { .owner =THIS_MODULE , .open = probes_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, .write = probes_write,
@@ -828,7 +828,7 @@ static int profile_open(struct inode *inode, struct file *file)static const struct file_operations uprobe_profile_ops = { .owner =THIS_MODULE , .open = profile_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
lib/debugobjects.c +1 -1
@@ -1030,7 +1030,7 @@ static int debug_stats_open(struct inode *inode, struct file *filp)static const struct file_operations debug_stats_fops = { .open = debug_stats_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
lib/dynamic_debug.c +1 -1
@@ -870,7 +870,7 @@ static int ddebug_proc_open(struct inode *inode, struct file *file)static const struct file_operations ddebug_proc_fops = { .owner =THIS_MODULE , .open = ddebug_proc_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release_private, .write = ddebug_proc_write
lib/error-inject.c +1 -1
@@ -208,7 +208,7 @@ static int ei_open(struct inode *inode, struct file *filp)static const struct file_operations debugfs_ei_ops = { .open = ei_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
lib/kunit/debugfs.c +1 -1
@@ -84,7 +84,7 @@ static int debugfs_results_open(struct inode *inode, struct file *file)static const struct file_operations debugfs_results_fops = { .open = debugfs_results_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = debugfs_release, };
mm/kmemleak.c +1 -1
@@ -1834,7 +1834,7 @@ static ssize_t kmemleak_write(struct file *file, const char __user *user_buf,static const struct file_operations kmemleak_fops = { .owner =THIS_MODULE , .open = kmemleak_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = kmemleak_write, .llseek = seq_lseek, .release = seq_release,
net/6lowpan/debugfs.c +1 -1
@@ -157,7 +157,7 @@ static ssize_t lowpan_ctx_pfx_write(struct file *fp,static const struct file_operations lowpan_ctx_pfx_fops = { .open = lowpan_ctx_pfx_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = lowpan_ctx_pfx_write, .llseek = seq_lseek, .release = single_release,
net/batman-adv/debugfs.c +2 -2
@@ -204,7 +204,7 @@ struct batadv_debuginfo batadv_debuginfo_##_name = { \ .fops = { \ .owner = THIS_MODULE, \ .open = _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }, \
@@ -272,7 +272,7 @@ struct batadv_debuginfo batadv_hardif_debuginfo_##_name = { \ .fops = { \ .owner = THIS_MODULE, \ .open = _open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ }, \
net/bluetooth/6lowpan.c +1 -1
@@ -1205,7 +1205,7 @@ static int lowpan_control_open(struct inode *inode, struct file *file)static const struct file_operations lowpan_control_fops = { .open = lowpan_control_open, - .read = seq_read, + .read_iter = seq_read_iter, .write = lowpan_control_write, .llseek = seq_lseek, .release = single_release,
net/hsr/hsr_debugfs.c +1 -1
@@ -80,7 +80,7 @@ void hsr_debugfs_rename(struct net_device *dev)static const struct file_operations hsr_fops = { .open = hsr_node_table_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
net/l2tp/l2tp_debugfs.c +1 -1
@@ -318,7 +318,7 @@ static int l2tp_dfs_seq_release(struct inode *inode, struct file *file)static const struct file_operations l2tp_dfs_fops = { .owner =THIS_MODULE , .open = l2tp_dfs_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = l2tp_dfs_seq_release, };
net/sunrpc/cache.c +1 -1
@@ -1842,7 +1842,7 @@ static int content_release_pipefs(struct inode *inode, struct file *filp)const struct file_operations content_file_operations_pipefs = { .open = content_open_pipefs, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = content_release_pipefs, };
net/sunrpc/debugfs.c +2 -2
@@ -112,7 +112,7 @@ tasks_release(struct inode *inode, struct file *filp)static const struct file_operations tasks_fops = { .owner =THIS_MODULE , .open = tasks_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = tasks_release, };
@@ -211,7 +211,7 @@ xprt_info_release(struct inode *inode, struct file *filp)static const struct file_operations xprt_info_fops = { .owner =THIS_MODULE , .open = xprt_info_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = xprt_info_release, };
net/sunrpc/rpc_pipe.c +1 -1
@@ -449,7 +449,7 @@ rpc_info_release(struct inode *inode, struct file *file)static const struct file_operations rpc_info_operations = { .owner =THIS_MODULE , .open = rpc_info_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = rpc_info_release, };
security/apparmor/apparmorfs.c +5 -5
@@ -1015,7 +1015,7 @@ static int aa_sfs_seq_open(struct inode *inode, struct file *file)const struct file_operations aa_sfs_seq_file_ops = { .owner =THIS_MODULE , .open = aa_sfs_seq_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = single_release, };
@@ -1034,7 +1034,7 @@ static int seq_profile_ ##NAME ##_open(struct inode *inode, struct file *file)\ static const struct file_operations seq_profile_ ##NAME ##_fops = { \ .owner = THIS_MODULE, \ .open = seq_profile_ ##NAME ##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = seq_profile_release, \ } \
@@ -1136,7 +1136,7 @@ static int seq_ns_ ##NAME ##_open(struct inode *inode, struct file *file) \ static const struct file_operations seq_ns_ ##NAME ##_fops = { \ .owner = THIS_MODULE, \ .open = seq_ns_ ##NAME ##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = single_release, \ } \
@@ -1212,7 +1212,7 @@ static int seq_rawdata_ ##NAME ##_open(struct inode *inode, struct file *file)\ static const struct file_operations seq_rawdata_ ##NAME ##_fops = { \ .owner = THIS_MODULE, \ .open = seq_rawdata_ ##NAME ##_open, \ - .read = seq_read, \ + .read_iter = seq_read_iter, \ .llseek = seq_lseek, \ .release = seq_rawdata_release, \ } \
@@ -2280,7 +2280,7 @@ static int profiles_release(struct inode *inode, struct file *file)static const struct file_operations aa_sfs_profiles_fops = { .open = profiles_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = profiles_release, };
security/integrity/ima/ima_fs.c +3 -3
@@ -199,7 +199,7 @@ static int ima_measurements_open(struct inode *inode, struct file *file)static const struct file_operations ima_measurements_ops = { .open = ima_measurements_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -265,7 +265,7 @@ static int ima_ascii_measurements_open(struct inode *inode, struct file *file)static const struct file_operations ima_ascii_measurements_ops = { .open = ima_ascii_measurements_open, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
@@ -441,7 +441,7 @@ static int ima_release_policy(struct inode *inode, struct file *file)static const struct file_operations ima_measure_policy_ops = { .open = ima_open_policy, .write = ima_write_policy, - .read = seq_read, + .read_iter = seq_read_iter, .release = ima_release_policy, .llseek = generic_file_llseek, };
security/selinux/selinuxfs.c +1 -1
@@ -1598,7 +1598,7 @@ static int sel_open_avc_cache_stats(struct inode *inode, struct file *file)static const struct file_operations sel_avc_cache_stats_ops = { .open = sel_open_avc_cache_stats, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .release = seq_release, };
security/smack/smackfs.c +10 -10
@@ -671,7 +671,7 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,static const struct file_operations smk_load_ops = { .open = smk_open_load, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_load, .release = seq_release,
@@ -944,7 +944,7 @@ static ssize_t smk_write_cipso(struct file *file, const char __user *buf,static const struct file_operations smk_cipso_ops = { .open = smk_open_cipso, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_cipso, .release = seq_release,
@@ -1018,7 +1018,7 @@ static ssize_t smk_write_cipso2(struct file *file, const char __user *buf,static const struct file_operations smk_cipso2_ops = { .open = smk_open_cipso2, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_cipso2, .release = seq_release,
@@ -1283,7 +1283,7 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,static const struct file_operations smk_net4addr_ops = { .open = smk_open_net4addr, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_net4addr, .release = seq_release,
@@ -1540,7 +1540,7 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,static const struct file_operations smk_net6addr_ops = { .open = smk_open_net6addr, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_net6addr, .release = seq_release,
@@ -2028,7 +2028,7 @@ static ssize_t smk_write_onlycap(struct file *file, const char __user *buf,static const struct file_operations smk_onlycap_ops = { .open = smk_open_onlycap, - .read = seq_read, + .read_iter = seq_read_iter, .write = smk_write_onlycap, .llseek = seq_lseek, .release = seq_release,
@@ -2252,7 +2252,7 @@ static ssize_t smk_write_load_self(struct file *file, const char __user *buf,static const struct file_operations smk_load_self_ops = { .open = smk_open_load_self, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_load_self, .release = seq_release,
@@ -2386,7 +2386,7 @@ static ssize_t smk_write_load2(struct file *file, const char __user *buf,static const struct file_operations smk_load2_ops = { .open = smk_open_load2, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_load2, .release = seq_release,
@@ -2459,7 +2459,7 @@ static ssize_t smk_write_load_self2(struct file *file, const char __user *buf,static const struct file_operations smk_load_self2_ops = { .open = smk_open_load_self2, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_load_self2, .release = seq_release,
@@ -2756,7 +2756,7 @@ static ssize_t smk_write_relabel_self(struct file *file, const char __user *buf,static const struct file_operations smk_relabel_self_ops = { .open = smk_open_relabel_self, - .read = seq_read, + .read_iter = seq_read_iter, .llseek = seq_lseek, .write = smk_write_relabel_self, .release = seq_release,
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 9/11 proc: switch over direct seq_read method calls to seq_read_iter
In reply to Christoph HellwigSwitch over all instances used directly as methods using these sed expressions:
sed -i -e 's/\.proc_read\(\s*=\s*\)seq_read/\.proc_read_iter\1seq_read_iter/g'
--- arch/alpha/kernel/srm_env.c | 2 +- arch/arm/mm/alignment.c | 2 +- arch/powerpc/kernel/rtas-proc.c | 10 +++++----- arch/powerpc/mm/numa.c | 2 +- arch/powerpc/platforms/pseries/lpar.c | 4 ++-- arch/powerpc/platforms/pseries/lparcfg.c | 2 +- arch/sh/mm/alignment.c | 2 +- arch/sparc/kernel/led.c | 2 +- arch/um/kernel/exitcode.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/kernel/cpu/mtrr/if.c | 2 +- arch/x86/platform/uv/tlb_uv.c | 2 +- drivers/acpi/battery.c | 2 +- drivers/acpi/proc.c | 2 +- drivers/hwmon/dell-smm-hwmon.c | 2 +- drivers/ide/ide-proc.c | 2 +- drivers/input/input.c | 4 ++-- drivers/macintosh/via-pmu.c | 2 +- drivers/md/md.c | 2 +- drivers/misc/sgi-gru/gruprocfs.c | 6 +++--- drivers/net/wireless/intel/ipw2x00/libipw_module.c | 2 +- .../net/wireless/intersil/hostap/hostap_download.c | 2 +- drivers/parisc/led.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/toshiba_acpi.c | 8 ++++---- drivers/pnp/pnpbios/proc.c | 2 +- drivers/s390/block/dasd_proc.c | 2 +- drivers/s390/cio/blacklist.c | 2 +- drivers/scsi/scsi_devinfo.c | 2 +- drivers/scsi/scsi_proc.c | 4 ++-- drivers/scsi/sg.c | 4 ++-- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- drivers/usb/gadget/function/rndis.c | 2 +- drivers/video/fbdev/via/viafbdev.c | 14 +++++++------- fs/cifs/cifs_debug.c | 14 +++++++------- fs/cifs/dfs_cache.c | 2 +- fs/fscache/object-list.c | 2 +- fs/jbd2/journal.c | 2 +- fs/jfs/jfs_debug.c | 2 +- fs/nfsd/nfsctl.c | 2 +- fs/nfsd/stats.c | 2 +- fs/proc/cpuinfo.c | 2 +- fs/proc/generic.c | 4 ++-- fs/proc/proc_net.c | 4 ++-- fs/proc/stat.c | 2 +- include/linux/seq_file.h | 2 +- ipc/util.c | 2 +- kernel/irq/proc.c | 6 +++--- kernel/kallsyms.c | 2 +- kernel/latencytop.c | 2 +- kernel/locking/lockdep_proc.c | 2 +- kernel/module.c | 2 +- kernel/profile.c | 2 +- kernel/sched/psi.c | 6 +++--- lib/dynamic_debug.c | 2 +- mm/slab_common.c | 2 +- mm/swapfile.c | 2 +- net/atm/mpoa_proc.c | 2 +- net/core/pktgen.c | 6 +++--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- net/ipv4/route.c | 4 ++-- net/netfilter/xt_recent.c | 2 +- net/sunrpc/cache.c | 2 +- net/sunrpc/stats.c | 2 +- sound/core/info.c | 2 +- 65 files changed, 99 insertions(+), 99 deletions(-)
arch/alpha/kernel/srm_env.c +1 -1
@@ -121,7 +121,7 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,static const struct proc_ops srm_env_proc_ops = { .proc_open = srm_env_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = srm_env_proc_write,
arch/arm/mm/alignment.c +1 -1
@@ -164,7 +164,7 @@ static ssize_t alignment_proc_write(struct file *file, const char __user *bufferstatic const struct proc_ops alignment_proc_ops = { .proc_open = alignment_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = alignment_proc_write,
arch/powerpc/kernel/rtas-proc.c +5 -5
@@ -161,7 +161,7 @@ static int poweron_open(struct inode *inode, struct file *file)static const struct proc_ops ppc_rtas_poweron_proc_ops = { .proc_open = poweron_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = ppc_rtas_poweron_write, .proc_release = single_release,
@@ -174,7 +174,7 @@ static int progress_open(struct inode *inode, struct file *file)static const struct proc_ops ppc_rtas_progress_proc_ops = { .proc_open = progress_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = ppc_rtas_progress_write, .proc_release = single_release,
@@ -187,7 +187,7 @@ static int clock_open(struct inode *inode, struct file *file)static const struct proc_ops ppc_rtas_clock_proc_ops = { .proc_open = clock_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = ppc_rtas_clock_write, .proc_release = single_release,
@@ -200,7 +200,7 @@ static int tone_freq_open(struct inode *inode, struct file *file)static const struct proc_ops ppc_rtas_tone_freq_proc_ops = { .proc_open = tone_freq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = ppc_rtas_tone_freq_write, .proc_release = single_release,
@@ -213,7 +213,7 @@ static int tone_volume_open(struct inode *inode, struct file *file)static const struct proc_ops ppc_rtas_tone_volume_proc_ops = { .proc_open = tone_volume_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = ppc_rtas_tone_volume_write, .proc_release = single_release,
arch/powerpc/mm/numa.c +1 -1
@@ -1672,7 +1672,7 @@ static ssize_t topology_write(struct file *file, const char __user *buf, }static const struct proc_ops topology_proc_ops = { - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = topology_write, .proc_open = topology_open, .proc_release = single_release,
arch/powerpc/platforms/pseries/lpar.c +2 -2
@@ -584,7 +584,7 @@ static int vcpudispatch_stats_open(struct inode *inode, struct file *file)static const struct proc_ops vcpudispatch_stats_proc_ops = { .proc_open = vcpudispatch_stats_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = vcpudispatch_stats_write, .proc_lseek = seq_lseek, .proc_release = single_release,
@@ -628,7 +628,7 @@ static int vcpudispatch_stats_freq_open(struct inode *inode, struct file *file)static const struct proc_ops vcpudispatch_stats_freq_proc_ops = { .proc_open = vcpudispatch_stats_freq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = vcpudispatch_stats_freq_write, .proc_lseek = seq_lseek, .proc_release = single_release,
arch/powerpc/platforms/pseries/lparcfg.c +1 -1
@@ -699,7 +699,7 @@ static int lparcfg_open(struct inode *inode, struct file *file) }static const struct proc_ops lparcfg_proc_ops = { - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = lparcfg_write, .proc_open = lparcfg_open, .proc_release = single_release,
arch/sh/mm/alignment.c +1 -1
@@ -154,7 +154,7 @@ static ssize_t alignment_proc_write(struct file *file,static const struct proc_ops alignment_proc_ops = { .proc_open = alignment_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = alignment_proc_write,
arch/sparc/kernel/led.c +1 -1
@@ -106,7 +106,7 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer,static const struct proc_ops led_proc_ops = { .proc_open = led_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = led_proc_write,
arch/um/kernel/exitcode.c +1 -1
@@ -57,7 +57,7 @@ static ssize_t exitcode_proc_write(struct file *file,static const struct proc_ops exitcode_proc_ops = { .proc_open = exitcode_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = exitcode_proc_write,
arch/um/kernel/process.c +1 -1
@@ -312,7 +312,7 @@ static ssize_t sysemu_proc_write(struct file *file, const char __user *buf,static const struct proc_ops sysemu_proc_ops = { .proc_open = sysemu_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = sysemu_proc_write,
arch/x86/kernel/cpu/mtrr/if.c +1 -1
@@ -398,7 +398,7 @@ static int mtrr_open(struct inode *inode, struct file *file)static const struct proc_ops mtrr_proc_ops = { .proc_open = mtrr_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = mtrr_write, .proc_ioctl = mtrr_ioctl,
arch/x86/platform/uv/tlb_uv.c +1 -1
@@ -1670,7 +1670,7 @@ static int tunables_open(struct inode *inode, struct file *file)static const struct proc_ops uv_ptc_proc_ops = { .proc_open = ptc_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = ptc_proc_write, .proc_lseek = seq_lseek, .proc_release = seq_release,
drivers/acpi/battery.c +1 -1
@@ -1204,7 +1204,7 @@ static int acpi_battery_alarm_proc_open(struct inode *inode, struct file *file)static const struct proc_ops acpi_battery_alarm_proc_ops = { .proc_open = acpi_battery_alarm_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = acpi_battery_write_alarm, .proc_lseek = seq_lseek, .proc_release = single_release,
drivers/acpi/proc.c +1 -1
@@ -136,7 +136,7 @@ acpi_system_wakeup_device_open_fs(struct inode *inode, struct file *file)static const struct proc_ops acpi_system_wakeup_device_proc_ops = { .proc_open = acpi_system_wakeup_device_open_fs, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = acpi_system_write_wakeup_device, .proc_lseek = seq_lseek, .proc_release = single_release,
drivers/hwmon/dell-smm-hwmon.c +1 -1
@@ -597,7 +597,7 @@ static int i8k_open_fs(struct inode *inode, struct file *file)static const struct proc_ops i8k_proc_ops = { .proc_open = i8k_open_fs, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_ioctl = i8k_ioctl,
drivers/ide/ide-proc.c +1 -1
@@ -383,7 +383,7 @@ static ssize_t ide_settings_proc_write(struct file *file, const char __user *bufstatic const struct proc_ops ide_settings_proc_ops = { .proc_open = ide_settings_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = ide_settings_proc_write,
drivers/input/input.c +2 -2
@@ -1220,7 +1220,7 @@ static int input_proc_devices_open(struct inode *inode, struct file *file)static const struct proc_ops input_devices_proc_ops = { .proc_open = input_proc_devices_open, .proc_poll = input_proc_devices_poll, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
@@ -1282,7 +1282,7 @@ static int input_proc_handlers_open(struct inode *inode, struct file *file)static const struct proc_ops input_handlers_proc_ops = { .proc_open = input_proc_handlers_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
drivers/macintosh/via-pmu.c +1 -1
@@ -973,7 +973,7 @@ static ssize_t pmu_options_proc_write(struct file *file,static const struct proc_ops pmu_options_proc_ops = { .proc_open = pmu_options_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = pmu_options_proc_write,
drivers/md/md.c +1 -1
@@ -8301,7 +8301,7 @@ static __poll_t mdstat_poll(struct file *filp, poll_table *wait)static const struct proc_ops mdstat_proc_ops = { .proc_open = md_seq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, .proc_poll = mdstat_poll,
drivers/misc/sgi-gru/gruprocfs.c +3 -3
@@ -257,7 +257,7 @@ static int options_open(struct inode *inode, struct file *file)/* *INDENT-OFF* */ static const struct proc_ops statistics_proc_ops = { .proc_open = statistics_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = statistics_write, .proc_lseek = seq_lseek, .proc_release = single_release,
@@ -265,7 +265,7 @@ static const struct proc_ops statistics_proc_ops = {static const struct proc_ops mcs_statistics_proc_ops = { .proc_open = mcs_statistics_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = mcs_statistics_write, .proc_lseek = seq_lseek, .proc_release = single_release,
@@ -273,7 +273,7 @@ static const struct proc_ops mcs_statistics_proc_ops = {static const struct proc_ops options_proc_ops = { .proc_open = options_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = options_write, .proc_lseek = seq_lseek, .proc_release = single_release,
drivers/net/wireless/intel/ipw2x00/libipw_module.c +1 -1
@@ -242,7 +242,7 @@ static ssize_t debug_level_proc_write(struct file *file,static const struct proc_ops debug_level_proc_ops = { .proc_open = debug_level_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = debug_level_proc_write,
drivers/net/wireless/intersil/hostap/hostap_download.c +1 -1
@@ -234,7 +234,7 @@ static int prism2_download_aux_dump_proc_open(struct inode *inode, struct file *static const struct proc_ops prism2_download_aux_dump_proc_ops = { .proc_open = prism2_download_aux_dump_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release_private, };
drivers/parisc/led.c +1 -1
@@ -232,7 +232,7 @@ static ssize_t led_proc_write(struct file *file, const char __user *buf,static const struct proc_ops led_proc_ops = { .proc_open = led_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = led_proc_write,
drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -901,7 +901,7 @@ static ssize_t dispatch_proc_write(struct file *file,static const struct proc_ops dispatch_proc_ops = { .proc_open = dispatch_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = dispatch_proc_write,
drivers/platform/x86/toshiba_acpi.c +4 -4
@@ -1428,7 +1428,7 @@ static ssize_t lcd_proc_write(struct file *file, const char __user *buf,static const struct proc_ops lcd_proc_ops = { .proc_open = lcd_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = lcd_proc_write,
@@ -1534,7 +1534,7 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,static const struct proc_ops video_proc_ops = { .proc_open = video_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = video_proc_write,
@@ -1611,7 +1611,7 @@ static ssize_t fan_proc_write(struct file *file, const char __user *buf,static const struct proc_ops fan_proc_ops = { .proc_open = fan_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = fan_proc_write,
@@ -1655,7 +1655,7 @@ static ssize_t keys_proc_write(struct file *file, const char __user *buf,static const struct proc_ops keys_proc_ops = { .proc_open = keys_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = keys_proc_write,
drivers/pnp/pnpbios/proc.c +1 -1
@@ -212,7 +212,7 @@ static ssize_t pnpbios_proc_write(struct file *file, const char __user *buf,static const struct proc_ops pnpbios_proc_ops = { .proc_open = pnpbios_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = pnpbios_proc_write,
drivers/s390/block/dasd_proc.c +1 -1
@@ -322,7 +322,7 @@ static ssize_t dasd_stats_proc_write(struct file *file,static const struct proc_ops dasd_stats_proc_ops = { .proc_open = dasd_stats_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = dasd_stats_proc_write,
drivers/s390/cio/blacklist.c +1 -1
@@ -401,7 +401,7 @@ cio_ignore_proc_open(struct inode *inode, struct file *file)static const struct proc_ops cio_ignore_proc_ops = { .proc_open = cio_ignore_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release_private, .proc_write = cio_ignore_write,
drivers/scsi/scsi_devinfo.c +1 -1
@@ -738,7 +738,7 @@ static ssize_t proc_scsi_devinfo_write(struct file *file,static const struct proc_ops scsi_devinfo_proc_ops = { .proc_open = proc_scsi_devinfo_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = proc_scsi_devinfo_write, .proc_lseek = seq_lseek, .proc_release = seq_release,
drivers/scsi/scsi_proc.c +2 -2
@@ -86,7 +86,7 @@ static int proc_scsi_host_open(struct inode *inode, struct file *file)static const struct proc_ops proc_scsi_ops = { .proc_open = proc_scsi_host_open, .proc_release = single_release, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = proc_scsi_host_write };
@@ -438,7 +438,7 @@ static int proc_scsi_open(struct inode *inode, struct file *file)static const struct proc_ops scsi_scsi_proc_ops = { .proc_open = proc_scsi_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = proc_scsi_write, .proc_lseek = seq_lseek, .proc_release = seq_release,
drivers/scsi/sg.c +2 -2
@@ -2328,7 +2328,7 @@ static ssize_t sg_proc_write_adio(struct file *filp, const char __user *buffer, size_t count, loff_t *off);static const struct proc_ops adio_proc_ops = { .proc_open = sg_proc_single_open_adio, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = sg_proc_write_adio, .proc_release = single_release,
@@ -2339,7 +2339,7 @@ static ssize_t sg_proc_write_dressz(struct file *filp, const char __user *buffer, size_t count, loff_t *off);static const struct proc_ops dressz_proc_ops = { .proc_open = sg_proc_single_open_dressz, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = sg_proc_write_dressz, .proc_release = single_release,
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +1 -1
@@ -265,7 +265,7 @@ static int open_debug_level(struct inode *inode, struct file *file)static const struct proc_ops debug_level_proc_ops = { .proc_open = open_debug_level, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = write_debug_level, .proc_release = single_release,
drivers/usb/gadget/function/rndis.c +1 -1
@@ -1166,7 +1166,7 @@ static int rndis_proc_open(struct inode *inode, struct file *file)static const struct proc_ops rndis_proc_ops = { .proc_open = rndis_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = rndis_proc_write,
drivers/video/fbdev/via/viafbdev.c +7 -7
@@ -1175,7 +1175,7 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,static const struct proc_ops viafb_dvp0_proc_ops = { .proc_open = viafb_dvp0_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_dvp0_proc_write,
@@ -1239,7 +1239,7 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,static const struct proc_ops viafb_dvp1_proc_ops = { .proc_open = viafb_dvp1_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_dvp1_proc_write,
@@ -1273,7 +1273,7 @@ static ssize_t viafb_dfph_proc_write(struct file *file,static const struct proc_ops viafb_dfph_proc_ops = { .proc_open = viafb_dfph_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_dfph_proc_write,
@@ -1307,7 +1307,7 @@ static ssize_t viafb_dfpl_proc_write(struct file *file,static const struct proc_ops viafb_dfpl_proc_ops = { .proc_open = viafb_dfpl_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_dfpl_proc_write,
@@ -1442,7 +1442,7 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,static const struct proc_ops viafb_vt1636_proc_ops = { .proc_open = viafb_vt1636_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_vt1636_proc_write,
@@ -1519,7 +1519,7 @@ static ssize_t viafb_iga1_odev_proc_write(struct file *file,static const struct proc_ops viafb_iga1_odev_proc_ops = { .proc_open = viafb_iga1_odev_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_iga1_odev_proc_write,
@@ -1558,7 +1558,7 @@ static ssize_t viafb_iga2_odev_proc_write(struct file *file,static const struct proc_ops viafb_iga2_odev_proc_ops = { .proc_open = viafb_iga2_odev_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = viafb_iga2_odev_proc_write,
fs/cifs/cifs_debug.c +7 -7
@@ -615,7 +615,7 @@ static int cifs_stats_proc_open(struct inode *inode, struct file *file)static const struct proc_ops cifs_stats_proc_ops = { .proc_open = cifs_stats_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = cifs_stats_proc_write,
@@ -644,7 +644,7 @@ static int name##_open(struct inode *inode, struct file *file) \ \ static const struct proc_ops cifs_##name##_proc_fops = { \ .proc_open = name##_open, \ - .proc_read = seq_read, \ + .proc_read_iter = seq_read_iter, \ .proc_lseek = seq_lseek, \ .proc_release = single_release, \ .proc_write = name##_write, \
@@ -778,7 +778,7 @@ static ssize_t cifsFYI_proc_write(struct file *file, const char __user *buffer,static const struct proc_ops cifsFYI_proc_ops = { .proc_open = cifsFYI_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = cifsFYI_proc_write,
@@ -809,7 +809,7 @@ static ssize_t cifs_linux_ext_proc_write(struct file *file,static const struct proc_ops cifs_linux_ext_proc_ops = { .proc_open = cifs_linux_ext_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = cifs_linux_ext_proc_write,
@@ -840,7 +840,7 @@ static ssize_t cifs_lookup_cache_proc_write(struct file *file,static const struct proc_ops cifs_lookup_cache_proc_ops = { .proc_open = cifs_lookup_cache_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = cifs_lookup_cache_proc_write,
@@ -871,7 +871,7 @@ static ssize_t traceSMB_proc_write(struct file *file, const char __user *buffer,static const struct proc_ops traceSMB_proc_ops = { .proc_open = traceSMB_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = traceSMB_proc_write,
@@ -982,7 +982,7 @@ static ssize_t cifs_security_flags_proc_write(struct file *file,static const struct proc_ops cifs_security_flags_proc_ops = { .proc_open = cifs_security_flags_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = cifs_security_flags_proc_write,
fs/cifs/dfs_cache.c +1 -1
@@ -214,7 +214,7 @@ static int dfscache_proc_open(struct inode *inode, struct file *file)const struct proc_ops dfscache_proc_ops = { .proc_open = dfscache_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = dfscache_proc_write,
fs/fscache/object-list.c +1 -1
@@ -408,7 +408,7 @@ static int fscache_objlist_release(struct inode *inode, struct file *file)const struct proc_ops fscache_objlist_proc_ops = { .proc_open = fscache_objlist_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = fscache_objlist_release, };
fs/jbd2/journal.c +1 -1
@@ -1080,7 +1080,7 @@ static int jbd2_seq_info_release(struct inode *inode, struct file *file)static const struct proc_ops jbd2_info_proc_ops = { .proc_open = jbd2_seq_info_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = jbd2_seq_info_release, };
fs/jfs/jfs_debug.c +1 -1
@@ -45,7 +45,7 @@ static ssize_t jfs_loglevel_proc_write(struct file *file,static const struct proc_ops jfs_loglevel_proc_ops = { .proc_open = jfs_loglevel_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = jfs_loglevel_proc_write,
fs/nfsd/nfsctl.c +1 -1
@@ -159,7 +159,7 @@ static int exports_proc_open(struct inode *inode, struct file *file)static const struct proc_ops exports_proc_ops = { .proc_open = exports_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
fs/nfsd/stats.c +1 -1
@@ -86,7 +86,7 @@ static int nfsd_proc_open(struct inode *inode, struct file *file)static const struct proc_ops nfsd_proc_ops = { .proc_open = nfsd_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, };
fs/proc/cpuinfo.c +1 -1
@@ -19,7 +19,7 @@ static int cpuinfo_open(struct inode *inode, struct file *file)static const struct proc_ops cpuinfo_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = cpuinfo_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
fs/proc/generic.c +2 -2
@@ -590,7 +590,7 @@ static int proc_seq_release(struct inode *inode, struct file *file)static const struct proc_ops proc_seq_ops = {/* not permanent -- can call into arbitrary seq_operations */ .proc_open = proc_seq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = proc_seq_release, };
@@ -621,7 +621,7 @@ static int proc_single_open(struct inode *inode, struct file *file)static const struct proc_ops proc_single_ops = {/* not permanent -- can call into arbitrary ->single_show */ .proc_open = proc_single_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, };
fs/proc/proc_net.c +2 -2
@@ -92,7 +92,7 @@ static int seq_release_net(struct inode *ino, struct file *f)static const struct proc_ops proc_net_seq_ops = { .proc_open = seq_open_net, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = proc_simple_write, .proc_lseek = seq_lseek, .proc_release = seq_release_net,
@@ -204,7 +204,7 @@ static int single_release_net(struct inode *ino, struct file *f)static const struct proc_ops proc_net_single_ops = { .proc_open = single_open_net, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = proc_simple_write, .proc_lseek = seq_lseek, .proc_release = single_release_net,
fs/proc/stat.c +1 -1
@@ -226,7 +226,7 @@ static int stat_open(struct inode *inode, struct file *file)static const struct proc_ops stat_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = stat_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, };
include/linux/seq_file.h +1 -1
@@ -187,7 +187,7 @@ static int __name ## _open(struct inode *inode, struct file *file) \ \ static const struct proc_ops __name ## _proc_ops = { \ .proc_open = __name ## _open, \ - .proc_read = seq_read, \ + .proc_read_iter = seq_read_iter, \ .proc_lseek = seq_lseek, \ .proc_release = single_release, \ }
ipc/util.c +1 -1
@@ -887,7 +887,7 @@ static int sysvipc_proc_release(struct inode *inode, struct file *file)static const struct proc_ops sysvipc_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = sysvipc_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = sysvipc_proc_release, };
kernel/irq/proc.c +3 -3
@@ -200,7 +200,7 @@ static int irq_affinity_list_proc_open(struct inode *inode, struct file *file)static const struct proc_ops irq_affinity_proc_ops = { .proc_open = irq_affinity_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = irq_affinity_proc_write,
@@ -208,7 +208,7 @@ static const struct proc_ops irq_affinity_proc_ops = {static const struct proc_ops irq_affinity_list_proc_ops = { .proc_open = irq_affinity_list_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = irq_affinity_list_proc_write,
@@ -270,7 +270,7 @@ static int default_affinity_open(struct inode *inode, struct file *file)static const struct proc_ops default_affinity_proc_ops = { .proc_open = default_affinity_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = default_affinity_write,
kernel/kallsyms.c +1 -1
@@ -699,7 +699,7 @@ const char *kdb_walk_kallsyms(loff_t *pos)static const struct proc_ops kallsyms_proc_ops = { .proc_open = kallsyms_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release_private, };
kernel/latencytop.c +1 -1
@@ -257,7 +257,7 @@ static int lstats_open(struct inode *inode, struct file *filp)static const struct proc_ops lstats_proc_ops = { .proc_open = lstats_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = lstats_write, .proc_lseek = seq_lseek, .proc_release = single_release,
kernel/locking/lockdep_proc.c +1 -1
@@ -669,7 +669,7 @@ static int lock_stat_release(struct inode *inode, struct file *file)static const struct proc_ops lock_stat_proc_ops = { .proc_open = lock_stat_open, .proc_write = lock_stat_write, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = lock_stat_release, };
kernel/module.c +1 -1
@@ -4386,7 +4386,7 @@ static int modules_open(struct inode *inode, struct file *file)static const struct proc_ops modules_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = modules_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
kernel/profile.c +1 -1
@@ -444,7 +444,7 @@ static ssize_t prof_cpu_mask_proc_write(struct file *file,static const struct proc_ops prof_cpu_mask_proc_ops = { .proc_open = prof_cpu_mask_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, .proc_write = prof_cpu_mask_proc_write,
kernel/sched/psi.c +3 -3
@@ -1305,7 +1305,7 @@ static int psi_fop_release(struct inode *inode, struct file *file)static const struct proc_ops psi_io_proc_ops = { .proc_open = psi_io_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = psi_io_write, .proc_poll = psi_fop_poll,
@@ -1314,7 +1314,7 @@ static const struct proc_ops psi_io_proc_ops = {static const struct proc_ops psi_memory_proc_ops = { .proc_open = psi_memory_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = psi_memory_write, .proc_poll = psi_fop_poll,
@@ -1323,7 +1323,7 @@ static const struct proc_ops psi_memory_proc_ops = {static const struct proc_ops psi_cpu_proc_ops = { .proc_open = psi_cpu_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = psi_cpu_write, .proc_poll = psi_fop_poll,
lib/dynamic_debug.c +1 -1
@@ -878,7 +878,7 @@ static const struct file_operations ddebug_proc_fops = {static const struct proc_ops proc_fops = { .proc_open = ddebug_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release_private, .proc_write = ddebug_proc_write
mm/slab_common.c +1 -1
@@ -1584,7 +1584,7 @@ static int slabinfo_open(struct inode *inode, struct file *file)static const struct proc_ops slabinfo_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = slabinfo_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = slabinfo_write, .proc_lseek = seq_lseek, .proc_release = seq_release,
mm/swapfile.c +1 -1
@@ -2835,7 +2835,7 @@ static int swaps_open(struct inode *inode, struct file *file)static const struct proc_ops swaps_proc_ops = { .proc_flags =PROC_ENTRY_PERMANENT , .proc_open = swaps_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, .proc_poll = swaps_poll,
net/atm/mpoa_proc.c +1 -1
@@ -55,7 +55,7 @@ static int parse_qos(const char *buff);static const struct proc_ops mpc_proc_ops = { .proc_open = proc_mpc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = proc_mpc_write, .proc_release = seq_release,
net/core/pktgen.c +3 -3
@@ -537,7 +537,7 @@ static int pgctrl_open(struct inode *inode, struct file *file)static const struct proc_ops pktgen_proc_ops = { .proc_open = pgctrl_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = pgctrl_write, .proc_release = single_release,
@@ -1709,7 +1709,7 @@ static int pktgen_if_open(struct inode *inode, struct file *file)static const struct proc_ops pktgen_if_proc_ops = { .proc_open = pktgen_if_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = pktgen_if_write, .proc_release = single_release,
@@ -1846,7 +1846,7 @@ static int pktgen_thread_open(struct inode *inode, struct file *file)static const struct proc_ops pktgen_thread_proc_ops = { .proc_open = pktgen_thread_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_write = pktgen_thread_write, .proc_release = single_release,
net/ipv4/netfilter/ipt_CLUSTERIP.c +1 -1
@@ -806,7 +806,7 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input,static const struct proc_ops clusterip_proc_ops = { .proc_open = clusterip_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = clusterip_proc_write, .proc_lseek = seq_lseek, .proc_release = clusterip_proc_release,
net/ipv4/route.c +2 -2
@@ -239,7 +239,7 @@ static int rt_cache_seq_open(struct inode *inode, struct file *file)static const struct proc_ops rt_cache_proc_ops = { .proc_open = rt_cache_seq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
@@ -330,7 +330,7 @@ static int rt_cpu_seq_open(struct inode *inode, struct file *file)static const struct proc_ops rt_cpu_proc_ops = { .proc_open = rt_cpu_seq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = seq_release, };
net/netfilter/xt_recent.c +1 -1
@@ -618,7 +618,7 @@ recent_mt_proc_write(struct file *file, const char __user *input,static const struct proc_ops recent_mt_proc_ops = { .proc_open = recent_seq_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_write = recent_mt_proc_write, .proc_release = seq_release_private, .proc_lseek = seq_lseek,
net/sunrpc/cache.c +1 -1
@@ -1623,7 +1623,7 @@ static int content_release_procfs(struct inode *inode, struct file *filp)static const struct proc_ops content_proc_ops = { .proc_open = content_open_procfs, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = content_release_procfs, };
net/sunrpc/stats.c +1 -1
@@ -71,7 +71,7 @@ static int rpc_proc_open(struct inode *inode, struct file *file)static const struct proc_ops rpc_proc_ops = { .proc_open = rpc_proc_open, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, .proc_lseek = seq_lseek, .proc_release = single_release, };
sound/core/info.c +1 -1
@@ -426,7 +426,7 @@ static const struct proc_ops snd_info_text_entry_ops = .proc_release = snd_info_text_entry_release, .proc_write = snd_info_text_entry_write, .proc_lseek = seq_lseek, - .proc_read = seq_read, + .proc_read_iter = seq_read_iter, }; static struct snd_info_entry *create_subdir(struct module *mod,
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 10/11 fs: don't allow kernel reads and writes using ->read and ->write
In reply to Christoph HellwigDon't allow calling ->read or ->write with set_fs as a preparation for killing off set_fs. While I've not triggered any of these cases in my setups as all the usual suspect (file systems, pipes, sockets, block devices, system character devices) use the iter ops this is almost going to be guaranteed to eventuall break something, so print a detailed error message helping to debug such cases. The fix will be to switch the affected driver to use ->read_uptr / ->write_uptr or ->read_iter / ->write_iter.
--- fs/read_write.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
fs/read_write.c +16 -13
@@ -420,6 +420,18 @@ ssize_t iter_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos,return ret; } +static void warn_unsupported (struct file *file,const char *op) +{ +char pathname[128 ], *path; + + path =file_path (file, pathname,sizeof (pathname)); +if (IS_ERR (path)) + path ="(unknown)" ; +pr_warn_ratelimited ( +"kernel space %s not supported for file %s (pid: %d comm: %.20s)\n" , + op, path, current->pid, current->comm); +} +ssize_t __kernel_read (struct file *file,void *buf,size_t count,loff_t *pos) {ssize_t ret;
@@ -433,12 +445,6 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) count =MAX_RW_COUNT ;if (file->f_op->read_uptr) { ret = file->f_op->read_uptr (file,KERNEL_UPTR (buf), count, pos); - }else if (file->f_op->read) { -mm_segment_t old_fs =get_fs (); - -set_fs (KERNEL_DS ); - ret = file->f_op->read (file, (void __user *)buf, count, pos); -set_fs (old_fs); }else if (file->f_op->read_iter) {struct kvec iov = { .iov_base = buf, .iov_len = count };struct kiocb kiocb;
@@ -450,6 +456,8 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos) ret = file->f_op->read_iter (&kiocb, &iter); *pos = kiocb.ki_pos; }else { +if (file->f_op->read) +warn_unsupported (file,"read" ); ret = -EINVAL ; }if (ret >0 ) {
@@ -539,13 +547,6 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count,if (file->f_op->write_uptr) { ret = file->f_op->write_uptr (file,KERNEL_UPTR ((void *)buf), count, pos); - }else if (file->f_op->write) { -mm_segment_t old_fs =get_fs (); - -set_fs (KERNEL_DS ); - ret = file->f_op->write (file, (__force const char __user *)buf, - count, pos); -set_fs (old_fs); }else if (file->f_op->write_iter) {struct kvec iov = { .iov_base = (void *)buf, .iov_len = count };struct kiocb kiocb;
@@ -558,6 +559,8 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count,if (ret >0 ) *pos = kiocb.ki_pos; }else { +if (file->f_op->write) +warn_unsupported (file,"write" ); ret = -EINVAL ; }if (ret >0 ) {
Signature · 1 line
2.26.2
Christoph Hellwig
maintainerPATCH 11/11 fs: don't allow splice read/write without explicit ops
In reply to Christoph HellwigNow that __kernel_write or __kernel_write don't just work on all file operations instances there is not much of a point of providing default splice methods. Renamed the existing default ones to simple_ and wire them up for the few instancas actually implementing ->read_uptr and ->write_uptr.
--- fs/proc/proc_sysctl.c | 2 ++ fs/splice.c | 40 ++++++++++++++++++++++++++++------------ include/linux/fs.h | 5 ++++- 3 files changed, 34 insertions(+), 13 deletions(-)
fs/proc/proc_sysctl.c +2 -0
@@ -856,6 +856,8 @@ static const struct file_operations proc_sys_file_operations = { .poll = proc_sys_poll, .read_uptr = proc_sys_read, .write_uptr = proc_sys_write, + .splice_read = simple_splice_read, + .splice_write = simple_splice_write, .llseek = default_llseek, };
fs/splice.c +28 -12
@@ -342,9 +342,8 @@ const struct pipe_buf_operations nosteal_pipe_buf_ops = { };EXPORT_SYMBOL (nosteal_pipe_buf_ops); -static ssize_t default_file_splice_read (struct file *in,loff_t *ppos, -struct pipe_inode_info *pipe,size_t len, -unsigned int flags) +ssize_t simple_splice_read (struct file *in,loff_t *ppos, +struct pipe_inode_info *pipe,size_t len,unsigned int flags) {struct iov_iter to;struct page **pages;
@@ -779,9 +778,8 @@ static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf,return ret; } -static ssize_t default_file_splice_write (struct pipe_inode_info *pipe, -struct file *out,loff_t *ppos, -size_t len,unsigned int flags) +ssize_t simple_splice_write (struct pipe_inode_info *pipe,struct file *out, +loff_t *ppos,size_t len,unsigned int flags) {ssize_t ret;
@@ -813,15 +811,30 @@ ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out,EXPORT_SYMBOL (generic_splice_sendpage); +static void warn_unsupported (struct file *file,const char *op) +{ +char pathname[128 ], *path; + + path =file_path (file, pathname,sizeof (pathname)); +if (IS_ERR (path)) + path ="(unknown)" ; +pr_debug_ratelimited ( +"splice %s not supported for file %s (pid: %d comm: %.20s)\n" , + op, path, current->pid, current->comm); +} +/* * Attempt to initiate a splice from pipe to file. */ static long do_splice_from (struct pipe_inode_info *pipe,struct file *out,loff_t *ppos,size_t len,unsigned int flags) { -if (out->f_op->splice_write) -return out->f_op->splice_write (pipe, out, ppos, len, flags); -return default_file_splice_write (pipe, out, ppos, len, flags); +if (!out->f_op->splice_write) { +warn_unsupported (out,"write" ); +return -EINVAL ; + } + +return out->f_op->splice_write (pipe, out, ppos, len, flags); }/*
@@ -843,9 +856,12 @@ static long do_splice_to(struct file *in, loff_t *ppos,if (unlikely (len >MAX_RW_COUNT )) len =MAX_RW_COUNT ; -if (in->f_op->splice_read) -return in->f_op->splice_read (in, ppos, pipe, len, flags); -return default_file_splice_read (in, ppos, pipe, len, flags); +if (!in->f_op->splice_read) { +warn_unsupported (in,"read" ); +return -EINVAL ; + } + +return in->f_op->splice_read (in, ppos, pipe, len, flags); }/**
include/linux/fs.h +4 -1
@@ -3175,7 +3175,10 @@ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out, loff_t *, size_t len, unsigned int flags);extern long do_splice_direct (struct file *in,loff_t *ppos,struct file *out,loff_t *opos,size_t len,unsigned int flags); - +ssize_t simple_splice_read (struct file *in,loff_t *ppos, +struct pipe_inode_info *pipe,size_t len,unsigned int flags); +ssize_t simple_splice_write (struct pipe_inode_info *pipe,struct file *out, +loff_t *ppos,size_t len,unsigned int flags);extern void file_ra_state_init (struct file_ra_state *ra,struct address_space *mapping);
Signature · 1 line
2.26.2