incoming
Subsystems (122)
Andrew Morton
maintainerThe rest of MM and the rest of everything else.
Subsystems affected by this patch series:
hotfixes
mm/pagealloc
mm/memory-hotplug
ipc
misc
mm/cleanups
mm/pagemap
procfs
lib
cleanups
arm
Subsystem: hotfixes
Gang He <[email protected]>:
ocfs2: fix oops when writing cloned file
David Hildenbrand <[email protected]>:
Patch series "mm: fix max_pfn not falling on section boundary", v2:
mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section fs/proc/page.c: allow inspection of last section and fix end detection mm/page_alloc.c: initialize memmap of unavailable memory directly
Subsystem: mm/pagealloc
David Hildenbrand <[email protected]>:
mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
mm: factor out next_present_section_nr()
Subsystem: mm/memory-hotplug
"Aneesh Kumar K.V" <[email protected]>:
Patch series "mm/memory_hotplug: Shrink zones before removing memory", v6:
mm/memmap_init: update variable name in memmap_init_zone
David Hildenbrand <[email protected]>:
mm/memory_hotplug: poison memmap in remove_pfn_range_from_zone() mm/memory_hotplug: we always have a zone in find_(smallest|biggest)_section_pfn mm/memory_hotplug: don't check for "all holes" in shrink_zone_span() mm/memory_hotplug: drop local variables in shrink_zone_span() mm/memory_hotplug: cleanup __remove_pages()
mm/memory_hotplug: drop valid_start/valid_end from test_pages_in_a_zone()
Subsystem: ipc
Manfred Spraul <[email protected]>:
smp_mb__{before,after}_atomic(): update Documentation
Davidlohr Bueso <[email protected]>:
ipc/mqueue.c: remove duplicated code
Manfred Spraul <[email protected]>:
ipc/mqueue.c: update/document memory barriers ipc/msg.c: update and document memory barriers ipc/sem.c: document and update memory barriers
Lu Shuaibing <[email protected]>:
ipc/msg.c: consolidate all xxxctl_down() functionsdrivers/block/null_blk_main.c: fix layout
Subsystem: misc
Andrew Morton <[email protected]>:
drivers/block/null_blk_main.c: fix layout drivers/block/null_blk_main.c: fix uninitialized var warnings
Randy Dunlap <[email protected]>:
pinctrl: fix pxa2xx.c build warnings
Subsystem: mm/cleanups
Florian Westphal <[email protected]>:
mm: remove __krealloc
Subsystem: mm/pagemap
Steven Price <[email protected]>:
Patch series "Generic page walk and ptdump", v17:
mm: add generic p?d_leaf() macros
arc: mm: add p?d_leaf() definitions
arm: mm: add p?d_leaf() definitions
arm64: mm: add p?d_leaf() definitions
mips: mm: add p?d_leaf() definitions
powerpc: mm: add p?d_leaf() definitions
riscv: mm: add p?d_leaf() definitions
s390: mm: add p?d_leaf() definitions
sparc: mm: add p?d_leaf() definitions
x86: mm: add p?d_leaf() definitions
mm: pagewalk: add p4d_entry() and pgd_entry()
mm: pagewalk: allow walking without vma
mm: pagewalk: don't lock PTEs for walk_page_range_novma()
mm: pagewalk: fix termination condition in walk_pte_range()
mm: pagewalk: add 'depth' parameter to pte_hole
x86: mm: point to struct seq_file from struct pg_state
x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct
mm: add generic ptdump
x86: mm: convert dump_pagetables to use walk_page_range
arm64: mm: convert mm/dump.c to use walk_page_range()
arm64: mm: display non-present entries in ptdump
mm: ptdump: reduce level numbers by 1 in note_page()
x86: mm: avoid allocating struct mm_struct on the stack
"Aneesh Kumar K.V" <[email protected]>:
Patch series "Fixup page directory freeing", v4:
powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case
Peter Zijlstra <[email protected]>:
mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush asm-generic/tlb: avoid potential double flush
asm-gemeric/tlb: remove stray function declarations asm-generic/tlb: add missing CONFIG symbol
asm-generic/tlb: rename HAVE_RCU_TABLE_FREE
asm-generic/tlb: rename HAVE_MMU_GATHER_PAGE_SIZE asm-generic/tlb: rename HAVE_MMU_GATHER_NO_GATHER asm-generic/tlb: provide MMU_GATHER_TABLE_FREE
Subsystem: procfs
Alexey Dobriyan <[email protected]>:
proc: decouple proc from VFS with "struct proc_ops"
proc: convert everything to "struct proc_ops"
Subsystem: lib
Yury Norov <[email protected]>:
Patch series "lib: rework bitmap_parse", v5:
lib/string: add strnchrnul()
bitops: more BITS_TO_* macros
lib: add test for bitmap_parse()
lib: make bitmap_parse_user a wrapper on bitmap_parse
lib: rework bitmap_parse()
lib: new testcases for bitmap_parse{_user} include/linux/cpumask.h: don't calculate length of the input string
Subsystem: cleanups
Masahiro Yamada <[email protected]>:
treewide: remove redundant IS_ERR() before error code check
Subsystem: arm
Chen-Yu Tsai <[email protected]>:
ARM: dma-api: fix max_pfn off-by-one error in __dma_supported()
Documentation/memory-barriers.txt | 14 arch/Kconfig | 17 arch/alpha/kernel/srm_env.c | 17 arch/arc/include/asm/pgtable.h | 1 arch/arm/Kconfig | 2 arch/arm/include/asm/pgtable-2level.h | 1 arch/arm/include/asm/pgtable-3level.h | 1 arch/arm/include/asm/tlb.h | 6 arch/arm/kernel/atags_proc.c | 8 arch/arm/mm/alignment.c | 14 arch/arm/mm/dma-mapping.c | 2 arch/arm64/Kconfig | 3 arch/arm64/Kconfig.debug | 19 arch/arm64/include/asm/pgtable.h | 2 arch/arm64/include/asm/ptdump.h | 8 arch/arm64/mm/Makefile | 4 arch/arm64/mm/dump.c | 152 ++---- arch/arm64/mm/mmu.c | 4 arch/arm64/mm/ptdump_debugfs.c | 2 arch/ia64/kernel/salinfo.c | 24 - arch/m68k/kernel/bootinfo_proc.c | 8 arch/mips/include/asm/pgtable.h | 5 arch/mips/lasat/picvue_proc.c | 31 - arch/powerpc/Kconfig | 7 arch/powerpc/include/asm/book3s/32/pgalloc.h | 8 arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 arch/powerpc/include/asm/book3s/64/pgtable.h | 3 arch/powerpc/include/asm/nohash/pgalloc.h | 8 arch/powerpc/include/asm/tlb.h | 11 arch/powerpc/kernel/proc_powerpc.c | 10 arch/powerpc/kernel/rtas-proc.c | 70 +-- arch/powerpc/kernel/rtas_flash.c | 34 - arch/powerpc/kernel/rtasd.c | 14 arch/powerpc/mm/book3s64/pgtable.c | 7 arch/powerpc/mm/numa.c | 12 arch/powerpc/platforms/pseries/lpar.c | 24 - arch/powerpc/platforms/pseries/lparcfg.c | 14 arch/powerpc/platforms/pseries/reconfig.c | 8 arch/powerpc/platforms/pseries/scanlog.c | 15 arch/riscv/include/asm/pgtable-64.h | 7 arch/riscv/include/asm/pgtable.h | 7 arch/s390/Kconfig | 4 arch/s390/include/asm/pgtable.h | 2 arch/sh/mm/alignment.c | 17 arch/sparc/Kconfig | 3 arch/sparc/include/asm/pgtable_64.h | 2 arch/sparc/include/asm/tlb_64.h | 11 arch/sparc/kernel/led.c | 15 arch/um/drivers/mconsole_kern.c | 9 arch/um/kernel/exitcode.c | 15 arch/um/kernel/process.c | 15 arch/x86/Kconfig | 3 arch/x86/Kconfig.debug | 20 arch/x86/include/asm/pgtable.h | 10 arch/x86/include/asm/tlb.h | 4 arch/x86/kernel/cpu/mtrr/if.c | 21 arch/x86/mm/Makefile | 4 arch/x86/mm/debug_pagetables.c | 18 arch/x86/mm/dump_pagetables.c | 418 +++++------------- arch/x86/platform/efi/efi_32.c | 2 arch/x86/platform/efi/efi_64.c | 4 arch/x86/platform/uv/tlb_uv.c | 14 arch/xtensa/platforms/iss/simdisk.c | 10 crypto/af_alg.c | 2 drivers/acpi/battery.c | 15 drivers/acpi/proc.c | 15 drivers/acpi/scan.c | 2 drivers/base/memory.c | 9 drivers/block/null_blk_main.c | 58 +- drivers/char/hw_random/bcm2835-rng.c | 2 drivers/char/hw_random/omap-rng.c | 4 drivers/clk/clk.c | 2 drivers/dma/mv_xor_v2.c | 2 drivers/firmware/efi/arm-runtime.c | 2 drivers/gpio/gpiolib-devres.c | 2 drivers/gpio/gpiolib-of.c | 8 drivers/gpio/gpiolib.c | 2 drivers/hwmon/dell-smm-hwmon.c | 15 drivers/i2c/busses/i2c-mv64xxx.c | 5 drivers/i2c/busses/i2c-synquacer.c | 2 drivers/ide/ide-proc.c | 19 drivers/input/input.c | 28 - drivers/isdn/capi/kcapi_proc.c | 6 drivers/macintosh/via-pmu.c | 17 drivers/md/md.c | 15 drivers/misc/sgi-gru/gruprocfs.c | 42 - drivers/mtd/ubi/build.c | 2 drivers/net/wireless/cisco/airo.c | 126 ++--- drivers/net/wireless/intel/ipw2x00/libipw_module.c | 15 drivers/net/wireless/intersil/hostap/hostap_hw.c | 4 drivers/net/wireless/intersil/hostap/hostap_proc.c | 14 drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 drivers/net/wireless/ray_cs.c | 20 drivers/of/device.c | 2 drivers/parisc/led.c | 17 drivers/pci/controller/pci-tegra.c | 2 drivers/pci/proc.c | 25 - drivers/phy/phy-core.c | 4 drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 drivers/platform/x86/thinkpad_acpi.c | 15 drivers/platform/x86/toshiba_acpi.c | 60 +- drivers/pnp/isapnp/proc.c | 9 drivers/pnp/pnpbios/proc.c | 17 drivers/s390/block/dasd_proc.c | 15 drivers/s390/cio/blacklist.c | 14 drivers/s390/cio/css.c | 11 drivers/scsi/esas2r/esas2r_main.c | 9 drivers/scsi/scsi_devinfo.c | 15 drivers/scsi/scsi_proc.c | 29 - drivers/scsi/sg.c | 30 - drivers/spi/spi-orion.c | 3 drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 14 drivers/tty/sysrq.c | 8 drivers/usb/gadget/function/rndis.c | 17 drivers/video/fbdev/imxfb.c | 2 drivers/video/fbdev/via/viafbdev.c | 105 ++-- drivers/zorro/proc.c | 9 fs/cifs/cifs_debug.c | 108 ++-- fs/cifs/dfs_cache.c | 13 fs/cifs/dfs_cache.h | 2 fs/ext4/super.c | 2 fs/f2fs/node.c | 2 fs/fscache/internal.h | 2 fs/fscache/object-list.c | 11 fs/fscache/proc.c | 2 fs/jbd2/journal.c | 13 fs/jfs/jfs_debug.c | 14 fs/lockd/procfs.c | 12 fs/nfsd/nfsctl.c | 13 fs/nfsd/stats.c | 12 fs/ocfs2/file.c | 14 fs/ocfs2/suballoc.c | 2 fs/proc/cpuinfo.c | 12 fs/proc/generic.c | 38 - fs/proc/inode.c | 76 +-- fs/proc/internal.h | 5 fs/proc/kcore.c | 13 fs/proc/kmsg.c | 14 fs/proc/page.c | 54 +- fs/proc/proc_net.c | 32 - fs/proc/proc_sysctl.c | 2 fs/proc/root.c | 2 fs/proc/stat.c | 12 fs/proc/task_mmu.c | 4 fs/proc/vmcore.c | 10 fs/sysfs/group.c | 2 include/asm-generic/pgtable.h | 20 include/asm-generic/tlb.h | 138 +++-- include/linux/bitmap.h | 8 include/linux/bitops.h | 4 include/linux/cpumask.h | 4 include/linux/memory_hotplug.h | 4 include/linux/mm.h | 6 include/linux/mmzone.h | 10 include/linux/pagewalk.h | 49 +- include/linux/proc_fs.h | 23 include/linux/ptdump.h | 24 - include/linux/seq_file.h | 13 include/linux/slab.h | 1 include/linux/string.h | 1 include/linux/sunrpc/stats.h | 4 ipc/mqueue.c | 123 ++++- ipc/msg.c | 62 +- ipc/sem.c | 66 +- ipc/util.c | 14 kernel/configs.c | 9 kernel/irq/proc.c | 42 - kernel/kallsyms.c | 12 kernel/latencytop.c | 14 kernel/locking/lockdep_proc.c | 15 kernel/module.c | 12 kernel/profile.c | 24 - kernel/sched/psi.c | 48 +- lib/bitmap.c | 195 ++++---- lib/string.c | 17 lib/test_bitmap.c | 105 ++++ mm/Kconfig.debug | 21 mm/Makefile | 1 mm/gup.c | 2 mm/hmm.c | 66 +- mm/memory_hotplug.c | 104 +--- mm/memremap.c | 2 mm/migrate.c | 5 mm/mincore.c | 1 mm/mmu_gather.c | 158 ++++-- mm/page_alloc.c | 75 +-- mm/pagewalk.c | 167 +++++-- mm/ptdump.c | 159 ++++++ mm/slab_common.c | 37 - mm/sparse.c | 10 mm/swapfile.c | 14 net/atm/mpoa_proc.c | 17 net/atm/proc.c | 8 net/core/dev.c | 2 net/core/filter.c | 2 net/core/pktgen.c | 44 - net/ipv4/ipconfig.c | 10 net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 net/ipv4/route.c | 24 - net/netfilter/xt_recent.c | 17 net/sunrpc/auth_gss/svcauth_gss.c | 10 net/sunrpc/cache.c | 45 - net/sunrpc/stats.c | 21 net/xfrm/xfrm_policy.c | 2 samples/kfifo/bytestream-example.c | 11 samples/kfifo/inttype-example.c | 11 samples/kfifo/record-example.c | 11 scripts/coccinelle/free/devm_free.cocci | 4 sound/core/info.c | 34 - sound/soc/codecs/ak4104.c | 3 sound/soc/codecs/cs4270.c | 3 sound/soc/codecs/tlv320aic32x4.c | 6 sound/soc/sunxi/sun4i-spdif.c | 2 tools/include/linux/bitops.h | 9 214 files changed, 2589 insertions(+), 2227 deletions(-)
Andrew Morton
maintainerPATCH 1/67 ocfs2: fix oops when writing cloned file
From: Gang He <[email protected]>
Subject: ocfs2: fix oops when writing cloned file
Writing a cloned file triggers a kernel oops and the user-space command process is also killed by the system. The bug can be reproduced stably via:
1) create a file under ocfs2 file system directory.
journalctl -b > aa.txt
2) create a cloned file for this file.
reflink aa.txt bb.txt
3) write the cloned file with dd command.
dd if=/dev/zero of=bb.txt bs=512 count=1 conv=notrunc
The dd command is killed by the kernel, then you can see the oops message via dmesg command.
[ 463.875404] BUG: kernel NULL pointer dereference, address: 0000000000000028 [ 463.875413] #PF: supervisor read access in kernel mode [ 463.875416] #PF: error_code(0x0000) - not-present page [ 463.875418] PGD 0 P4D 0 [ 463.875425] Oops: 0000 [#1] SMP PTI [ 463.875431] CPU: 1 PID: 2291 Comm: dd Tainted: G OE 5.3.16-2-default [ 463.875433] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 [ 463.875500] RIP: 0010:ocfs2_refcount_cow+0xa4/0x5d0 [ocfs2] [ 463.875505] Code: 06 89 6c 24 38 89 eb f6 44 24 3c 02 74 be 49 8b 47 28 [ 463.875508] RSP: 0018:ffffa2cb409dfce8 EFLAGS: 00010202 [ 463.875512] RAX: ffff8b1ebdca8000 RBX: 0000000000000001 RCX: ffff8b1eb73a9df0 [ 463.875515] RDX: 0000000000056a01 RSI: 0000000000000000 RDI: 0000000000000000 [ 463.875517] RBP: 0000000000000001 R08: ffff8b1eb73a9de0 R09: 0000000000000000 [ 463.875520] R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000 [ 463.875522] R13: ffff8b1eb922f048 R14: 0000000000000000 R15: ffff8b1eb922f048 [ 463.875526] FS: 00007f8f44d15540(0000) GS:ffff8b1ebeb00000(0000) knlGS:0000000000000000 [ 463.875529] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 463.875532] CR2: 0000000000000028 CR3: 000000003c17a000 CR4: 00000000000006e0 [ 463.875546] Call Trace: [ 463.875596] ? ocfs2_inode_lock_full_nested+0x18b/0x960 [ocfs2] [ 463.875648] ocfs2_file_write_iter+0xaf8/0xc70 [ocfs2] [ 463.875672] new_sync_write+0x12d/0x1d0 [ 463.875688] vfs_write+0xad/0x1a0 [ 463.875697] ksys_write+0xa1/0xe0 [ 463.875710] do_syscall_64+0x60/0x1f0 [ 463.875743] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 463.875758] RIP: 0033:0x7f8f4482ed44 [ 463.875762] Code: 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 80 00 00 00 [ 463.875765] RSP: 002b:00007fff300a79d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 463.875769] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f8f4482ed44 [ 463.875771] RDX: 0000000000000200 RSI: 000055f771b5c000 RDI: 0000000000000001 [ 463.875774] RBP: 0000000000000200 R08: 00007f8f44af9c78 R09: 0000000000000003 [ 463.875776] R10: 000000000000089f R11: 0000000000000246 R12: 000055f771b5c000 [ 463.875779] R13: 0000000000000200 R14: 0000000000000000 R15: 000055f771b5c000
This regression problem was introduced by commit e74540b28556 ("ocfs2:
protect extent tree in ocfs2_prepare_inode_for_write()").
---
fs/ocfs2/file.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/ocfs2/file.c renamed from fs/ocfs2/file.c~ocfs2-fix-the-oops-problem-when-write-cloned-file +6 -8
@@ -2101,17 +2101,15 @@ static int ocfs2_is_io_unaligned(structstatic int ocfs2_inode_lock_for_extent_tree (struct inode *inode,struct buffer_head **di_bh,int meta_level, -int overwrite_io,int write_sem,int wait) {int ret =0 ;if (wait) - ret =ocfs2_inode_lock (inode,NULL , meta_level); + ret =ocfs2_inode_lock (inode, di_bh, meta_level);else - ret =ocfs2_try_inode_lock (inode, - overwrite_io ?NULL : di_bh, meta_level); + ret =ocfs2_try_inode_lock (inode, di_bh, meta_level);if (ret <0 ) goto out;
@@ -2136,6 +2134,7 @@ static int ocfs2_inode_lock_for_extent_t out_unlock:brelse (*di_bh); + *di_bh =NULL ;ocfs2_inode_unlock (inode, meta_level); out:return ret;
@@ -2177,7 +2176,6 @@ static int ocfs2_prepare_inode_for_write ret =ocfs2_inode_lock_for_extent_tree (inode, &di_bh, meta_level, - overwrite_io, write_sem, wait);if (ret <0 ) {
@@ -2233,13 +2231,13 @@ static int ocfs2_prepare_inode_for_write &di_bh, meta_level, write_sem); + meta_level =1 ; + write_sem =1 ; ret =ocfs2_inode_lock_for_extent_tree (inode, &di_bh, meta_level, - overwrite_io, -1 , + write_sem, wait); - write_sem =1 ;if (ret <0 ) {if (ret != -EAGAIN )mlog_errno (ret);
_
Andrew Morton
maintainerPATCH 2/67 mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/page_alloc.c: fix uninitialized memmaps on a partially populated last section
Patch series "mm: fix max_pfn not falling on section boundary", v2.
Playing with different memory sizes for a x86-64 guest, I discovered that some memmaps (highest section if max_mem does not fall on the section boundary) are marked as being valid and online, but contain garbage. We have to properly initialize these memmaps.
Looking at /proc/kpageflags and friends, I found some more issues, partially related to this.
This patch (of 3):
If max_pfn is not aligned to a section boundary, we can easily run into BUGs. This can e.g., be triggered on x86-64 under QEMU by specifying a memory size that is not a multiple of 128MB (e.g., 4097MB, but also 4160MB). I was told that on real HW, we can easily have this scenario (esp., one of the main reasons sub-section hotadd of devmem was added).
The issue is, that we have a valid memmap (pfn_valid()) for the whole section, and the whole section will be marked "online". pfn_to_online_page() will succeed, but the memmap contains garbage.
E.g., doing a "./page-types -r -a 0x144001" when QEMU was started with "-m 4160M" - (see tools/vm/page-types.c):
[ 200.476376] BUG: unable to handle page fault for address: fffffffffffffffe [ 200.477500] #PF: supervisor read access in kernel mode [ 200.478334] #PF: error_code(0x0000) - not-present page [ 200.479076] PGD 59614067 P4D 59614067 PUD 59616067 PMD 0 [ 200.479557] Oops: 0000 [#4] SMP NOPTI [ 200.479875] CPU: 0 PID: 603 Comm: page-types Tainted: G D W 5.5.0-rc1-next-20191209 #93 [ 200.480646] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu4 [ 200.481648] RIP: 0010:stable_page_flags+0x4d/0x410 [ 200.482061] Code: f3 ff 41 89 c0 48 b8 00 00 00 00 01 00 00 00 45 84 c0 0f 85 cd 02 00 00 48 8b 53 08 48 8b 2b 48f [ 200.483644] RSP: 0018:ffffb139401cbe60 EFLAGS: 00010202 [ 200.484091] RAX: fffffffffffffffe RBX: fffffbeec5100040 RCX: 0000000000000000 [ 200.484697] RDX: 0000000000000001 RSI: ffffffff9535c7cd RDI: 0000000000000246 [ 200.485313] RBP: ffffffffffffffff R08: 0000000000000000 R09: 0000000000000000 [ 200.485917] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000144001 [ 200.486523] R13: 00007ffd6ba55f48 R14: 00007ffd6ba55f40 R15: ffffb139401cbf08 [ 200.487130] FS: 00007f68df717580(0000) GS:ffff9ec77fa00000(0000) knlGS:0000000000000000 [ 200.487804] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 200.488295] CR2: fffffffffffffffe CR3: 0000000135d48000 CR4: 00000000000006f0 [ 200.488897] Call Trace: [ 200.489115] kpageflags_read+0xe9/0x140 [ 200.489447] proc_reg_read+0x3c/0x60 [ 200.489755] vfs_read+0xc2/0x170 [ 200.490037] ksys_pread64+0x65/0xa0 [ 200.490352] do_syscall_64+0x5c/0xa0 [ 200.490665] entry_SYSCALL_64_after_hwframe+0x49/0xbe
But it can be triggered much easier via "cat /proc/kpageflags > /dev/null" after cold/hot plugging a DIMM to such a system:
[root@localhost ~]# cat /proc/kpageflags > /dev/null
[ 111.517275] BUG: unable to handle page fault for address: fffffffffffffffe [ 111.517907] #PF: supervisor read access in kernel mode [ 111.518333] #PF: error_code(0x0000) - not-present page [ 111.518771] PGD a240e067 P4D a240e067 PUD a2410067 PMD 0
This patch fixes that by at least zero-ing out that memmap (so e.g., page_to_pfn() will not crash). Commit 907ec5fca3dc ("mm: zero remaining unavailable struct pages") tried to fix a similar issue, but forgot to consider this special case.
After this patch, there are still problems to solve. E.g., not all of these pages falling into a memory hole will actually get initialized later and set PageReserved - they are only zeroed out - but at least the immediate crashes are gone. A follow-up patch will take care of this.
---
mm/page_alloc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-fix-uninitialized-memmaps-on-a-partially-populated-last-section +12 -2
@@ -6947,7 +6947,8 @@ static u64 zero_pfn_range(unsigned long* This function also addresses a similar issue where struct pages are left * uninitialized because the physical address range is not covered by * memblock.memory or memblock.reserved. That could happen when memblock -* layout is manually configured via memmap=. +* layout is manually configured via memmap=, or when the highest physical +* address (max_pfn) does not end on a section boundary. */ void __init zero_resv_unavail (void ) {
@@ -6965,7 +6966,16 @@ void __init zero_resv_unavail(void) pgcnt +=zero_pfn_range (PFN_DOWN (next),PFN_UP (start)); next = end; } - pgcnt +=zero_pfn_range (PFN_DOWN (next), max_pfn); + +/* +* Early sections always have a fully populated memmap for the whole +* section - see pfn_valid(). If the last section has holes at the +* end and that section is marked "online", the memmap will be +* considered initialized. Make sure that memmap has a well defined +* state. +*/ + pgcnt +=zero_pfn_range (PFN_DOWN (next), +round_up (max_pfn,PAGES_PER_SECTION ));/* * Struct pages that do not have backing memory. This could be because
_
Andrew Morton
maintainerPATCH 3/67 fs/proc/page.c: allow inspection of last section and fix end detection
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: fs/proc/page.c: allow inspection of last section and fix end detection
If max_pfn does not fall onto a section boundary, it is possible to inspect PFNs up to max_pfn, and PFNs above max_pfn, however, max_pfn itself can't be inspected. We can have a valid (and online) memmap at and above max_pfn if max_pfn is not aligned to a section boundary. The whole early section has a memmap and is marked online. Being able to inspect the state of these PFNs is valuable for debugging, especially because max_pfn can change on memory hotplug and expose these memmaps.
Also, querying page flags via "./page-types -r -a 0x144001," (tools/vm/page-types.c) inside a x86-64 guest with 4160MB under QEMU results in an (almost) endless loop in user space, because the end is not detected properly when starting after max_pfn.
Instead, let's allow to inspect all pages in the highest section and return 0 directly if we try to access pages above that section.
While at it, check the count before adjusting it, to avoid masking user errors.
---
fs/proc/page.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
fs/proc/page.c renamed from fs/proc/page.c~fs-proc-pagec-allow-inspection-of-last-section-and-fix-end-detection +27 -3
@@ -21,6 +21,21 @@#define KPMMASK (KPMSIZE - 1)#define KPMBITS (KPMSIZE * BITS_PER_BYTE) +static inline unsigned long get_max_dump_pfn (void ) +{ +#ifdef CONFIG_SPARSEMEM +/* +* The memmap of early sections is completely populated and marked +* online even if max_pfn does not fall on a section boundary - +* pfn_to_online_page() will succeed on all pages. Allow inspecting +* these memmaps. +*/ +return round_up (max_pfn,PAGES_PER_SECTION ); +#else +return max_pfn; +#endif +} +/* /proc/kpagecount - an array exposing page counts * * Each entry is a u64 representing the corresponding
@@ -29,6 +44,7 @@static ssize_t kpagecount_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { +const unsigned long max_dump_pfn =get_max_dump_pfn ();u64 __user *out = (u64 __user *)buf;struct page *ppage;unsigned long src = *ppos;
@@ -37,9 +53,11 @@ static ssize_t kpagecount_read(struct fiu64 pcount; pfn = src /KPMSIZE ; - count =min_t (size_t, count, (max_pfn *KPMSIZE ) - src);if (src &KPMMASK || count &KPMMASK )return -EINVAL ; +if (src >= max_dump_pfn *KPMSIZE ) +return 0 ; + count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src);while (count >0 ) {/*
@@ -206,6 +224,7 @@ u64 stable_page_flags(struct page *page)static ssize_t kpageflags_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { +const unsigned long max_dump_pfn =get_max_dump_pfn ();u64 __user *out = (u64 __user *)buf;struct page *ppage;unsigned long src = *ppos;
@@ -213,9 +232,11 @@ static ssize_t kpageflags_read(struct fissize_t ret =0 ; pfn = src /KPMSIZE ; - count = min_t(unsigned long, count, (max_pfn * KPMSIZE) - src);if (src &KPMMASK || count &KPMMASK )return -EINVAL ; +if (src >= max_dump_pfn *KPMSIZE ) +return 0 ; + count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src);while (count >0 ) {/*
@@ -251,6 +272,7 @@ static const struct file_operations procstatic ssize_t kpagecgroup_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { +const unsigned long max_dump_pfn =get_max_dump_pfn ();u64 __user *out = (u64 __user *)buf;struct page *ppage;unsigned long src = *ppos;
@@ -259,9 +281,11 @@ static ssize_t kpagecgroup_read(struct fu64 ino; pfn = src /KPMSIZE ; - count = min_t(unsigned long, count, (max_pfn * KPMSIZE) - src);if (src &KPMMASK || count &KPMMASK )return -EINVAL ; +if (src >= max_dump_pfn *KPMSIZE ) +return 0 ; + count = min_t(unsigned long, count, (max_dump_pfn * KPMSIZE) - src);while (count >0 ) {/*
_
Andrew Morton
maintainerPATCH 4/67 mm/page_alloc.c: initialize memmap of unavailable memory directly
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/page_alloc.c: initialize memmap of unavailable memory directly
Let's make sure that all memory holes are actually marked PageReserved(), that page_to_pfn() produces reliable results, and that these pages are not detected as "mmap" pages due to the mapcount.
E.g., booting a x86-64 QEMU guest with 4160 MB:
[ 0.010585] Early memory node ranges [ 0.010586] node 0: [mem 0x0000000000001000-0x000000000009efff] [ 0.010588] node 0: [mem 0x0000000000100000-0x00000000bffdefff] [ 0.010589] node 0: [mem 0x0000000100000000-0x0000000143ffffff]
max_pfn is 0x144000.
Before this change:
[root@localhost ~]# ./page-types -r -a 0x144000,
flags page-count MB symbolic-flags long-symbolic-flags
0x0000000000000800 16384 64 ___________M_______________________________ mmap
total 16384 64After this change:
[root@localhost ~]# ./page-types -r -a 0x144000,
flags page-count MB symbolic-flags long-symbolic-flags
0x0000000100000000 16384 64 ___________________________r_______________ reserved
total 16384 64IOW, especially the unavailable physical memory ("memory hole") in the last section would not get properly marked PageReserved() and is indicated to be "mmap" memory.
Drop the trace of that function from include/linux/mm.h - nobody else needs it, and rename it accordingly.
Note: The fake zone/node might not be covered by the zone/node span. This is not an urgent issue (for now, we had the same node/zone due to the zeroing). We'll need a clean way to mark memory holes (e.g., using a page type PageHole() if possible or a fake ZONE_INVALID) and eventually stop marking these memory holes PageReserved().
---
include/linux/mm.h | 6 ------ mm/page_alloc.c | 33 ++++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 17 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-initialize-memmap-of-unavailable-memory-directly +0 -6
@@ -2182,12 +2182,6 @@ extern int __meminit __early_pfn_to_nid( struct mminit_pfnnid_cache *state);#endif -#if !defined(CONFIG_FLAT_NODE_MEM_MAP ) -void zero_resv_unavail (void ); -#else -static inline void zero_resv_unavail (void ) {} -#endif -extern void set_dma_reserve (unsigned long new_dma_reserve);extern void memmap_init_zone (unsigned long ,int ,unsigned long ,unsigned long ,enum memmap_context ,struct vmem_altmap *);
mm/page_alloc.c renamed from mm/page_alloc.c~mm-initialize-memmap-of-unavailable-memory-directly +22 -11
@@ -6916,10 +6916,10 @@ void __init free_area_init_node(int nid,#if !defined(CONFIG_FLAT_NODE_MEM_MAP )/* -* Zero all valid struct pages in range [spfn, epfn), return number of struct -* pages zeroed +* Initialize all valid struct pages in the range [spfn, epfn) and mark them +* PageReserved(). Return the number of struct pages that were initialized. */ -static u64 zero_pfn_range (unsigned long spfn,unsigned long epfn) +static u64 __init init_unavailable_range (unsigned long spfn,unsigned long epfn) {unsigned long pfn;u64 pgcnt =0 ;
@@ -6930,7 +6930,13 @@ static u64 zero_pfn_range(unsigned long + pageblock_nr_pages -1 ;continue ; } -mm_zero_struct_page (pfn_to_page (pfn)); +/* +* Use a fake node/zone (0) for now. Some of these pages +* (in memblock.reserved but not in memblock.memory) will +* get re-initialized via reserve_bootmem_region() later. +*/ +__init_single_page (pfn_to_page (pfn), pfn,0 ,0 ); +__SetPageReserved (pfn_to_page (pfn)); pgcnt++; }
@@ -6942,7 +6948,7 @@ static u64 zero_pfn_range(unsigned long* initialized by going through __init_single_page(). But, there are some * struct pages which are reserved in memblock allocator and their fields * may be accessed (for example page_to_pfn() on some configuration accesses -* flags). We must explicitly zero those struct pages. +* flags). We must explicitly initialize those struct pages. * * This function also addresses a similar issue where struct pages are left * uninitialized because the physical address range is not covered by
@@ -6950,7 +6956,7 @@ static u64 zero_pfn_range(unsigned long* layout is manually configured via memmap=, or when the highest physical * address (max_pfn) does not end on a section boundary. */ -void __init zero_resv_unavail (void ) +static void __init init_unavailable_mem (void ) {phys_addr_t start, end;u64 i, pgcnt;
@@ -6963,7 +6969,8 @@ void __init zero_resv_unavail(void)for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE ,MEMBLOCK_NONE , &start, &end,NULL ) {if (next < start) - pgcnt +=zero_pfn_range (PFN_DOWN (next),PFN_UP (start)); + pgcnt +=init_unavailable_range (PFN_DOWN (next), +PFN_UP (start)); next = end; }
@@ -6974,8 +6981,8 @@ void __init zero_resv_unavail(void)* considered initialized. Make sure that memmap has a well defined * state. */ - pgcnt +=zero_pfn_range (PFN_DOWN (next), -round_up (max_pfn,PAGES_PER_SECTION )); + pgcnt +=init_unavailable_range (PFN_DOWN (next), +round_up (max_pfn,PAGES_PER_SECTION ));/* * Struct pages that do not have backing memory. This could be because
@@ -6984,6 +6991,10 @@ void __init zero_resv_unavail(void)if (pgcnt) pr_info("Zeroed struct page in unavailable ranges: %lld pages", pgcnt); } +#else +static inline void __init init_unavailable_mem (void ) +{ +}#endif /* !CONFIG_FLAT_NODE_MEM_MAP */ #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
@@ -7413,7 +7424,7 @@ void __init free_area_init_nodes(unsigne/* Initialise every node */ mminit_verify_pageflags_layout ();setup_nr_node_ids (); -zero_resv_unavail (); +init_unavailable_mem ();for_each_online_node (nid) {pg_data_t *pgdat =NODE_DATA (nid); free_area_init_node(nid, NULL,
@@ -7608,7 +7619,7 @@ void __init set_dma_reserve(unsigned lonvoid __init free_area_init (unsigned long *zones_size) { -zero_resv_unavail (); +init_unavailable_mem ();free_area_init_node (0 , zones_size,__pa (PAGE_OFFSET ) >>PAGE_SHIFT ,NULL ); }
_
Andrew Morton
maintainerPATCH 5/67 mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
Let's update the pfn manually whenever we continue the loop. This makes the code easier to read but also less error prone (and we can directly fix one issue).
When overlap_memmap_init() returns true, pfn is updated to "memblock_region_memory_end_pfn(r)". So it already points at the *next* pfn to process. Incrementing the pfn another time is wrong, we might leave one uninitialized. I spotted this by inspecting the code, so I have no idea if this is relevant in practise (with kernelcore=3Dmirror).
emmap_init_zone")
---
mm/page_alloc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-fix-and-rework-pfn-handling-in-memmap_init_zone +6 -3
@@ -5905,18 +5905,20 @@ void __meminit memmap_init_zone(unsigned }#endif -for (pfn = start_pfn; pfn < end_pfn; pfn++) { +for (pfn = start_pfn; pfn < end_pfn; ) {/* * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory. */ if (context ==MEMMAP_EARLY ) {if (!early_pfn_valid (pfn)) { - pfn =next_pfn (pfn) -1 ; + pfn =next_pfn (pfn);continue ; } -if (!early_pfn_in_nid (pfn, nid)) +if (!early_pfn_in_nid (pfn, nid)) { + pfn++;continue ; + }if (overlap_memmap_init (zone, &pfn))continue ;if (defer_init (nid, pfn, end_pfn))
@@ -5944,6 +5946,7 @@ void __meminit memmap_init_zone(unsignedset_pageblock_migratetype (page,MIGRATE_MOVABLE );cond_resched (); } + pfn++; } }
_
Re: [patch 05/67] mm/page_alloc: fix and rework pfn handling in memmap_init_zone()
Anxdrew,
this whole patch-series seems to be corrupt. Not only was the
"incoming" cover emal missing the base to apply it to, but the patches themselves are broken too.
See for example this one:
Quoted 8 lines · Andrew Morton
From: David Hildenbrand <[email protected]>
Subject:mm/page_alloc: fix and rework pfn handling inmemmap_init_zone()Let's update the pfn manually whenever we continue the loop. This makes the code easier to read but also less error prone (and we can directly fix one issue).
Quoted 5 lines
When
overlap_memmap_init()returns true, pfn is updated to "memblock_region_memory_end_pfn(r)". So it already points at the *next* pfn to process. Incrementing the pfn another time is wrong, we might leave one uninitialized. I spotted this by inspecting the code, so I have no idea if this is relevant in practise (with kernelcore=3Dmirror).
Note that "=3D". That's some MIME stuff that you haven't decoded, and then sent out as an email as-is.
Quoted 3 lines
Fixes a9a9e77fbf27 ("mm: move mirrored memory specific code outside of m=
emmap_init_zone")
Same here. That "=\n" shouldn't be in the email, it comes from some original MIME data that wasn't ever properly decoded.
The *patch* itself seems fine, and the "=" signs are not mime:
mm/page_alloc.c void __meminit memmap_init_zone(unsigned · line 5908
Quoted 2 lines
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-fix-and-rework-pfn-handling-in-memmap_init_zone +1
-1-for (pfn = start_pfn; pfn < end_pfn; pfn++) { +for (pfn = start_pfn; pfn < end_pfn; ) {
so it seems that only the actual explanations have gotten corrupted somehow.
Cut-and-paste from some MIME source in a MUA that doesn't know mime? Or directly from some mbox file without any MIME decoding?
Linus
Andrew Morton
maintainerPATCH 6/67 mm: factor out next_present_section_nr()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm: factor out next_present_section_nr()
Let's move it to the header and use the shorter variant from mm/page_alloc.c (the original one will also check "__highest_present_section_nr + 1", which is not necessary). While at it, make the section_nr in next_pfn() const.
In next_pfn(), we now return section_nr_to_pfn(-1) instead of -1 once we exceed __highest_present_section_nr, which doesn't make a difference i= n the caller as it is big enough (>=3D all sane end_pfn).
---
include/linux/mmzone.h | 10 ++++++++++ mm/page_alloc.c | 11 ++--------- mm/sparse.c | 10 ---------- 3 files changed, 12 insertions(+), 19 deletions(-)
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-factor-out-next_present_section_nr +10 -0
@@ -1379,6 +1379,16 @@ static inline int pfn_present(unsigned lreturn present_section (__nr_to_section (pfn_to_section_nr (pfn))); } +static inline unsigned long next_present_section_nr (unsigned long section_nr) +{ +while (++section_nr <= __highest_present_section_nr) { +if (present_section_nr (section_nr)) +return section_nr; + } + +return -1 ; +} +/* * These are _only_ used during initialisation, therefore they * can use __initdata ... They could have names to indicate
mm/page_alloc.c renamed from mm/page_alloc.c~mm-factor-out-next_present_section_nr +2 -9
@@ -5852,18 +5852,11 @@ overlap_memmap_init(unsigned long zone,/* Skip PFNs that belong to non-present sections */ static inline __meminit unsigned long next_pfn (unsigned long pfn) { -unsigned long section_nr; +const unsigned long section_nr =pfn_to_section_nr (++pfn); - section_nr =pfn_to_section_nr (++pfn);if (present_section_nr (section_nr))return pfn; - -while (++section_nr <= __highest_present_section_nr) { -if (present_section_nr (section_nr)) -return section_nr_to_pfn (section_nr); - } - -return -1 ; +return section_nr_to_pfn (next_present_section_nr (section_nr)); }#else static inline __meminit unsigned long next_pfn (unsigned long pfn)
mm/sparse.c renamed from mm/sparse.c~mm-factor-out-next_present_section_nr +0 -10
@@ -198,16 +198,6 @@ static void section_mark_present(struct ms->section_mem_map |=SECTION_MARKED_PRESENT ; } -static inline unsigned long next_present_section_nr (unsigned long section_nr) -{ -do { - section_nr++; -if (present_section_nr (section_nr)) -return section_nr; - }while ((section_nr <= __highest_present_section_nr)); - -return -1 ; -}#define for_each_present_section_nr (start, section_nr) \ for (section_nr = next_present_section_nr(start-1); \ ((section_nr != -1) && \
_
Re: [patch 06/67] mm: factor out next_present_section_nr()
More signs of your - or somebody elses - email scripts being broken:
Quoted 4 lines · Andrew Morton
From: David Hildenbrand <[email protected]>
Subject: mm: factor outnext_present_section_nr()
Quoted 8 lines
Let's move it to the header and use the shorter variant from
mm/page_alloc.c(the original one will also check "__highest_present_section_nr+ 1", which is not necessary). While at it, make thesection_nrinnext_pfn()const.In
next_pfn(), we now returnsection_nr_to_pfn(-1)instead of -1 once we exceed__highest_present_section_nr, which doesn't make a difference i= n the caller as it is big enough (>=3D all saneend_pfn).
Here, look at that "i= n". It looks like it was a MIME line-break (so "in" was MIME-encoded and turned into "i=\nn") followed by you or David re-flowing the text without MIME-decoding it.
And note the ">=3D" thing. It should be just ">=" but again there is left-over crud from using MIME-encoded data without decoding it.
I am noticing that this has apparently happened before too. And maybe it's not you. Maybe it's David Hildenbrand that has sent you already corrupted data.
Doing a
git log --grep="=3D"
shows that this mistake has been done by others before. But it's not _that_ common. I find 25 occurrences of that "=3D" thing in the logs over the whole history of the kernel.
The "=\n" thing is much harder to grep for quite that trivially, or the other "random utf8 encoded as MIME and never decoded properly" stuff.
But the fact that I found at least _two_ of these cases in just this series, and it had that broken coverletter too, makes me go "Hmm".
I tried to look for other cases, but those two emails (both from David Hildenbrand, soo...) were the only ones I found in this series of 67.
I can fix them up, of course, but I really hate how somebody has some workflow that generates this corruption.
MIME corruption in the patches themselves tends to be much more obvious ("it doesn't apply" or "it no longer builds"). But in the commit message it's not always clear. So please be *careful*.
I'm jetlagged in Cambridge UK and was going to apply this series since I was awake anyway, but now I'm not sure I should do that.
At a minimum I want to know what the base commit was supposed to be..
Linus
Andrew Morton
maintainerRe: [patch 06/67] mm: factor out next_present_section_nr()
Quoted 10 lines · On Tue, 4 Feb 2020 03:04:40 +0000 Linus Torvalds…
Quoted 9 lines · Andrew Morton
From: David Hildenbrand <[email protected]>
Subject: mm: factor outnext_present_section_nr()Let's move it to the header and use the shorter variant from
mm/page_alloc.c(the original one will also check "__highest_present_section_nr+ 1", which is not necessary). While at it, make thesection_nrinnext_pfn()const.
Quoted 7 lines
Quoted 3 lines
In
next_pfn(), we now returnsection_nr_to_pfn(-1)instead of -1 once we exceed__highest_present_section_nr, which doesn't make a difference i= n the caller as it is big enough (>=3D all saneend_pfn).Here, look at that "i= n". It looks like it was a MIME line-break (so "in" was MIME-encoded and turned into "i=\nn") followed by you or David re-flowing the text without MIME-decoding it.
Yes, my MUA is not good about converting all input. I have tools to fix up the patches post-facto but changelogs have been a challenge.
I have updated my nightly check-patches-for-crap-and-email-it-to-andrew script to check for this.
Re: [patch 06/67] mm: factor out next_present_section_nr()
In reply to Linus TorvaldsQuoted 27 lines · Linus Torvalds
More signs of your - or somebody elses - email scripts being broken:
Quoted 4 lines · Andrew Morton
From: David Hildenbrand <[email protected]>
Subject: mm: factor outnext_present_section_nr()Quoted 8 lines
Let's move it to the header and use the shorter variant from
mm/page_alloc.c(the original one will also check "__highest_present_section_nr+ 1", which is not necessary). While at it, make thesection_nrinnext_pfn()const.In
next_pfn(), we now returnsection_nr_to_pfn(-1)instead of -1 once we exceed__highest_present_section_nr, which doesn't make a difference i= n the caller as it is big enough (>=3D all saneend_pfn).Here, look at that "i= n". It looks like it was a MIME line-break (so "in" was MIME-encoded and turned into "i=\nn") followed by you or David re-flowing the text without MIME-decoding it.
And note the ">=3D" thing. It should be just ">=" but again there is left-over crud from using MIME-encoded data without decoding it.
I am noticing that this has apparently happened before too. And maybe it's not you. Maybe it's David Hildenbrand that has sent you already corrupted data.
Quoted 8 lines
Doing a
git log --grep="=3D"shows that this mistake has been done by others before. But it's not _that_ common. I find 25 occurrences of that "=3D" thing in the logs over the whole history of the kernel.
Easter eggs :)
Quoted 4 lines
The "=\n" thing is much harder to grep for quite that trivially, or the other "random utf8 encoded as MIME and never decoded properly" stuff.
Quoted 8 lines
But the fact that I found at least _two_ of these cases in just this series, and it had that broken coverletter too, makes me go "Hmm".
I tried to look for other cases, but those two emails (both from David Hildenbrand, soo...) were the only ones I found in this series of 67.
I can fix them up, of course, but I really hate how somebody has some workflow that generates this corruption.
I'm a simple man - I use vim+git with barely any custom scripts (well, only a cc-cmd script shared my Michal once). I've been sending patches from the same machine for years without any such glitches.
The only thing I do manually is copying the cover letter from Thunderbird + adapting it when resending a version. But as the patch descriptions themselves are messed up, that doesn't explain the story.
I *suspect* this is the result of (one of many) temporary mail server issues we had at Red Hat when switching providers (although a weird one
- but I remember there were weird ones).
Signature · 3 lines
Thanks, David / dhildenb
Andrew Morton
maintainerPATCH 7/67 mm/memmap_init: update variable name in memmap_init_zone
In reply to Andrew MortonFrom: "Aneesh Kumar K.V" <[email protected]>
Subject: mm/memmap_init: update variable name in memmap_init_zone
Patch series "mm/memory_hotplug: Shrink zones before removing memory", v6.
This series fixes the access of uninitialized memmaps when shrinking zones/nodes and when removing memory. Also, it contains all fixes for crashes that can be triggered when removing certain namespace using memunmap_pages() - ZONE_DEVICE, reported by Aneesh.
We stop trying to shrink ZONE_DEVICE, as it's buggy, fixing it would be more involved (we don't have SECTION_IS_ONLINE as an indicator), and shrinking is only of limited use (set_zone_contiguous() cannot detect the ZONE_DEVICE as contiguous).
We continue shrinking !ZONE_DEVICE zones, however, I reduced the amount of code to a minimum. Shrinking is especially necessary to keep zone->contiguous set where possible, especially, on memory unplug of DIMMs at zone boundaries.
--------------------------------------------------------------------------
Zones are now properly shrunk when offlining memory blocks or when onlining failed. This allows to properly shrink zones on memory unplug even if the separate memory blocks of a DIMM were onlined to different zones or re-onlined to a different zone after offlining.
Example:
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0
:/# echo "online_movable" > /sys/devices/system/memory/memory41/state
:/# echo "online_movable" > /sys/devices/system/memory/memory43/state
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 98304
present 65536
managed 65536
:/# echo 0 > /sys/devices/system/memory/memory43/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 32768
present 32768
managed 32768
:/# echo 0 > /sys/devices/system/memory/memory41/online
:/# cat /proc/zoneinfo
Node 1, zone Movable
spanned 0
present 0
managed 0This patch (of 6):
The third argument is actually number of pages. Change the variable name from size to nr_pages to indicate this better.
No functional change in this patch.
---
mm/page_alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-memmap_init-update-variable-name-in-memmap_init_zone +4 -4
@@ -5946,10 +5946,10 @@ void __meminit memmap_init_zone(unsigned#ifdef CONFIG_ZONE_DEVICE void __ref memmap_init_zone_device (struct zone *zone,unsigned long start_pfn, -unsigned long size, +unsigned long nr_pages,struct dev_pagemap *pgmap) { -unsigned long pfn, end_pfn = start_pfn + size; +unsigned long pfn, end_pfn = start_pfn + nr_pages;struct pglist_data *pgdat = zone->zone_pgdat;struct vmem_altmap *altmap =pgmap_altmap (pgmap);unsigned long zone_idx =zone_idx (zone);
@@ -5966,7 +5966,7 @@ void __ref memmap_init_zone_device(struc*/ if (altmap) { start_pfn = altmap->base_pfn +vmem_altmap_offset (altmap); - size = end_pfn - start_pfn; + nr_pages = end_pfn - start_pfn; }for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -6013,7 +6013,7 @@ void __ref memmap_init_zone_device(struc }pr_info ("%s initialised %lu pages in %ums\n" , __func__, - size,jiffies_to_msecs (jiffies - start)); + nr_pages,jiffies_to_msecs (jiffies - start)); }#endif
_
Andrew Morton
maintainerPATCH 8/67 mm/memory_hotplug: poison memmap in remove_pfn_range_from_zone()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: poison memmap in remove_pfn_range_from_zone()
Let's poison the pages similar to when adding new memory in sparse_add_section(). Also call remove_pfn_range_from_zone() from memunmap_pages(), so we can poison the memmap from there as well.
---
mm/memory_hotplug.c | 3 +++ mm/memremap.c | 2 ++ 2 files changed, 5 insertions(+)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-poison-memmap-in-remove_pfn_range_from_zone +3 -0
@@ -490,6 +490,9 @@ void __ref remove_pfn_range_from_zone(ststruct pglist_data *pgdat = zone->zone_pgdat;unsigned long flags; +/* Poison struct pages because they are now uninitialized again. */ +page_init_poison (pfn_to_page (start_pfn),sizeof (struct page ) * nr_pages); +#ifdef CONFIG_ZONE_DEVICE /* * Zone shrinking code cannot properly deal with ZONE_DEVICE. So
mm/memremap.c renamed from mm/memremap.c~mm-memory_hotplug-poison-memmap-in-remove_pfn_range_from_zone +2 -0
@@ -120,6 +120,8 @@ void memunmap_pages(struct dev_pagemap * nid =page_to_nid (first_page);mem_hotplug_begin (); +remove_pfn_range_from_zone (page_zone (first_page),PHYS_PFN (res->start), +PHYS_PFN (resource_size (res)));if (pgmap->type ==MEMORY_DEVICE_PRIVATE ) {__remove_pages (PHYS_PFN (res->start),PHYS_PFN (resource_size (res)),NULL );
_
Andrew Morton
maintainerPATCH 9/67 mm/memory_hotplug: we always have a zone in find_(smallest|biggest)_section_pfn
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: we always have a zone in find_(smallest|biggest)_section_pfn
With shrink_pgdat_span() out of the way, we now always have a valid zone.
---
mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-we-always-have-a-zone-in-find_smallestbiggest_section_pfn +2 -2
@@ -355,7 +355,7 @@ static unsigned long find_smallest_sectiif (unlikely (pfn_to_nid (start_pfn) != nid))continue ; -if (zone && zone !=page_zone (pfn_to_page (start_pfn))) +if (zone !=page_zone (pfn_to_page (start_pfn)))continue ;return start_pfn;
@@ -380,7 +380,7 @@ static unsigned long find_biggest_sectioif (unlikely (pfn_to_nid (pfn) != nid))continue ; -if (zone && zone !=page_zone (pfn_to_page (pfn))) +if (zone !=page_zone (pfn_to_page (pfn)))continue ;return pfn;
_
Andrew Morton
maintainerPATCH 10/67 mm/memory_hotplug: don't check for "all holes" in shrink_zone_span()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: don't check for "all holes" in shrink_zone_span()
If we have holes, the holes will automatically get detected and removed once we remove the next bigger/smaller section. The extra checks can go.
---
mm/memory_hotplug.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-dont-check-for-all-holes-in-shrink_zone_span +7 -23
@@ -411,6 +411,9 @@ static void shrink_zone_span(struct zoneif (pfn) { zone->zone_start_pfn = pfn; zone->spanned_pages = zone_end_pfn - pfn; + }else { + zone->zone_start_pfn =0 ; + zone->spanned_pages =0 ; } }else if (zone_end_pfn == end_pfn) {/*
@@ -423,34 +426,11 @@ static void shrink_zone_span(struct zone start_pfn);if (pfn) zone->spanned_pages = pfn - zone_start_pfn +1 ; +else { + zone->zone_start_pfn =0 ; + zone->spanned_pages =0 ; + } } - -/* -* The section is not biggest or smallest mem_section in the zone, it -* only creates a hole in the zone. So in this case, we need not -* change the zone. But perhaps, the zone has only hole data. Thus -* it check the zone has only hole or not. -*/ - pfn = zone_start_pfn; -for (; pfn < zone_end_pfn; pfn +=PAGES_PER_SUBSECTION ) { -if (unlikely (!pfn_to_online_page (pfn))) -continue ; - -if (page_zone (pfn_to_page (pfn)) != zone) -continue ; - -/* Skip range to be removed */ -if (pfn >= start_pfn && pfn < end_pfn) -continue ; - -/* If we find valid section, we have nothing to do */ -zone_span_writeunlock (zone); -return ; - }
Andrew Morton
maintainerPATCH 11/67 mm/memory_hotplug: drop local variables in shrink_zone_span()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: drop local variables in shrink_zone_span()
Get rid of the unnecessary local variables.
---
mm/memory_hotplug.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-drop-local-variables-in-shrink_zone_span +6 -9
@@ -392,14 +392,11 @@ static unsigned long find_biggest_sectiostatic void shrink_zone_span (struct zone *zone,unsigned long start_pfn,unsigned long end_pfn) { -unsigned long zone_start_pfn = zone->zone_start_pfn; -unsigned long z =zone_end_pfn (zone);/* zone_end_pfn namespace clash */ -unsigned long zone_end_pfn = z;unsigned long pfn;int nid =zone_to_nid (zone);zone_span_writelock (zone); -if (zone_start_pfn == start_pfn) { +if (zone->zone_start_pfn == start_pfn) {/* * If the section is smallest section in the zone, it need * shrink zone->zone_start_pfn and zone->zone_spanned_pages.
@@ -407,25 +404,25 @@ static void shrink_zone_span(struct zone* for shrinking zone. */ pfn =find_smallest_section_pfn (nid, zone, end_pfn, - zone_end_pfn); +zone_end_pfn (zone));if (pfn) { + zone->spanned_pages =zone_end_pfn (zone) - pfn; zone->zone_start_pfn = pfn; - zone->spanned_pages = zone_end_pfn - pfn; }else { zone->zone_start_pfn =0 ; zone->spanned_pages =0 ; } - }else if (zone_end_pfn == end_pfn) { + }else if (zone_end_pfn (zone) == end_pfn) {/* * If the section is biggest section in the zone, it need * shrink zone->spanned_pages. * In this case, we find second biggest valid mem_section for * shrinking zone. */ - pfn =find_biggest_section_pfn (nid, zone, zone_start_pfn, + pfn =find_biggest_section_pfn (nid, zone, zone->zone_start_pfn, start_pfn);if (pfn) - zone->spanned_pages = pfn - zone_start_pfn +1 ; + zone->spanned_pages = pfn - zone->zone_start_pfn +1 ;else { zone->zone_start_pfn =0 ; zone->spanned_pages =0 ;
_
Andrew Morton
maintainerPATCH 12/67 mm/memory_hotplug: cleanup __remove_pages()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: cleanup __remove_pages()
Let's drop the basically unused section stuff and simplify.
Also, let's use a shorter variant to calculate the number of pages to the next section boundary.
---
mm/memory_hotplug.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-cleanup-__remove_pages +6 -11
@@ -516,25 +516,20 @@ static void __remove_section(unsigned lovoid __remove_pages (unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap) { +const unsigned long end_pfn = pfn + nr_pages; +unsigned long cur_nr_pages;unsigned long map_offset =0 ; -unsigned long nr, start_sec, end_sec; map_offset =vmem_altmap_offset (altmap);if (check_pfn_span (pfn, nr_pages,"remove" ))return ; - start_sec =pfn_to_section_nr (pfn); - end_sec =pfn_to_section_nr (pfn + nr_pages -1 ); -for (nr = start_sec; nr <= end_sec; nr++) { -unsigned long pfns; - +for (; pfn < end_pfn; pfn += cur_nr_pages) {cond_resched (); - pfns =min (nr_pages,PAGES_PER_SECTION - - (pfn & ~PAGE_SECTION_MASK )); -__remove_section (pfn, pfns, map_offset, altmap); - pfn += pfns; - nr_pages -= pfns; +/* Select all remaining pages up to the next section boundary */ + cur_nr_pages =min (end_pfn - pfn, -(pfn |PAGE_SECTION_MASK )); +__remove_section (pfn, cur_nr_pages, map_offset, altmap); map_offset =0 ; } }
_
Andrew Morton
maintainerPATCH 13/67 mm/memory_hotplug: drop valid_start/valid_end from test_pages_in_a_zone()
In reply to Andrew MortonFrom: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: drop valid_start/valid_end from test_pages_in_a_zone()
The callers are only interested in the actual zone, they don't care about boundaries. Return the zone instead to simplify.
---
drivers/base/memory.c | 9 ++++----- include/linux/memory_hotplug.h | 4 ++-- mm/memory_hotplug.c | 31 +++++++++---------------------- 3 files changed, 15 insertions(+), 29 deletions(-)
drivers/base/memory.c renamed from drivers/base/memory.c~mm-memory_hotplug-drop-valid_start-valid_end-from-test_pages_in_a_zone +4 -5
@@ -376,7 +376,6 @@ static ssize_t valid_zones_show(struct dstruct memory_block *mem =to_memory_block (dev);unsigned long start_pfn =section_nr_to_pfn (mem->start_section_nr);unsigned long nr_pages =PAGES_PER_SECTION * sections_per_block; -unsigned long valid_start_pfn, valid_end_pfn;struct zone *default_zone;int nid;
@@ -389,11 +388,11 @@ static ssize_t valid_zones_show(struct d* The block contains more than one zone can not be offlined. * This can happen e.g. for ZONE_DMA and ZONE_DMA32 */ -if (!test_pages_in_a_zone (start_pfn, start_pfn + nr_pages, - &valid_start_pfn, &valid_end_pfn)) + default_zone =test_pages_in_a_zone (start_pfn, + start_pfn + nr_pages); +if (!default_zone)return sprintf (buf,"none\n" ); - start_pfn = valid_start_pfn; -strcat (buf,page_zone (pfn_to_page (start_pfn))->name); +strcat (buf, default_zone->name); goto out; }
include/linux/memory_hotplug.h renamed from include/linux/memory_hotplug.h~mm-memory_hotplug-drop-valid_start-valid_end-from-test_pages_in_a_zone +2 -2
@@ -96,8 +96,8 @@ extern int add_one_highpage(struct page/* VM interface that may be used by firmware interface */ extern int online_pages (unsigned long pfn,unsigned long nr_pages,int online_type,int nid); -extern int test_pages_in_a_zone (unsigned long start_pfn,unsigned long end_pfn, -unsigned long *valid_start,unsigned long *valid_end); +extern struct zone *test_pages_in_a_zone (unsigned long start_pfn, +unsigned long end_pfn);extern unsigned long __offline_isolated_pages (unsigned long start_pfn,unsigned long end_pfn);
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-drop-valid_start-valid_end-from-test_pages_in_a_zone +9 -20
@@ -1172,14 +1172,13 @@ bool is_mem_section_removable(unsigned l }/* -* Confirm all pages in a range [start, end) belong to the same zone. -* When true, return its valid [start, end). +* Confirm all pages in a range [start, end) belong to the same zone (skipping +* memory holes). When true, return the zone. */ -int test_pages_in_a_zone (unsigned long start_pfn,unsigned long end_pfn, -unsigned long *valid_start,unsigned long *valid_end) +struct zone *test_pages_in_a_zone (unsigned long start_pfn, +unsigned long end_pfn) {unsigned long pfn, sec_end_pfn; -unsigned long start, end;struct zone *zone =NULL ;struct page *page;int i;
@@ -1200,24 +1199,15 @@ int test_pages_in_a_zone(unsigned long scontinue ;/* Check if we got outside of the zone */ if (zone && !zone_spans_pfn (zone, pfn + i)) -return 0 ; +return NULL ; page =pfn_to_page (pfn + i);if (zone &&page_zone (page) != zone) -return 0 ; -if (!zone) - start = pfn + i; +return NULL ; zone =page_zone (page); - end = pfn +MAX_ORDER_NR_PAGES ; } } -if (zone) { - *valid_start = start; - *valid_end =min (end, end_pfn); -return 1 ; - }else { -return 0 ; - } +return zone; }/*
@@ -1462,7 +1452,6 @@ static int __ref __offline_pages(unsigneunsigned long offlined_pages =0 ;int ret, node, nr_isolate_pageblock;unsigned long flags; -unsigned long valid_start, valid_end;struct zone *zone;struct memory_notify arg;char *reason;
@@ -1487,14 +1476,12 @@ static int __ref __offline_pages(unsigne/* This makes hotplug much easier...and readable. we assume this for now. .*/ -if (!test_pages_in_a_zone (start_pfn, end_pfn, &valid_start, - &valid_end)) { + zone =test_pages_in_a_zone (start_pfn, end_pfn); +if (!zone) { ret = -EINVAL ; reason ="multizone range" ; goto failed_removal; }
Andrew Morton
maintainerPATCH 14/67 smp_mb__{before,after}_atomic(): update Documentation
In reply to Andrew MortonFrom: Manfred Spraul <[email protected]>
Subject: smp_mb__{before,after}_atomic(): update Documentation
When adding the _{acquire|release|relaxed}() variants of some atomic operations, it was forgotten to update Documentation/memory_barrier.txt:
smp_mb__{before,after}_atomic() is now intended for all RMW operations that do not imply a memory barrier.
1)
smp_mb__before_atomic(); atomic_add();
2)
smp_mb__before_atomic(); atomic_xchg_relaxed();
3)
smp_mb__before_atomic(); atomic_fetch_add_relaxed();
Invalid would be:
smp_mb__before_atomic(); atomic_set();
In addition, the patch splits the long sentence into multiple shorter sentences.
---
Documentation/memory-barriers.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
Documentation/memory-barriers.txt renamed from Documentation/memory-barriers.txt~smp_mb__beforeafter_atomic-update-documentation +9 -5
@@ -1868,12 +1868,16 @@ There are some more advanced barrier fun (*) smp_mb__before_atomic(); (*) smp_mb__after_atomic(); - These are for use with atomic (such as add, subtract, increment and - decrement) functions that don't return a value, especially when used for - reference counting. These functions do not imply memory barriers. + These are for use with atomic RMW functions that do not imply memory + barriers, but where the code needs a memory barrier. Examples for atomic + RMW functions that do not imply are memory barrier are e.g. add, + subtract, (failed) conditional operations, _relaxed functions, + but not atomic_read or atomic_set. A common example where a memory + barrier may be required is when atomic ops are used for reference + counting. - These are also used for atomic bitop functions that do not return a - value (such as set_bit and clear_bit). + These are also used for atomic RMW bitop functions that do not imply a + memory barrier (such as set_bit and clear_bit). As an example, consider a piece of code that marks an object as being dead and then decrements the object's reference count:
_
Andrew Morton
maintainerPATCH 15/67 ipc/mqueue.c: remove duplicated code
In reply to Andrew MortonFrom: Davidlohr Bueso <[email protected]>
Subject: ipc/mqueue.c: remove duplicated code
pipelined_send() and pipelined_receive() are identical, so merge them.
---
ipc/mqueue.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
ipc/mqueue.c renamed from ipc/mqueue.c~ipc-mqueuec-remove-duplicated-code +18 -13
@@ -918,17 +918,12 @@ out_name:* The same algorithm is used for senders. */ -/* pipelined_send() - send a message directly to the task waiting in -* sys_mq_timedreceive() (without inserting message into a queue). -*/ -static inline void pipelined_send (struct wake_q_head *wake_q, +static inline void __pipelined_op (struct wake_q_head *wake_q,struct mqueue_inode_info *info, -struct msg_msg *message, -struct ext_wait_queue *receiver) +struct ext_wait_queue *this) { - receiver->msg = message; -list_del (&receiver->list); -wake_q_add (wake_q, receiver->task); +list_del (&this->list); +wake_q_add (wake_q, this->task);/* * Rely on the implicit cmpxchg barrier from wake_q_add such * that we can ensure that updating receiver->state is the last
@@ -937,7 +932,19 @@ static inline void pipelined_send(struct* yet, at that point we can later have a use-after-free * condition and bogus wakeup. */ - receiver->state =STATE_READY ; + this->state =STATE_READY ; +} + +/* pipelined_send() - send a message directly to the task waiting in +* sys_mq_timedreceive() (without inserting message into a queue). +*/ +static inline void pipelined_send (struct wake_q_head *wake_q, +struct mqueue_inode_info *info, +struct msg_msg *message, +struct ext_wait_queue *receiver) +{ + receiver->msg = message; +__pipelined_op (wake_q, info, receiver); }/* pipelined_receive() - if there is task waiting in sys_mq_timedsend()
@@ -955,9 +962,7 @@ static inline void pipelined_receive(strif (msg_insert (sender->msg, info))return ; -list_del (&sender->list); -wake_q_add (wake_q, sender->task); - sender->state =STATE_READY ; +__pipelined_op (wake_q, info, sender); } static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
_
Andrew Morton
maintainerPATCH 16/67 ipc/mqueue.c: update/document memory barriers
In reply to Andrew MortonFrom: Manfred Spraul <[email protected]>
Subject: ipc/mqueue.c: update/document memory barriers
Update and document memory barriers for mqueue.c:
- ewp->state is read without any locks, thus READ_ONCE is required.
- add smp_aquire__after_ctrl_dep() after the READ_ONCE, we need acquire semantics if the value is STATE_READY.
- use wake_q_add_safe()
- document why __set_current_state() may be used:
Reading task->state cannot happen before the wake_q_add() call, which happens while holding info->lock. Thus the spin_unlock() is the RELEASE, and the spin_lock() is the ACQUIRE.
For completeness: there is also a 3 CPU scenario, if the to be woken up task is already on another wake_q.
Then:
- CPU1: spin_unlock() of the task that goes to sleep is the RELEASE
- CPU2: the spin_lock() of the waker is the ACQUIRE
- CPU2: smp_mb__before_atomic inside wake_q_add() is the RELEASE
- CPU3: smp_mb__after_spinlock() inside try_to_wake_up() is the ACQUIRE
---
ipc/mqueue.c | 92 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 14 deletions(-)
ipc/mqueue.c renamed from ipc/mqueue.c~ipc-mqueuec-update-document-memory-barriers +78 -14
@@ -63,6 +63,66 @@ struct posix_msg_tree_node {int priority; }; +/* +* Locking: +* +* Accesses to a message queue are synchronized by acquiring info->lock. +* +* There are two notable exceptions: +* - The actual wakeup of a sleeping task is performed using the wake_q +* framework. info->lock is already released when wake_up_q is called. +* - The exit codepaths after sleeping check ext_wait_queue->state without +* any locks. If it is STATE_READY, then the syscall is completed without +* acquiring info->lock. +* +* MQ_BARRIER: +* To achieve proper release/acquire memory barrier pairing, the state is set to +* STATE_READY with smp_store_release(), and it is read with READ_ONCE followed +* by smp_acquire__after_ctrl_dep(). In addition, wake_q_add_safe() is used. +* +* This prevents the following races: +* +* 1) With the simple wake_q_add(), the task could be gone already before +* the increase of the reference happens +* Thread A +* Thread B +* WRITE_ONCE(wait.state, STATE_NONE); +* schedule_hrtimeout() +* wake_q_add(A) +* if (cmpxchg()) // success +* ->state = STATE_READY (reordered) +* <timeout returns> +* if (wait.state == STATE_READY) return; +* sysret to user space +* sys_exit() +* get_task_struct() // UaF +* +* Solution: Use wake_q_add_safe() and perform the get_task_struct() before +* the smp_store_release() that does ->state = STATE_READY. +* +* 2) Without proper _release/_acquire barriers, the woken up task +* could read stale data +* +* Thread A +* Thread B +* do_mq_timedreceive +* WRITE_ONCE(wait.state, STATE_NONE); +* schedule_hrtimeout() +* state = STATE_READY; +* <timeout returns> +* if (wait.state == STATE_READY) return; +* msg_ptr = wait.msg; // Access to stale data! +* receiver->msg = message; (reordered) +* +* Solution: use _release and _acquire barriers. +* +* 3) There is intentionally no barrier when setting current->state +* to TASK_INTERRUPTIBLE: spin_unlock(&info->lock) provides the +* release memory barrier, and the wakeup is triggered when holding +* info->lock, i.e. spin_lock(&info->lock) provided a pairing +* acquire memory barrier. +*/ +struct ext_wait_queue {/* queue of sleeping tasks */ struct task_struct *task;struct list_head list;
@@ -646,18 +706,23 @@ static int wq_sleep(struct mqueue_inode_wq_add (info, sr, ewp);for (;;) { +/* memory barrier not required, we hold info->lock */ __set_current_state (TASK_INTERRUPTIBLE );spin_unlock (&info->lock); time =schedule_hrtimeout_range_clock (timeout,0 ,HRTIMER_MODE_ABS ,CLOCK_REALTIME ); -if (ewp->state ==STATE_READY ) { +if (READ_ONCE (ewp->state) ==STATE_READY ) { +/* see MQ_BARRIER for purpose/pairing */ +smp_acquire__after_ctrl_dep (); retval =0 ; goto out; }spin_lock (&info->lock); -if (ewp->state ==STATE_READY ) { + +/* we hold info->lock, so no memory barrier required */ +if (READ_ONCE (ewp->state) ==STATE_READY ) { retval =0 ; goto out_unlock; }
@@ -923,16 +988,11 @@ static inline void __pipelined_op(struct struct ext_wait_queue *this) {list_del (&this->list); -wake_q_add (wake_q, this->task); -/* -* Rely on the implicit cmpxchg barrier from wake_q_add such -* that we can ensure that updating receiver->state is the last -* write operation: As once set, the receiver can continue, -* and if we don't have the reference count from the wake_q, -* yet, at that point we can later have a use-after-free -* condition and bogus wakeup. -*/ - this->state =STATE_READY ; +get_task_struct (this->task); + +/* see MQ_BARRIER for purpose/pairing */ +smp_store_release (&this->state,STATE_READY ); +wake_q_add_safe (wake_q, this->task); }/* pipelined_send() - send a message directly to the task waiting in
@@ -1049,7 +1109,9 @@ static int do_mq_timedsend(mqd_t mqdes, }else { wait.task = current; wait.msg = (void *) msg_ptr; - wait.state =STATE_NONE ; + +/* memory barrier not required, we hold info->lock */ +WRITE_ONCE (wait.state,STATE_NONE ); ret =wq_sleep (info,SEND , timeout, &wait);/* * wq_sleep must be called with info->lock held, and
@@ -1152,7 +1214,9 @@ static int do_mq_timedreceive(mqd_t mqde ret = -EAGAIN ; }else { wait.task = current; - wait.state =STATE_NONE ; + +/* memory barrier not required, we hold info->lock */ +WRITE_ONCE (wait.state,STATE_NONE ); ret =wq_sleep (info,RECV , timeout, &wait); msg_ptr = wait.msg; }
_
Andrew Morton
maintainerPATCH 17/67 ipc/msg.c: update and document memory barriers
In reply to Andrew MortonFrom: Manfred Spraul <[email protected]>
Subject: ipc/msg.c: update and document memory barriers
Transfer findings from ipc/mqueue.c:
- A control barrier was missing for the lockless receive case So in theory, not yet initialized data may have been copied to user space - obviously only for architectures where control barriers are not NOP.
- use smp_store_release(). In theory, the refount may have been decreased to 0 already when wake_q_add() tries to get a reference.
---
ipc/msg.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-)
ipc/msg.c renamed from ipc/msg.c~ipc-msgc-update-and-document-memory-barriers +36 -7
@@ -61,6 +61,16 @@ struct msg_queue {struct list_head q_senders; } __randomize_layout; +/* +* MSG_BARRIER Locking: +* +* Similar to the optimization used in ipc/mqueue.c, one syscall return path +* does not acquire any locks when it sees that a message exists in +* msg_receiver.r_msg. Therefore r_msg is set using smp_store_release() +* and accessed using READ_ONCE()+smp_acquire__after_ctrl_dep(). In addition, +* wake_q_add_safe() is used. See ipc/mqueue.c for more details +*/ +/* one msg_receiver structure for each sleeping receiver */ struct msg_receiver {struct list_head r_list;
@@ -184,6 +194,10 @@ static inline void ss_add(struct msg_que { mss->tsk = current; mss->msgsz = msgsz; +/* +* No memory barrier required: we did ipc_lock_object(), +* and the waker obtains that lock before calling wake_q_add(). +*/ __set_current_state (TASK_INTERRUPTIBLE );list_add_tail (&mss->list, &msq->q_senders); }
@@ -237,8 +251,11 @@ static void expunge_all(struct msg_queuestruct msg_receiver *msr, *t;list_for_each_entry_safe (msr, t, &msq->q_receivers, r_list) { -wake_q_add (wake_q, msr->r_tsk); -WRITE_ONCE (msr->r_msg,ERR_PTR (res)); +get_task_struct (msr->r_tsk); + +/* see MSG_BARRIER for purpose/pairing */ +smp_store_release (&msr->r_msg,ERR_PTR (res)); +wake_q_add_safe (wake_q, msr->r_tsk); } }
@@ -798,13 +815,17 @@ static inline int pipelined_send(structlist_del (&msr->r_list);if (msr->r_maxsize < msg->m_ts) {wake_q_add (wake_q, msr->r_tsk); -WRITE_ONCE (msr->r_msg,ERR_PTR (-E2BIG )); + +/* See expunge_all regarding memory barrier */ +smp_store_release (&msr->r_msg,ERR_PTR (-E2BIG )); }else {ipc_update_pid (&msq->q_lrpid,task_pid (msr->r_tsk)); msq->q_rtime =ktime_get_real_seconds ();wake_q_add (wake_q, msr->r_tsk); -WRITE_ONCE (msr->r_msg, msg); + +/* See expunge_all regarding memory barrier */ +smp_store_release (&msr->r_msg, msg);return 1 ; } }
@@ -1154,7 +1175,11 @@ static long do_msgrcv(int msqid, void __ msr_d.r_maxsize =INT_MAX ; else msr_d.r_maxsize = bufsz; - msr_d.r_msg =ERR_PTR (-EAGAIN ); + +/* memory barrier not require due to ipc_lock_object() */ +WRITE_ONCE (msr_d.r_msg,ERR_PTR (-EAGAIN )); + +/* memory barrier not required, we own ipc_lock_object() */ __set_current_state (TASK_INTERRUPTIBLE );ipc_unlock_object (&msq->q_perm);
@@ -1183,8 +1208,12 @@ static long do_msgrcv(int msqid, void __* signal) it will either see the message and continue ... */ msg =READ_ONCE (msr_d.r_msg); -if (msg !=ERR_PTR (-EAGAIN )) +if (msg !=ERR_PTR (-EAGAIN )) { +/* see MSG_BARRIER for purpose/pairing */ +smp_acquire__after_ctrl_dep (); + goto out_unlock1; + }/* * ... or see -EAGAIN, acquire the lock to check the message
@@ -1192,7 +1221,7 @@ static long do_msgrcv(int msqid, void __*/ ipc_lock_object (&msq->q_perm); - msg = msr_d.r_msg; + msg =READ_ONCE (msr_d.r_msg);if (msg !=ERR_PTR (-EAGAIN )) goto out_unlock0;
_
Andrew Morton
maintainerPATCH 18/67 ipc/sem.c: document and update memory barriers
In reply to Andrew MortonFrom: Manfred Spraul <[email protected]>
Subject: ipc/sem.c: document and update memory barriers
Document and update the memory barriers in ipc/sem.c:
- Add smp_store_release() to wake_up_sem_queue_prepare() and document why it is needed.
- Read q->status using READ_ONCE+smp_acquire__after_ctrl_dep(). as the pair for the barrier inside wake_up_sem_queue_prepare().
- Add comments to all barriers, and mention the rules in the block regarding locking.
- Switch to using wake_q_add_safe().
---
ipc/sem.c | 66 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 25 deletions(-)
ipc/sem.c renamed from ipc/sem.c~ipc-semc-document-and-update-memory-barriers +41 -25
@@ -205,15 +205,38 @@ static int sysvipc_sem_proc_show(struct* * Memory ordering: * Most ordering is enforced by using spin_lock() and spin_unlock(). -* The special case is use_global_lock: +* +* Exceptions: +* 1) use_global_lock: (SEM_BARRIER_1) * Setting it from non-zero to 0 is a RELEASE, this is ensured by -* using smp_store_release(). +* using smp_store_release(): Immediately after setting it to 0, +* a simple op can start. * Testing if it is non-zero is an ACQUIRE, this is ensured by using * smp_load_acquire(). * Setting it from 0 to non-zero must be ordered with regards to * this smp_load_acquire(), this is guaranteed because the smp_load_acquire() * is inside a spin_lock() and after a write from 0 to non-zero a * spin_lock()+spin_unlock() is done. +* +* 2) queue.status: (SEM_BARRIER_2) +* Initialization is done while holding sem_lock(), so no further barrier is +* required. +* Setting it to a result code is a RELEASE, this is ensured by both a +* smp_store_release() (for case a) and while holding sem_lock() +* (for case b). +* The AQUIRE when reading the result code without holding sem_lock() is +* achieved by using READ_ONCE() + smp_acquire__after_ctrl_dep(). +* (case a above). +* Reading the result code while holding sem_lock() needs no further barriers, +* the locks inside sem_lock() enforce ordering (case b above) +* +* 3) current->state: +* current->state is set to TASK_INTERRUPTIBLE while holding sem_lock(). +* The wakeup is handled using the wake_q infrastructure. wake_q wakeups may +* happen immediately after calling wake_q_add. As wake_q_add_safe() is called +* when holding sem_lock(), no further barriers are required. +* +* See also ipc/mqueue.c for more details on the covered races. */ #define sc_semmsl sem_ctls[0]
@@ -344,12 +367,8 @@ static void complexmode_tryleave(structreturn ; }if (sma->use_global_lock ==1 ) { -/* -* Immediately after setting use_global_lock to 0, -* a simple op can start. Thus: all memory writes -* performed by the current operation must be visible -* before we set use_global_lock to 0. -*/ + +/* See SEM_BARRIER_1 for purpose/pairing */ smp_store_release (&sma->use_global_lock,0 ); }else { sma->use_global_lock--;
@@ -400,7 +419,7 @@ static inline int sem_lock(struct sem_ar*/ spin_lock (&sem->lock); -/* pairs with smp_store_release() */ +/* see SEM_BARRIER_1 for purpose/pairing */ if (!smp_load_acquire (&sma->use_global_lock)) {/* fast path successful! */ return sops->sem_num;
@@ -766,15 +785,12 @@ would_block:static inline void wake_up_sem_queue_prepare (struct sem_queue *q,int error,struct wake_q_head *wake_q) { -wake_q_add (wake_q, q->sleeper); -/* -* Rely on the above implicit barrier, such that we can -* ensure that we hold reference to the task before setting -* q->status. Otherwise we could race with do_exit if the -* task is awoken by an external event before calling -* wake_up_process(). -*/ -WRITE_ONCE (q->status, error); +get_task_struct (q->sleeper); + +/* see SEM_BARRIER_2 for purpuse/pairing */ +smp_store_release (&q->status, error); + +wake_q_add_safe (wake_q, q->sleeper); }static void unlink_queue (struct sem_array *sma,struct sem_queue *q)
@@ -2148,9 +2164,11 @@ static long do_semtimedop(int semid, str } do { + /* memory ordering ensured by the lock in sem_lock() */ WRITE_ONCE(queue.status, -EINTR); queue.sleeper = current; + /* memory ordering is ensured by the lock in sem_lock() */ __set_current_state(TASK_INTERRUPTIBLE); sem_unlock(sma, locknum); rcu_read_unlock();
@@ -2173,13 +2191,8 @@ static long do_semtimedop(int semid, str*/ error =READ_ONCE (queue.status);if (error != -EINTR ) { -/* -* User space could assume that semop() is a memory -* barrier: Without the mb(), the cpu could -* speculatively read in userspace stale data that was -* overwritten by the previous owner of the semaphore. -*/ -smp_mb (); +/* see SEM_BARRIER_2 for purpose/pairing */ +smp_acquire__after_ctrl_dep (); goto out_free; }
@@ -2189,6 +2202,9 @@ static long do_semtimedop(int semid, strif (!ipc_valid_object (&sma->sem_perm)) goto out_unlock_free; +/* +* No necessity for any barrier: We are protect by sem_lock() +*/ error =READ_ONCE (queue.status);/*
_
Andrew Morton
maintainerPATCH 19/67 ipc/msg.c: consolidate all xxxctl_down() functions
In reply to Andrew MortonFrom: Lu Shuaibing <[email protected]>
Subject: ipc/msg.c: consolidate all xxxctl_down() functions
A use of uninitialized memory in msgctl_down() because msqid64 in ksys_msgctl hasn't been initialized. The local | msqid64 | is created in ksys_msgctl() and then passed into msgctl_down(). Along the way msqid64 is never initialized before msgctl_down() checks msqid64->msg_qbytes.
KUMSAN(KernelUninitializedMemorySantizer, a new error detection tool) reports:
==================================================================
BUG: KUMSAN: use of uninitialized memory in msgctl_down+0x94/0x300 Read of size 8 at addr ffff88806bb97eb8 by task syz-executor707/2022 CPU: 0 PID: 2022 Comm: syz-executor707 Not tainted 5.2.0-rc4+ #63 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 Call Trace: dump_stack+0x75/0xae __kumsan_report+0x17c/0x3e6 kumsan_report+0xe/0x20 msgctl_down+0x94/0x300 ksys_msgctl.constprop.14+0xef/0x260 do_syscall_64+0x7e/0x1f0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x4400e9 Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 fb 13 fc ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007ffd869e0598 EFLAGS: 00000246 ORIG_RAX: 0000000000000047 RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 00000000004400e9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 00000000006ca018 R08: 0000000000000000 R09: 0000000000000000 R10: 00000000ffffffff R11: 0000000000000246 R12: 0000000000401970 R13: 0000000000401a00 R14: 0000000000000000 R15: 0000000000000000 The buggy address belongs to the page: page:ffffea0001aee5c0 refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 flags: 0x100000000000000() raw: 0100000000000000 0000000000000000 ffffffff01ae0101 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kumsan: bad access detected ==================================================================
Syzkaller reproducer:
msgctl$IPC_RMID(0x0, 0x0)
C reproducer:
// autogenerated by syzkaller (https://github.com/google/syzkaller)
int main(void)
{
syscall(__NR_mmap, 0x20000000, 0x1000000, 3, 0x32, -1, 0); syscall(__NR_msgctl, 0, 0, 0);
return 0;
}
From: Andrew Morton <[email protected]>
Subject: drivers/block/null_blk_main.c: fix layout
Each line here overflows 80 cols by exactly one character. Delete one tab per line to fix.
---
ipc/msg.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
ipc/msg.c renamed from ipc/msg.c~ipc-consolidate-all-xxxctl_down-functions +10 -9
@@ -394,7 +394,7 @@ copy_msqid_from_user(struct msqid64_ds ** NOTE: no locks must be held, the rwsem is taken inside this function. */ static int msgctl_down (struct ipc_namespace *ns,int msqid,int cmd, -struct msqid64_ds *msqid64) +struct ipc64_perm *perm,int msg_qbytes) {struct kern_ipc_perm *ipcp;struct msg_queue *msq;
@@ -404,7 +404,7 @@ static int msgctl_down(struct ipc_namesprcu_read_lock (); ipcp =ipcctl_obtain_check (ns, &msg_ids (ns), msqid, cmd, - &msqid64->msg_perm, msqid64->msg_qbytes); + perm, msg_qbytes);if (IS_ERR (ipcp)) { err =PTR_ERR (ipcp); goto out_unlock1;
@@ -426,18 +426,18 @@ static int msgctl_down(struct ipc_namesp {DEFINE_WAKE_Q (wake_q); -if (msqid64->msg_qbytes > ns->msg_ctlmnb && +if (msg_qbytes > ns->msg_ctlmnb && !capable (CAP_SYS_RESOURCE )) { err = -EPERM ; goto out_unlock1; }ipc_lock_object (&msq->q_perm); - err =ipc_update_perm (&msqid64->msg_perm, ipcp); + err =ipc_update_perm (perm, ipcp);if (err) goto out_unlock0; - msq->q_qbytes = msqid64->msg_qbytes; + msq->q_qbytes = msg_qbytes; msq->q_ctime =ktime_get_real_seconds ();/*
@@ -618,9 +618,10 @@ static long ksys_msgctl(int msqid, int ccase IPC_SET :if (copy_msqid_from_user (&msqid64, buf, version))return -EFAULT ; -/* fallthru */ +return msgctl_down (ns, msqid, cmd, &msqid64.msg_perm, + msqid64.msg_qbytes);case IPC_RMID : -return msgctl_down (ns, msqid, cmd, &msqid64); +return msgctl_down (ns, msqid, cmd,NULL ,0 );default :return -EINVAL ; }
@@ -752,9 +753,9 @@ static long compat_ksys_msgctl(int msqidcase IPC_SET :if (copy_compat_msqid_from_user (&msqid64, uptr, version))return -EFAULT ; -/* fallthru */ +return msgctl_down (ns, msqid, cmd, &msqid64.msg_perm, msqid64.msg_qbytes);case IPC_RMID : -return msgctl_down (ns, msqid, cmd, &msqid64); +return msgctl_down (ns, msqid, cmd,NULL ,0 );default :return -EINVAL ; }
_
Andrew Morton
maintainerPATCH 20/67 drivers/block/null_blk_main.c: fix layout
In reply to Andrew MortonFrom: Andrew Morton <[email protected]>
Subject: drivers/block/null_blk_main.c: fix layout
Each line here overflows 80 cols by exactly one character. Delete one tab per line to fix.
---
drivers/block/null_blk_main.c | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-)
drivers/block/null_blk_main.c renamed from drivers/block/null_blk_main.c~drivers-block-null_blk_mainc-fix-layout +28 -28
@@ -263,34 +263,34 @@ static ssize_t nullb_device_bool_attr_st }/* The following macro should only be used with TYPE = {uint, ulong, bool}. */ -#define NULLB_DEVICE_ATTR (NAME ,TYPE ,APPLY ) \ -static ssize_t \ -nullb_device_##NAME##_show(struct config_item *item, char *page) \ -{ \ - return nullb_device_##TYPE##_attr_show( \ - to_nullb_device(item)->NAME, page); \ -} \ -static ssize_t \ -nullb_device_##NAME##_store(struct config_item *item, const char *page, \ - size_t count) \ -{ \ - int (*apply_fn)(struct nullb_device *dev, TYPE new_value) = APPLY; \ - struct nullb_device *dev = to_nullb_device(item); \ - TYPE new_value; \ - int ret; \ - \ - ret = nullb_device_##TYPE##_attr_store(&new_value, page, count); \ - if (ret < 0) \ - return ret; \ - if (apply_fn) \ - ret = apply_fn(dev, new_value); \ - else if (test_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags)) \ - ret = -EBUSY; \ - if (ret < 0) \ - return ret; \ - dev->NAME = new_value; \ - return count; \ -} \ +#define NULLB_DEVICE_ATTR (NAME ,TYPE ,APPLY ) \ +static ssize_t \ +nullb_device_##NAME##_show(struct config_item *item, char *page) \ +{ \ + return nullb_device_##TYPE##_attr_show( \ + to_nullb_device(item)->NAME, page); \ +} \ +static ssize_t \ +nullb_device_##NAME##_store(struct config_item *item, const char *page, \ + size_t count) \ +{ \ + int (*apply_fn)(struct nullb_device *dev, TYPE new_value) = APPLY;\ + struct nullb_device *dev = to_nullb_device(item); \ + TYPE new_value; \ + int ret; \ + \ + ret = nullb_device_##TYPE##_attr_store(&new_value, page, count);\ + if (ret < 0) \ + return ret; \ + if (apply_fn) \ + ret = apply_fn(dev, new_value); \ + else if (test_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags)) \ + ret = -EBUSY; \ + if (ret < 0) \ + return ret; \ + dev->NAME = new_value; \ + return count; \ +} \ CONFIGFS_ATTR(nullb_device_, NAME); static int nullb_apply_submit_queues(struct nullb_device *dev,
_
Andrew Morton
maintainerPATCH 21/67 drivers/block/null_blk_main.c: fix uninitialized var warnings
In reply to Andrew MortonFrom: Andrew Morton <[email protected]>
Subject: drivers/block/null_blk_main.c: fix uninitialized var warnings
With gcc-7.2, many instances of
drivers/block/null_blk_main.c: In function ‘nullb_device_zone_nr_conv_store’:drivers/block/null_blk_main.c:291:12: warning: ‘new_value’ may be used uninitialized in this function [-Wmaybe-uninitialized]
dev->NAME = new_value; \
^
drivers/block/null_blk_main.c:279:7: note: ‘new_value’ was declared here
TYPE new_value; \
^Presumably notabug, so use uninitialized_var() to suppress them.
---
drivers/block/null_blk_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk_main.c renamed from drivers/block/null_blk_main.c~drivers-block-null_blk_mainc-fix-uninitialized-var-warnings +1 -1
@@ -276,7 +276,7 @@ nullb_device_##NAME##_store(struct confi { \int (*apply_fn)(struct nullb_device *dev,TYPE new_value) =APPLY ;\struct nullb_device *dev =to_nullb_device (item); \ -TYPE new_value; \ +TYPE uninitialized_var (new_value ); \int ret; \ \ ret = nullb_device_##TYPE##_attr_store(&new_value, page, count);\
_
Andrew Morton
maintainerPATCH 22/67 pinctrl: fix pxa2xx.c build warnings
In reply to Andrew MortonFrom: Randy Dunlap <[email protected]>
Subject: pinctrl: fix pxa2xx.c build warnings
Add #include of <linux/pinctrl/machine.h> to fix build warnings in pinctrl-pxa2xx.c. Fixes these warnings:
In file included from ../drivers/pinctrl/pxa/pinctrl-pxa2xx.c:24:0:../drivers/pinctrl/pxa/../pinctrl-utils.h:36:8: warning: `enum pinctrl_map_type' declared inside parameter list [enabled by default]
enum pinctrl_map_type type);
^../drivers/pinctrl/pxa/../pinctrl-utils.h:36:8: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
---
drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pxa/pinctrl-pxa2xx.c renamed from drivers/pinctrl/pxa/pinctrl-pxa2xx.c~pinctrl-fix-pxa2xxc-build-warnings +1 -0
@@ -10,6 +10,7 @@#include <linux/of.h> #include <linux/of_address.h> #include <linux/module.h> +#include <linux/pinctrl/machine.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinmux.h>
_
Andrew Morton
maintainerPATCH 23/67 mm: remove __krealloc
In reply to Andrew MortonFrom: Florian Westphal <[email protected]>
Subject: mm: remove __krealloc
Since 5.5-rc1 the last user of this function is gone, so remove the functionality.
See commit2ad9d7747c10 ("netfilter: conntrack: free extension area immediately") for details.
---
include/linux/slab.h | 1 - mm/slab_common.c | 22 ---------------------- scripts/coccinelle/free/devm_free.cocci | 4 ---- 3 files changed, 27 deletions(-)
include/linux/slab.h renamed from include/linux/slab.h~mm-remove-__krealloc +0 -1
@@ -184,7 +184,6 @@ void memcg_deactivate_kmem_caches(struct/* * Common kmalloc functions provided by all allocators */ -void *__must_check __krealloc (const void *,size_t ,gfp_t );void *__must_check krealloc (const void *,size_t ,gfp_t );void kfree (const void *);void kzfree (const void *);
mm/slab_common.c renamed from mm/slab_common.c~mm-remove-__krealloc +0 -20
@@ -1677,28 +1677,6 @@ static __always_inline void *__do_kreall }/** -* __krealloc - like krealloc() but don't free @p. -* @p: object to reallocate memory for. -* @new_size: how many bytes of memory are required. -* @flags: the type of memory to allocate. -* -* This function is like krealloc() except it never frees the originally -* allocated buffer. Use this if you don't want to free the buffer immediately -* like, for example, with RCU. -* -* Return: pointer to the allocated memory or %NULL in case of error -*/ -void *__krealloc (const void *p,size_t new_size,gfp_t flags) -{ -if (unlikely (!new_size)) -return ZERO_SIZE_PTR ; - -return __do_krealloc (p, new_size, flags); - -} -EXPORT_SYMBOL (__krealloc);
Andrew Morton
maintainerPATCH 24/67 mm: add generic p?d_leaf() macros
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: add generic p?d_leaf() macros
Patch series "Generic page walk and ptdump", v17.
Many architectures current have a debugfs file for dumping the kernel page tables. Currently each architecture has to implement custom functions for this because the details of walking the page tables used by the kernel are different between architectures.
This series extends the capabilities of walk_page_range() so that it can deal with the page tables of the kernel (which have no VMAs and can contain larger huge pages than exist for user space). A generic PTDUMP implementation is the implemented making use of the new functionality of walk_page_range() and finally arm64 and x86 are switch to using it, removing the custom table walkers.
To enable a generic page table walker to walk the unusual mappings of the kernel we need to implement a set of functions which let us know when the walker has reached the leaf entry. After a suggestion from Will Deacon I've chosen the name p?d_leaf() as this (hopefully) describes the purpose (and is a new name so has no historic baggage). Some architectures have p?d_large macros but this is easily confused with "large pages".
This series ends with a generic PTDUMP implemention for arm64 and x86.
Mostly this is a clean up and there should be very little functional change. The exceptions are:
* arm64 PTDUMP debugfs now displays pages which aren't present (patch 22).
* arm64 has the ability to efficiently process KASAN pages (which previously only x86 implemented). This means that the combination of KASAN and DEBUG_WX is now useable.
This patch (of 23):
Exposing the pud/pgd levels of the page tables to walk_page_range() means we may come across the exotic large mappings that come with large areas of contiguous memory (such as the kernel's linear map).
For architectures that don't provide all p?d_leaf() macros, provide generic do nothing default that are suitable where there cannot be leaf pages at that level. Futher patches will add implementations for individual architectures.
The name p?d_leaf() is chosen to minimize the confusion with existing uses of "large" pages and "huge" pages which do not necessary mean that the entry is a leaf (for example it may be a set of contiguous entries that only take 1 TLB slot). For the purpose of walking the page tables we don't need to know how it will be represented in the TLB, but we do need to know for sure if it is a leaf of the tree.
---
include/asm-generic/pgtable.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
include/asm-generic/pgtable.h renamed from include/asm-generic/pgtable.h~mm-add-generic-pd_leaf-macros +20 -0
@@ -1238,4 +1238,24 @@ static inline bool arch_has_pfn_modify_c#define mm_pmd_folded (mm) __is_defined(__PAGETABLE_PMD_FOLDED)#endif +/* +* p?d_leaf() - true if this entry is a final mapping to a physical address. +* This differs from p?d_huge() by the fact that they are always available (if +* the architecture supports large pages at the appropriate level) even +* if CONFIG_HUGETLB_PAGE is not defined. +* Only meaningful when called on a valid entry. +*/ +#ifndef pgd_leaf +#define pgd_leaf (x) 0 +#endif +#ifndef p4d_leaf +#define p4d_leaf (x) 0 +#endif +#ifndef pud_leaf +#define pud_leaf (x) 0 +#endif +#ifndef pmd_leaf +#define pmd_leaf (x) 0 +#endif +#endif /* _ASM_GENERIC_PGTABLE_H */
_
Andrew Morton
maintainerPATCH 25/67 arc: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: arc: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information will be provided by the p?d_leaf() functions/macros.
For arc, we only have two levels, so only pmd_leaf() is needed.
---
arch/arc/include/asm/pgtable.h | 1 + 1 file changed, 1 insertion(+)
arch/arc/include/asm/pgtable.h renamed from arch/arc/include/asm/pgtable.h~arc-mm-add-pd_leaf-definitions +1 -0
@@ -273,6 +273,7 @@ static inline void pmd_set(pmd_t *pmdp,#define pmd_none (x) (!pmd_val(x))#define pmd_bad (x) ((pmd_val(x) & ~PAGE_MASK))#define pmd_present (x) (pmd_val(x)) +#define pmd_leaf (x) (pmd_val(x) & _PAGE_HW_SZ)#define pmd_clear (xp) do { pmd_val(*(xp)) = 0; } while (0)#define pte_page (pte) pfn_to_page(pte_pfn(pte))
_
Andrew Morton
maintainerPATCH 26/67 arm: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: arm: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For arm pmd_large() already exists and does what we want. So simply provide the generic pmd_leaf() name.
---
arch/arm/include/asm/pgtable-2level.h | 1 + arch/arm/include/asm/pgtable-3level.h | 1 + 2 files changed, 2 insertions(+)
arch/arm/include/asm/pgtable-2level.h renamed from arch/arm/include/asm/pgtable-2level.h~arm-mm-add-pd_leaf-definitions +1 -0
@@ -189,6 +189,7 @@ static inline pmd_t *pmd_offset(pud_t *p }#define pmd_large (pmd) (pmd_val(pmd) & 2) +#define pmd_leaf (pmd) (pmd_val(pmd) & 2)#define pmd_bad (pmd) (pmd_val(pmd) & 2)#define pmd_present (pmd) (pmd_val(pmd))
arch/arm/include/asm/pgtable-3level.h renamed from arch/arm/include/asm/pgtable-3level.h~arm-mm-add-pd_leaf-definitions +1 -0
@@ -134,6 +134,7 @@#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT)#define pmd_large (pmd) pmd_sect(pmd) +#define pmd_leaf (pmd) pmd_sect(pmd)#define pud_clear (pudp) \ do { \
_
Andrew Morton
maintainerPATCH 27/67 arm64: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: arm64: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information will be provided by the p?d_leaf() functions/macros.
For arm64, we already have p?d_sect() macros which we can reuse for p?d_leaf().
pud_sect() is defined as a dummy function when CONFIG_PGTABLE_LEVELS < 3 or CONFIG_ARM64_64K_PAGES is defined. However when the kernel is configured this way then architecturally it isn't allowed to have a large page at this level, and any code using these page walking macros is implicitly relying on the page size/number of levels being the same as the kernel. So it is safe to reuse this for p?d_leaf() as it is an architectural restriction.
---
arch/arm64/include/asm/pgtable.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/include/asm/pgtable.h renamed from arch/arm64/include/asm/pgtable.h~arm64-mm-add-pd_leaf-definitions +2 -0
@@ -441,6 +441,7 @@ extern pgprot_t phys_mem_access_prot(str PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT) +#define pmd_leaf (pmd) pmd_sect(pmd)#if defined(CONFIG_ARM64_64K_PAGES ) ||CONFIG_PGTABLE_LEVELS <3 static inline bool pud_sect (pud_t pud) {return false; }
@@ -525,6 +526,7 @@ static inline void pte_unmap(pte_t *pte)#define pud_none (pud) (!pud_val(pud))#define pud_bad (pud) (!(pud_val(pud) & PUD_TABLE_BIT))#define pud_present (pud) pte_present(pud_pte(pud)) +#define pud_leaf (pud) pud_sect(pud)#define pud_valid (pud) pte_valid(pud_pte(pud))static inline void set_pud (pud_t *pudp,pud_t pud)
_
Andrew Morton
maintainerPATCH 28/67 mips: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mips: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
If _PAGE_HUGE is defined we can simply look for it. When not defined we can be confident that there are no leaf pages in existence and fall back on the generic implementation (added in a later patch) which returns 0.
---
arch/mips/include/asm/pgtable.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/mips/include/asm/pgtable.h renamed from arch/mips/include/asm/pgtable.h~mips-mm-add-pd_leaf-definitions +5 -0
@@ -639,6 +639,11 @@ static inline pmd_t pmdp_huge_get_and_cl#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +#ifdef _PAGE_HUGE +#define pmd_leaf (pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0) +#define pud_leaf (pud) ((pud_val(pud) & _PAGE_HUGE) != 0) +#endif +#define gup_fast_permitted (start, end) (!cpu_has_dc_aliases)#include <asm-generic/pgtable.h>
_
Andrew Morton
maintainerPATCH 29/67 powerpc: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: powerpc: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For powerpc p?d_is_leaf() functions already exist. Export them using the new p?d_leaf() name.
---
arch/powerpc/include/asm/book3s/64/pgtable.h | 3 +++ 1 file changed, 3 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h renamed from arch/powerpc/include/asm/book3s/64/pgtable.h~powerpc-mm-add-pd_leaf-definitions +3 -0
@@ -1355,18 +1355,21 @@ static inline bool is_pte_rw_upgrade(uns* Like pmd_huge() and pmd_large(), but works regardless of config options */ #define pmd_is_leaf pmd_is_leaf +#define pmd_leaf pmd_is_leafstatic inline bool pmd_is_leaf (pmd_t pmd) {return !!(pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE)); }#define pud_is_leaf pud_is_leaf +#define pud_leaf pud_is_leafstatic inline bool pud_is_leaf (pud_t pud) {return !!(pud_raw (pud) &cpu_to_be64 (_PAGE_PTE)); }#define pgd_is_leaf pgd_is_leaf +#define pgd_leaf pgd_is_leafstatic inline bool pgd_is_leaf (pgd_t pgd) {return !!(pgd_raw (pgd) &cpu_to_be64 (_PAGE_PTE));
_
Andrew Morton
maintainerPATCH 30/67 riscv: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: riscv: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For riscv a page is a leaf page when it has a read, write or execute bit set on it.
---
arch/riscv/include/asm/pgtable-64.h | 7 +++++++ arch/riscv/include/asm/pgtable.h | 7 +++++++ 2 files changed, 14 insertions(+)
arch/riscv/include/asm/pgtable-64.h renamed from arch/riscv/include/asm/pgtable-64.h~riscv-mm-add-pd_leaf-definitions +7 -0
@@ -43,6 +43,13 @@ static inline int pud_bad(pud_t pud)return !pud_present (pud); } +#define pud_leaf pud_leaf +static inline int pud_leaf (pud_t pud) +{ +return pud_present (pud) && + (pud_val (pud) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC)); +} +static inline void set_pud (pud_t *pudp,pud_t pud) { *pudp = pud;
arch/riscv/include/asm/pgtable.h renamed from arch/riscv/include/asm/pgtable.h~riscv-mm-add-pd_leaf-definitions +7 -0
@@ -130,6 +130,13 @@ static inline int pmd_bad(pmd_t pmd)return !pmd_present (pmd); } +#define pmd_leaf pmd_leaf +static inline int pmd_leaf (pmd_t pmd) +{ +return pmd_present (pmd) && + (pmd_val (pmd) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC)); +} +static inline void set_pmd (pmd_t *pmdp,pmd_t pmd) { *pmdp = pmd;
_
Andrew Morton
maintainerPATCH 31/67 s390: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: s390: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For s390, pud_large() and pmd_large() are already implemented as static inline functions. Add a macro to provide the p?d_leaf names for the generic code to use.
---
arch/s390/include/asm/pgtable.h | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/include/asm/pgtable.h renamed from arch/s390/include/asm/pgtable.h~s390-mm-add-pd_leaf-definitions +2 -0
@@ -673,6 +673,7 @@ static inline int pud_none(pud_t pud)return pud_val (pud) == _REGION3_ENTRY_EMPTY; } +#define pud_leaf pud_largestatic inline int pud_large (pud_t pud) {if ((pud_val (pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3)
@@ -690,6 +691,7 @@ static inline unsigned long pud_pfn(pud_return (pud_val (pud) & origin_mask) >>PAGE_SHIFT ; } +#define pmd_leaf pmd_largestatic inline int pmd_large (pmd_t pmd) {return (pmd_val (pmd) & _SEGMENT_ENTRY_LARGE) !=0 ;
_
Andrew Morton
maintainerPATCH 32/67 sparc: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: sparc: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For sparc 64 bit, pmd_large() and pud_large() are already provided, so add macros to provide the p?d_leaf names required by the generic code.
---
arch/sparc/include/asm/pgtable_64.h | 2 ++ 1 file changed, 2 insertions(+)
arch/sparc/include/asm/pgtable_64.h renamed from arch/sparc/include/asm/pgtable_64.h~sparc-mm-add-pd_leaf-definitions +2 -0
@@ -683,6 +683,7 @@ static inline unsigned long pte_special(return pte_val (pte) & _PAGE_SPECIAL; } +#define pmd_leaf pmd_largestatic inline unsigned long pmd_large (pmd_t pmd) {pte_t pte =__pte (pmd_val (pmd));
@@ -867,6 +868,7 @@ static inline unsigned long pud_page_vad/* only used by the stubbed out hugetlb gup code, should never be called */ #define p4d_page (p4d) NULL +#define pud_leaf pud_largestatic inline unsigned long pud_large (pud_t pud) {pte_t pte =__pte (pud_val (pud));
_
Andrew Morton
maintainerPATCH 33/67 x86: mm: add p?d_leaf() definitions
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm: add p?d_leaf() definitions
walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros.
For x86 we already have p?d_large() functions, so simply add macros to provide the generic p?d_leaf() names for the generic code.
---
arch/x86/include/asm/pgtable.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~x86-mm-add-pd_leaf-definitions +5 -0
@@ -239,6 +239,7 @@ static inline unsigned long pgd_pfn(pgd_return (pgd_val (pgd) &PTE_PFN_MASK ) >>PAGE_SHIFT ; } +#define p4d_leaf p4d_largestatic inline int p4d_large (p4d_t p4d) {/* No 512 GiB pages yet */
@@ -247,6 +248,7 @@ static inline int p4d_large(p4d_t p4d)#define pte_page (pte) pfn_to_page(pte_pfn(pte)) +#define pmd_leaf pmd_largestatic inline int pmd_large (pmd_t pte) {return pmd_flags (pte) & _PAGE_PSE;
@@ -874,6 +876,7 @@ static inline pmd_t *pmd_offset(pud_t *preturn (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); } +#define pud_leaf pud_largestatic inline int pud_large (pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
@@ -885,6 +888,7 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; }#else +#define pud_leaf pud_largestatic inline int pud_large (pud_t pud) {return 0 ;
@@ -1233,6 +1237,7 @@ static inline bool pgdp_maps_userspace(vreturn (((ptr & ~PAGE_MASK ) /sizeof (pgd_t)) <PGD_KERNEL_START ); } +#define pgd_leaf pgd_largestatic inline int pgd_large (pgd_t pgd) {return 0 ; }#ifdef CONFIG_PAGE_TABLE_ISOLATION
_
Andrew Morton
maintainerPATCH 34/67 mm: pagewalk: add p4d_entry() and pgd_entry()
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: pagewalk: add p4d_entry() and pgd_entry()
pgd_entry() and pud_entry() were removed by commit 0b1fbfe50006c410 ("mm/pagewalk: remove pgd_entry() and pud_entry()") because there were no users. We're about to add users so reintroduce them, along with p4d_entry() as we now have 5 levels of tables.
Note that commit a00cc7d9dd93d66a ("mm, x86: add support for PUD-sized transparent hugepages") already re-added pud_entry() but with different semantics to the other callbacks. This commit reverts the semantics back to match the other callbacks.
To support hmm.c which now uses the new semantics of pud_entry() a new member ('action') of struct mm_walk is added which allows the callbacks to either descend (ACTION_SUBTREE, the default), skip (ACTION_CONTINUE) or repeat the callback (ACTION_AGAIN). hmm.c is then updated to call pud_trans_huge_lock() itself and make use of the splitting/retry logic of the core code.
After this change pud_entry() is called for all entries, not just transparent huge pages.
---
include/linux/pagewalk.h | 34 +++++++++++++++++---- mm/hmm.c | 58 ++++++++++++++++++++----------------- mm/pagewalk.c | 50 ++++++++++++++++++++++--------- 3 files changed, 95 insertions(+), 47 deletions(-)
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~mm-pagewalk-add-p4d_entry-and-pgd_entry +28 -6
@@ -8,15 +8,15 @@ struct mm_walk;/** * mm_walk_ops - callbacks for walk_page_range -* @pud_entry: if set, called for each non-empty PUD (2nd-level) entry -* this handler should only handle pud_trans_huge() puds. -* the pmd_entry or pte_entry callbacks will be used for -* regular PUDs. -* @pmd_entry: if set, called for each non-empty PMD (3rd-level) entry +* @pgd_entry: if set, called for each non-empty PGD (top-level) entry +* @p4d_entry: if set, called for each non-empty P4D entry +* @pud_entry: if set, called for each non-empty PUD entry +* @pmd_entry: if set, called for each non-empty PMD entry * this handler is required to be able to handle * pmd_trans_huge() pmds. They may simply choose to * split_huge_page() instead of handling it explicitly. -* @pte_entry: if set, called for each non-empty PTE (4th-level) entry +* @pte_entry: if set, called for each non-empty PTE (lowest-level) +* entry * @pte_hole: if set, called for each hole at all levels * @hugetlb_entry: if set, called for each hugetlb entry * @test_walk: caller specific callback function to determine whether
@@ -27,8 +27,15 @@ struct mm_walk;* @pre_vma: if set, called before starting walk on a non-null vma. * @post_vma: if set, called after a walk on a non-null vma, provided * that @pre_vma and the vma walk succeeded. +* +* p?d_entry callbacks are called even if those levels are folded on a +* particular architecture/configuration. */ struct mm_walk_ops { +int (*pgd_entry)(pgd_t *pgd,unsigned long addr, +unsigned long next,struct mm_walk *walk); +int (*p4d_entry)(p4d_t *p4d,unsigned long addr, +unsigned long next,struct mm_walk *walk);int (*pud_entry)(pud_t *pud,unsigned long addr,unsigned long next,struct mm_walk *walk); int (*pmd_entry)(pmd_t *pmd, unsigned long addr,
@@ -47,11 +54,25 @@ struct mm_walk_ops {void (*post_vma)(struct mm_walk *walk); }; +/* +* Action for pud_entry / pmd_entry callbacks. +* ACTION_SUBTREE is the default +*/ +enum page_walk_action { +/* Descend to next level, splitting huge pages if needed and possible */ +ACTION_SUBTREE =0 , +/* Continue to next entry at this level (ignoring any subtree) */ +ACTION_CONTINUE =1 , +/* Call again for this entry */ +ACTION_AGAIN =2 +}; +/** * mm_walk - walk_page_range data * @ops: operation to call during the walk * @mm: mm_struct representing the target process of page table walk * @vma: vma currently walked (NULL if walking outside vmas) +* @action: next action to perform (see enum page_walk_action) * @private: private data for callbacks' usage * * (see the comment on walk_page_range() for more details)
@@ -60,6 +81,7 @@ struct mm_walk {const struct mm_walk_ops *ops;struct mm_struct *mm;struct vm_area_struct *vma; +enum page_walk_action action;void *private; };
mm/hmm.c renamed from mm/hmm.c~mm-pagewalk-add-p4d_entry-and-pgd_entry +32 -26
93 lines not on this page · raw message
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-add-p4d_entry-and-pgd_entry +35 -15
95 lines not on this page · raw message
_
Andrew Morton
maintainerPATCH 35/67 mm: pagewalk: allow walking without vma
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: pagewalk: allow walking without vma
Since 48684a65b4e3: "mm: pagewalk: fix misbehavior of walk_page_range for vma(VM_PFNMAP)", page_table_walk() will report any kernel area as a hole, because it lacks a vma.
This means each arch has re-implemented page table walking when needed, for example in the per-arch ptdump walker.
Remove the requirement to have a vma in the generic code and add a new function walk_page_range_novma() which ignores the VMAs and simply walks the page tables.
---
include/linux/pagewalk.h | 5 ++++ mm/pagewalk.c | 40 +++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-)
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~mm-pagewalk-allow-walking-without-vma +5 -0
@@ -73,6 +73,7 @@ enum page_walk_action {* @mm: mm_struct representing the target process of page table walk * @vma: vma currently walked (NULL if walking outside vmas) * @action: next action to perform (see enum page_walk_action) +* @no_vma: walk ignoring vmas (vma will always be NULL) * @private: private data for callbacks' usage * * (see the comment on walk_page_range() for more details)
@@ -82,12 +83,16 @@ struct mm_walk {struct mm_struct *mm;struct vm_area_struct *vma;enum page_walk_action action; +bool no_vma;void *private; };int walk_page_range (struct mm_struct *mm,unsigned long start,unsigned long end,const struct mm_walk_ops *ops,void *private); +int walk_page_range_novma (struct mm_struct *mm,unsigned long start, +unsigned long end,const struct mm_walk_ops *ops, +void *private);int walk_page_vma (struct vm_area_struct *vma,const struct mm_walk_ops *ops,void *private); int walk_page_mapping(struct address_space *mapping, pgoff_t first_index,
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-allow-walking-without-vma +32 -8
@@ -39,7 +39,7 @@ static int walk_pmd_range(pud_t *pud, un do { again: next = pmd_addr_end(addr, end); - if (pmd_none(*pmd) || !walk->vma) { + if (pmd_none(*pmd) || (!walk->vma && !walk->no_vma)) { if (ops->pte_hole) err = ops->pte_hole(addr, next, walk); if (err)
@@ -65,13 +65,16 @@ again:* Check this here so we only break down trans_huge * pages when we _need_ to */ -if (walk->action ==ACTION_CONTINUE || +if ((!walk->vma && (pmd_leaf (*pmd) || !pmd_present (*pmd))) || + walk->action ==ACTION_CONTINUE || !(ops->pte_entry))continue ; -split_huge_pmd (walk->vma, pmd, addr); -if (pmd_trans_unstable (pmd)) - goto again; +if (walk->vma) { +split_huge_pmd (walk->vma, pmd, addr); +if (pmd_trans_unstable (pmd)) + goto again; + } err =walk_pte_range (pmd, addr, next, walk);if (err)
@@ -93,7 +96,7 @@ static int walk_pud_range(p4d_t *p4d, un do { again: next = pud_addr_end(addr, end); - if (pud_none(*pud) || !walk->vma) { + if (pud_none(*pud) || (!walk->vma && !walk->no_vma)) { if (ops->pte_hole) err = ops->pte_hole(addr, next, walk); if (err)
@@ -111,11 +114,13 @@ static int walk_pud_range(p4d_t *p4d, unif (walk->action ==ACTION_AGAIN ) goto again; -if (walk->action ==ACTION_CONTINUE || +if ((!walk->vma && (pud_leaf (*pud) || !pud_present (*pud))) || + walk->action ==ACTION_CONTINUE || !(ops->pmd_entry || ops->pte_entry))continue ; -split_huge_pud (walk->vma, pud, addr); +if (walk->vma) +split_huge_pud (walk->vma, pud, addr);if (pud_none (*pud)) goto again;
@@ -389,6 +394,25 @@ int walk_page_range(struct mm_struct *mmreturn err; } +int walk_page_range_novma (struct mm_struct *mm,unsigned long start, +unsigned long end,const struct mm_walk_ops *ops, +void *private) +{ +struct mm_walk walk = { + .ops = ops, + .mm = mm, + .private = private, + .no_vma = true + }; + +if (start >= end || !walk.mm) +return -EINVAL ; + +lockdep_assert_held (&walk.mm->mmap_sem); + +return __walk_page_range (start, end, &walk); +} +int walk_page_vma (struct vm_area_struct *vma,const struct mm_walk_ops *ops,void *private) {
_
Andrew Morton
maintainerPATCH 36/67 mm: pagewalk: don't lock PTEs for walk_page_range_novma()
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: pagewalk: don't lock PTEs for walk_page_range_novma()
walk_page_range_novma() can be used to walk page tables or the kernel or for firmware. These page tables may contain entries that are not backed by a struct page and so it isn't (in general) possible to take the PTE lock for the pte_entry() callback. So update walk_pte_range() to only take the lock when no_vma==false by splitting out the inner loop to a separate function and add a comment explaining the difference to walk_page_range_novma().
---
mm/pagewalk.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-dont-lock-ptes-for-walk_page_range_novma +28 -7
@@ -4,15 +4,12 @@#include <linux/sched.h> #include <linux/hugetlb.h> -static int walk_pte_range (pmd_t *pmd,unsigned long addr,unsigned long end, -struct mm_walk *walk) +static int walk_pte_range_inner (pte_t *pte,unsigned long addr, +unsigned long end,struct mm_walk *walk) { -pte_t *pte; -int err =0 ;const struct mm_walk_ops *ops = walk->ops; -spinlock_t *ptl; +int err =0 ; - pte =pte_offset_map_lock (walk->mm, pmd, addr, &ptl);for (;;) { err = ops->pte_entry (pte, addr, addr +PAGE_SIZE , walk);if (err)
@@ -22,8 +19,26 @@ static int walk_pte_range(pmd_t *pmd, unbreak ; pte++; } +return err; +} + +static int walk_pte_range (pmd_t *pmd,unsigned long addr,unsigned long end, +struct mm_walk *walk) +{ +pte_t *pte; +int err =0 ; +spinlock_t *ptl; + +if (walk->no_vma) { + pte =pte_offset_map (pmd, addr); + err =walk_pte_range_inner (pte, addr, end, walk); +pte_unmap (pte); + }else { + pte =pte_offset_map_lock (walk->mm, pmd, addr, &ptl); + err =walk_pte_range_inner (pte, addr, end, walk); +pte_unmap_unlock (pte, ptl); + } -pte_unmap_unlock (pte, ptl);return err; }
@@ -394,6 +409,12 @@ int walk_page_range(struct mm_struct *mmreturn err; } +/* +* Similar to walk_page_range() but can walk any page tables even if they are +* not backed by VMAs. Because 'unusual' entries may be walked this function +* will also not lock the PTEs for the pte_entry() callback. This is useful for +* walking the kernel pages tables or page tables for firmware. +*/ int walk_page_range_novma (struct mm_struct *mm,unsigned long start,unsigned long end,const struct mm_walk_ops *ops,void *private)
_
Andrew Morton
maintainerPATCH 37/67 mm: pagewalk: fix termination condition in walk_pte_range()
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: pagewalk: fix termination condition in walk_pte_range()
If walk_pte_range() is called with a 'end' argument that is beyond the last page of memory (e.g. ~0UL) then the comparison between 'addr' and 'end' will always fail and the loop will be infinite. Instead change the comparison to >= while accounting for overflow.
---
mm/pagewalk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-fix-termination-condition-in-walk_pte_range +2 -2
@@ -14,9 +14,9 @@ static int walk_pte_range_inner(pte_t *p err = ops->pte_entry (pte, addr, addr +PAGE_SIZE , walk);if (err)break ; - addr +=PAGE_SIZE ; -if (addr == end) +if (addr >= end -PAGE_SIZE )break ; + addr +=PAGE_SIZE ; pte++; }return err;
_
Andrew Morton
maintainerPATCH 38/67 mm: pagewalk: add 'depth' parameter to pte_hole
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: pagewalk: add 'depth' parameter to pte_hole
The pte_hole() callback is called at multiple levels of the page tables. Code dumping the kernel page tables needs to know what at what depth the missing entry is. Add this is an extra parameter to pte_hole(). When the depth isn't know (e.g. processing a vma) then -1 is passed.
The depth that is reported is the actual level where the entry is missing (ignoring any folding that is in place), i.e. any levels where PTRS_PER_P?D is set to 1 are ignored.
Note that depth starts at 0 for a PGD so that PUD/PMD/PTE retain their natural numbers as levels 2/3/4.
---
fs/proc/task_mmu.c | 4 ++-- include/linux/pagewalk.h | 7 +++++-- mm/hmm.c | 8 ++++---- mm/migrate.c | 5 +++-- mm/mincore.c | 1 + mm/pagewalk.c | 31 +++++++++++++++++++++++++------ 6 files changed, 40 insertions(+), 16 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-pagewalk-add-depth-parameter-to-pte_hole +2 -2
@@ -505,7 +505,7 @@ static void smaps_account(struct mem_siz#ifdef CONFIG_SHMEM static int smaps_pte_hole (unsigned long addr,unsigned long end, -struct mm_walk *walk) +__always_unused int depth,struct mm_walk *walk) {struct mem_size_stats *mss = walk->private;
@@ -1282,7 +1282,7 @@ static int add_to_pagemap(unsigned long }static int pagemap_pte_hole (unsigned long start,unsigned long end, -struct mm_walk *walk) +__always_unused int depth,struct mm_walk *walk) {struct pagemapread *pm = walk->private;unsigned long addr = start;
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~mm-pagewalk-add-depth-parameter-to-pte_hole +5 -2
@@ -17,7 +17,10 @@ struct mm_walk;* split_huge_page() instead of handling it explicitly. * @pte_entry: if set, called for each non-empty PTE (lowest-level) * entry -* @pte_hole: if set, called for each hole at all levels +* @pte_hole: if set, called for each hole at all levels, +* depth is -1 if not known, 0:PGD, 1:P4D, 2:PUD, 3:PMD +* 4:PTE. Any folded depths (where PTRS_PER_P?D is equal +* to 1) are skipped. * @hugetlb_entry: if set, called for each hugetlb entry * @test_walk: caller specific callback function to determine whether * we walk over the current vma or not. Returning 0 means
@@ -43,7 +46,7 @@ struct mm_walk_ops {int (*pte_entry)(pte_t *pte,unsigned long addr,unsigned long next,struct mm_walk *walk);int (*pte_hole)(unsigned long addr,unsigned long next, -struct mm_walk *walk); +int depth,struct mm_walk *walk);int (*hugetlb_entry)(pte_t *pte,unsigned long hmask,unsigned long addr,unsigned long next,struct mm_walk *walk);
mm/hmm.c renamed from mm/hmm.c~mm-pagewalk-add-depth-parameter-to-pte_hole +4 -4
@@ -186,7 +186,7 @@ static void hmm_range_need_fault(const s }static int hmm_vma_walk_hole (unsigned long addr,unsigned long end, -struct mm_walk *walk) +__always_unused int depth,struct mm_walk *walk) {struct hmm_vma_walk *hmm_vma_walk = walk->private;struct hmm_range *range = hmm_vma_walk->range;
@@ -380,7 +380,7 @@ static int hmm_vma_walk_pmd(pmd_t *pmdp, again: pmd =READ_ONCE (*pmdp);if (pmd_none (pmd)) -return hmm_vma_walk_hole (start, end, walk); +return hmm_vma_walk_hole (start, end,-1 , walk);if (thp_migration_supported () &&is_pmd_migration_entry (pmd)) {bool fault, write_fault;
@@ -487,7 +487,7 @@ static int hmm_vma_walk_pud(pud_t *pudp, pud =READ_ONCE (*pudp);if (pud_none (pud)) { - ret =hmm_vma_walk_hole (start, end, walk); + ret =hmm_vma_walk_hole (start, end,-1 , walk); goto out_unlock; }
@@ -497,7 +497,7 @@ static int hmm_vma_walk_pud(pud_t *pudp,bool fault, write_fault;if (!pud_present (pud)) { - ret =hmm_vma_walk_hole (start, end, walk); + ret =hmm_vma_walk_hole (start, end,-1 , walk); goto out_unlock; }
mm/migrate.c renamed from mm/migrate.c~mm-pagewalk-add-depth-parameter-to-pte_hole +3 -2
@@ -2151,6 +2151,7 @@ out_unlock:#ifdef CONFIG_DEVICE_PRIVATE static int migrate_vma_collect_hole (unsigned long start,unsigned long end, +__always_unused int depth,struct mm_walk *walk) {struct migrate_vma *migrate = walk->private;
@@ -2195,7 +2196,7 @@ static int migrate_vma_collect_pmd(pmd_t again:if (pmd_none (*pmdp)) -return migrate_vma_collect_hole (start, end, walk); +return migrate_vma_collect_hole (start, end,-1 , walk);if (pmd_trans_huge (*pmdp)) {struct page *page;
@@ -2228,7 +2229,7 @@ again:return migrate_vma_collect_skip (start, end, walk);if (pmd_none (*pmdp)) -return migrate_vma_collect_hole (start, end, +return migrate_vma_collect_hole (start, end,-1 , walk); } }
mm/mincore.c renamed from mm/mincore.c~mm-pagewalk-add-depth-parameter-to-pte_hole +1 -0
@@ -112,6 +112,7 @@ static int __mincore_unmapped_range(unsi }static int mincore_unmapped_range (unsigned long addr,unsigned long end, +__always_unused int depth,struct mm_walk *walk) { walk->private += __mincore_unmapped_range(addr, end,
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-add-depth-parameter-to-pte_hole +25 -6
@@ -4,6 +4,22 @@#include <linux/sched.h> #include <linux/hugetlb.h> +/* +* We want to know the real level where a entry is located ignoring any +* folding of levels which may be happening. For example if p4d is folded then +* a missing entry found at level 1 (p4d) is actually at level 0 (pgd). +*/ +static int real_depth (int depth) +{ +if (depth ==3 &&PTRS_PER_PMD ==1 ) + depth =2 ; +if (depth ==2 &&PTRS_PER_PUD ==1 ) + depth =1 ; +if (depth ==1 &&PTRS_PER_P4D ==1 ) + depth =0 ; +return depth; +} +static int walk_pte_range_inner (pte_t *pte,unsigned long addr,unsigned long end,struct mm_walk *walk) {
@@ -49,6 +65,7 @@ static int walk_pmd_range(pud_t *pud, ununsigned long next;const struct mm_walk_ops *ops = walk->ops;int err =0 ; +int depth =real_depth (3 ); pmd =pmd_offset (pud, addr); do {
@@ -56,7 +73,7 @@ again: next =pmd_addr_end (addr, end);if (pmd_none (*pmd) || (!walk->vma && !walk->no_vma)) {if (ops->pte_hole) - err = ops->pte_hole (addr, next, walk); + err = ops->pte_hole (addr, next, depth, walk);if (err)break ;continue ;
@@ -106,6 +123,7 @@ static int walk_pud_range(p4d_t *p4d, ununsigned long next;const struct mm_walk_ops *ops = walk->ops;int err =0 ; +int depth =real_depth (2 ); pud =pud_offset (p4d, addr); do {
@@ -113,7 +131,7 @@ static int walk_pud_range(p4d_t *p4d, un next =pud_addr_end (addr, end);if (pud_none (*pud) || (!walk->vma && !walk->no_vma)) {if (ops->pte_hole) - err = ops->pte_hole (addr, next, walk); + err = ops->pte_hole (addr, next, depth, walk);if (err)break ;continue ;
@@ -154,13 +172,14 @@ static int walk_p4d_range(pgd_t *pgd, ununsigned long next;const struct mm_walk_ops *ops = walk->ops;int err =0 ; +int depth =real_depth (1 ); p4d =p4d_offset (pgd, addr); do { next = p4d_addr_end(addr, end); if (p4d_none_or_clear_bad(p4d)) { if (ops->pte_hole) - err = ops->pte_hole(addr, next, walk); + err = ops->pte_hole(addr, next, depth, walk); if (err) break; continue;
@@ -192,7 +211,7 @@ static int walk_pgd_range(unsigned long next =pgd_addr_end (addr, end);if (pgd_none_or_clear_bad (pgd)) {if (ops->pte_hole) - err = ops->pte_hole (addr, next, walk); + err = ops->pte_hole (addr, next,0 , walk);if (err)break ;continue ;
@@ -239,7 +258,7 @@ static int walk_hugetlb_range(unsigned lif (pte) err = ops->hugetlb_entry (pte, hmask, addr, next, walk);else if (ops->pte_hole) - err = ops->pte_hole (addr, next, walk); + err = ops->pte_hole (addr, next,-1 , walk);if (err)break ;
@@ -283,7 +302,7 @@ static int walk_page_test(unsigned longif (vma->vm_flags &VM_PFNMAP ) {int err =1 ;if (ops->pte_hole) - err = ops->pte_hole (start, end, walk); + err = ops->pte_hole (start, end,-1 , walk);return err ? err :1 ; }return 0 ;
_
Andrew Morton
maintainerPATCH 39/67 x86: mm: point to struct seq_file from struct pg_state
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm: point to struct seq_file from struct pg_state
mm/dump_pagetables.c passes both struct seq_file and struct pg_state down the chain of walk_*_level() functions to be passed to note_page(). Instead place the struct seq_file in struct pg_state and access it from struct pg_state (which is private to this file) in note_page().
---
arch/x86/mm/dump_pagetables.c | 69 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 34 deletions(-)
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~x86-mm-point-to-struct-seq_file-from-struct-pg_state +35 -34
@@ -36,6 +36,7 @@ struct pg_state {bool to_dmesg;bool check_wx;unsigned long wx_pages; +struct seq_file *seq; };struct addr_marker {
@@ -265,11 +266,12 @@ static void note_wx(struct pg_state *st)* of PTE entries; the next one is different so we need to * print what we collected so far. */ -static void note_page (struct seq_file *m,struct pg_state *st, -pgprot_t new_prot,pgprotval_t new_eff,int level) +static void note_page (struct pg_state *st,pgprot_t new_prot, +pgprotval_t new_eff,int level) {pgprotval_t prot, cur, eff;static const char units[] ="BKMGTPE" ; +struct seq_file *m = st->seq;/* * If we have a "break" in the series, we need to flush the state that
@@ -354,8 +356,8 @@ static inline pgprotval_t effective_prot ((prot1 | prot2) & _PAGE_NX); } -static void walk_pte_level (struct seq_file *m,struct pg_state *st,pmd_t addr, -pgprotval_t eff_in,unsigned long P ) +static void walk_pte_level (struct pg_state *st,pmd_t addr,pgprotval_t eff_in, +unsigned long P ) {int i;pte_t *pte;
@@ -366,7 +368,7 @@ static void walk_pte_level(struct seq_fi pte =pte_offset_map (&addr, st->current_address); prot =pte_flags (*pte); eff =effective_prot (eff_in, prot); -note_page (m, st,__pgprot (prot), eff,5 ); +note_page (st,__pgprot (prot), eff,5 );pte_unmap (pte); } }
@@ -379,22 +381,20 @@ static void walk_pte_level(struct seq_fi* us dozens of seconds (minutes for 5-level config) while checking for * W+X mapping or reading kernel_page_tables debugfs file. */ -static inline bool kasan_page_table (struct seq_file *m,struct pg_state *st, -void *pt) +static inline bool kasan_page_table (struct pg_state *st,void *pt) {if (__pa (pt) ==__pa (kasan_early_shadow_pmd) || (pgtable_l5_enabled () &&__pa (pt) ==__pa (kasan_early_shadow_p4d)) ||__pa (pt) ==__pa (kasan_early_shadow_pud)) {pgprotval_t prot =pte_flags (kasan_early_shadow_pte[0 ]); -note_page (m, st,__pgprot (prot),0 ,5 ); +note_page (st,__pgprot (prot),0 ,5 );return true; }return false; }#else -static inline bool kasan_page_table (struct seq_file *m,struct pg_state *st, -void *pt) +static inline bool kasan_page_table (struct pg_state *st,void *pt) {return false; }
@@ -402,7 +402,7 @@ static inline bool kasan_page_table(stru#if PTRS_PER_PMD >1 -static void walk_pmd_level (struct seq_file *m,struct pg_state *st,pud_t addr, +static void walk_pmd_level (struct pg_state *st,pud_t addr,pgprotval_t eff_in,unsigned long P ) {int i;
@@ -416,27 +416,27 @@ static void walk_pmd_level(struct seq_fi prot =pmd_flags (*start); eff =effective_prot (eff_in, prot);if (pmd_large (*start) || !pmd_present (*start)) { -note_page (m, st,__pgprot (prot), eff,4 ); - }else if (!kasan_page_table (m, st, pmd_start)) { -walk_pte_level (m, st, *start, eff, +note_page (st,__pgprot (prot), eff,4 ); + }else if (!kasan_page_table (st, pmd_start)) { +walk_pte_level (st, *start, eff,P + i *PMD_LEVEL_MULT ); } }else -note_page (m, st,__pgprot (0 ),0 ,4 ); +note_page (st,__pgprot (0 ),0 ,4 ); start++; } }#else -#define walk_pmd_level (m,s,a,e,p) walk_pte_level(m,s,__pmd(pud_val(a)),e,p) +#define walk_pmd_level (s,a,e,p) walk_pte_level(s,__pmd(pud_val(a)),e,p)#define pud_large (a) pmd_large(__pmd(pud_val(a)))#define pud_none (a) pmd_none(__pmd(pud_val(a)))#endif #if PTRS_PER_PUD >1 -static void walk_pud_level (struct seq_file *m,struct pg_state *st,p4d_t addr, -pgprotval_t eff_in,unsigned long P ) +static void walk_pud_level (struct pg_state *st,p4d_t addr,pgprotval_t eff_in, +unsigned long P ) {int i;pud_t *start, *pud_start;
@@ -450,33 +450,33 @@ static void walk_pud_level(struct seq_fi prot =pud_flags (*start); eff =effective_prot (eff_in, prot);if (pud_large (*start) || !pud_present (*start)) { -note_page (m, st,__pgprot (prot), eff,3 ); - }else if (!kasan_page_table (m, st, pud_start)) { -walk_pmd_level (m, st, *start, eff, +note_page (st,__pgprot (prot), eff,3 ); + }else if (!kasan_page_table (st, pud_start)) { +walk_pmd_level (st, *start, eff,P + i *PUD_LEVEL_MULT ); } }else -note_page (m, st,__pgprot (0 ),0 ,3 ); +note_page (st,__pgprot (0 ),0 ,3 ); start++; } }#else -#define walk_pud_level (m,s,a,e,p) walk_pmd_level(m,s,__pud(p4d_val(a)),e,p) +#define walk_pud_level (s,a,e,p) walk_pmd_level(s,__pud(p4d_val(a)),e,p)#define p4d_large (a) pud_large(__pud(p4d_val(a)))#define p4d_none (a) pud_none(__pud(p4d_val(a)))#endif -static void walk_p4d_level (struct seq_file *m,struct pg_state *st,pgd_t addr, -pgprotval_t eff_in,unsigned long P ) +static void walk_p4d_level (struct pg_state *st,pgd_t addr,pgprotval_t eff_in, +unsigned long P ) {int i;p4d_t *start, *p4d_start;pgprotval_t prot, eff;if (PTRS_PER_P4D ==1 ) -return walk_pud_level (m, st,__p4d (pgd_val (addr)), eff_in,P ); +return walk_pud_level (st,__p4d (pgd_val (addr)), eff_in,P ); p4d_start = start = (p4d_t *)pgd_page_vaddr (addr);
@@ -486,13 +486,13 @@ static void walk_p4d_level(struct seq_fi prot =p4d_flags (*start); eff =effective_prot (eff_in, prot);if (p4d_large (*start) || !p4d_present (*start)) { -note_page (m, st,__pgprot (prot), eff,2 ); - }else if (!kasan_page_table (m, st, p4d_start)) { -walk_pud_level (m, st, *start, eff, +note_page (st,__pgprot (prot), eff,2 ); + }else if (!kasan_page_table (st, p4d_start)) { +walk_pud_level (st, *start, eff,P + i *P4D_LEVEL_MULT ); } }else -note_page (m, st,__pgprot (0 ),0 ,2 ); +note_page (st,__pgprot (0 ),0 ,2 ); start++; }
@@ -529,6 +529,7 @@ static void ptdump_walk_pgd_level_core(s } st.check_wx = checkwx; + st.seq = m;if (checkwx) st.wx_pages =0 ;
@@ -542,13 +543,13 @@ static void ptdump_walk_pgd_level_core(s eff = prot;#endif if (pgd_large (*start) || !pgd_present (*start)) { -note_page (m, &st,__pgprot (prot), eff,1 ); +note_page (&st,__pgprot (prot), eff,1 ); }else { -walk_p4d_level (m, &st, *start, eff, +walk_p4d_level (&st, *start, eff, i *PGD_LEVEL_MULT ); } }else -note_page (m, &st,__pgprot (0 ),0 ,1 ); +note_page (&st,__pgprot (0 ),0 ,1 );cond_resched (); start++;
@@ -556,7 +557,7 @@ static void ptdump_walk_pgd_level_core(s/* Flush out the last page */ st.current_address =normalize_addr (PTRS_PER_PGD *PGD_LEVEL_MULT ); -note_page (m, &st,__pgprot (0 ),0 ,0 ); +note_page (&st,__pgprot (0 ),0 ,0 );if (!checkwx)return ;if (st.wx_pages)
_
Andrew Morton
maintainerPATCH 40/67 x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
To enable x86 to use the generic walk_page_range() function, the callers of ptdump_walk_pgd_level() need to pass an mm_struct rather than the raw pgd_t pointer. Luckily since commit 7e904a91bf60 ("efi: Use efi_mm in x86 as well as ARM") we now have an mm_struct for EFI on x86.
---
arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/dump_pagetables.c | 4 ++-- arch/x86/platform/efi/efi_32.c | 2 +- arch/x86/platform/efi/efi_64.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~x86-mmefi-convert-ptdump_walk_pgd_level-to-take-a-mm_struct +1 -1
@@ -29,7 +29,7 @@extern pgd_t early_top_pgt[PTRS_PER_PGD ];int __init __early_make_pgtable (unsigned long address,pmdval_t pmd); -void ptdump_walk_pgd_level (struct seq_file *m,pgd_t *pgd); +void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm);void ptdump_walk_pgd_level_debugfs (struct seq_file *m,pgd_t *pgd,bool user);void ptdump_walk_pgd_level_checkwx (void );void ptdump_walk_user_pgd_level_checkwx (void );
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~x86-mmefi-convert-ptdump_walk_pgd_level-to-take-a-mm_struct +2 -2
@@ -567,9 +567,9 @@ static void ptdump_walk_pgd_level_core(spr_info ("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n" ); } -void ptdump_walk_pgd_level (struct seq_file *m,pgd_t *pgd) +void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm) { -ptdump_walk_pgd_level_core (m, pgd, false, true); +ptdump_walk_pgd_level_core (m, mm->pgd, false, true); }void ptdump_walk_pgd_level_debugfs (struct seq_file *m,pgd_t *pgd,bool user)
arch/x86/platform/efi/efi_32.c renamed from arch/x86/platform/efi/efi_32.c~x86-mmefi-convert-ptdump_walk_pgd_level-to-take-a-mm_struct +1 -1
@@ -49,7 +49,7 @@ void efi_sync_low_kernel_mappings(void)void __init efi_dump_pagetable (void ) {#ifdef CONFIG_EFI_PGT_DUMP -ptdump_walk_pgd_level (NULL , swapper_pg_dir); +ptdump_walk_pgd_level (NULL , &init_mm);#endif }
arch/x86/platform/efi/efi_64.c renamed from arch/x86/platform/efi/efi_64.c~x86-mmefi-convert-ptdump_walk_pgd_level-to-take-a-mm_struct +2 -2
@@ -471,9 +471,9 @@ void __init efi_dump_pagetable(void) {#ifdef CONFIG_EFI_PGT_DUMP if (efi_have_uv1_memmap ()) -ptdump_walk_pgd_level (NULL , swapper_pg_dir); +ptdump_walk_pgd_level (NULL , &init_mm);else -ptdump_walk_pgd_level (NULL , efi_mm.pgd); +ptdump_walk_pgd_level (NULL , &efi_mm);#endif }
_
Andrew Morton
maintainerPATCH 41/67 x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct
To enable x86 to use the generic walk_page_range() function, the callers of ptdump_walk_pgd_level_debugfs() need to pass in the mm_struct.
This means that ptdump_walk_pgd_level_core() is now always passed a valid pgd, so drop the support for pgd==NULL.
---
arch/x86/include/asm/pgtable.h | 3 ++- arch/x86/mm/debug_pagetables.c | 8 ++++---- arch/x86/mm/dump_pagetables.c | 14 ++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-)
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~x86-mm-convert-ptdump_walk_pgd_level_debugfs-to-take-an-mm_struct +2 -1
@@ -30,7 +30,8 @@ extern pgd_t early_top_pgt[PTRS_PER_PGD]int __init __early_make_pgtable (unsigned long address,pmdval_t pmd);void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm); -void ptdump_walk_pgd_level_debugfs (struct seq_file *m,pgd_t *pgd,bool user); +void ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm, +bool user);void ptdump_walk_pgd_level_checkwx (void );void ptdump_walk_user_pgd_level_checkwx (void );
arch/x86/mm/debug_pagetables.c renamed from arch/x86/mm/debug_pagetables.c~x86-mm-convert-ptdump_walk_pgd_level_debugfs-to-take-an-mm_struct +4 -4
@@ -7,7 +7,7 @@static int ptdump_show (struct seq_file *m,void *v) { -ptdump_walk_pgd_level_debugfs (m,NULL , false); +ptdump_walk_pgd_level_debugfs (m, &init_mm, false);return 0 ; }
@@ -17,7 +17,7 @@ static int ptdump_curknl_show(struct seq {if (current->mm->pgd) {down_read (¤t->mm->mmap_sem); -ptdump_walk_pgd_level_debugfs (m, current->mm->pgd, false); +ptdump_walk_pgd_level_debugfs (m, current->mm, false);up_read (¤t->mm->mmap_sem); }return 0 ;
@@ -30,7 +30,7 @@ static int ptdump_curusr_show(struct seq {if (current->mm->pgd) {down_read (¤t->mm->mmap_sem); -ptdump_walk_pgd_level_debugfs (m, current->mm->pgd, true); +ptdump_walk_pgd_level_debugfs (m, current->mm, true);up_read (¤t->mm->mmap_sem); }return 0 ;
@@ -43,7 +43,7 @@ DEFINE_SHOW_ATTRIBUTE(ptdump_curusr);static int ptdump_efi_show (struct seq_file *m,void *v) {if (efi_mm.pgd) -ptdump_walk_pgd_level_debugfs (m, efi_mm.pgd, false); +ptdump_walk_pgd_level_debugfs (m, &efi_mm, false);return 0 ; }
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~x86-mm-convert-ptdump_walk_pgd_level_debugfs-to-take-an-mm_struct +1 -5
@@ -518,16 +518,12 @@ static inline bool is_hypervisor_range(istatic void ptdump_walk_pgd_level_core (struct seq_file *m,pgd_t *pgd,bool checkwx,bool dmesg) { -pgd_t *start =INIT_PGD ; +pgd_t *start = pgd;pgprotval_t prot, eff;int i;struct pg_state st = {}; -if (pgd) { - start = pgd; - st.to_dmesg = dmesg; - }
Andrew Morton
maintainerPATCH 42/67 mm: add generic ptdump
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: add generic ptdump
Add a generic version of page table dumping that architectures can opt-in to.
---
include/linux/ptdump.h | 21 +++++ mm/Kconfig.debug | 21 +++++ mm/Makefile | 1 mm/ptdump.c | 139 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 182 insertions(+)
include/linux/ptdump.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_PTDUMP_H +#define _LINUX_PTDUMP_H + +#include <linux/mm_types.h> + +struct ptdump_range { +unsigned long start; +unsigned long end; +}; + +struct ptdump_state { +void (*note_page)(struct ptdump_state *st,unsigned long addr, +int level,unsigned long val); +const struct ptdump_range *range; +}; + +void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm); + +#endif /* _LINUX_PTDUMP_H */
mm/Kconfig.debug renamed from mm/Kconfig.debug~mm-add-generic-ptdump +21 -0
@@ -117,3 +117,24 @@ config DEBUG_RODATA_TEST depends on STRICT_KERNEL_RWX ---help--- This option enables a testcase for the setting rodata read-only. + +config GENERIC_PTDUMP + bool + +config PTDUMP_CORE + bool + +config PTDUMP_DEBUGFS + bool "Export kernel pagetable layout to userspace via debugfs" + depends on DEBUG_KERNEL + depends on DEBUG_FS + depends on GENERIC_PTDUMP + select PTDUMP_CORE + help + Say Y here if you want to show the kernel pagetable layout in a + debugfs file. This information is only useful for kernel developers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a production + kernel. + + If in doubt, say N.
mm/Makefile renamed from mm/Makefile~mm-add-generic-ptdump +1 -0
@@ -109,3 +109,4 @@ obj-$(CONFIG_ZONE_DEVICE) += memremap.o obj-$(CONFIG_HMM_MIRROR) += hmm.o obj-$(CONFIG_MEMFD_CREATE) += memfd.o obj-$(CONFIG_MAPPING_DIRTY_HELPERS) += mapping_dirty_helpers.o +obj-$(CONFIG_PTDUMP_CORE) += ptdump.o
mm/ptdump.c new file +139 -0
139 lines not on this page · raw message
_
Andrew Morton
maintainerPATCH 43/67 x86: mm: convert dump_pagetables to use walk_page_range
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm: convert dump_pagetables to use walk_page_range
Make use of the new functionality in walk_page_range to remove the arch page walking code and use the generic code to walk the page tables.
The effective permissions are passed down the chain using new fields in struct pg_state.
The KASAN optimisation is implemented by setting action=CONTINUE in the callbacks to skip an entire tree of entries.
---
arch/x86/Kconfig | 1 arch/x86/Kconfig.debug | 20 -- arch/x86/mm/Makefile | 4 arch/x86/mm/dump_pagetables.c | 294 +++++++------------------------- 4 files changed, 71 insertions(+), 248 deletions(-)
arch/x86/Kconfig renamed from arch/x86/Kconfig~x86-mm-convert-dump_pagetables-to-use-walk_page_range +1 -0
@@ -120,6 +120,7 @@ config X86 select GENERIC_IRQ_RESERVATION_MODE select GENERIC_IRQ_SHOW select GENERIC_PENDING_IRQ if SMP + select GENERIC_PTDUMP select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER
arch/x86/Kconfig.debug renamed from arch/x86/Kconfig.debug~x86-mm-convert-dump_pagetables-to-use-walk_page_range +2 -18
@@ -62,26 +62,10 @@ config EARLY_PRINTK_USB_XDBC config MCSAFE_TEST def_bool n -config X86_PTDUMP_CORE - def_bool n - -config X86_PTDUMP - tristate "Export kernel pagetable layout to userspace via debugfs" - depends on DEBUG_KERNEL - select DEBUG_FS - select X86_PTDUMP_CORE - ---help--- - Say Y here if you want to show the kernel pagetable layout in a - debugfs file. This information is only useful for kernel developers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - If in doubt, say "N" - config EFI_PGT_DUMP bool "Dump the EFI pagetable" depends on EFI - select X86_PTDUMP_CORE + select PTDUMP_CORE ---help--- Enable this if you want to dump the EFI page table before enabling virtual mode. This can be used to debug miscellaneous
@@ -90,7 +74,7 @@ config EFI_PGT_DUMP config DEBUG_WX bool "Warn on W+X mappings at boot" - select X86_PTDUMP_CORE + select PTDUMP_CORE ---help--- Generate a warning if any W+X mappings are found at boot.
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~x86-mm-convert-dump_pagetables-to-use-walk_page_range +66 -228
395 lines not on this page · raw message
arch/x86/mm/Makefile renamed from arch/x86/mm/Makefile~x86-mm-convert-dump_pagetables-to-use-walk_page_range +2 -2
@@ -28,8 +28,8 @@ CFLAGS_fault.o := -I $(srctree)/$(src)/. obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o -obj-$(CONFIG_X86_PTDUMP_CORE) += dump_pagetables.o -obj-$(CONFIG_X86_PTDUMP) += debug_pagetables.o +obj-$(CONFIG_PTDUMP_CORE) += dump_pagetables.o +obj-$(CONFIG_PTDUMP_DEBUGFS) += debug_pagetables.o obj-$(CONFIG_HIGHMEM) += highmem_32.o
_
Andrew Morton
maintainerPATCH 44/67 arm64: mm: convert mm/dump.c to use walk_page_range()
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: arm64: mm: convert mm/dump.c to use walk_page_range()
Now walk_page_range() can walk kernel page tables, we can switch the arm64 ptdump code over to using it, simplifying the code.
---
arch/arm64/Kconfig | 1 arch/arm64/Kconfig.debug | 19 ---- arch/arm64/include/asm/ptdump.h | 8 - arch/arm64/mm/Makefile | 4 arch/arm64/mm/dump.c | 117 ++++++++------------------- arch/arm64/mm/mmu.c | 4 arch/arm64/mm/ptdump_debugfs.c | 2 drivers/firmware/efi/arm-runtime.c | 2 8 files changed, 50 insertions(+), 107 deletions(-)
arch/arm64/include/asm/ptdump.h renamed from arch/arm64/include/asm/ptdump.h~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +4 -4
@@ -5,7 +5,7 @@#ifndef __ASM_PTDUMP_H#define __ASM_PTDUMP_H -#ifdef CONFIG_ARM64_PTDUMP_CORE +#ifdef CONFIG_PTDUMP_CORE #include <linux/mm_types.h> #include <linux/seq_file.h>
@@ -21,15 +21,15 @@ struct ptdump_info { unsigned long base_addr; }; -void ptdump_walk_pgd (struct seq_file *s,struct ptdump_info *info); -#ifdef CONFIG_ARM64_PTDUMP_DEBUGFS +void ptdump_walk (struct seq_file *s,struct ptdump_info *info); +#ifdef CONFIG_PTDUMP_DEBUGFS void ptdump_debugfs_register (struct ptdump_info *info,const char *name);#else static inline void ptdump_debugfs_register (struct ptdump_info *info,const char *name) { }#endif void ptdump_check_wx (void ); -#endif /* CONFIG_ARM64_PTDUMP_CORE */ +#endif /* CONFIG_PTDUMP_CORE */ #ifdef CONFIG_DEBUG_WX #define debug_checkwx () ptdump_check_wx()
arch/arm64/Kconfig renamed from arch/arm64/Kconfig~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -0
@@ -104,6 +104,7 @@ config ARM64 select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL select GENERIC_PCI_IOMAP + select GENERIC_PTDUMP select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER
arch/arm64/Kconfig.debug renamed from arch/arm64/Kconfig.debug~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -18
@@ -1,22 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -config ARM64_PTDUMP_CORE - def_bool n - -config ARM64_PTDUMP_DEBUGFS - bool "Export kernel pagetable layout to userspace via debugfs" - depends on DEBUG_KERNEL - select ARM64_PTDUMP_CORE - select DEBUG_FS - help - Say Y here if you want to show the kernel pagetable layout in a - debugfs file. This information is only useful for kernel developers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - - If in doubt, say N. - config PID_IN_CONTEXTIDR bool "Write the current PID to the CONTEXTIDR register" help
@@ -42,7 +25,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET config DEBUG_WX bool "Warn on W+X mappings at boot" - select ARM64_PTDUMP_CORE + select PTDUMP_CORE ---help--- Generate a warning if any W+X mappings are found at boot.
arch/arm64/mm/dump.c renamed from arch/arm64/mm/dump.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +38 -79
166 lines not on this page · raw message
arch/arm64/mm/Makefile renamed from arch/arm64/mm/Makefile~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +2 -2
@@ -4,8 +4,8 @@ obj-y := dma-mapping.o extable.o faul ioremap.o mmap.o pgd.o mmu.o \ context.o proc.o pageattr.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o -obj-$(CONFIG_ARM64_PTDUMP_CORE) += dump.o -obj-$(CONFIG_ARM64_PTDUMP_DEBUGFS) += ptdump_debugfs.o +obj-$(CONFIG_PTDUMP_CORE) += dump.o +obj-$(CONFIG_PTDUMP_DEBUGFS) += ptdump_debugfs.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o KASAN_SANITIZE_physaddr.o += n
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +2 -2
@@ -943,13 +943,13 @@ int __init arch_ioremap_pud_supported(vo* SW table walks can't handle removal of intermediate entries. */ return IS_ENABLED (CONFIG_ARM64_4K_PAGES ) && - !IS_ENABLED (CONFIG_ARM64_PTDUMP_DEBUGFS ); + !IS_ENABLED (CONFIG_PTDUMP_DEBUGFS ); }int __init arch_ioremap_pmd_supported (void ) {/* See arch_ioremap_pud_supported() */ -return !IS_ENABLED (CONFIG_ARM64_PTDUMP_DEBUGFS ); +return !IS_ENABLED (CONFIG_PTDUMP_DEBUGFS ); }int pud_set_huge (pud_t *pudp,phys_addr_t phys,pgprot_t prot)
arch/arm64/mm/ptdump_debugfs.c renamed from arch/arm64/mm/ptdump_debugfs.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -1
@@ -7,7 +7,7 @@static int ptdump_show (struct seq_file *m,void *v) {struct ptdump_info *info = m->private; -ptdump_walk_pgd (m, info); +ptdump_walk (m, info);return 0 ; }DEFINE_SHOW_ATTRIBUTE (ptdump);
drivers/firmware/efi/arm-runtime.c renamed from drivers/firmware/efi/arm-runtime.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -1
@@ -27,7 +27,7 @@extern u64 efi_system_table; -#ifdef CONFIG_ARM64_PTDUMP_DEBUGFS +#if defined(CONFIG_PTDUMP_DEBUGFS ) && defined(CONFIG_ARM64 )#include <asm/ptdump.h> static struct ptdump_info efi_ptdump_info = {
_
Andrew Morton
maintainerPATCH 45/67 arm64: mm: display non-present entries in ptdump
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: arm64: mm: display non-present entries in ptdump
Previously the /sys/kernel/debug/kernel_page_tables file would only show lines for entries present in the page tables. However it is useful to also show non-present entries as this makes the size and level of the holes more visible. This aligns the behaviour with x86 which also shows holes.
---
arch/arm64/mm/dump.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
arch/arm64/mm/dump.c renamed from arch/arm64/mm/dump.c~arm64-mm-display-non-present-entries-in-ptdump +13 -12
@@ -270,21 +270,22 @@ static void note_page(struct ptdump_statif (st->current_prot) {note_prot_uxn (st, addr);note_prot_wx (st, addr); -pt_dump_seq_printf (st->seq,"0x%016lx-0x%016lx " , + } + +pt_dump_seq_printf (st->seq,"0x%016lx-0x%016lx " , st->start_address, addr); - delta = (addr - st->start_address) >>10 ; -while (!(delta &1023 ) && unit[1 ]) { - delta >>=10 ; - unit++; - } -pt_dump_seq_printf (st->seq,"%9lu%c %s" , delta, *unit, - pg_level[st->level].name); -if (pg_level[st->level].bits) -dump_prot (st, pg_level[st->level].bits, - pg_level[st->level].num); -pt_dump_seq_puts (st->seq,"\n" ); + delta = (addr - st->start_address) >>10 ; +while (!(delta &1023 ) && unit[1 ]) { + delta >>=10 ; + unit++; } +pt_dump_seq_printf (st->seq,"%9lu%c %s" , delta, *unit, + pg_level[st->level].name); +if (st->current_prot && pg_level[st->level].bits) +dump_prot (st, pg_level[st->level].bits, + pg_level[st->level].num); +pt_dump_seq_puts (st->seq,"\n" );if (addr >= st->marker[1 ].start_address) { st->marker++;
_
Andrew Morton
maintainerPATCH 46/67 mm: ptdump: reduce level numbers by 1 in note_page()
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: mm: ptdump: reduce level numbers by 1 in note_page()
Rather than having to increment the 'depth' number by 1 in ptdump_hole(), let's change the meaning of 'level' in note_page() since that makes the code simplier.
Note that for x86, the level numbers were previously increased by 1 in commit 45dcd2091363 ("x86/mm/dump_pagetables: Fix printout of p4d level") and the comment "Bit 7 has a different meaning" was not updated, so this change also makes the code match the comment again.
---
arch/arm64/mm/dump.c | 6 +++--- arch/x86/mm/dump_pagetables.c | 19 ++++++++++--------- include/linux/ptdump.h | 1 + mm/ptdump.c | 16 ++++++++-------- 4 files changed, 22 insertions(+), 20 deletions(-)
arch/arm64/mm/dump.c renamed from arch/arm64/mm/dump.c~mm-ptdump-reduce-level-numbers-by-1-in-note_page +3 -3
@@ -176,8 +176,7 @@ struct pg_level { };static struct pg_level pg_level[] = { - { - }, {/* pgd */ + {/* pgd */ .name ="PGD" , .bits = pte_bits, .num =ARRAY_SIZE (pte_bits),
@@ -257,7 +256,7 @@ static void note_page(struct ptdump_statif (level >=0 ) prot = val & pg_level[level].mask; -if (!st->level) { +if (st->level ==-1 ) { st->level = level; st->current_prot = prot; st->start_address = addr;
@@ -351,6 +350,7 @@ void ptdump_check_wx(void) { 0, NULL}, { -1, NULL}, }, + .level = -1, .check_wx = true, .ptdump = { .note_page = note_page,
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~mm-ptdump-reduce-level-numbers-by-1-in-note_page +10 -9
@@ -180,7 +180,7 @@ static struct addr_marker address_markerstatic void printk_prot (struct seq_file *m,pgprotval_t pr,int level,bool dmsg) {static const char *const level_name[] = - {"cr3" ,"pgd" ,"p4d" ,"pud" ,"pmd" ,"pte" }; + {"pgd" ,"p4d" ,"pud" ,"pmd" ,"pte" };if (!(pr & _PAGE_PRESENT)) {/* Not present */
@@ -204,12 +204,12 @@ static void printk_prot(struct seq_filept_dump_cont_printf (m, dmsg," " );/* Bit 7 has a different meaning on level 3 vs 4 */ -if (level <=4 && pr & _PAGE_PSE) +if (level <=3 && pr & _PAGE_PSE)pt_dump_cont_printf (m, dmsg,"PSE " );else pt_dump_cont_printf (m, dmsg," " ); -if ((level ==5 && pr & _PAGE_PAT) || - ((level ==4 || level ==3 ) && pr & _PAGE_PAT_LARGE)) +if ((level ==4 && pr & _PAGE_PAT) || + ((level ==3 || level ==2 ) && pr & _PAGE_PAT_LARGE))pt_dump_cont_printf (m, dmsg,"PAT " );else pt_dump_cont_printf (m, dmsg," " );
@@ -271,15 +271,15 @@ static void note_page(struct ptdump_stat new_prot = val &PTE_FLAGS_MASK ; -if (level >1 ) { - new_eff =effective_prot (st->prot_levels[level -2 ], +if (level >0 ) { + new_eff =effective_prot (st->prot_levels[level -1 ], new_prot); }else { new_eff = new_prot; } -if (level >0 ) - st->prot_levels[level -1 ] = new_eff; +if (level >=0 ) + st->prot_levels[level] = new_eff;/* * If we have a "break" in the series, we need to flush the state that
@@ -289,7 +289,7 @@ static void note_page(struct ptdump_stat cur = st->current_prot; eff = st->effective_prot; -if (!st->level) { +if (st->level ==-1 ) {/* First entry */ st->current_prot = new_prot; st->effective_prot = new_eff;
@@ -380,6 +380,7 @@ static void ptdump_walk_pgd_level_core(s .note_page = note_page, .range = ptdump_ranges }, + .level = -1, .to_dmesg = dmesg, .check_wx = checkwx, .seq = m
include/linux/ptdump.h renamed from include/linux/ptdump.h~mm-ptdump-reduce-level-numbers-by-1-in-note_page +1 -0
@@ -11,6 +11,7 @@ struct ptdump_range { };struct ptdump_state { +/* level is 0:PGD to 4:PTE, or -1 if unknown */ void (*note_page)(struct ptdump_state *st,unsigned long addr,int level,unsigned long val);const struct ptdump_range *range;
mm/ptdump.c renamed from mm/ptdump.c~mm-ptdump-reduce-level-numbers-by-1-in-note_page +8 -8
@@ -17,7 +17,7 @@ static inline int note_kasan_page_table( {struct ptdump_state *st = walk->private; - st->note_page (st, addr,5 ,pte_val (kasan_early_shadow_pte[0 ])); + st->note_page (st, addr,4 ,pte_val (kasan_early_shadow_pte[0 ])); walk->action =ACTION_CONTINUE ;
@@ -37,7 +37,7 @@ static int ptdump_pgd_entry(pgd_t *pgd,#endif if (pgd_leaf (val)) - st->note_page (st, addr,1 ,pgd_val (val)); + st->note_page (st, addr,0 ,pgd_val (val));return 0 ; }
@@ -54,7 +54,7 @@ static int ptdump_p4d_entry(p4d_t *p4d,#endif if (p4d_leaf (val)) - st->note_page (st, addr,2 ,p4d_val (val)); + st->note_page (st, addr,1 ,p4d_val (val));return 0 ; }
@@ -71,7 +71,7 @@ static int ptdump_pud_entry(pud_t *pud,#endif if (pud_leaf (val)) - st->note_page (st, addr,3 ,pud_val (val)); + st->note_page (st, addr,2 ,pud_val (val));return 0 ; }
@@ -88,7 +88,7 @@ static int ptdump_pmd_entry(pmd_t *pmd,#endif if (pmd_leaf (val)) - st->note_page (st, addr,4 ,pmd_val (val)); + st->note_page (st, addr,3 ,pmd_val (val));return 0 ; }
@@ -98,7 +98,7 @@ static int ptdump_pte_entry(pte_t *pte, {struct ptdump_state *st = walk->private; - st->note_page (st, addr,5 ,pte_val (READ_ONCE (*pte))); + st->note_page (st, addr,4 ,pte_val (READ_ONCE (*pte)));return 0 ; }
@@ -108,7 +108,7 @@ static int ptdump_hole(unsigned long add {struct ptdump_state *st = walk->private; - st->note_page (st, addr, depth +1 ,0 ); + st->note_page (st, addr, depth,0 );return 0 ; }
@@ -135,5 +135,5 @@ void ptdump_walk_pgd(struct ptdump_stateup_read (&mm->mmap_sem);/* Flush out the last page */ - st->note_page (st,0 ,0 ,0 ); + st->note_page (st,0 ,-1 ,0 ); }
_
Andrew Morton
maintainerPATCH 47/67 x86: mm: avoid allocating struct mm_struct on the stack
In reply to Andrew MortonFrom: Steven Price <[email protected]>
Subject: x86: mm: avoid allocating struct mm_struct on the stack
struct mm_struct is quite large (~1664 bytes) and so allocating on the stack may cause problems as the kernel stack size is small.
Since ptdump_walk_pgd_level_core() was only allocating the structure so that it could modify the pgd argument we can instead introduce a pgd override in struct mm_walk and pass this down the call stack to where it is needed.
Since the correct mm_struct is now being passed down, it is now also unnecessary to take the mmap_sem semaphore because ptdump_walk_pgd() will now take the semaphore on the real mm.
---
arch/arm64/mm/dump.c | 4 ++-- arch/x86/mm/debug_pagetables.c | 10 ++-------- arch/x86/mm/dump_pagetables.c | 18 +++++++----------- include/linux/pagewalk.h | 3 +++ include/linux/ptdump.h | 2 +- mm/pagewalk.c | 7 ++++++- mm/ptdump.c | 4 ++-- 7 files changed, 23 insertions(+), 25 deletions(-)
arch/arm64/mm/dump.c renamed from arch/arm64/mm/dump.c~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +2 -2
@@ -323,7 +323,7 @@ void ptdump_walk(struct seq_file *s, str } }; -ptdump_walk_pgd (&st.ptdump, info->mm); +ptdump_walk_pgd (&st.ptdump, info->mm,NULL ); }static void ptdump_initialize (void )
@@ -361,7 +361,7 @@ void ptdump_check_wx(void) } }; -ptdump_walk_pgd (&st.ptdump, &init_mm); +ptdump_walk_pgd (&st.ptdump, &init_mm,NULL );if (st.wx_pages || st.uxn_pages) pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n",
arch/x86/mm/debug_pagetables.c renamed from arch/x86/mm/debug_pagetables.c~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +2 -8
@@ -15,11 +15,8 @@ DEFINE_SHOW_ATTRIBUTE(ptdump);static int ptdump_curknl_show (struct seq_file *m,void *v) { -if (current->mm->pgd) { -down_read (¤t->mm->mmap_sem); +if (current->mm->pgd)ptdump_walk_pgd_level_debugfs (m, current->mm, false); -up_read (¤t->mm->mmap_sem); - }return 0 ; }
@@ -28,11 +25,8 @@ DEFINE_SHOW_ATTRIBUTE(ptdump_curknl);#ifdef CONFIG_PAGE_TABLE_ISOLATION static int ptdump_curusr_show (struct seq_file *m,void *v) { -if (current->mm->pgd) { -down_read (¤t->mm->mmap_sem); +if (current->mm->pgd)ptdump_walk_pgd_level_debugfs (m, current->mm, true); -up_read (¤t->mm->mmap_sem); - }return 0 ; }
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +7 -11
@@ -357,7 +357,8 @@ static void note_page(struct ptdump_stat } } -static void ptdump_walk_pgd_level_core (struct seq_file *m,pgd_t *pgd, +static void ptdump_walk_pgd_level_core (struct seq_file *m, +struct mm_struct *mm,pgd_t *pgd,bool checkwx,bool dmesg) {const struct ptdump_range ptdump_ranges[] = {
@@ -386,12 +387,7 @@ static void ptdump_walk_pgd_level_core(s .seq = m }; -struct mm_struct fake_mm = { - .pgd = pgd - }; -init_rwsem (&fake_mm.mmap_sem); - -ptdump_walk_pgd (&st.ptdump, &fake_mm); +ptdump_walk_pgd (&st.ptdump, mm, pgd);if (!checkwx)return ;
@@ -404,7 +400,7 @@ static void ptdump_walk_pgd_level_core(svoid ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm) { -ptdump_walk_pgd_level_core (m, mm->pgd, false, true); +ptdump_walk_pgd_level_core (m, mm, mm->pgd, false, true); } void ptdump_walk_pgd_level_debugfs(struct seq_file *m, struct mm_struct *mm,
@@ -415,7 +411,7 @@ void ptdump_walk_pgd_level_debugfs(strucif (user &&boot_cpu_has (X86_FEATURE_PTI )) pgd =kernel_to_user_pgdp (pgd);#endif -ptdump_walk_pgd_level_core (m, pgd, false, false); +ptdump_walk_pgd_level_core (m, mm, pgd, false, false); }EXPORT_SYMBOL_GPL (ptdump_walk_pgd_level_debugfs);
@@ -430,13 +426,13 @@ void ptdump_walk_user_pgd_level_checkwx(pr_info ("x86/mm: Checking user space page tables\n" ); pgd =kernel_to_user_pgdp (pgd); -ptdump_walk_pgd_level_core (NULL , pgd, true, false); +ptdump_walk_pgd_level_core (NULL , &init_mm, pgd, true, false);#endif }void ptdump_walk_pgd_level_checkwx (void ) { -ptdump_walk_pgd_level_core (NULL ,INIT_PGD , true, false); +ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }static int __init pt_dump_init (void )
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +3 -0
@@ -74,6 +74,7 @@ enum page_walk_action {* mm_walk - walk_page_range data * @ops: operation to call during the walk * @mm: mm_struct representing the target process of page table walk +* @pgd: pointer to PGD; only valid with no_vma (otherwise set to NULL) * @vma: vma currently walked (NULL if walking outside vmas) * @action: next action to perform (see enum page_walk_action) * @no_vma: walk ignoring vmas (vma will always be NULL)
@@ -84,6 +85,7 @@ enum page_walk_action {struct mm_walk {const struct mm_walk_ops *ops;struct mm_struct *mm; +pgd_t *pgd;struct vm_area_struct *vma;enum page_walk_action action;bool no_vma;
@@ -95,6 +97,7 @@ int walk_page_range(struct mm_struct *mm void *private);int walk_page_range_novma (struct mm_struct *mm,unsigned long start,unsigned long end,const struct mm_walk_ops *ops, +pgd_t *pgd,void *private);int walk_page_vma (struct vm_area_struct *vma,const struct mm_walk_ops *ops,void *private);
include/linux/ptdump.h renamed from include/linux/ptdump.h~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +1 -1
@@ -17,6 +17,6 @@ struct ptdump_state { const struct ptdump_range *range; }; -void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm); +void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd);#endif /* _LINUX_PTDUMP_H */
mm/pagewalk.c renamed from mm/pagewalk.c~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +6 -1
@@ -206,7 +206,10 @@ static int walk_pgd_range(unsigned longconst struct mm_walk_ops *ops = walk->ops;int err =0 ; - pgd =pgd_offset (walk->mm, addr); +if (walk->pgd) + pgd = walk->pgd +pgd_index (addr); +else + pgd =pgd_offset (walk->mm, addr); do { next = pgd_addr_end(addr, end); if (pgd_none_or_clear_bad(pgd)) {
@@ -436,11 +439,13 @@ int walk_page_range(struct mm_struct *mm*/ int walk_page_range_novma (struct mm_struct *mm,unsigned long start,unsigned long end,const struct mm_walk_ops *ops, +pgd_t *pgd,void *private) {struct mm_walk walk = { .ops = ops, .mm = mm, + .pgd = pgd, .private = private, .no_vma = true };
mm/ptdump.c renamed from mm/ptdump.c~x86-mm-avoid-allocating-struct-mm_struct-on-the-stack +2 -2
@@ -122,14 +122,14 @@ static const struct mm_walk_ops ptdump_o .pte_hole = ptdump_hole, }; -void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm) +void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd) {const struct ptdump_range *range = st->range;down_read (&mm->mmap_sem);while (range->start != range->end) {walk_page_range_novma (mm, range->start, range->end, - &ptdump_ops, st); + &ptdump_ops, pgd, st); range++; }up_read (&mm->mmap_sem);
_
Andrew Morton
maintainerPATCH 48/67 powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case
In reply to Andrew MortonFrom: "Aneesh Kumar K.V" <[email protected]>
Subject: powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case
Patch series "Fixup page directory freeing", v4.
This is a repost of patch series from Peter with the arch specific changes except ppc64 dropped. ppc64 changes are added here because we are redoing the patch series on top of ppc64 changes. This makes it easy to backport these changes. Only the first 2 patches need to be backported to stable.
The thing is, on anything SMP, freeing page directories should observe the exact same order as normal page freeing:
1) unhook page/directory
2) TLB invalidate
3) free page/directory
Without this, any concurrent page-table walk could end up with a Use-after-Free. This is esp. trivial for anything that has software page-table walkers (HAVE_FAST_GUP / software TLB fill) or the hardware caches partial page-walks (ie. caches page directories).
Even on UP this might give issues since mmu_gather is preemptible these days. An interrupt or preempted task accessing user pages might stumble into the free page if the hardware caches page directories.
This patch series fixes ppc64 and add generic MMU_GATHER changes to support the conversion of other architectures. I haven't added patches w.r.t other architecture because they are yet to be acked.
This patch (of 9):
A followup patch is going to make sure we correctly invalidate page walk cache before we free page table pages. In order to keep things simple enable RCU_TABLE_FREE even for !SMP so that we don't have to fixup the !SMP case differently in the followup patch
!SMP case is right now broken for radix translation w.r.t page walk cache flush. We can get interrupted in between page table free and that would imply we have page walk cache entries pointing to tables which got freed already. Michael said "both our platforms that run on Power9 force SMP on in Kconfig, so the !SMP case is unlikely to be a problem for anyone in practice, unless they've hacked their kernel to build it !SMP."
---
arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/book3s/32/pgalloc.h | 8 -------- arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 -- arch/powerpc/include/asm/nohash/pgalloc.h | 8 -------- arch/powerpc/mm/book3s64/pgtable.c | 7 ------- 5 files changed, 1 insertion(+), 26 deletions(-)
arch/powerpc/include/asm/book3s/32/pgalloc.h renamed from arch/powerpc/include/asm/book3s/32/pgalloc.h~powerpc-mmu_gather-enable-rcu_table_free-even-for-smp-case +0 -8
@@ -49,7 +49,6 @@ static inline void pgtable_free(void *ta#define get_hugepd_cache_index (x) (x) -#ifdef CONFIG_SMP static inline void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int shift) {
@@ -66,13 +65,6 @@ static inline void __tlb_remove_table(vopgtable_free (table, shift); } -#else -static inline void pgtable_free_tlb (struct mmu_gather *tlb, -void *table,int shift) -{ -pgtable_free (table, shift); -} -#endif static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address)
arch/powerpc/include/asm/book3s/64/pgalloc.h renamed from arch/powerpc/include/asm/book3s/64/pgalloc.h~powerpc-mmu_gather-enable-rcu_table_free-even-for-smp-case +0 -2
@@ -19,9 +19,7 @@ extern struct vmemmap_backing *vmemmap_lextern pmd_t *pmd_fragment_alloc (struct mm_struct *,unsigned long );extern void pmd_fragment_free (unsigned long *);extern void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int shift); -#ifdef CONFIG_SMP extern void __tlb_remove_table (void *_table); -#endif void pte_frag_destroy (void *pte_frag);static inline pgd_t *radix__pgd_alloc (struct mm_struct *mm)
arch/powerpc/include/asm/nohash/pgalloc.h renamed from arch/powerpc/include/asm/nohash/pgalloc.h~powerpc-mmu_gather-enable-rcu_table_free-even-for-smp-case +0 -8
@@ -46,7 +46,6 @@ static inline void pgtable_free(void *ta#define get_hugepd_cache_index (x) (x) -#ifdef CONFIG_SMP static inline void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int shift) {unsigned long pgf = (unsigned long )table;
@@ -64,13 +63,6 @@ static inline void __tlb_remove_table(vopgtable_free (table, shift); } -#else -static inline void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int shift) -{ -pgtable_free (table, shift); -} -#endif -static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address) {
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~powerpc-mmu_gather-enable-rcu_table_free-even-for-smp-case +1 -1
@@ -222,7 +222,7 @@ config PPC select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE if SMP + select HAVE_RCU_TABLE_FREE select HAVE_RCU_TABLE_NO_INVALIDATE if HAVE_RCU_TABLE_FREE select HAVE_MMU_GATHER_PAGE_SIZE select HAVE_REGS_AND_STACK_ACCESS_API
arch/powerpc/mm/book3s64/pgtable.c renamed from arch/powerpc/mm/book3s64/pgtable.c~powerpc-mmu_gather-enable-rcu_table_free-even-for-smp-case +0 -7
@@ -378,7 +378,6 @@ static inline void pgtable_free(void *ta } } -#ifdef CONFIG_SMP void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int index) {unsigned long pgf = (unsigned long )table;
@@ -395,12 +394,6 @@ void __tlb_remove_table(void *_table)return pgtable_free (table, index); } -#else -void pgtable_free_tlb (struct mmu_gather *tlb,void *table,int index) -{ -return pgtable_free (table, index); -} -#endif #ifdef CONFIG_PROC_FS atomic_long_t direct_pages_count[MMU_PAGE_COUNT ];
_
Andrew Morton
maintainerPATCH 49/67 mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush
Architectures for which we have hardware walkers of Linux page table should flush TLB on mmu gather batch allocation failures and batch flush. Some architectures like POWER supports multiple translation modes (hash and radix) and in the case of POWER only radix translation mode needs the above TLBI. This is because for hash translation mode kernel wants to avoid this extra flush since there are no hardware walkers of linux page table. With radix translation, the hardware also walks linux page table and with that, kernel needs to make sure to TLB invalidate page walk cache before page table pages are freed.
More details in commit d86564a2f085 ("mm/tlb, x86/mm: Support invalidating TLB caches for RCU_TABLE_FREE")
The changes to sparc are to make sure we keep the old behavior since we are now removing HAVE_RCU_TABLE_NO_INVALIDATE. The default value for tlb_needs_table_invalidate is to always force an invalidate and sparc can avoid the table invalidate. Hence we define tlb_needs_table_invalidate to false for sparc architecture.
---
arch/Kconfig | 3 --- arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/tlb.h | 11 +++++++++++ arch/sparc/Kconfig | 1 - arch/sparc/include/asm/tlb_64.h | 9 +++++++++ include/asm-generic/tlb.h | 22 +++++++++++++++------- mm/mmu_gather.c | 16 ++++++++-------- 7 files changed, 43 insertions(+), 20 deletions(-)
arch/Kconfig renamed from arch/Kconfig~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +0 -3
@@ -396,9 +396,6 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE config HAVE_RCU_TABLE_FREE bool -config HAVE_RCU_TABLE_NO_INVALIDATE - bool - config HAVE_MMU_GATHER_PAGE_SIZE bool
arch/powerpc/include/asm/tlb.h renamed from arch/powerpc/include/asm/tlb.h~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +11 -0
@@ -26,6 +26,17 @@#define tlb_flush tlb_flushextern void tlb_flush (struct mmu_gather *tlb); +/* +* book3s: +* Hash does not use the linux page-tables, so we can avoid +* the TLB invalidate for page-table freeing, Radix otoh does use the +* page-tables and needs the TLBI. +* +* nohash: +* We still do TLB invalidate in the __pte_free_tlb routine before we +* add the page table pages to mmu gather table batch. +*/ +#define tlb_needs_table_invalidate () radix_enabled()/* Get the generic bits... */ #include <asm-generic/tlb.h>
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +0 -1
@@ -223,7 +223,6 @@ config PPC select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP select HAVE_RCU_TABLE_FREE - select HAVE_RCU_TABLE_NO_INVALIDATE if HAVE_RCU_TABLE_FREE select HAVE_MMU_GATHER_PAGE_SIZE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN
arch/sparc/include/asm/tlb_64.h renamed from arch/sparc/include/asm/tlb_64.h~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +9 -0
@@ -28,6 +28,15 @@ void flush_tlb_pending(void);#define __tlb_remove_tlb_entry (tlb, ptep, address) do { } while (0)#define tlb_flush (tlb) flush_tlb_pending() +/* +* SPARC64's hardware TLB fill does not use the Linux page-tables +* and therefore we don't need a TLBI when freeing page-table pages. +*/ + +#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#define tlb_needs_table_invalidate () (false) +#endif +#include <asm-generic/tlb.h> #endif /* _SPARC64_TLB_H */
arch/sparc/Kconfig renamed from arch/sparc/Kconfig~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +0 -1
@@ -65,7 +65,6 @@ config SPARC64 select HAVE_KRETPROBES select HAVE_KPROBES select HAVE_RCU_TABLE_FREE if SMP - select HAVE_RCU_TABLE_NO_INVALIDATE if HAVE_RCU_TABLE_FREE select HAVE_MEMBLOCK_NODE_MAP select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_DYNAMIC_FTRACE
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +15 -7
@@ -137,13 +137,6 @@* When used, an architecture is expected to provide __tlb_remove_table() * which does the actual freeing of these pages. * -* HAVE_RCU_TABLE_NO_INVALIDATE -* -* This makes HAVE_RCU_TABLE_FREE avoid calling tlb_flush_mmu_tlbonly() before -* freeing the page-table pages. This can be avoided if you use -* HAVE_RCU_TABLE_FREE and your architecture does _NOT_ use the Linux -* page-tables natively. -* * MMU_GATHER_NO_RANGE * * Use this if your architecture lacks an efficient flush_tlb_range().
@@ -189,8 +182,23 @@ struct mmu_table_batch {extern void tlb_remove_table (struct mmu_gather *tlb,void *table); +/* +* This allows an architecture that does not use the linux page-tables for +* hardware to skip the TLBI when freeing page tables. +*/ +#ifndef tlb_needs_table_invalidate +#define tlb_needs_table_invalidate () (true)#endif +#else + +#ifdef tlb_needs_table_invalidate +#error tlb_needs_table_invalidate() requires HAVE_RCU_TABLE_FREE +#endif + +#endif /* CONFIG_HAVE_RCU_TABLE_FREE */ + +#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER /* * If we can't allocate a page to make a big batch of page pointers
mm/mmu_gather.c renamed from mm/mmu_gather.c~mm-mmu_gather-invalidate-tlb-correctly-on-batch-allocation-failure-and-flush +8 -8
@@ -102,14 +102,14 @@ bool __tlb_remove_page_size(struct mmu_g*/ static inline void tlb_table_invalidate (struct mmu_gather *tlb) { -#ifndef CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE -/* -* Invalidate page-table caches used by hardware walkers. Then we still -* need to RCU-sched wait while freeing the pages because software -* walkers can still be in-flight. -*/ -tlb_flush_mmu_tlbonly (tlb); -#endif +if (tlb_needs_table_invalidate ()) { +/* +* Invalidate page-table caches used by hardware walkers. Then +* we still need to RCU-sched wait while freeing the pages +* because software walkers can still be in-flight. +*/ +tlb_flush_mmu_tlbonly (tlb); + } }static void tlb_remove_table_smp_sync (void *arg)
_
Andrew Morton
maintainerPATCH 50/67 asm-generic/tlb: avoid potential double flush
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: avoid potential double flush
Aneesh reported that:
tlb_flush_mmu() tlb_flush_mmu_tlbonly() tlb_flush() <-- #1 tlb_flush_mmu_free() tlb_table_flush() tlb_table_invalidate() tlb_flush_mmu_tlbonly() tlb_flush() <-- #2
does two TLBIs when tlb->fullmm, because __tlb_reset_range() will not clear tlb->end in that case.
Observe that any caller to __tlb_adjust_range() also sets at least one of the tlb->freed_tables || tlb->cleared_p* bits, and those are unconditionally cleared by __tlb_reset_range().
Change the condition for actually issuing TLBI to having one of those bits set, as opposed to having tlb->end != 0.
---
include/asm-generic/tlb.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-avoid-potential-double-flush +6 -1
@@ -402,7 +402,12 @@ tlb_update_vma_flags(struct mmu_gather *static inline void tlb_flush_mmu_tlbonly (struct mmu_gather *tlb) { -if (!tlb->end) +/* +* Anything calling __tlb_adjust_range() also sets at least one of +* these bits. +*/ +if (!(tlb->freed_tables || tlb->cleared_ptes || tlb->cleared_pmds || + tlb->cleared_puds || tlb->cleared_p4ds))return ;tlb_flush (tlb);
_
Andrew Morton
maintainerPATCH 51/67 asm-gemeric/tlb: remove stray function declarations
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-gemeric/tlb: remove stray function declarations
We removed the actual functions a while ago.
---
include/asm-generic/tlb.h | 4 ---- 1 file changed, 4 deletions(-)
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-gemeric-tlb-remove-stray-function-declarations +0 -4
@@ -285,11 +285,7 @@ struct mmu_gather {#endif }; -void arch_tlb_gather_mmu (struct mmu_gather *tlb, -struct mm_struct *mm,unsigned long start,unsigned long end);void tlb_flush_mmu (struct mmu_gather *tlb); -void arch_tlb_finish_mmu (struct mmu_gather *tlb, -unsigned long start,unsigned long end,bool force); static inline void __tlb_adjust_range(struct mmu_gather *tlb, unsigned long address,
_
Andrew Morton
maintainerPATCH 52/67 asm-generic/tlb: add missing CONFIG symbol
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: add missing CONFIG symbol
Without this the symbol will not actually end up in .config files.
---
arch/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-add-missing-config-symbol +3 -0
@@ -399,6 +399,9 @@ config HAVE_RCU_TABLE_FREE config HAVE_MMU_GATHER_PAGE_SIZE bool +config MMU_GATHER_NO_RANGE + bool + config HAVE_MMU_GATHER_NO_GATHER bool
_
Andrew Morton
maintainerPATCH 53/67 asm-generic/tlb: rename HAVE_RCU_TABLE_FREE
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: rename HAVE_RCU_TABLE_FREE
Towards a more consistent naming scheme.
---
arch/Kconfig | 2 +- arch/arm/Kconfig | 2 +- arch/arm/include/asm/tlb.h | 2 +- arch/arm64/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/sparc/Kconfig | 2 +- arch/sparc/include/asm/tlb_64.h | 2 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/tlb.h | 4 ++-- include/asm-generic/tlb.h | 10 +++++----- mm/gup.c | 2 +- mm/mmu_gather.c | 8 ++++---- 13 files changed, 21 insertions(+), 21 deletions(-)
arch/arm64/Kconfig renamed from arch/arm64/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -165,7 +165,7 @@ config ARM64 select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_FUTEX_CMPXCHG if FUTEX - select HAVE_RCU_TABLE_FREE + select MMU_GATHER_RCU_TABLE_FREE select HAVE_RSEQ select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS
arch/arm/include/asm/tlb.h renamed from arch/arm/include/asm/tlb.h~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -37,7 +37,7 @@ static inline void __tlb_remove_table(vo#include <asm-generic/tlb.h> -#ifndef CONFIG_HAVE_RCU_TABLE_FREE +#ifndef CONFIG_MMU_GATHER_RCU_TABLE_FREE #define tlb_remove_table (tlb, entry) tlb_remove_page(tlb, entry)#endif
arch/arm/Kconfig renamed from arch/arm/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -102,7 +102,7 @@ config ARM select HAVE_PERF_EVENTS select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE if SMP && ARM_LPAE + select MMU_GATHER_RCU_TABLE_FREE if SMP && ARM_LPAE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ select HAVE_STACKPROTECTOR
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -393,7 +393,7 @@ config HAVE_ARCH_JUMP_LABEL config HAVE_ARCH_JUMP_LABEL_RELATIVE bool -config HAVE_RCU_TABLE_FREE +config MMU_GATHER_RCU_TABLE_FREE bool config HAVE_MMU_GATHER_PAGE_SIZE
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -222,7 +222,7 @@ config PPC select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE + select MMU_GATHER_RCU_TABLE_FREE select HAVE_MMU_GATHER_PAGE_SIZE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN
arch/s390/Kconfig renamed from arch/s390/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -169,7 +169,7 @@ config S390 select HAVE_OPROFILE select HAVE_PCI select HAVE_PERF_EVENTS - select HAVE_RCU_TABLE_FREE + select MMU_GATHER_RCU_TABLE_FREE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE select HAVE_RSEQ
arch/sparc/include/asm/tlb_64.h renamed from arch/sparc/include/asm/tlb_64.h~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -33,7 +33,7 @@ void flush_tlb_pending(void);* and therefore we don't need a TLBI when freeing page-table pages. */ -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE #define tlb_needs_table_invalidate () (false)#endif
arch/sparc/Kconfig renamed from arch/sparc/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -64,7 +64,7 @@ config SPARC64 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_KRETPROBES select HAVE_KPROBES - select HAVE_RCU_TABLE_FREE if SMP + select MMU_GATHER_RCU_TABLE_FREE if SMP select HAVE_MEMBLOCK_NODE_MAP select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_DYNAMIC_FTRACE
arch/x86/include/asm/tlb.h renamed from arch/x86/include/asm/tlb.h~asm-generic-tlb-rename-have_rcu_table_free +2 -2
@@ -29,8 +29,8 @@ static inline void tlb_flush(struct mmu_* shootdown, enablement code for several hypervisors overrides * .flush_tlb_others hook in pv_mmu_ops and implements it by issuing * a hypercall. To keep software pagetable walkers safe in this case we -* switch to RCU based table free (HAVE_RCU_TABLE_FREE). See the comment -* below 'ifdef CONFIG_HAVE_RCU_TABLE_FREE' in include/asm-generic/tlb.h +* switch to RCU based table free (MMU_GATHER_RCU_TABLE_FREE). See the comment +* below 'ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE' in include/asm-generic/tlb.h * for more details. */ static inline void __tlb_remove_table (void *table)
arch/x86/Kconfig renamed from arch/x86/Kconfig~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -203,7 +203,7 @@ config X86 select HAVE_PCI select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE if PARAVIRT + select MMU_GATHER_RCU_TABLE_FREE if PARAVIRT select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if X86_64 && (UNWINDER_FRAME_POINTER || UNWINDER_ORC) && STACK_VALIDATION select HAVE_FUNCTION_ARG_ACCESS_API
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-rename-have_rcu_table_free +5 -5
@@ -126,7 +126,7 @@* This ensures we call tlb_flush() every time tlb_change_page_size() actually * changes the size and provides mmu_gather::page_size to tlb_flush(). * -* HAVE_RCU_TABLE_FREE +* MMU_GATHER_RCU_TABLE_FREE * * This provides tlb_remove_table(), to be used instead of tlb_remove_page() * for page directores (__p*_free_tlb()). This provides separate freeing of
@@ -142,7 +142,7 @@* Use this if your architecture lacks an efficient flush_tlb_range(). */ -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE /* * Semi RCU freeing of the page directories. *
@@ -193,10 +193,10 @@ extern void tlb_remove_table(struct mmu_#else #ifdef tlb_needs_table_invalidate -#error tlb_needs_table_invalidate() requires HAVE_RCU_TABLE_FREE +#error tlb_needs_table_invalidate() requires MMU_GATHER_RCU_TABLE_FREE#endif -#endif /* CONFIG_HAVE_RCU_TABLE_FREE */ +#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER
@@ -235,7 +235,7 @@ extern bool __tlb_remove_page_size(strucstruct mmu_gather {struct mm_struct *mm; -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE struct mmu_table_batch *batch;#endif
mm/gup.c renamed from mm/gup.c~asm-generic-tlb-rename-have_rcu_table_free +1 -1
@@ -1792,7 +1792,7 @@ EXPORT_SYMBOL(get_user_pages_unlocked);* Before activating this code, please be aware that the following assumptions * are currently made: * -* *) Either HAVE_RCU_TABLE_FREE is enabled, and tlb_remove_table() is used to +* *) Either MMU_GATHER_RCU_TABLE_FREE is enabled, and tlb_remove_table() is used to * free pages containing page tables or TLB flushing requires IPI broadcast. * * *) ptes can be read atomically by the architecture.
mm/mmu_gather.c renamed from mm/mmu_gather.c~asm-generic-tlb-rename-have_rcu_table_free +4 -4
@@ -91,7 +91,7 @@ bool __tlb_remove_page_size(struct mmu_g#endif /* HAVE_MMU_GATHER_NO_GATHER */ -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE /* * See the comment near struct mmu_table_batch.
@@ -173,11 +173,11 @@ void tlb_remove_table(struct mmu_gather tlb_table_flush(tlb); } -#endif /* CONFIG_HAVE_RCU_TABLE_FREE */ +#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ static void tlb_flush_mmu_free (struct mmu_gather *tlb) { -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb_table_flush (tlb);#endif #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER
@@ -220,7 +220,7 @@ void tlb_gather_mmu(struct mmu_gather *t tlb->batch_count =0 ;#endif -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb->batch =NULL ;#endif #ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE
_
Andrew Morton
maintainerPATCH 54/67 asm-generic/tlb: rename HAVE_MMU_GATHER_PAGE_SIZE
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: rename HAVE_MMU_GATHER_PAGE_SIZE
Towards a more consistent naming scheme.
---
arch/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- include/asm-generic/tlb.h | 9 ++++++--- mm/mmu_gather.c | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-)
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-rename-have_mmu_gather_page_size +1 -1
@@ -396,7 +396,7 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE config MMU_GATHER_RCU_TABLE_FREE bool -config HAVE_MMU_GATHER_PAGE_SIZE +config MMU_GATHER_PAGE_SIZE bool config MMU_GATHER_NO_RANGE
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~asm-generic-tlb-rename-have_mmu_gather_page_size +1 -1
@@ -223,7 +223,7 @@ config PPC select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP select MMU_GATHER_RCU_TABLE_FREE - select HAVE_MMU_GATHER_PAGE_SIZE + select MMU_GATHER_PAGE_SIZE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN select HAVE_SYSCALL_TRACEPOINTS
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-rename-have_mmu_gather_page_size +6 -3
@@ -121,11 +121,14 @@* * Additionally there are a few opt-in features: * -* HAVE_MMU_GATHER_PAGE_SIZE +* MMU_GATHER_PAGE_SIZE * * This ensures we call tlb_flush() every time tlb_change_page_size() actually * changes the size and provides mmu_gather::page_size to tlb_flush(). * +* This might be useful if your architecture has size specific TLB +* invalidation instructions. +* * MMU_GATHER_RCU_TABLE_FREE * * This provides tlb_remove_table(), to be used instead of tlb_remove_page()
@@ -279,7 +282,7 @@ struct mmu_gather {struct mmu_gather_batch local;struct page *__pages[MMU_GATHER_BUNDLE ]; -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE unsigned int page_size;#endif #endif
@@ -435,7 +438,7 @@ static inline void tlb_remove_page(strucstatic inline void tlb_change_page_size (struct mmu_gather *tlb,unsigned int page_size) { -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE if (tlb->page_size && tlb->page_size != page_size) {if (!tlb->fullmm && !tlb->need_flush_all)tlb_flush_mmu (tlb);
mm/mmu_gather.c renamed from mm/mmu_gather.c~asm-generic-tlb-rename-have_mmu_gather_page_size +2 -2
@@ -69,7 +69,7 @@ bool __tlb_remove_page_size(struct mmu_gVM_BUG_ON (!tlb->end); -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE VM_WARN_ON (tlb->page_size != page_size);#endif
@@ -223,7 +223,7 @@ void tlb_gather_mmu(struct mmu_gather *t#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb->batch =NULL ;#endif -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE tlb->page_size =0 ;#endif
_
Andrew Morton
maintainerPATCH 55/67 asm-generic/tlb: rename HAVE_MMU_GATHER_NO_GATHER
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: rename HAVE_MMU_GATHER_NO_GATHER
Towards a more consistent naming scheme.
---
arch/Kconfig | 2 +- arch/s390/Kconfig | 2 +- include/asm-generic/tlb.h | 14 ++++++++++++-- mm/mmu_gather.c | 10 +++++----- 4 files changed, 19 insertions(+), 9 deletions(-)
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-rename-have_mmu_gather_no_gather +1 -1
@@ -402,7 +402,7 @@ config MMU_GATHER_PAGE_SIZE config MMU_GATHER_NO_RANGE bool -config HAVE_MMU_GATHER_NO_GATHER +config MMU_GATHER_NO_GATHER bool config ARCH_HAVE_NMI_SAFE_CMPXCHG
arch/s390/Kconfig renamed from arch/s390/Kconfig~asm-generic-tlb-rename-have_mmu_gather_no_gather +1 -1
@@ -163,7 +163,7 @@ config S390 select HAVE_PERF_USER_STACK_DUMP select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_PHYS_MAP - select HAVE_MMU_GATHER_NO_GATHER + select MMU_GATHER_NO_GATHER select HAVE_MOD_ARCH_SPECIFIC select HAVE_NOP_MCOUNT select HAVE_OPROFILE
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-rename-have_mmu_gather_no_gather +12 -2
@@ -143,6 +143,16 @@* MMU_GATHER_NO_RANGE * * Use this if your architecture lacks an efficient flush_tlb_range(). +* +* MMU_GATHER_NO_GATHER +* +* If the option is set the mmu_gather will not track individual pages for +* delayed page free anymore. A platform that enables the option needs to +* provide its own implementation of the __tlb_remove_page_size() function to +* free pages. +* +* This is useful if your architecture already flushes TLB entries in the +* various ptep_get_and_clear() functions. */ #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE
@@ -202,7 +212,7 @@ extern void tlb_remove_table(struct mmu_#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER /* * If we can't allocate a page to make a big batch of page pointers * to work on, then just handle a few from the on-stack structure.
@@ -277,7 +287,7 @@ struct mmu_gather {unsigned int batch_count; -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER struct mmu_gather_batch *active;struct mmu_gather_batch local;struct page *__pages[MMU_GATHER_BUNDLE ];
mm/mmu_gather.c renamed from mm/mmu_gather.c~asm-generic-tlb-rename-have_mmu_gather_no_gather +5 -5
@@ -11,7 +11,7 @@#include <asm/pgalloc.h> #include <asm/tlb.h> -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER static bool tlb_next_batch (struct mmu_gather *tlb) {
@@ -89,7 +89,7 @@ bool __tlb_remove_page_size(struct mmu_g return false; } -#endif /* HAVE_MMU_GATHER_NO_GATHER */ +#endif /* MMU_GATHER_NO_GATHER */ #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE
@@ -180,7 +180,7 @@ static void tlb_flush_mmu_free(struct mm#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb_table_flush (tlb);#endif -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb_batch_pages_flush (tlb);#endif }
@@ -211,7 +211,7 @@ void tlb_gather_mmu(struct mmu_gather *t/* Is it from 0 to ~0? */ tlb->fullmm = !(start | (end+1 )); -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb->need_flush_all =0 ; tlb->local.next =NULL ; tlb->local.nr =0 ;
@@ -271,7 +271,7 @@ void tlb_finish_mmu(struct mmu_gather *ttlb_flush_mmu (tlb); -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb_batch_list_free (tlb);#endif dec_tlb_flush_pending (tlb->mm);
_
Andrew Morton
maintainerPATCH 56/67 asm-generic/tlb: provide MMU_GATHER_TABLE_FREE
In reply to Andrew MortonFrom: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: provide MMU_GATHER_TABLE_FREE
As described in the comment, the correct order for freeing pages is:
1) unhook page
2) TLB invalidate page
3) free page
This order equally applies to page directories.
Currently there are two correct options:
- use tlb_remove_page(), when all page directores are full pages and there are no futher contraints placed by things like software walkers (HAVE_FAST_GUP).
- use MMU_GATHER_RCU_TABLE_FREE and tlb_remove_table() when the architecture does not do IPI based TLB invalidate and has HAVE_FAST_GUP (or software TLB fill).
This however leaves architectures that don't have page based directories but don't need RCU in a bind. For those, provide MMU_GATHER_TABLE_FREE, which provides the independent batching for directories without the additional RCU freeing.
---
arch/Kconfig | 5 + arch/arm/include/asm/tlb.h | 4 - include/asm-generic/tlb.h | 72 ++++++++++----------- mm/mmu_gather.c | 120 +++++++++++++++++++++++++---------- 4 files changed, 130 insertions(+), 71 deletions(-)
arch/arm/include/asm/tlb.h renamed from arch/arm/include/asm/tlb.h~asm-generic-tlb-provide-mmu_gather_table_free +0 -4
@@ -37,10 +37,6 @@ static inline void __tlb_remove_table(vo#include <asm-generic/tlb.h> -#ifndef CONFIG_MMU_GATHER_RCU_TABLE_FREE -#define tlb_remove_table (tlb, entry) tlb_remove_page(tlb, entry) -#endif -static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pte,unsigned long addr) {
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-provide-mmu_gather_table_free +5 -0
@@ -393,8 +393,12 @@ config HAVE_ARCH_JUMP_LABEL config HAVE_ARCH_JUMP_LABEL_RELATIVE bool +config MMU_GATHER_TABLE_FREE + bool + config MMU_GATHER_RCU_TABLE_FREE bool + select MMU_GATHER_TABLE_FREE config MMU_GATHER_PAGE_SIZE bool
@@ -404,6 +408,7 @@ config MMU_GATHER_NO_RANGE config MMU_GATHER_NO_GATHER bool + depends on MMU_GATHER_TABLE_FREE config ARCH_HAVE_NMI_SAFE_CMPXCHG bool
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-provide-mmu_gather_table_free +37 -35
110 lines not on this page · raw message
mm/mmu_gather.c renamed from mm/mmu_gather.c~asm-generic-tlb-provide-mmu_gather_table_free +88 -32
173 lines not on this page · raw message
_
Andrew Morton
maintainerPATCH 57/67 proc: decouple proc from VFS with "struct proc_ops"
In reply to Andrew MortonFrom: Alexey Dobriyan <[email protected]>
Subject: proc: decouple proc from VFS with "struct proc_ops"
Currently core /proc code uses "struct file_operations" for custom hooks, however, VFS doesn't directly call them. Every time VFS expands file_operations hook set, /proc code bloats for no reason.
Introduce "struct proc_ops" which contains only those hooks which /proc allows to call into (open, release, read, write, ioctl, mmap, poll). It doesn't contain module pointer as well.
Save ~184 bytes per usage:
add/remove: 26/26 grow/shrink: 1/4 up/down: 1922/-6674 (-4752)
Function old new delta
sysvipc_proc_ops - 72 +72
...
config_gz_proc_ops - 72 +72
proc_get_inode 289 339 +50
proc_reg_get_unmapped_area 110 107 -3
close_pdeo 227 224 -3
proc_reg_open 289 284 -5
proc_create_data 60 53 -7
rt_cpu_seq_fops 256 - -256
...
default_affinity_proc_fops 256 - -256
Total: Before=5430095, After=5425343, chg -0.09%
---
fs/proc/generic.c | 38 +++++++++---------- fs/proc/inode.c | 76 +++++++++++++++++++------------------- fs/proc/internal.h | 5 ++ fs/proc/proc_net.c | 32 ++++++++-------- fs/proc/proc_sysctl.c | 2 - fs/proc/root.c | 2 - include/linux/proc_fs.h | 23 +++++++++-- 7 files changed, 98 insertions(+), 80 deletions(-)
fs/proc/generic.c renamed from fs/proc/generic.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +18 -20
@@ -473,7 +473,7 @@ struct proc_dir_entry *proc_mkdir_data(c ent =__proc_create (&parent, name,S_IFDIR | mode,2 );if (ent) { ent->data = data; - ent->proc_fops = &proc_dir_operations; + ent->proc_dir_ops = &proc_dir_operations; ent->proc_iops = &proc_dir_inode_operations; ent =proc_register (parent, ent); }
@@ -503,7 +503,7 @@ struct proc_dir_entry *proc_create_mount ent =__proc_create (&parent, name, mode,2 );if (ent) { ent->data =NULL ; - ent->proc_fops =NULL ; + ent->proc_dir_ops =NULL ; ent->proc_iops =NULL ; ent =proc_register (parent, ent); }
@@ -533,25 +533,23 @@ struct proc_dir_entry *proc_create_reg(cstruct proc_dir_entry *proc_create_data (const char *name,umode_t mode,struct proc_dir_entry *parent, -const struct file_operations *proc_fops,void *data) +const struct proc_ops *proc_ops,void *data) {struct proc_dir_entry *p; -BUG_ON (proc_fops ==NULL ); - p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = proc_fops; + p->proc_ops = proc_ops;return proc_register (parent, p); }EXPORT_SYMBOL (proc_create_data);struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent, -const struct file_operations *proc_fops) +const struct proc_ops *proc_ops) { -return proc_create_data (name, mode, parent, proc_fops,NULL ); +return proc_create_data (name, mode, parent, proc_ops,NULL ); }EXPORT_SYMBOL (proc_create);
@@ -573,11 +571,11 @@ static int proc_seq_release(struct inodereturn seq_release (inode, file); } -static const struct file_operations proc_seq_fops = { - .open = proc_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = proc_seq_release, +static const struct proc_ops proc_seq_ops = { + .proc_open = proc_seq_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = proc_seq_release, }; struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,
@@ -589,7 +587,7 @@ struct proc_dir_entry *proc_create_seq_p p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = &proc_seq_fops; + p->proc_ops = &proc_seq_ops; p->seq_ops = ops; p->state_size = state_size;return proc_register (parent, p);
@@ -603,11 +601,11 @@ static int proc_single_open(struct inodereturn single_open (file, de->single_show, de->data); } -static const struct file_operations proc_single_fops = { - .open = proc_single_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops proc_single_ops = { + .proc_open = proc_single_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, }; struct proc_dir_entry *proc_create_single_data(const char *name, umode_t mode,
@@ -619,7 +617,7 @@ struct proc_dir_entry *proc_create_singl p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = &proc_single_fops; + p->proc_ops = &proc_single_ops; p->single_show = show;return proc_register (parent, p); }
fs/proc/inode.c renamed from fs/proc/inode.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +39 -37
164 lines not on this page · raw message
fs/proc/internal.h renamed from fs/proc/internal.h~proc-decouple-proc-from-vfs-with-struct-proc_ops +4 -1
@@ -39,7 +39,10 @@ struct proc_dir_entry {spinlock_t pde_unload_lock;struct completion *pde_unload_completion;const struct inode_operations *proc_iops; -const struct file_operations *proc_fops; +union { +const struct proc_ops *proc_ops; +const struct file_operations *proc_dir_ops; + };const struct dentry_operations *proc_dops;union {const struct seq_operations *seq_ops;
fs/proc/proc_net.c renamed from fs/proc/proc_net.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +16 -16
@@ -90,12 +90,12 @@ static int seq_release_net(struct inodereturn 0 ; } -static const struct file_operations proc_net_seq_fops = { - .open = seq_open_net, - .read = seq_read, - .write = proc_simple_write, - .llseek = seq_lseek, - .release = seq_release_net, +static const struct proc_ops proc_net_seq_ops = { + .proc_open = seq_open_net, + .proc_read = seq_read, + .proc_write = proc_simple_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release_net, }; struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,
@@ -108,7 +108,7 @@ struct proc_dir_entry *proc_create_net_dif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_seq_fops; + p->proc_ops = &proc_net_seq_ops; p->seq_ops = ops; p->state_size = state_size;return proc_register (parent, p);
@@ -152,7 +152,7 @@ struct proc_dir_entry *proc_create_net_dif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_seq_fops; + p->proc_ops = &proc_net_seq_ops; p->seq_ops = ops; p->state_size = state_size; p->write = write;
@@ -183,12 +183,12 @@ static int single_release_net(struct inoreturn single_release (ino, f); } -static const struct file_operations proc_net_single_fops = { - .open = single_open_net, - .read = seq_read, - .write = proc_simple_write, - .llseek = seq_lseek, - .release = single_release_net, +static const struct proc_ops proc_net_single_ops = { + .proc_open = single_open_net, + .proc_read = seq_read, + .proc_write = proc_simple_write, + .proc_lseek = seq_lseek, + .proc_release = single_release_net, }; struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
@@ -201,7 +201,7 @@ struct proc_dir_entry *proc_create_net_sif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_single_fops; + p->proc_ops = &proc_net_single_ops; p->single_show = show;return proc_register (parent, p); }
@@ -244,7 +244,7 @@ struct proc_dir_entry *proc_create_net_sif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_single_fops; + p->proc_ops = &proc_net_single_ops; p->single_show = show; p->write = write;return proc_register (parent, p);
fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +1 -1
@@ -1720,7 +1720,7 @@ int __init proc_sys_init(void) proc_sys_root =proc_mkdir ("sys" ,NULL ); proc_sys_root->proc_iops = &proc_sys_dir_operations; - proc_sys_root->proc_fops = &proc_sys_dir_file_operations; + proc_sys_root->proc_dir_ops = &proc_sys_dir_file_operations; proc_sys_root->nlink =0 ;return sysctl_init ();
fs/proc/root.c renamed from fs/proc/root.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +1 -1
@@ -292,7 +292,7 @@ struct proc_dir_entry proc_root = { .nlink = 2, .refcnt = REFCOUNT_INIT(1), .proc_iops = &proc_root_inode_operations, - .proc_fops = &proc_root_operations, + .proc_dir_ops = &proc_root_operations, .parent = &proc_root, .subdir = RB_ROOT, .name = "/proc",
include/linux/proc_fs.h renamed from include/linux/proc_fs.h~proc-decouple-proc-from-vfs-with-struct-proc_ops +19 -4
@@ -12,6 +12,21 @@ struct proc_dir_entry;struct seq_file ;struct seq_operations ; +struct proc_ops { +int (*proc_open)(struct inode *,struct file *); +ssize_t (*proc_read)(struct file *,char __user *,size_t ,loff_t *); +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 *); +__poll_t (*proc_poll)(struct file *,struct poll_table_struct *); +long (*proc_ioctl)(struct file *,unsigned int ,unsigned long ); +#ifdef CONFIG_COMPAT +long (*proc_compat_ioctl)(struct file *,unsigned int ,unsigned long ); +#endif +int (*proc_mmap)(struct file *,struct vm_area_struct *); +unsigned long (*proc_get_unmapped_area)(struct file *,unsigned long ,unsigned long ,unsigned long ,unsigned long ); +}; +#ifdef CONFIG_PROC_FS typedef int (*proc_write_t )(struct file *,char *,size_t );
@@ -43,10 +58,10 @@ struct proc_dir_entry *proc_create_singlextern struct proc_dir_entry *proc_create_data (const char *,umode_t ,struct proc_dir_entry *, -const struct file_operations *, +const struct proc_ops *,void *); -struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent,const struct file_operations *proc_fops); +struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent,const struct proc_ops *proc_ops);extern void proc_set_size (struct proc_dir_entry *,loff_t );extern void proc_set_user (struct proc_dir_entry *,kuid_t ,kgid_t );extern void *PDE_DATA (const struct inode *);
@@ -108,8 +123,8 @@ static inline struct proc_dir_entry *pro#define proc_create_seq (name, mode, parent, ops) ({NULL;})#define proc_create_single (name, mode, parent, show) ({NULL;})#define proc_create_single_data (name, mode, parent, show, data) ({NULL;}) -#define proc_create (name, mode, parent, proc_fops) ({NULL;}) -#define proc_create_data (name, mode, parent, proc_fops, data) ({NULL;}) +#define proc_create (name, mode, parent, proc_ops) ({NULL;}) +#define proc_create_data (name, mode, parent, proc_ops, data) ({NULL;})static inline void proc_set_size (struct proc_dir_entry *de,loff_t size) {}static inline void proc_set_user (struct proc_dir_entry *de,kuid_t uid,kgid_t gid) {}
_
Andrew Morton
maintainerPATCH 58/67 proc: convert everything to "struct proc_ops"
In reply to Andrew MortonFrom: Alexey Dobriyan <[email protected]>
Subject: proc: convert everything to "struct proc_ops"
The most notable change is DEFINE_SHOW_ATTRIBUTE macro split in seq_file.h.
Conversion rule is:
llseek => proc_lseek
unlocked_ioctl => proc_ioctl
xxx => proc_xxx
delete ".owner = THIS_MODULE" line
---
arch/alpha/kernel/srm_env.c | 17 - arch/arm/kernel/atags_proc.c | 8 arch/arm/mm/alignment.c | 14 - arch/ia64/kernel/salinfo.c | 24 - arch/m68k/kernel/bootinfo_proc.c | 8 arch/mips/lasat/picvue_proc.c | 31 +- arch/powerpc/kernel/proc_powerpc.c | 10 arch/powerpc/kernel/rtas-proc.c | 70 ++--- arch/powerpc/kernel/rtas_flash.c | 34 +- arch/powerpc/kernel/rtasd.c | 14 - arch/powerpc/mm/numa.c | 12 arch/powerpc/platforms/pseries/lpar.c | 24 - arch/powerpc/platforms/pseries/lparcfg.c | 14 - arch/powerpc/platforms/pseries/reconfig.c | 8 arch/powerpc/platforms/pseries/scanlog.c | 15 - arch/sh/mm/alignment.c | 17 - arch/sparc/kernel/led.c | 15 - arch/um/drivers/mconsole_kern.c | 9 arch/um/kernel/exitcode.c | 15 - arch/um/kernel/process.c | 15 - arch/x86/kernel/cpu/mtrr/if.c | 21 - arch/x86/platform/uv/tlb_uv.c | 14 - arch/xtensa/platforms/iss/simdisk.c | 10 drivers/acpi/battery.c | 15 - drivers/acpi/proc.c | 15 - drivers/hwmon/dell-smm-hwmon.c | 15 - drivers/ide/ide-proc.c | 19 - drivers/input/input.c | 28 +- drivers/isdn/capi/kcapi_proc.c | 6 drivers/macintosh/via-pmu.c | 17 - drivers/md/md.c | 15 - drivers/misc/sgi-gru/gruprocfs.c | 42 +-- drivers/net/wireless/cisco/airo.c | 126 ++++------ drivers/net/wireless/intel/ipw2x00/libipw_module.c | 15 - drivers/net/wireless/intersil/hostap/hostap_hw.c | 4 drivers/net/wireless/intersil/hostap/hostap_proc.c | 14 - drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 drivers/net/wireless/ray_cs.c | 20 - drivers/parisc/led.c | 17 - drivers/pci/proc.c | 25 + drivers/platform/x86/thinkpad_acpi.c | 15 - drivers/platform/x86/toshiba_acpi.c | 60 ++-- drivers/pnp/isapnp/proc.c | 9 drivers/pnp/pnpbios/proc.c | 17 - drivers/s390/block/dasd_proc.c | 15 - drivers/s390/cio/blacklist.c | 14 - drivers/s390/cio/css.c | 11 drivers/scsi/esas2r/esas2r_main.c | 9 drivers/scsi/scsi_devinfo.c | 15 - drivers/scsi/scsi_proc.c | 29 +- drivers/scsi/sg.c | 30 +- drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 14 - drivers/tty/sysrq.c | 8 drivers/usb/gadget/function/rndis.c | 17 - drivers/video/fbdev/via/viafbdev.c | 105 +++----- drivers/zorro/proc.c | 9 fs/cifs/cifs_debug.c | 108 ++++---- fs/cifs/dfs_cache.c | 13 - fs/cifs/dfs_cache.h | 2 fs/fscache/internal.h | 2 fs/fscache/object-list.c | 11 fs/fscache/proc.c | 2 fs/jbd2/journal.c | 13 - fs/jfs/jfs_debug.c | 14 - fs/lockd/procfs.c | 12 fs/nfsd/nfsctl.c | 13 - fs/nfsd/stats.c | 12 fs/proc/cpuinfo.c | 12 fs/proc/kcore.c | 13 - fs/proc/kmsg.c | 14 - fs/proc/page.c | 24 - fs/proc/stat.c | 12 fs/proc/vmcore.c | 10 include/linux/seq_file.h | 13 + include/linux/sunrpc/stats.h | 4 ipc/util.c | 14 - kernel/configs.c | 9 kernel/irq/proc.c | 42 +-- kernel/kallsyms.c | 12 kernel/latencytop.c | 14 - kernel/locking/lockdep_proc.c | 15 - kernel/module.c | 12 kernel/profile.c | 24 - kernel/sched/psi.c | 48 +-- mm/slab_common.c | 15 - mm/swapfile.c | 14 - net/atm/mpoa_proc.c | 17 - net/atm/proc.c | 8 net/core/pktgen.c | 44 +-- net/ipv4/ipconfig.c | 10 net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 - net/ipv4/route.c | 24 - net/netfilter/xt_recent.c | 17 - net/sunrpc/auth_gss/svcauth_gss.c | 10 net/sunrpc/cache.c | 45 +-- net/sunrpc/stats.c | 21 - samples/kfifo/bytestream-example.c | 11 samples/kfifo/inttype-example.c | 11 samples/kfifo/record-example.c | 11 sound/core/info.c | 34 +- 100 files changed, 974 insertions(+), 1019 deletions(-)
arch/alpha/kernel/srm_env.c renamed from arch/alpha/kernel/srm_env.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -119,13 +119,12 @@ static ssize_t srm_env_proc_write(structreturn res; } -static const struct file_operations srm_env_proc_fops = { - .owner =THIS_MODULE , - .open = srm_env_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = srm_env_proc_write, +static const struct proc_ops srm_env_proc_ops = { + .proc_open = srm_env_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = srm_env_proc_write, }; static int __init
@@ -182,7 +181,7 @@ srm_env_init(void) entry = srm_named_entries;while (entry->name && entry->id) {if (!proc_create_data (entry->name,0644 , named_dir, - &srm_env_proc_fops, (void *)entry->id)) + &srm_env_proc_ops, (void *)entry->id)) goto cleanup; entry++; }
@@ -194,7 +193,7 @@ srm_env_init(void)char name[4 ];sprintf (name,"%ld" , var_num);if (!proc_create_data (name,0644 , numbered_dir, - &srm_env_proc_fops, (void *)var_num)) + &srm_env_proc_ops, (void *)var_num)) goto cleanup; }
arch/arm/kernel/atags_proc.c renamed from arch/arm/kernel/atags_proc.c~proc-convert-everything-to-struct-proc_ops +4 -4
@@ -17,9 +17,9 @@ static ssize_t atags_read(struct file *freturn simple_read_from_buffer (buf, count, ppos, b->data, b->size); } -static const struct file_operations atags_fops = { - .read = atags_read, - .llseek = default_llseek, +static const struct proc_ops atags_proc_ops = { + .proc_read = atags_read, + .proc_lseek = default_llseek, };#define BOOT_PARAMS_SIZE 1536
@@ -61,7 +61,7 @@ static int __init init_atags_procfs(void b->size = size;memcpy (b->data, atags_copy, size); - tags_entry =proc_create_data ("atags" ,0400 ,NULL , &atags_fops, b); + tags_entry =proc_create_data ("atags" ,0400 ,NULL , &atags_proc_ops, b);if (!tags_entry) goto nomem;
arch/arm/mm/alignment.c renamed from arch/arm/mm/alignment.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -162,12 +162,12 @@ static ssize_t alignment_proc_write(stru return count; } -static const struct file_operations alignment_proc_fops = { - .open = alignment_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = alignment_proc_write, +static const struct proc_ops alignment_proc_ops = { + .proc_open = alignment_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = alignment_proc_write, };#endif /* CONFIG_PROC_FS */
@@ -1016,7 +1016,7 @@ static int __init alignment_init(void)struct proc_dir_entry *res; res =proc_create ("cpu/alignment" ,S_IWUSR |S_IRUGO ,NULL , - &alignment_proc_fops); + &alignment_proc_ops);if (!res)return -ENOMEM ;#endif
arch/ia64/kernel/salinfo.c renamed from arch/ia64/kernel/salinfo.c~proc-convert-everything-to-struct-proc_ops +12 -12
@@ -331,10 +331,10 @@ retry:return size; } -static const struct file_operations salinfo_event_fops = { - .open = salinfo_event_open, - .read = salinfo_event_read, - .llseek = noop_llseek, +static const struct proc_ops salinfo_event_proc_ops = { + .proc_open = salinfo_event_open, + .proc_read = salinfo_event_read, + .proc_lseek = noop_llseek, }; static int
@@ -534,12 +534,12 @@ salinfo_log_write(struct file *file, conreturn count; } -static const struct file_operations salinfo_data_fops = { - .open = salinfo_log_open, - .release = salinfo_log_release, - .read = salinfo_log_read, - .write = salinfo_log_write, - .llseek = default_llseek, +static const struct proc_ops salinfo_data_proc_ops = { + .proc_open = salinfo_log_open, + .proc_release = salinfo_log_release, + .proc_read = salinfo_log_read, + .proc_write = salinfo_log_write, + .proc_lseek = default_llseek, };static int salinfo_cpu_online (unsigned int cpu)
@@ -617,13 +617,13 @@ salinfo_init(void)continue ; entry =proc_create_data ("event" ,S_IRUSR , dir, - &salinfo_event_fops, data); + &salinfo_event_proc_ops, data);if (!entry)continue ; *sdir++ = entry; entry =proc_create_data ("data" ,S_IRUSR |S_IWUSR , dir, - &salinfo_data_fops, data); + &salinfo_data_proc_ops, data);if (!entry)continue ; *sdir++ = entry;
arch/m68k/kernel/bootinfo_proc.c renamed from arch/m68k/kernel/bootinfo_proc.c~proc-convert-everything-to-struct-proc_ops +4 -4
@@ -26,9 +26,9 @@ static ssize_t bootinfo_read(struct file bootinfo_size); } -static const struct file_operations bootinfo_fops = { - .read = bootinfo_read, - .llseek = default_llseek, +static const struct proc_ops bootinfo_proc_ops = { + .proc_read = bootinfo_read, + .proc_lseek = default_llseek, };void __init save_bootinfo (const struct bi_record *bi)
@@ -67,7 +67,7 @@ static int __init init_bootinfo_procfs(vif (!bootinfo_copy)return -ENOMEM ; - pde =proc_create_data ("bootinfo" ,0400 ,NULL , &bootinfo_fops,NULL ); + pde =proc_create_data ("bootinfo" ,0400 ,NULL , &bootinfo_proc_ops,NULL );if (!pde) {kfree (bootinfo_copy);return -ENOMEM ;
arch/mips/lasat/picvue_proc.c renamed from arch/mips/lasat/picvue_proc.c~proc-convert-everything-to-struct-proc_ops +14 -17
@@ -89,13 +89,12 @@ static ssize_t pvc_line_proc_write(strucreturn count; } -static const struct file_operations pvc_line_proc_fops = { - .owner =THIS_MODULE , - .open = pvc_line_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = pvc_line_proc_write, +static const struct proc_ops pvc_line_proc_ops = { + .proc_open = pvc_line_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = pvc_line_proc_write, }; static ssize_t pvc_scroll_proc_write(struct file *file, const char __user *buf,
@@ -148,13 +147,12 @@ static int pvc_scroll_proc_open(struct ireturn single_open (file, pvc_scroll_proc_show,NULL ); } -static const struct file_operations pvc_scroll_proc_fops = { - .owner =THIS_MODULE , - .open = pvc_scroll_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = pvc_scroll_proc_write, +static const struct proc_ops pvc_scroll_proc_ops = { + .proc_open = pvc_scroll_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = pvc_scroll_proc_write, };void pvc_proc_timerfunc (struct timer_list *unused)
@@ -189,12 +187,11 @@ static int __init pvc_proc_init(void) }for (i =0 ; i <PVC_NLINES ; i++) { proc_entry =proc_create_data (pvc_linename[i],0644 , dir, - &pvc_line_proc_fops, &pvc_linedata[i]); + &pvc_line_proc_ops, &pvc_linedata[i]);if (proc_entry ==NULL ) goto error; } - proc_entry =proc_create ("scroll" ,0644 , dir, - &pvc_scroll_proc_fops); + proc_entry =proc_create ("scroll" ,0644 , dir, &pvc_scroll_proc_ops);if (proc_entry ==NULL ) goto error;
arch/powerpc/kernel/proc_powerpc.c renamed from arch/powerpc/kernel/proc_powerpc.c~proc-convert-everything-to-struct-proc_ops +5 -5
@@ -39,10 +39,10 @@ static int page_map_mmap( struct file *freturn 0 ; } -static const struct file_operations page_map_fops = { - .llseek = page_map_seek, - .read = page_map_read, - .mmap = page_map_mmap +static const struct proc_ops page_map_proc_ops = { + .proc_lseek = page_map_seek, + .proc_read = page_map_read, + .proc_mmap = page_map_mmap, };
@@ -51,7 +51,7 @@ static int __init proc_ppc64_init(void)struct proc_dir_entry *pde; pde =proc_create_data ("powerpc/systemcfg" ,S_IFREG |0444 ,NULL , - &page_map_fops, vdso_data); + &page_map_proc_ops, vdso_data);if (!pde)return 1 ;proc_set_size (pde,PAGE_SIZE );
arch/powerpc/kernel/rtasd.c renamed from arch/powerpc/kernel/rtasd.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -385,12 +385,12 @@ static __poll_t rtas_log_poll(struct filreturn 0 ; } -static const struct file_operations proc_rtas_log_operations = { - .read = rtas_log_read, - .poll = rtas_log_poll, - .open = rtas_log_open, - .release = rtas_log_release, - .llseek = noop_llseek, +static const struct proc_ops rtas_log_proc_ops = { + .proc_read = rtas_log_read, + .proc_poll = rtas_log_poll, + .proc_open = rtas_log_open, + .proc_release = rtas_log_release, + .proc_lseek = noop_llseek, };static int enable_surveillance (int timeout)
@@ -572,7 +572,7 @@ static int __init rtas_init(void)return -ENODEV ; entry =proc_create ("powerpc/rtas/error_log" ,0400 ,NULL , - &proc_rtas_log_operations); + &rtas_log_proc_ops);if (!entry)printk (KERN_ERR "Failed to create error_log proc entry\n" );
arch/powerpc/kernel/rtas_flash.c renamed from arch/powerpc/kernel/rtas_flash.c~proc-convert-everything-to-struct-proc_ops +17 -17
@@ -655,7 +655,7 @@ struct rtas_flash_file {const char *filename;const char *rtas_call_name;int *status; -const struct file_operations fops; +const struct proc_ops ops; };static const struct rtas_flash_file rtas_flash_files[] = {
@@ -663,36 +663,36 @@ static const struct rtas_flash_file rtas .filename = "powerpc/rtas/" FIRMWARE_FLASH_NAME, .rtas_call_name = "ibm,update-flash-64-and-reboot", .status = &rtas_update_flash_data.status, - .fops.read = rtas_flash_read_msg, - .fops.write = rtas_flash_write, - .fops.release = rtas_flash_release, - .fops.llseek = default_llseek, + .ops.proc_read = rtas_flash_read_msg, + .ops.proc_write = rtas_flash_write, + .ops.proc_release = rtas_flash_release, + .ops.proc_lseek = default_llseek, }, { .filename = "powerpc/rtas/" FIRMWARE_UPDATE_NAME, .rtas_call_name = "ibm,update-flash-64-and-reboot", .status = &rtas_update_flash_data.status, - .fops.read = rtas_flash_read_num, - .fops.write = rtas_flash_write, - .fops.release = rtas_flash_release, - .fops.llseek = default_llseek, + .ops.proc_read = rtas_flash_read_num, + .ops.proc_write = rtas_flash_write, + .ops.proc_release = rtas_flash_release, + .ops.proc_lseek = default_llseek, }, { .filename = "powerpc/rtas/" VALIDATE_FLASH_NAME, .rtas_call_name = "ibm,validate-flash-image", .status = &rtas_validate_flash_data.status, - .fops.read = validate_flash_read, - .fops.write = validate_flash_write, - .fops.release = validate_flash_release, - .fops.llseek = default_llseek, + .ops.proc_read = validate_flash_read, + .ops.proc_write = validate_flash_write, + .ops.proc_release = validate_flash_release, + .ops.proc_lseek = default_llseek, }, { .filename = "powerpc/rtas/" MANAGE_FLASH_NAME, .rtas_call_name = "ibm,manage-flash-image", .status = &rtas_manage_flash_data.status, - .fops.read = manage_flash_read, - .fops.write = manage_flash_write, - .fops.llseek = default_llseek, + .ops.proc_read = manage_flash_read, + .ops.proc_write = manage_flash_write, + .ops.proc_lseek = default_llseek, } };
@@ -723,7 +723,7 @@ static int __init rtas_flash_init(void)const struct rtas_flash_file *f = &rtas_flash_files[i];int token; -if (!proc_create (f->filename,0600 ,NULL , &f->fops)) +if (!proc_create (f->filename,0600 ,NULL , &f->ops)) goto enomem;/*
arch/powerpc/kernel/rtas-proc.c renamed from arch/powerpc/kernel/rtas-proc.c~proc-convert-everything-to-struct-proc_ops +35 -35
112 lines not on this page · raw message
arch/powerpc/mm/numa.c renamed from arch/powerpc/mm/numa.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -1616,11 +1616,11 @@ static ssize_t topology_write(struct filreturn count; } -static const struct file_operations topology_ops = { - .read = seq_read, - .write = topology_write, - .open = topology_open, - .release = single_release +static const struct proc_ops topology_proc_ops = { + .proc_read = seq_read, + .proc_write = topology_write, + .proc_open = topology_open, + .proc_release = single_release, };static int topology_update_init (void )
@@ -1630,7 +1630,7 @@ static int topology_update_init(void)if (vphn_enabled)topology_schedule_update (); -if (!proc_create ("powerpc/topology_updates" ,0644 ,NULL , &topology_ops)) +if (!proc_create ("powerpc/topology_updates" ,0644 ,NULL , &topology_proc_ops))return -ENOMEM ; topology_inited =1 ;
arch/powerpc/platforms/pseries/lpar.c renamed from arch/powerpc/platforms/pseries/lpar.c~proc-convert-everything-to-struct-proc_ops +12 -12
@@ -582,12 +582,12 @@ static int vcpudispatch_stats_open(strucreturn single_open (file, vcpudispatch_stats_display,NULL ); } -static const struct file_operations vcpudispatch_stats_proc_ops = { - .open = vcpudispatch_stats_open, - .read = seq_read, - .write = vcpudispatch_stats_write, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops vcpudispatch_stats_proc_ops = { + .proc_open = vcpudispatch_stats_open, + .proc_read = seq_read, + .proc_write = vcpudispatch_stats_write, + .proc_lseek = seq_lseek, + .proc_release = single_release, }; static ssize_t vcpudispatch_stats_freq_write(struct file *file,
@@ -626,12 +626,12 @@ static int vcpudispatch_stats_freq_open(return single_open (file, vcpudispatch_stats_freq_display,NULL ); } -static const struct file_operations vcpudispatch_stats_freq_proc_ops = { - .open = vcpudispatch_stats_freq_open, - .read = seq_read, - .write = vcpudispatch_stats_freq_write, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops vcpudispatch_stats_freq_proc_ops = { + .proc_open = vcpudispatch_stats_freq_open, + .proc_read = seq_read, + .proc_write = vcpudispatch_stats_freq_write, + .proc_lseek = seq_lseek, + .proc_release = single_release, };static int __init vcpudispatch_stats_procfs_init (void )
arch/powerpc/platforms/pseries/lparcfg.c renamed from arch/powerpc/platforms/pseries/lparcfg.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -698,12 +698,12 @@ static int lparcfg_open(struct inode *inreturn single_open (file, lparcfg_data,NULL ); } -static const struct file_operations lparcfg_fops = { - .read = seq_read, - .write = lparcfg_write, - .open = lparcfg_open, - .release = single_release, - .llseek = seq_lseek, +static const struct proc_ops lparcfg_proc_ops = { + .proc_read = seq_read, + .proc_write = lparcfg_write, + .proc_open = lparcfg_open, + .proc_release = single_release, + .proc_lseek = seq_lseek, };static int __init lparcfg_init (void )
@@ -714,7 +714,7 @@ static int __init lparcfg_init(void)if (firmware_has_feature (FW_FEATURE_SPLPAR )) mode |=0200 ; -if (!proc_create ("powerpc/lparcfg" , mode,NULL , &lparcfg_fops)) { +if (!proc_create ("powerpc/lparcfg" , mode,NULL , &lparcfg_proc_ops)) {printk (KERN_ERR "Failed to create powerpc/lparcfg\n" );return -EIO ; }
arch/powerpc/platforms/pseries/reconfig.c renamed from arch/powerpc/platforms/pseries/reconfig.c~proc-convert-everything-to-struct-proc_ops +4 -4
@@ -391,9 +391,9 @@ out:return rv ? rv : count; } -static const struct file_operations ofdt_fops = { - .write = ofdt_write, - .llseek = noop_llseek, +static const struct proc_ops ofdt_proc_ops = { + .proc_write = ofdt_write, + .proc_lseek = noop_llseek, };/* create /proc/powerpc/ofdt write-only by root */
@@ -401,7 +401,7 @@ static int proc_ppc64_create_ofdt(void) {struct proc_dir_entry *ent; - ent =proc_create ("powerpc/ofdt" ,0200 ,NULL , &ofdt_fops); + ent =proc_create ("powerpc/ofdt" ,0200 ,NULL , &ofdt_proc_ops);if (ent)proc_set_size (ent,0 );
arch/powerpc/platforms/pseries/scanlog.c renamed from arch/powerpc/platforms/pseries/scanlog.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -152,13 +152,12 @@ static int scanlog_release(struct inodereturn 0 ; } -static const struct file_operations scanlog_fops = { - .owner =THIS_MODULE , - .read = scanlog_read, - .write = scanlog_write, - .open = scanlog_open, - .release = scanlog_release, - .llseek = noop_llseek, +static const struct proc_ops scanlog_proc_ops = { + .proc_read = scanlog_read, + .proc_write = scanlog_write, + .proc_open = scanlog_open, + .proc_release = scanlog_release, + .proc_lseek = noop_llseek, };static int __init scanlog_init (void )
@@ -176,7 +175,7 @@ static int __init scanlog_init(void) goto err; ent =proc_create ("powerpc/rtas/scan-log-dump" ,0400 ,NULL , - &scanlog_fops); + &scanlog_proc_ops);if (!ent) goto err;return 0 ;
arch/sh/mm/alignment.c renamed from arch/sh/mm/alignment.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -152,13 +152,12 @@ static ssize_t alignment_proc_write(strureturn count; } -static const struct file_operations alignment_proc_fops = { - .owner =THIS_MODULE , - .open = alignment_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = alignment_proc_write, +static const struct proc_ops alignment_proc_ops = { + .proc_open = alignment_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = alignment_proc_write, };/*
@@ -176,12 +175,12 @@ static int __init alignment_init(void)return -ENOMEM ; res =proc_create_data ("alignment" ,S_IWUSR |S_IRUGO , dir, - &alignment_proc_fops, &se_usermode); + &alignment_proc_ops, &se_usermode);if (!res)return -ENOMEM ; res =proc_create_data ("kernel_alignment" ,S_IWUSR |S_IRUGO , dir, - &alignment_proc_fops, &se_kernmode_warn); + &alignment_proc_ops, &se_kernmode_warn);if (!res)return -ENOMEM ;
arch/sparc/kernel/led.c renamed from arch/sparc/kernel/led.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -104,13 +104,12 @@ static ssize_t led_proc_write(struct filreturn count; } -static const struct file_operations led_proc_fops = { - .owner =THIS_MODULE , - .open = led_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = led_proc_write, +static const struct proc_ops led_proc_ops = { + .proc_open = led_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = led_proc_write, };static struct proc_dir_entry *led;
@@ -121,7 +120,7 @@ static int __init led_init(void) {timer_setup (&led_blink_timer, led_blink,0 ); - led =proc_create ("led" ,0 ,NULL , &led_proc_fops); + led =proc_create ("led" ,0 ,NULL , &led_proc_ops);if (!led)return -ENOMEM ;
arch/um/drivers/mconsole_kern.c renamed from arch/um/drivers/mconsole_kern.c~proc-convert-everything-to-struct-proc_ops +4 -5
@@ -752,10 +752,9 @@ static ssize_t mconsole_proc_write(strucreturn count; } -static const struct file_operations mconsole_proc_fops = { - .owner =THIS_MODULE , - .write = mconsole_proc_write, - .llseek = noop_llseek, +static const struct proc_ops mconsole_proc_ops = { + .proc_write = mconsole_proc_write, + .proc_lseek = noop_llseek, };static int create_proc_mconsole (void )
@@ -765,7 +764,7 @@ static int create_proc_mconsole(void)if (notify_socket ==NULL )return 0 ; - ent =proc_create ("mconsole" ,0200 ,NULL , &mconsole_proc_fops); + ent =proc_create ("mconsole" ,0200 ,NULL , &mconsole_proc_ops);if (ent ==NULL ) {printk (KERN_INFO "create_proc_mconsole : proc_create failed\n" );return 0 ;
arch/um/kernel/exitcode.c renamed from arch/um/kernel/exitcode.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -55,20 +55,19 @@ static ssize_t exitcode_proc_write(strucreturn count; } -static const struct file_operations exitcode_proc_fops = { - .owner =THIS_MODULE , - .open = exitcode_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = exitcode_proc_write, +static const struct proc_ops exitcode_proc_ops = { + .proc_open = exitcode_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = exitcode_proc_write, };static int make_proc_exitcode (void ) {struct proc_dir_entry *ent; - ent =proc_create ("exitcode" ,0600 ,NULL , &exitcode_proc_fops); + ent =proc_create ("exitcode" ,0600 ,NULL , &exitcode_proc_ops);if (ent ==NULL ) {printk (KERN_WARNING "make_proc_exitcode : Failed to register " "/proc/exitcode\n" );
arch/um/kernel/process.c renamed from arch/um/kernel/process.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -348,13 +348,12 @@ static ssize_t sysemu_proc_write(structreturn count; } -static const struct file_operations sysemu_proc_fops = { - .owner =THIS_MODULE , - .open = sysemu_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = sysemu_proc_write, +static const struct proc_ops sysemu_proc_ops = { + .proc_open = sysemu_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = sysemu_proc_write, };int __init make_proc_sysemu (void )
@@ -363,7 +362,7 @@ int __init make_proc_sysemu(void)if (!sysemu_supported)return 0 ; - ent =proc_create ("sysemu" ,0600 ,NULL , &sysemu_proc_fops); + ent =proc_create ("sysemu" ,0600 ,NULL , &sysemu_proc_ops);if (ent ==NULL ) {
arch/x86/kernel/cpu/mtrr/if.c renamed from arch/x86/kernel/cpu/mtrr/if.c~proc-convert-everything-to-struct-proc_ops +11 -10
@@ -396,15 +396,16 @@ static int mtrr_open(struct inode *inodereturn single_open (file, mtrr_seq_show,NULL ); } -static const struct file_operations mtrr_fops = { - .owner =THIS_MODULE , - .open = mtrr_open, - .read = seq_read, - .llseek = seq_lseek, - .write = mtrr_write, - .unlocked_ioctl = mtrr_ioctl, - .compat_ioctl = mtrr_ioctl, - .release = mtrr_close, +static const struct proc_ops mtrr_proc_ops = { + .proc_open = mtrr_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_write = mtrr_write, + .proc_ioctl = mtrr_ioctl, +#ifdef CONFIG_COMPAT + .proc_compat_ioctl = mtrr_ioctl, +#endif + .proc_release = mtrr_close, };static int __init mtrr_if_init (void )
@@ -417,7 +418,7 @@ static int __init mtrr_if_init(void) (!cpu_has(c, X86_FEATURE_CENTAUR_MCR)))return -ENODEV ; -proc_create ("mtrr" ,S_IWUSR |S_IRUGO ,NULL , &mtrr_fops); +proc_create ("mtrr" ,S_IWUSR |S_IRUGO ,NULL , &mtrr_proc_ops);return 0 ; }arch_initcall (mtrr_if_init);
arch/x86/platform/uv/tlb_uv.c renamed from arch/x86/platform/uv/tlb_uv.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -1668,12 +1668,12 @@ static int tunables_open(struct inode *ireturn 0 ; } -static const struct file_operations proc_uv_ptc_operations = { - .open = ptc_proc_open, - .read = seq_read, - .write = ptc_proc_write, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops uv_ptc_proc_ops = { + .proc_open = ptc_proc_open, + .proc_read = seq_read, + .proc_write = ptc_proc_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static const struct file_operations tunables_fops = {
@@ -1691,7 +1691,7 @@ static int __init uv_ptc_init(void)return 0 ; proc_uv_ptc =proc_create (UV_PTC_BASENAME ,0444 ,NULL , - &proc_uv_ptc_operations); + &uv_ptc_proc_ops);if (!proc_uv_ptc) {pr_err ("unable to create %s proc entry\n" ,UV_PTC_BASENAME );
arch/xtensa/platforms/iss/simdisk.c renamed from arch/xtensa/platforms/iss/simdisk.c~proc-convert-everything-to-struct-proc_ops +5 -5
@@ -251,10 +251,10 @@ out_free:return err; } -static const struct file_operations fops = { - .read = proc_read_simdisk, - .write = proc_write_simdisk, - .llseek = default_llseek, +static const struct proc_ops simdisk_proc_ops = { + .proc_read = proc_read_simdisk, + .proc_write = proc_write_simdisk, + .proc_lseek = default_llseek, }; static int __init simdisk_setup(struct simdisk *dev, int which,
@@ -290,7 +290,7 @@ static int __init simdisk_setup(struct sset_capacity (dev->gd,0 );add_disk (dev->gd); - dev->procfile =proc_create_data (tmp,0644 , procdir, &fops, dev); + dev->procfile =proc_create_data (tmp,0644 , procdir, &simdisk_proc_ops, dev);return 0 ; out_alloc_disk:
drivers/acpi/battery.c renamed from drivers/acpi/battery.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -1202,13 +1202,12 @@ static int acpi_battery_alarm_proc_open(return single_open (file, acpi_battery_alarm_proc_show,PDE_DATA (inode)); } -static const struct file_operations acpi_battery_alarm_fops = { - .owner =THIS_MODULE , - .open = acpi_battery_alarm_proc_open, - .read = seq_read, - .write = acpi_battery_write_alarm, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops acpi_battery_alarm_proc_ops = { + .proc_open = acpi_battery_alarm_proc_open, + .proc_read = seq_read, + .proc_write = acpi_battery_write_alarm, + .proc_lseek = seq_lseek, + .proc_release = single_release, };static int acpi_battery_add_fs (struct acpi_device *device)
@@ -1228,7 +1227,7 @@ static int acpi_battery_add_fs(struct ac acpi_battery_state_proc_show, acpi_driver_data(device)))return -ENODEV ;if (!proc_create_data ("alarm" ,S_IFREG |S_IRUGO |S_IWUSR , -acpi_device_dir (device), &acpi_battery_alarm_fops, +acpi_device_dir (device), &acpi_battery_alarm_proc_ops,acpi_driver_data (device)))return -ENODEV ;return 0 ;
drivers/acpi/proc.c renamed from drivers/acpi/proc.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -136,18 +136,17 @@ acpi_system_wakeup_device_open_fs(struct PDE_DATA(inode)); } -static const struct file_operations acpi_system_wakeup_device_fops = { - .owner =THIS_MODULE , - .open = acpi_system_wakeup_device_open_fs, - .read = seq_read, - .write = acpi_system_write_wakeup_device, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops acpi_system_wakeup_device_proc_ops = { + .proc_open = acpi_system_wakeup_device_open_fs, + .proc_read = seq_read, + .proc_write = acpi_system_write_wakeup_device, + .proc_lseek = seq_lseek, + .proc_release = single_release, };void __init acpi_sleep_proc_init (void ) {/* 'wakeup device' [R/W] */ proc_create ("wakeup" ,S_IFREG |S_IRUGO |S_IWUSR , - acpi_root_dir, &acpi_system_wakeup_device_fops); + acpi_root_dir, &acpi_system_wakeup_device_proc_ops); }
drivers/hwmon/dell-smm-hwmon.c renamed from drivers/hwmon/dell-smm-hwmon.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -595,19 +595,18 @@ static int i8k_open_fs(struct inode *inoreturn single_open (file, i8k_proc_show,NULL ); } -static const struct file_operations i8k_fops = { - .owner =THIS_MODULE , - .open = i8k_open_fs, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .unlocked_ioctl = i8k_ioctl, +static const struct proc_ops i8k_proc_ops = { + .proc_open = i8k_open_fs, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_ioctl = i8k_ioctl, };static void __init i8k_init_procfs (void ) {/* Register the proc entry */ -proc_create ("i8k" ,0 ,NULL , &i8k_fops); +proc_create ("i8k" ,0 ,NULL , &i8k_proc_ops); } static void __exit i8k_exit_procfs(void)
drivers/ide/ide-proc.c renamed from drivers/ide/ide-proc.c~proc-convert-everything-to-struct-proc_ops +9 -10
@@ -381,13 +381,12 @@ parse_error:return -EINVAL ; } -static const struct file_operations ide_settings_proc_fops = { - .owner =THIS_MODULE , - .open = ide_settings_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = ide_settings_proc_write, +static const struct proc_ops ide_settings_proc_ops = { + .proc_open = ide_settings_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = ide_settings_proc_write, };int ide_capacity_proc_show (struct seq_file *m,void *v)
@@ -546,7 +545,7 @@ void ide_proc_port_register_devices(ide_if (drive->proc) {ide_add_proc_entries (drive->proc, generic_drive_entries, drive);proc_create_data ("settings" ,S_IFREG |S_IRUSR |S_IWUSR , - drive->proc, &ide_settings_proc_fops, + drive->proc, &ide_settings_proc_ops, drive); }sprintf (name,"ide%d/%s" , (drive->name[2 ]-'a' )/2 , drive->name);
@@ -615,7 +614,7 @@ static int ide_drivers_show(struct seq_freturn 0 ; } -DEFINE_SHOW_ATTRIBUTE (ide_drivers); +DEFINE_PROC_SHOW_ATTRIBUTE (ide_drivers);void proc_ide_create (void ) {
@@ -624,7 +623,7 @@ void proc_ide_create(void)if (!proc_ide_root)return ; -proc_create ("drivers" ,0 , proc_ide_root, &ide_drivers_fops); +proc_create ("drivers" ,0 , proc_ide_root, &ide_drivers_proc_ops); }void proc_ide_destroy (void )
drivers/input/input.c renamed from drivers/input/input.c~proc-convert-everything-to-struct-proc_ops +13 -15
@@ -1216,13 +1216,12 @@ static int input_proc_devices_open(strucreturn seq_open (file, &input_devices_seq_ops); } -static const struct file_operations input_devices_fileops = { - .owner =THIS_MODULE , - .open = input_proc_devices_open, - .poll = input_proc_devices_poll, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, +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_lseek = seq_lseek, + .proc_release = seq_release, };static void *input_handlers_seq_start (struct seq_file *seq,loff_t *pos)
@@ -1280,12 +1279,11 @@ static int input_proc_handlers_open(strureturn seq_open (file, &input_handlers_seq_ops); } -static const struct file_operations input_handlers_fileops = { - .owner =THIS_MODULE , - .open = input_proc_handlers_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops input_handlers_proc_ops = { + .proc_open = input_proc_handlers_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static int __init input_proc_init (void )
@@ -1297,12 +1295,12 @@ static int __init input_proc_init(void)return -ENOMEM ; entry =proc_create ("devices" ,0 , proc_bus_input_dir, - &input_devices_fileops); + &input_devices_proc_ops);if (!entry) goto fail1; entry =proc_create ("handlers" ,0 , proc_bus_input_dir, - &input_handlers_fileops); + &input_handlers_proc_ops);if (!entry) goto fail2;
drivers/isdn/capi/kcapi_proc.c renamed from drivers/isdn/capi/kcapi_proc.c~proc-convert-everything-to-struct-proc_ops +3 -3
@@ -199,8 +199,8 @@ static ssize_t empty_read(struct file *freturn 0 ; } -static const struct file_operations empty_fops = { - .read = empty_read, +static const struct proc_ops empty_proc_ops = { + .proc_read = empty_read, };// ---------------------------------------------------------------------------
@@ -214,7 +214,7 @@ kcapi_proc_init(void)proc_create_seq ("capi/contrstats" ,0 ,NULL , &seq_contrstats_ops);proc_create_seq ("capi/applications" ,0 ,NULL , &seq_applications_ops);proc_create_seq ("capi/applstats" ,0 ,NULL , &seq_applstats_ops); -proc_create ("capi/driver" ,0 ,NULL , &empty_fops); +proc_create ("capi/driver" ,0 ,NULL , &empty_proc_ops); }void
drivers/macintosh/via-pmu.c renamed from drivers/macintosh/via-pmu.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -212,7 +212,7 @@ static int pmu_info_proc_show(struct seqstatic int pmu_irqstats_proc_show (struct seq_file *m,void *v);static int pmu_battery_proc_show (struct seq_file *m,void *v);static void pmu_pass_intr (unsigned char *data,int len); -static const struct file_operations pmu_options_proc_fops; +static const struct proc_ops pmu_options_proc_ops;#ifdef CONFIG_ADB const struct adb_driver via_pmu_driver = {
@@ -573,7 +573,7 @@ static int __init via_pmu_dev_init(void) proc_pmu_irqstats =proc_create_single ("interrupts" ,0 , proc_pmu_root, pmu_irqstats_proc_show); proc_pmu_options =proc_create ("options" ,0600 , proc_pmu_root, - &pmu_options_proc_fops); + &pmu_options_proc_ops); }return 0 ; }
@@ -974,13 +974,12 @@ static ssize_t pmu_options_proc_write(streturn fcount; } -static const struct file_operations pmu_options_proc_fops = { - .owner =THIS_MODULE , - .open = pmu_options_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = pmu_options_proc_write, +static const struct proc_ops pmu_options_proc_ops = { + .proc_open = pmu_options_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = pmu_options_proc_write, };#ifdef CONFIG_ADB
drivers/md/md.c renamed from drivers/md/md.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -8279,13 +8279,12 @@ static __poll_t mdstat_poll(struct filereturn mask; } -static const struct file_operations md_seq_fops = { - .owner =THIS_MODULE , - .open = md_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, - .poll = mdstat_poll, +static const struct proc_ops mdstat_proc_ops = { + .proc_open = md_seq_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, + .proc_poll = mdstat_poll, };int register_md_personality (struct md_personality *p)
@@ -9454,7 +9453,7 @@ static void md_geninit(void) {pr_debug ("md: sizeof(mdp_super_t) = %d\n" , (int )sizeof (mdp_super_t)); -proc_create ("mdstat" ,S_IRUGO ,NULL , &md_seq_fops); +proc_create ("mdstat" ,S_IRUGO ,NULL , &mdstat_proc_ops); }static int __init md_init (void )
drivers/misc/sgi-gru/gruprocfs.c renamed from drivers/misc/sgi-gru/gruprocfs.c~proc-convert-everything-to-struct-proc_ops +21 -21
60 lines not on this page · raw message
drivers/net/wireless/cisco/airo.c renamed from drivers/net/wireless/cisco/airo.c~proc-convert-everything-to-struct-proc_ops +59 -67
132 lines not on this page · raw message
drivers/net/wireless/intel/ipw2x00/libipw_module.c renamed from drivers/net/wireless/intel/ipw2x00/libipw_module.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -240,13 +240,12 @@ static ssize_t debug_level_proc_write(st return strnlen(buf, len); } -static const struct file_operations debug_level_proc_fops = { - .owner =THIS_MODULE , - .open = debug_level_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = debug_level_proc_write, +static const struct proc_ops debug_level_proc_ops = { + .proc_open = debug_level_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = debug_level_proc_write, };#endif /* CONFIG_LIBIPW_DEBUG */
@@ -263,7 +262,7 @@ static int __init libipw_init(void)return -EIO ; } e =proc_create ("debug_level" ,0644 , libipw_proc, - &debug_level_proc_fops); + &debug_level_proc_ops);if (!e) {remove_proc_entry (DRV_PROCNAME , init_net.proc_net); libipw_proc =NULL ;
drivers/net/wireless/intersil/hostap/hostap_hw.c renamed from drivers/net/wireless/intersil/hostap/hostap_hw.c~proc-convert-everything-to-struct-proc_ops +2 -2
@@ -126,7 +126,7 @@ static void prism2_check_sta_fw_version(#ifdef PRISM2_DOWNLOAD_SUPPORT /* hostap_download.c */ -static const struct file_operations prism2_download_aux_dump_proc_fops; +static const struct proc_ops prism2_download_aux_dump_proc_ops;static u8 *prism2_read_pda (struct net_device *dev);static int prism2_download (local_info_t *local,struct prism2_download_param *param);
@@ -3094,7 +3094,7 @@ prism2_init_local_data(struct prism2_hel local->func->reset_port = prism2_reset_port; local->func->schedule_reset = prism2_schedule_reset;#ifdef PRISM2_DOWNLOAD_SUPPORT - local->func->read_aux_fops = &prism2_download_aux_dump_proc_fops; + local->func->read_aux_proc_ops = &prism2_download_aux_dump_proc_ops; local->func->download = prism2_download;#endif /* PRISM2_DOWNLOAD_SUPPORT */ local->func->tx = prism2_tx_80211;
drivers/net/wireless/intersil/hostap/hostap_proc.c renamed from drivers/net/wireless/intersil/hostap/hostap_proc.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -211,9 +211,9 @@ static ssize_t prism2_pda_proc_read(strureturn count; } -static const struct file_operations prism2_pda_proc_fops = { - .read = prism2_pda_proc_read, - .llseek = generic_file_llseek, +static const struct proc_ops prism2_pda_proc_ops = { + .proc_read = prism2_pda_proc_read, + .proc_lseek = generic_file_llseek, };
@@ -223,8 +223,8 @@ static ssize_t prism2_aux_dump_proc_no_rreturn 0 ; } -static const struct file_operations prism2_aux_dump_proc_fops = { - .read = prism2_aux_dump_proc_no_read, +static const struct proc_ops prism2_aux_dump_proc_ops = { + .proc_read = prism2_aux_dump_proc_no_read, };
@@ -379,9 +379,9 @@ void hostap_init_proc(local_info_t *locaproc_create_seq_data ("wds" ,0 , local->proc, &prism2_wds_proc_seqops, local);proc_create_data ("pda" ,0 , local->proc, - &prism2_pda_proc_fops, local); + &prism2_pda_proc_ops, local);proc_create_data ("aux_dump" ,0 , local->proc, - local->func->read_aux_fops ?: &prism2_aux_dump_proc_fops, + local->func->read_aux_proc_ops ?: &prism2_aux_dump_proc_ops, local);proc_create_seq_data ("bss_list" ,0 , local->proc, &prism2_bss_list_proc_seqops, local);
drivers/net/wireless/intersil/hostap/hostap_wlan.h renamed from drivers/net/wireless/intersil/hostap/hostap_wlan.h~proc-convert-everything-to-struct-proc_ops +1 -1
@@ -599,7 +599,7 @@ struct prism2_helper_functions { struct prism2_download_param *param);int (*tx)(struct sk_buff *skb,struct net_device *dev);int (*set_tim)(struct net_device *dev,int aid,int set); -const struct file_operations *read_aux_fops; +const struct proc_ops *read_aux_proc_ops;int need_tx_headroom;/* number of bytes of headroom needed before * IEEE 802.11 header */
drivers/net/wireless/ray_cs.c renamed from drivers/net/wireless/ray_cs.c~proc-convert-everything-to-struct-proc_ops +9 -11
@@ -2717,10 +2717,9 @@ static ssize_t ray_cs_essid_proc_write(sreturn count; } -static const struct file_operations ray_cs_essid_proc_fops = { - .owner =THIS_MODULE , - .write = ray_cs_essid_proc_write, - .llseek = noop_llseek, +static const struct proc_ops ray_cs_essid_proc_ops = { + .proc_write = ray_cs_essid_proc_write, + .proc_lseek = noop_llseek, }; static ssize_t int_proc_write(struct file *file, const char __user *buffer,
@@ -2751,10 +2750,9 @@ static ssize_t int_proc_write(struct fil return count; } -static const struct file_operations int_proc_fops = { - .owner =THIS_MODULE , - .write = int_proc_write, - .llseek = noop_llseek, +static const struct proc_ops int_proc_ops = { + .proc_write = int_proc_write, + .proc_lseek = noop_llseek, };#endif
@@ -2790,10 +2788,10 @@ static int __init init_ray_cs(void)proc_mkdir ("driver/ray_cs" ,NULL );proc_create_single ("driver/ray_cs/ray_cs" ,0 ,NULL , ray_cs_proc_show); -proc_create ("driver/ray_cs/essid" ,0200 ,NULL , &ray_cs_essid_proc_fops); -proc_create_data ("driver/ray_cs/net_type" ,0200 ,NULL , &int_proc_fops, +proc_create ("driver/ray_cs/essid" ,0200 ,NULL , &ray_cs_essid_proc_ops); +proc_create_data ("driver/ray_cs/net_type" ,0200 ,NULL , &int_proc_ops, &net_type); -proc_create_data ("driver/ray_cs/translate" ,0200 ,NULL , &int_proc_fops, +proc_create_data ("driver/ray_cs/translate" ,0200 ,NULL , &int_proc_ops, &translate);#endif if (translate !=0 )
drivers/parisc/led.c renamed from drivers/parisc/led.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -230,13 +230,12 @@ parse_error:return -EINVAL ; } -static const struct file_operations led_proc_fops = { - .owner =THIS_MODULE , - .open = led_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = led_proc_write, +static const struct proc_ops led_proc_ops = { + .proc_open = led_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = led_proc_write, };static int __init led_create_procfs (void )
@@ -252,14 +251,14 @@ static int __init led_create_procfs(voidif (!lcd_no_led_support) { ent =proc_create_data ("led" ,S_IRUGO |S_IWUSR , proc_pdc_root, - &led_proc_fops, (void *)LED_NOLCD );/* LED */ + &led_proc_ops, (void *)LED_NOLCD );/* LED */ if (!ent)return -1 ; }if (led_type ==LED_HASLCD ) { ent =proc_create_data ("lcd" ,S_IRUGO |S_IWUSR , proc_pdc_root, - &led_proc_fops, (void *)LED_HASLCD );/* LCD */ + &led_proc_ops, (void *)LED_HASLCD );/* LCD */ if (!ent)return -1 ; }
drivers/pci/proc.c renamed from drivers/pci/proc.c~proc-convert-everything-to-struct-proc_ops +13 -12
@@ -306,19 +306,20 @@ static int proc_bus_pci_release(struct i }#endif /* HAVE_PCI_MMAP */ -static const struct file_operations proc_bus_pci_operations = { - .owner =THIS_MODULE , - .llseek = proc_bus_pci_lseek, - .read = proc_bus_pci_read, - .write = proc_bus_pci_write, - .unlocked_ioctl = proc_bus_pci_ioctl, - .compat_ioctl = proc_bus_pci_ioctl, +static const struct proc_ops proc_bus_pci_ops = { + .proc_lseek = proc_bus_pci_lseek, + .proc_read = proc_bus_pci_read, + .proc_write = proc_bus_pci_write, + .proc_ioctl = proc_bus_pci_ioctl, +#ifdef CONFIG_COMPAT + .proc_compat_ioctl = proc_bus_pci_ioctl, +#endif #ifdef HAVE_PCI_MMAP - .open = proc_bus_pci_open, - .release = proc_bus_pci_release, - .mmap = proc_bus_pci_mmap, + .proc_open = proc_bus_pci_open, + .proc_release = proc_bus_pci_release, + .proc_mmap = proc_bus_pci_mmap, #ifdef HAVE_ARCH_PCI_GET_UNMAPPED_AREA - .get_unmapped_area = get_pci_unmapped_area, + .proc_get_unmapped_area = get_pci_unmapped_area, #endif /* HAVE_ARCH_PCI_GET_UNMAPPED_AREA */ #endif /* HAVE_PCI_MMAP */ };
@@ -424,7 +425,7 @@ int pci_proc_attach_device(struct pci_desprintf (name,"%02x.%x" ,PCI_SLOT (dev->devfn),PCI_FUNC (dev->devfn)); e =proc_create_data (name,S_IFREG |S_IRUGO |S_IWUSR , bus->procdir, - &proc_bus_pci_operations, dev); + &proc_bus_pci_ops, dev);if (!e)return -ENOMEM ;proc_set_size (e, dev->cfg_size);
drivers/platform/x86/thinkpad_acpi.c renamed from drivers/platform/x86/thinkpad_acpi.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -907,13 +907,12 @@ static ssize_t dispatch_proc_write(strucreturn ret; } -static const struct file_operations dispatch_proc_fops = { - .owner =THIS_MODULE , - .open = dispatch_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = dispatch_proc_write, +static const struct proc_ops dispatch_proc_ops = { + .proc_open = dispatch_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = dispatch_proc_write, };static char *next_cmd (char **cmds)
@@ -9984,7 +9983,7 @@ static int __init ibm_init(struct ibm_inif (ibm->write) mode |=S_IWUSR ; entry =proc_create_data (ibm->name, mode, proc_dir, - &dispatch_proc_fops, ibm); + &dispatch_proc_ops, ibm);if (!entry) {pr_err ("unable to create proc entry %s\n" , ibm->name); ret = -ENODEV ;
drivers/platform/x86/toshiba_acpi.c renamed from drivers/platform/x86/toshiba_acpi.c~proc-convert-everything-to-struct-proc_ops +28 -32
96 lines not on this page · raw message
drivers/pnp/isapnp/proc.c renamed from drivers/pnp/isapnp/proc.c~proc-convert-everything-to-struct-proc_ops +4 -5
@@ -49,10 +49,9 @@ static ssize_t isapnp_proc_bus_read(strureturn nbytes; } -static const struct file_operations isapnp_proc_bus_file_operations = { - .owner =THIS_MODULE , - .llseek = isapnp_proc_bus_lseek, - .read = isapnp_proc_bus_read, +static const struct proc_ops isapnp_proc_bus_proc_ops = { + .proc_lseek = isapnp_proc_bus_lseek, + .proc_read = isapnp_proc_bus_read, };static int isapnp_proc_attach_device (struct pnp_dev *dev)
@@ -69,7 +68,7 @@ static int isapnp_proc_attach_device(str }sprintf (name,"%02x" , dev->number); e = dev->procent =proc_create_data (name,S_IFREG |S_IRUGO , de, - &isapnp_proc_bus_file_operations, dev); + &isapnp_proc_bus_proc_ops, dev);if (!e)return -ENOMEM ;proc_set_size (e,256 );
drivers/pnp/pnpbios/proc.c renamed from drivers/pnp/pnpbios/proc.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -210,13 +210,12 @@ out:return ret; } -static const struct file_operations pnpbios_proc_fops = { - .owner =THIS_MODULE , - .open = pnpbios_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = pnpbios_proc_write, +static const struct proc_ops pnpbios_proc_ops = { + .proc_open = pnpbios_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = pnpbios_proc_write, };int pnpbios_interface_attach_device (struct pnp_bios_node *node)
@@ -228,13 +227,13 @@ int pnpbios_interface_attach_device(struif (!proc_pnp)return -EIO ;if (!pnpbios_dont_use_current_config) { -proc_create_data (name,0644 , proc_pnp, &pnpbios_proc_fops, +proc_create_data (name,0644 , proc_pnp, &pnpbios_proc_ops, (void *)(long )(node->handle)); }if (!proc_pnp_boot)return -EIO ; -if (proc_create_data (name,0644 , proc_pnp_boot, &pnpbios_proc_fops, +if (proc_create_data (name,0644 , proc_pnp_boot, &pnpbios_proc_ops, (void *)(long )(node->handle +0x100 )))return 0 ;return -EIO ;
drivers/s390/block/dasd_proc.c renamed from drivers/s390/block/dasd_proc.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -320,13 +320,12 @@ out_error:#endif /* CONFIG_DASD_PROFILE */ } -static const struct file_operations dasd_stats_proc_fops = { - .owner =THIS_MODULE , - .open = dasd_stats_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = dasd_stats_proc_write, +static const struct proc_ops dasd_stats_proc_ops = { + .proc_open = dasd_stats_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = dasd_stats_proc_write, };/*
@@ -347,7 +346,7 @@ dasd_proc_init(void) dasd_statistics_entry =proc_create ("statistics" ,S_IFREG |S_IRUGO |S_IWUSR , dasd_proc_root_entry, - &dasd_stats_proc_fops); + &dasd_stats_proc_ops);if (!dasd_statistics_entry) goto out_nostatistics;return 0 ;
drivers/s390/cio/blacklist.c renamed from drivers/s390/cio/blacklist.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -398,12 +398,12 @@ cio_ignore_proc_open(struct inode *inode sizeof(struct ccwdev_iter)); } -static const struct file_operations cio_ignore_proc_fops = { - .open = cio_ignore_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release_private, - .write = cio_ignore_write, +static const struct proc_ops cio_ignore_proc_ops = { + .proc_open = cio_ignore_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release_private, + .proc_write = cio_ignore_write, }; static int
@@ -412,7 +412,7 @@ cio_ignore_proc_init (void)struct proc_dir_entry *entry; entry =proc_create ("cio_ignore" ,S_IFREG |S_IRUGO |S_IWUSR ,NULL , - &cio_ignore_proc_fops); + &cio_ignore_proc_ops);if (!entry)return -ENOENT ;return 0 ;
drivers/s390/cio/css.c renamed from drivers/s390/cio/css.c~proc-convert-everything-to-struct-proc_ops +5 -6
@@ -1372,18 +1372,17 @@ static ssize_t cio_settle_write(struct freturn ret ? ret : count; } -static const struct file_operations cio_settle_proc_fops = { - .open = nonseekable_open, - .write = cio_settle_write, - .llseek = no_llseek, +static const struct proc_ops cio_settle_proc_ops = { + .proc_open = nonseekable_open, + .proc_write = cio_settle_write, + .proc_lseek = no_llseek, };static int __init cio_settle_init (void ) {struct proc_dir_entry *entry; - entry =proc_create ("cio_settle" ,S_IWUSR ,NULL , - &cio_settle_proc_fops); + entry =proc_create ("cio_settle" ,S_IWUSR ,NULL , &cio_settle_proc_ops);if (!entry)return -ENOMEM ;return 0 ;
drivers/scsi/esas2r/esas2r_main.c renamed from drivers/scsi/esas2r/esas2r_main.c~proc-convert-everything-to-struct-proc_ops +8 -1
@@ -617,6 +617,13 @@ static const struct file_operations esas .unlocked_ioctl = esas2r_proc_ioctl, }; +static const struct proc_ops esas2r_proc_ops = { + .proc_ioctl = esas2r_proc_ioctl, +#ifdef CONFIG_COMPAT + .proc_compat_ioctl = compat_ptr_ioctl, +#endif +}; +static struct Scsi_Host *esas2r_proc_host;static int esas2r_proc_major;
@@ -728,7 +735,7 @@ const char *esas2r_info(struct Scsi_Host pde =proc_create (ATTONODE_NAME ,0 , sh->hostt->proc_dir, - &esas2r_proc_fops); + &esas2r_proc_ops);if (!pde) { esas2r_log_dev(ESAS2R_LOG_WARN,
drivers/scsi/scsi_devinfo.c renamed from drivers/scsi/scsi_devinfo.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -736,13 +736,12 @@ out: return err; } -static const struct file_operations scsi_devinfo_proc_fops = { - .owner =THIS_MODULE , - .open = proc_scsi_devinfo_open, - .read = seq_read, - .write = proc_scsi_devinfo_write, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops scsi_devinfo_proc_ops = { + .proc_open = proc_scsi_devinfo_open, + .proc_read = seq_read, + .proc_write = proc_scsi_devinfo_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };#endif /* CONFIG_SCSI_PROC_FS */
@@ -867,7 +866,7 @@ int __init scsi_init_devinfo(void) }#ifdef CONFIG_SCSI_PROC_FS - p =proc_create ("scsi/device_info" ,0 ,NULL , &scsi_devinfo_proc_fops); + p =proc_create ("scsi/device_info" ,0 ,NULL , &scsi_devinfo_proc_ops);if (!p) { error = -ENOMEM ; goto out;
drivers/scsi/scsi_proc.c renamed from drivers/scsi/scsi_proc.c~proc-convert-everything-to-struct-proc_ops +14 -15
@@ -83,12 +83,12 @@ static int proc_scsi_host_open(struct in 4 * PAGE_SIZE); } -static const struct file_operations proc_scsi_fops = { - .open = proc_scsi_host_open, - .release = single_release, - .read = seq_read, - .llseek = seq_lseek, - .write = proc_scsi_host_write +static const struct proc_ops proc_scsi_ops = { + .proc_open = proc_scsi_host_open, + .proc_release = single_release, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_write = proc_scsi_host_write };/**
@@ -146,7 +146,7 @@ void scsi_proc_host_add(struct Scsi_Hostsprintf (name,"%d" , shost->host_no); p =proc_create_data (name,S_IRUGO |S_IWUSR , - sht->proc_dir, &proc_scsi_fops, shost); + sht->proc_dir, &proc_scsi_ops, shost);if (!p) printk(KERN_ERR "%s: Failed to register host %d in" "%s\n", __func__, shost->host_no,
@@ -436,13 +436,12 @@ static int proc_scsi_open(struct inode *return seq_open (file, &scsi_seq_ops); } -static const struct file_operations proc_scsi_operations = { - .owner =THIS_MODULE , - .open = proc_scsi_open, - .read = seq_read, - .write = proc_scsi_write, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops scsi_scsi_proc_ops = { + .proc_open = proc_scsi_open, + .proc_read = seq_read, + .proc_write = proc_scsi_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };/**
@@ -456,7 +455,7 @@ int __init scsi_init_procfs(void)if (!proc_scsi) goto err1; - pde =proc_create ("scsi/scsi" ,0 ,NULL , &proc_scsi_operations); + pde =proc_create ("scsi/scsi" ,0 ,NULL , &scsi_scsi_proc_ops);if (!pde) goto err2;
drivers/scsi/sg.c renamed from drivers/scsi/sg.c~proc-convert-everything-to-struct-proc_ops +14 -16
@@ -2322,25 +2322,23 @@ static int sg_proc_seq_show_int(struct sstatic int sg_proc_single_open_adio (struct inode *inode,struct file *file);static ssize_t sg_proc_write_adio (struct file *filp,const char __user *buffer,size_t count,loff_t *off); -static const struct file_operations adio_fops = { - .owner =THIS_MODULE , - .open = sg_proc_single_open_adio, - .read = seq_read, - .llseek = seq_lseek, - .write = sg_proc_write_adio, - .release = single_release, +static const struct proc_ops adio_proc_ops = { + .proc_open = sg_proc_single_open_adio, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_write = sg_proc_write_adio, + .proc_release = single_release, };static int sg_proc_single_open_dressz (struct inode *inode,struct file *file);static ssize_t sg_proc_write_dressz (struct file *filp,const char __user *buffer,size_t count,loff_t *off); -static const struct file_operations dressz_fops = { - .owner =THIS_MODULE , - .open = sg_proc_single_open_dressz, - .read = seq_read, - .llseek = seq_lseek, - .write = sg_proc_write_dressz, - .release = single_release, +static const struct proc_ops dressz_proc_ops = { + .proc_open = sg_proc_single_open_dressz, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_write = sg_proc_write_dressz, + .proc_release = single_release, };static int sg_proc_seq_show_version (struct seq_file *s,void *v);
@@ -2381,9 +2379,9 @@ sg_proc_init(void)if (!p)return 1 ; -proc_create ("allow_dio" ,S_IRUGO |S_IWUSR , p, &adio_fops); +proc_create ("allow_dio" ,S_IRUGO |S_IWUSR , p, &adio_proc_ops);proc_create_seq ("debug" ,S_IRUGO , p, &debug_seq_ops); -proc_create ("def_reserved_size" ,S_IRUGO |S_IWUSR , p, &dressz_fops); +proc_create ("def_reserved_size" ,S_IRUGO |S_IWUSR , p, &dressz_proc_ops);proc_create_single ("device_hdr" ,S_IRUGO , p, sg_proc_seq_show_devhdr);proc_create_seq ("devices" ,S_IRUGO , p, &dev_seq_ops);proc_create_seq ("device_strs" ,S_IRUGO , p, &devstrs_seq_ops);
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c renamed from drivers/staging/rtl8192u/ieee80211/ieee80211_module.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -264,12 +264,12 @@ static int open_debug_level(struct inodereturn single_open (file, show_debug_level,NULL ); } -static const struct file_operations fops = { - .open = open_debug_level, - .read = seq_read, - .llseek = seq_lseek, - .write = write_debug_level, - .release = single_release, +static const struct proc_ops debug_level_proc_ops = { + .proc_open = open_debug_level, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_write = write_debug_level, + .proc_release = single_release, };int __init ieee80211_debug_init (void )
@@ -284,7 +284,7 @@ int __init ieee80211_debug_init(void) " proc directory\n");return -EIO ; } - e =proc_create ("debug_level" ,0644 , ieee80211_proc, &fops); + e =proc_create ("debug_level" ,0644 , ieee80211_proc, &debug_level_proc_ops);if (!e) {remove_proc_entry (DRV_NAME , init_net.proc_net); ieee80211_proc =NULL ;
drivers/tty/sysrq.c renamed from drivers/tty/sysrq.c~proc-convert-everything-to-struct-proc_ops +4 -4
@@ -1101,15 +1101,15 @@ static ssize_t write_sysrq_trigger(strucreturn count; } -static const struct file_operations proc_sysrq_trigger_operations = { - .write = write_sysrq_trigger, - .llseek = noop_llseek, +static const struct proc_ops sysrq_trigger_proc_ops = { + .proc_write = write_sysrq_trigger, + .proc_lseek = noop_llseek, };static void sysrq_init_procfs (void ) {if (!proc_create ("sysrq-trigger" ,S_IWUSR ,NULL , - &proc_sysrq_trigger_operations)) + &sysrq_trigger_proc_ops))pr_err ("Failed to register proc interface\n" ); }
drivers/usb/gadget/function/rndis.c renamed from drivers/usb/gadget/function/rndis.c~proc-convert-everything-to-struct-proc_ops +8 -9
@@ -72,7 +72,7 @@ static rndis_resp_t *rndis_add_response(#ifdef CONFIG_USB_GADGET_DEBUG_FILES -static const struct file_operations rndis_proc_fops; +static const struct proc_ops rndis_proc_ops;#endif /* CONFIG_USB_GADGET_DEBUG_FILES */
@@ -902,7 +902,7 @@ struct rndis_params *rndis_register(voidsprintf (name,NAME_TEMPLATE , i); proc_entry =proc_create_data (name,0660 ,NULL , - &rndis_proc_fops, params); + &rndis_proc_ops, params);if (!proc_entry) {kfree (params);rndis_put_nr (i);
@@ -1164,13 +1164,12 @@ static int rndis_proc_open(struct inodereturn single_open (file, rndis_proc_show,PDE_DATA (inode)); } -static const struct file_operations rndis_proc_fops = { - .owner =THIS_MODULE , - .open = rndis_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = rndis_proc_write, +static const struct proc_ops rndis_proc_ops = { + .proc_open = rndis_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = rndis_proc_write, };#define NAME_TEMPLATE "driver/rndis-%03d"
drivers/video/fbdev/via/viafbdev.c renamed from drivers/video/fbdev/via/viafbdev.c~proc-convert-everything-to-struct-proc_ops +49 -56
165 lines not on this page · raw message
drivers/zorro/proc.c renamed from drivers/zorro/proc.c~proc-convert-everything-to-struct-proc_ops +4 -5
@@ -56,10 +56,9 @@ proc_bus_zorro_read(struct file *file, creturn nbytes; } -static const struct file_operations proc_bus_zorro_operations = { - .owner =THIS_MODULE , - .llseek = proc_bus_zorro_lseek, - .read = proc_bus_zorro_read, +static const struct proc_ops bus_zorro_proc_ops = { + .proc_lseek = proc_bus_zorro_lseek, + .proc_read = proc_bus_zorro_read, };static void *zorro_seq_start (struct seq_file *m,loff_t *pos)
@@ -105,7 +104,7 @@ static int __init zorro_proc_attach_devisprintf (name,"%02x" , slot); entry =proc_create_data (name,0 , proc_bus_zorro_dir, - &proc_bus_zorro_operations, + &bus_zorro_proc_ops, &zorro_autocon[slot]);if (!entry)return -ENOMEM ;
fs/cifs/cifs_debug.c renamed from fs/cifs/cifs_debug.c~proc-convert-everything-to-struct-proc_ops +54 -54
167 lines not on this page · raw message
fs/cifs/dfs_cache.c renamed from fs/cifs/dfs_cache.c~proc-convert-everything-to-struct-proc_ops +7 -6
@@ -8,6 +8,7 @@#include <linux/jhash.h> #include <linux/ktime.h> #include <linux/slab.h> +#include <linux/proc_fs.h> #include <linux/nls.h> #include <linux/workqueue.h> #include "cifsglob.h"
@@ -211,12 +212,12 @@ static int dfscache_proc_open(struct inoreturn single_open (file, dfscache_proc_show,NULL ); } -const struct file_operations dfscache_proc_fops = { - .open = dfscache_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = dfscache_proc_write, +const struct proc_ops dfscache_proc_ops = { + .proc_open = dfscache_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = dfscache_proc_write, };#ifdef CONFIG_CIFS_DEBUG2
fs/cifs/dfs_cache.h renamed from fs/cifs/dfs_cache.h~proc-convert-everything-to-struct-proc_ops +1 -1
@@ -24,7 +24,7 @@ struct dfs_cache_tgt_iterator {extern int dfs_cache_init (void );extern void dfs_cache_destroy (void ); -extern const struct file_operations dfscache_proc_fops; +extern const struct proc_ops dfscache_proc_ops; extern int dfs_cache_find(const unsigned int xid, struct cifs_ses *ses, const struct nls_table *nls_codepage, int remap,
fs/fscache/internal.h renamed from fs/fscache/internal.h~proc-convert-everything-to-struct-proc_ops +1 -1
@@ -111,7 +111,7 @@ extern void fscache_enqueue_object(struc* object-list.c */ #ifdef CONFIG_FSCACHE_OBJECT_LIST -extern const struct file_operations fscache_objlist_fops; +extern const struct proc_ops fscache_objlist_proc_ops;extern void fscache_objlist_add (struct fscache_object *);extern void fscache_objlist_remove (struct fscache_object *);
fs/fscache/object-list.c renamed from fs/fscache/object-list.c~proc-convert-everything-to-struct-proc_ops +6 -5
@@ -7,6 +7,7 @@#define FSCACHE_DEBUG_LEVEL COOKIE#include <linux/module.h> +#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/key.h>
@@ -405,9 +406,9 @@ static int fscache_objlist_release(strucreturn seq_release (inode, file); } -const struct file_operations fscache_objlist_fops = { - .open = fscache_objlist_open, - .read = seq_read, - .llseek = seq_lseek, - .release = fscache_objlist_release, +const struct proc_ops fscache_objlist_proc_ops = { + .proc_open = fscache_objlist_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = fscache_objlist_release, };
fs/fscache/proc.c renamed from fs/fscache/proc.c~proc-convert-everything-to-struct-proc_ops +1 -1
@@ -35,7 +35,7 @@ int __init fscache_proc_init(void)#ifdef CONFIG_FSCACHE_OBJECT_LIST if (!proc_create ("fs/fscache/objects" ,S_IFREG |0444 ,NULL , - &fscache_objlist_fops)) + &fscache_objlist_proc_ops)) goto error_objects;#endif
fs/jbd2/journal.c renamed from fs/jbd2/journal.c~proc-convert-everything-to-struct-proc_ops +6 -7
@@ -1074,12 +1074,11 @@ static int jbd2_seq_info_release(structreturn seq_release (inode, file); } -static const struct file_operations jbd2_seq_info_fops = { - .owner =THIS_MODULE , - .open = jbd2_seq_info_open, - .read = seq_read, - .llseek = seq_lseek, - .release = jbd2_seq_info_release, +static const struct proc_ops jbd2_info_proc_ops = { + .proc_open = jbd2_seq_info_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = jbd2_seq_info_release, };static struct proc_dir_entry *proc_jbd2_stats;
@@ -1089,7 +1088,7 @@ static void jbd2_stats_proc_init(journal journal->j_proc_entry =proc_mkdir (journal->j_devname, proc_jbd2_stats);if (journal->j_proc_entry) {proc_create_data ("info" ,S_IRUGO , journal->j_proc_entry, - &jbd2_seq_info_fops, journal); + &jbd2_info_proc_ops, journal); } }
fs/jfs/jfs_debug.c renamed from fs/jfs/jfs_debug.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -43,12 +43,12 @@ static ssize_t jfs_loglevel_proc_write(s return count; } -static const struct file_operations jfs_loglevel_proc_fops = { - .open = jfs_loglevel_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = jfs_loglevel_proc_write, +static const struct proc_ops jfs_loglevel_proc_ops = { + .proc_open = jfs_loglevel_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = jfs_loglevel_proc_write, };#endif
@@ -68,7 +68,7 @@ void jfs_proc_init(void)#endif #ifdef CONFIG_JFS_DEBUG proc_create_single ("TxAnchor" ,0 , base, jfs_txanchor_proc_show); -proc_create ("loglevel" ,0 , base, &jfs_loglevel_proc_fops); +proc_create ("loglevel" ,0 , base, &jfs_loglevel_proc_ops);#endif }
fs/lockd/procfs.c renamed from fs/lockd/procfs.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -60,11 +60,11 @@ nlm_end_grace_read(struct file *file, chreturn simple_read_from_buffer (buf, size, pos, resp,sizeof (resp)); } -static const struct file_operations lockd_end_grace_operations = { - .write = nlm_end_grace_write, - .read = nlm_end_grace_read, - .llseek = default_llseek, - .release = simple_transaction_release, +static const struct proc_ops lockd_end_grace_proc_ops = { + .proc_write = nlm_end_grace_write, + .proc_read = nlm_end_grace_read, + .proc_lseek = default_llseek, + .proc_release = simple_transaction_release, };int __init
@@ -76,7 +76,7 @@ lockd_create_procfs(void)if (!entry)return -ENOMEM ; entry =proc_create ("nlm_end_grace" ,S_IRUGO |S_IWUSR , entry, - &lockd_end_grace_operations); + &lockd_end_grace_proc_ops);if (!entry) {remove_proc_entry ("fs/lockd" ,NULL );return -ENOMEM ;
fs/nfsd/nfsctl.c renamed from fs/nfsd/nfsctl.c~proc-convert-everything-to-struct-proc_ops +6 -7
@@ -157,11 +157,11 @@ static int exports_proc_open(struct inodreturn exports_net_open (current->nsproxy->net_ns, file); } -static const struct file_operations exports_proc_operations = { - .open = exports_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops exports_proc_ops = { + .proc_open = exports_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static int exports_nfsd_open (struct inode *inode,struct file *file)
@@ -1431,8 +1431,7 @@ static int create_proc_exports_entry(voi entry =proc_mkdir ("fs/nfs" ,NULL );if (!entry)return -ENOMEM ; - entry =proc_create ("exports" ,0 , entry, - &exports_proc_operations); + entry =proc_create ("exports" ,0 , entry, &exports_proc_ops);if (!entry) {remove_proc_entry ("fs/nfs" ,NULL );return -ENOMEM ;
fs/nfsd/stats.c renamed from fs/nfsd/stats.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -84,17 +84,17 @@ static int nfsd_proc_open(struct inode *return single_open (file, nfsd_proc_show,NULL ); } -static const struct file_operations nfsd_proc_fops = { - .open = nfsd_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops nfsd_proc_ops = { + .proc_open = nfsd_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, };void nfsd_stat_init (void ) { -svc_proc_register (&init_net, &nfsd_svcstats, &nfsd_proc_fops); +svc_proc_register (&init_net, &nfsd_svcstats, &nfsd_proc_ops); }void
fs/proc/cpuinfo.c renamed from fs/proc/cpuinfo.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -16,16 +16,16 @@ static int cpuinfo_open(struct inode *inreturn seq_open (file, &cpuinfo_op); } -static const struct file_operations proc_cpuinfo_operations = { - .open = cpuinfo_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops cpuinfo_proc_ops = { + .proc_open = cpuinfo_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static int __init proc_cpuinfo_init (void ) { -proc_create ("cpuinfo" ,0 ,NULL , &proc_cpuinfo_operations); +proc_create ("cpuinfo" ,0 ,NULL , &cpuinfo_proc_ops);return 0 ; }fs_initcall (proc_cpuinfo_init);
fs/proc/kcore.c renamed from fs/proc/kcore.c~proc-convert-everything-to-struct-proc_ops +6 -7
@@ -574,11 +574,11 @@ static int release_kcore(struct inode *ireturn 0 ; } -static const struct file_operations proc_kcore_operations = { - .read = read_kcore, - .open = open_kcore, - .release = release_kcore, - .llseek = default_llseek, +static const struct proc_ops kcore_proc_ops = { + .proc_read = read_kcore, + .proc_open = open_kcore, + .proc_release = release_kcore, + .proc_lseek = default_llseek, };/* just remember that we have to update kcore */
@@ -637,8 +637,7 @@ static void __init add_modules_range(voistatic int __init proc_kcore_init (void ) { - proc_root_kcore =proc_create ("kcore" ,S_IRUSR ,NULL , - &proc_kcore_operations); + proc_root_kcore =proc_create ("kcore" ,S_IRUSR ,NULL , &kcore_proc_ops);if (!proc_root_kcore) {pr_err ("couldn't create /proc/kcore\n" );return 0 ;/* Always returns 0. */
fs/proc/kmsg.c renamed from fs/proc/kmsg.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -49,17 +49,17 @@ static __poll_t kmsg_poll(struct file *f } -static const struct file_operations proc_kmsg_operations = { - .read = kmsg_read, - .poll = kmsg_poll, - .open = kmsg_open, - .release = kmsg_release, - .llseek = generic_file_llseek, +static const struct proc_ops kmsg_proc_ops = { + .proc_read = kmsg_read, + .proc_poll = kmsg_poll, + .proc_open = kmsg_open, + .proc_release = kmsg_release, + .proc_lseek = generic_file_llseek, };static int __init proc_kmsg_init (void ) { -proc_create ("kmsg" ,S_IRUSR ,NULL , &proc_kmsg_operations); +proc_create ("kmsg" ,S_IRUSR ,NULL , &kmsg_proc_ops);return 0 ; }fs_initcall (proc_kmsg_init);
fs/proc/page.c renamed from fs/proc/page.c~proc-convert-everything-to-struct-proc_ops +12 -12
@@ -89,9 +89,9 @@ static ssize_t kpagecount_read(struct fireturn ret; } -static const struct file_operations proc_kpagecount_operations = { - .llseek = mem_lseek, - .read = kpagecount_read, +static const struct proc_ops kpagecount_proc_ops = { + .proc_lseek = mem_lseek, + .proc_read = kpagecount_read, };/* /proc/kpageflags - an array exposing page flags
@@ -263,9 +263,9 @@ static ssize_t kpageflags_read(struct fireturn ret; } -static const struct file_operations proc_kpageflags_operations = { - .llseek = mem_lseek, - .read = kpageflags_read, +static const struct proc_ops kpageflags_proc_ops = { + .proc_lseek = mem_lseek, + .proc_read = kpageflags_read, };#ifdef CONFIG_MEMCG
@@ -317,18 +317,18 @@ static ssize_t kpagecgroup_read(struct f return ret; } -static const struct file_operations proc_kpagecgroup_operations = { - .llseek = mem_lseek, - .read = kpagecgroup_read, +static const struct proc_ops kpagecgroup_proc_ops = { + .proc_lseek = mem_lseek, + .proc_read = kpagecgroup_read, };#endif /* CONFIG_MEMCG */ static int __init proc_page_init (void ) { -proc_create ("kpagecount" ,S_IRUSR ,NULL , &proc_kpagecount_operations); -proc_create ("kpageflags" ,S_IRUSR ,NULL , &proc_kpageflags_operations); +proc_create ("kpagecount" ,S_IRUSR ,NULL , &kpagecount_proc_ops); +proc_create ("kpageflags" ,S_IRUSR ,NULL , &kpageflags_proc_ops);#ifdef CONFIG_MEMCG -proc_create ("kpagecgroup" ,S_IRUSR ,NULL , &proc_kpagecgroup_operations); +proc_create ("kpagecgroup" ,S_IRUSR ,NULL , &kpagecgroup_proc_ops);#endif return 0 ; }
fs/proc/stat.c renamed from fs/proc/stat.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -223,16 +223,16 @@ static int stat_open(struct inode *inodereturn single_open_size (file, show_stat,NULL , size); } -static const struct file_operations proc_stat_operations = { - .open = stat_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops stat_proc_ops = { + .proc_open = stat_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, };static int __init proc_stat_init (void ) { -proc_create ("stat" ,0 ,NULL , &proc_stat_operations); +proc_create ("stat" ,0 ,NULL , &stat_proc_ops);return 0 ; }fs_initcall (proc_stat_init);
fs/proc/vmcore.c renamed from fs/proc/vmcore.c~proc-convert-everything-to-struct-proc_ops +5 -5
@@ -667,10 +667,10 @@ static int mmap_vmcore(struct file *file }#endif -static const struct file_operations proc_vmcore_operations = { - .read = read_vmcore, - .llseek = default_llseek, - .mmap = mmap_vmcore, +static const struct proc_ops vmcore_proc_ops = { + .proc_read = read_vmcore, + .proc_lseek = default_llseek, + .proc_mmap = mmap_vmcore, };static struct vmcore *__init get_new_element (void )
@@ -1555,7 +1555,7 @@ static int __init vmcore_init(void)elfcorehdr_free (elfcorehdr_addr); elfcorehdr_addr =ELFCORE_ADDR_ERR ; - proc_vmcore =proc_create ("vmcore" ,S_IRUSR ,NULL , &proc_vmcore_operations); + proc_vmcore =proc_create ("vmcore" ,S_IRUSR ,NULL , &vmcore_proc_ops);if (proc_vmcore) proc_vmcore->size = vmcore_size;return 0 ;
include/linux/seq_file.h renamed from include/linux/seq_file.h~proc-convert-everything-to-struct-proc_ops +13 -0
@@ -160,6 +160,19 @@ static const struct file_operations __na .release = single_release, \ } +#define DEFINE_PROC_SHOW_ATTRIBUTE (__name) \ +static int __name ## _open(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, __name ## _show, inode->i_private); \ +} \ + \ +static const struct proc_ops __name ## _proc_ops = { \ + .proc_open = __name ## _open, \ + .proc_read = seq_read, \ + .proc_lseek = seq_lseek, \ + .proc_release = single_release, \ +} +static inline struct user_namespace *seq_user_ns (struct seq_file *seq) {#ifdef CONFIG_USER_NS
include/linux/sunrpc/stats.h renamed from include/linux/sunrpc/stats.h~proc-convert-everything-to-struct-proc_ops +2 -2
@@ -63,7 +63,7 @@ struct proc_dir_entry * rpc_proc_registevoid rpc_proc_unregister (struct net *,const char *);void rpc_proc_zero (const struct rpc_program *);struct proc_dir_entry *svc_proc_register (struct net *,struct svc_stat *, -const struct file_operations *); +const struct proc_ops *);void svc_proc_unregister (struct net *,const char *); void svc_seq_show(struct seq_file *,
@@ -75,7 +75,7 @@ static inline void rpc_proc_unregister(sstatic inline void rpc_proc_zero (const struct rpc_program *p) {}static inline struct proc_dir_entry *svc_proc_register (struct net *net,struct svc_stat *s, -const struct file_operations *f) {return NULL ; } +const struct proc_ops *proc_ops) {return NULL ; }static inline void svc_proc_unregister (struct net *net,const char *p) {} static inline void svc_seq_show(struct seq_file *seq,
ipc/util.c renamed from ipc/util.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -126,7 +126,7 @@ void ipc_init_ids(struct ipc_ids *ids) }#ifdef CONFIG_PROC_FS -static const struct file_operations sysvipc_proc_fops; +static const struct proc_ops sysvipc_proc_ops;/** * ipc_init_proc_interface - create a proc interface for sysipc types using a seq_file interface. * @path: Path in procfs
@@ -151,7 +151,7 @@ void __init ipc_init_proc_interface(cons pde =proc_create_data (path,S_IRUGO ,/* world readable */ NULL ,/* parent dir */ - &sysvipc_proc_fops, + &sysvipc_proc_ops, iface);if (!pde)kfree (iface);
@@ -884,10 +884,10 @@ static int sysvipc_proc_release(struct i return seq_release_private(inode, file); } -static const struct file_operations sysvipc_proc_fops = { - .open = sysvipc_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = sysvipc_proc_release, +static const struct proc_ops sysvipc_proc_ops = { + .proc_open = sysvipc_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = sysvipc_proc_release, };#endif /* CONFIG_PROC_FS */
kernel/configs.c renamed from kernel/configs.c~proc-convert-everything-to-struct-proc_ops +4 -5
@@ -47,10 +47,9 @@ ikconfig_read_current(struct file *file, &kernel_config_data); } -static const struct file_operations ikconfig_file_ops = { - .owner =THIS_MODULE , - .read = ikconfig_read_current, - .llseek = default_llseek, +static const struct proc_ops config_gz_proc_ops = { + .proc_read = ikconfig_read_current, + .proc_lseek = default_llseek, };static int __init ikconfig_init (void )
@@ -59,7 +58,7 @@ static int __init ikconfig_init(void)/* create the current config file */ entry =proc_create ("config.gz" ,S_IFREG |S_IRUGO ,NULL , - &ikconfig_file_ops); + &config_gz_proc_ops);if (!entry)return -ENOMEM ;
kernel/irq/proc.c renamed from kernel/irq/proc.c~proc-convert-everything-to-struct-proc_ops +21 -21
74 lines not on this page · raw message
kernel/kallsyms.c renamed from kernel/kallsyms.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -698,16 +698,16 @@ const char *kdb_walk_kallsyms(loff_t *po }#endif /* CONFIG_KGDB_KDB */ -static const struct file_operations kallsyms_operations = { - .open = kallsyms_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release_private, +static const struct proc_ops kallsyms_proc_ops = { + .proc_open = kallsyms_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release_private, };static int __init kallsyms_init (void ) { -proc_create ("kallsyms" ,0444 ,NULL , &kallsyms_operations); +proc_create ("kallsyms" ,0444 ,NULL , &kallsyms_proc_ops);return 0 ; }device_initcall (kallsyms_init);
kernel/latencytop.c renamed from kernel/latencytop.c~proc-convert-everything-to-struct-proc_ops +7 -7
@@ -255,17 +255,17 @@ static int lstats_open(struct inode *inoreturn single_open (filp, lstats_show,NULL ); } -static const struct file_operations lstats_fops = { - .open = lstats_open, - .read = seq_read, - .write = lstats_write, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops lstats_proc_ops = { + .proc_open = lstats_open, + .proc_read = seq_read, + .proc_write = lstats_write, + .proc_lseek = seq_lseek, + .proc_release = single_release, };static int __init init_lstats_procfs (void ) { -proc_create ("latency_stats" ,0644 ,NULL , &lstats_fops); +proc_create ("latency_stats" ,0644 ,NULL , &lstats_proc_ops);return 0 ; }
kernel/locking/lockdep_proc.c renamed from kernel/locking/lockdep_proc.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -643,12 +643,12 @@ static int lock_stat_release(struct inod return seq_release(inode, file); } -static const struct file_operations proc_lock_stat_operations = { - .open = lock_stat_open, - .write = lock_stat_write, - .read = seq_read, - .llseek = seq_lseek, - .release = lock_stat_release, +static const struct proc_ops lock_stat_proc_ops = { + .proc_open = lock_stat_open, + .proc_write = lock_stat_write, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = lock_stat_release, };#endif /* CONFIG_LOCK_STAT */
@@ -660,8 +660,7 @@ static int __init lockdep_proc_init(void#endif proc_create_single ("lockdep_stats" ,S_IRUSR ,NULL , lockdep_stats_show);#ifdef CONFIG_LOCK_STAT -proc_create ("lock_stat" ,S_IRUSR |S_IWUSR ,NULL , - &proc_lock_stat_operations); +proc_create ("lock_stat" ,S_IRUSR |S_IWUSR ,NULL , &lock_stat_proc_ops);#endif return 0 ;
kernel/module.c renamed from kernel/module.c~proc-convert-everything-to-struct-proc_ops +6 -6
@@ -4354,16 +4354,16 @@ static int modules_open(struct inode *inreturn err; } -static const struct file_operations proc_modules_operations = { - .open = modules_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops modules_proc_ops = { + .proc_open = modules_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static int __init proc_modules_init (void ) { -proc_create ("modules" ,0 ,NULL , &proc_modules_operations); +proc_create ("modules" ,0 ,NULL , &modules_proc_ops);return 0 ; }module_init (proc_modules_init);
kernel/profile.c renamed from kernel/profile.c~proc-convert-everything-to-struct-proc_ops +12 -12
@@ -442,18 +442,18 @@ static ssize_t prof_cpu_mask_proc_write(return err; } -static const struct file_operations prof_cpu_mask_proc_fops = { - .open = prof_cpu_mask_proc_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = prof_cpu_mask_proc_write, +static const struct proc_ops prof_cpu_mask_proc_ops = { + .proc_open = prof_cpu_mask_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, + .proc_write = prof_cpu_mask_proc_write, };void create_prof_cpu_mask (void ) {/* create /proc/irq/prof_cpu_mask */ -proc_create ("irq/prof_cpu_mask" ,0600 ,NULL , &prof_cpu_mask_proc_fops); +proc_create ("irq/prof_cpu_mask" ,0600 ,NULL , &prof_cpu_mask_proc_ops); }/*
@@ -517,10 +517,10 @@ static ssize_t write_profile(struct filereturn count; } -static const struct file_operations proc_profile_operations = { - .read = read_profile, - .write = write_profile, - .llseek = default_llseek, +static const struct proc_ops profile_proc_ops = { + .proc_read = read_profile, + .proc_write = write_profile, + .proc_lseek = default_llseek, };int __ref create_proc_profile (void )
@@ -548,7 +548,7 @@ int __ref create_proc_profile(void) err =0 ;#endif entry =proc_create ("profile" ,S_IWUSR |S_IRUGO , -NULL , &proc_profile_operations); +NULL , &profile_proc_ops);if (!entry) goto err_state_onl;proc_set_size (entry, (1 + prof_len) *sizeof (atomic_t));
kernel/sched/psi.c renamed from kernel/sched/psi.c~proc-convert-everything-to-struct-proc_ops +24 -24
64 lines not on this page · raw message
mm/slab_common.c renamed from mm/slab_common.c~proc-convert-everything-to-struct-proc_ops +7 -8
@@ -1580,18 +1580,17 @@ static int slabinfo_open(struct inode *ireturn seq_open (file, &slabinfo_op); } -static const struct file_operations proc_slabinfo_operations = { - .open = slabinfo_open, - .read = seq_read, - .write = slabinfo_write, - .llseek = seq_lseek, - .release = seq_release, +static const struct proc_ops slabinfo_proc_ops = { + .proc_open = slabinfo_open, + .proc_read = seq_read, + .proc_write = slabinfo_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release, };static int __init slab_proc_init (void ) { -proc_create ("slabinfo" ,SLABINFO_RIGHTS ,NULL , - &proc_slabinfo_operations); +proc_create ("slabinfo" ,SLABINFO_RIGHTS ,NULL , &slabinfo_proc_ops);return 0 ; }module_init (slab_proc_init);
mm/swapfile.c renamed from mm/swapfile.c~proc-convert-everything-to-struct-proc_ops +7 -7
Lines of this file are not shown. View the raw message.
net/atm/mpoa_proc.c renamed from net/atm/mpoa_proc.c~proc-convert-everything-to-struct-proc_ops +7 -10
Lines of this file are not shown. View the raw message.
net/atm/proc.c renamed from net/atm/proc.c~proc-convert-everything-to-struct-proc_ops +4 -4
Lines of this file are not shown. View the raw message.
net/core/pktgen.c renamed from net/core/pktgen.c~proc-convert-everything-to-struct-proc_ops +22 -22
44 lines not on this page · raw message
net/ipv4/ipconfig.c renamed from net/ipv4/ipconfig.c~proc-convert-everything-to-struct-proc_ops +5 -5
Lines of this file are not shown. View the raw message.
net/ipv4/netfilter/ipt_CLUSTERIP.c renamed from net/ipv4/netfilter/ipt_CLUSTERIP.c~proc-convert-everything-to-struct-proc_ops +8 -8
Lines of this file are not shown. View the raw message.
net/ipv4/route.c renamed from net/ipv4/route.c~proc-convert-everything-to-struct-proc_ops +12 -12
Lines of this file are not shown. View the raw message.
net/netfilter/xt_recent.c renamed from net/netfilter/xt_recent.c~proc-convert-everything-to-struct-proc_ops +8 -9
Lines of this file are not shown. View the raw message.
net/sunrpc/auth_gss/svcauth_gss.c renamed from net/sunrpc/auth_gss/svcauth_gss.c~proc-convert-everything-to-struct-proc_ops +5 -5
Lines of this file are not shown. View the raw message.
net/sunrpc/cache.c renamed from net/sunrpc/cache.c~proc-convert-everything-to-struct-proc_ops +22 -23
45 lines not on this page · raw message
net/sunrpc/stats.c renamed from net/sunrpc/stats.c~proc-convert-everything-to-struct-proc_ops +10 -11
Lines of this file are not shown. View the raw message.
samples/kfifo/bytestream-example.c renamed from samples/kfifo/bytestream-example.c~proc-convert-everything-to-struct-proc_ops +5 -6
Lines of this file are not shown. View the raw message.
samples/kfifo/inttype-example.c renamed from samples/kfifo/inttype-example.c~proc-convert-everything-to-struct-proc_ops +5 -6
Lines of this file are not shown. View the raw message.
samples/kfifo/record-example.c renamed from samples/kfifo/record-example.c~proc-convert-everything-to-struct-proc_ops +5 -6
Lines of this file are not shown. View the raw message.
sound/core/info.c renamed from sound/core/info.c~proc-convert-everything-to-struct-proc_ops +16 -18
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
_
Part of the diff is not shown here. View the raw message.
Andrew Morton
maintainerPATCH 59/67 lib/string: add strnchrnul()
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: lib/string: add strnchrnul()
Patch series "lib: rework bitmap_parse", v5.
Similarl to the recently revisited bitmap_parselist(), bitmap_parse() is ineffective and overcomplicated. This series reworks it, aligns its interface with bitmap_parselist() and makes it simpler to use.
The series also adds a test for the function and fixes usage of it in cpumask_parse() according to the new design - drops the calculating of length of an input string.
bitmap_parse() takes the array of numbers to be put into the map in the BE order which is reversed to the natural LE order for bitmaps. For example, to construct bitmap containing a bit on the position 42, we have to put a line '400,0'. Current implementation reads chunk one by one from the beginning ('400' before '0') and makes bitmap shift after each successful parse. It makes the complexity of the whole process as O(n^2). We can do it in reverse direction ('0' before '400') and avoid shifting, but it requires reverse parsing helpers.
This patch (of 7):
New function works like strchrnul() with a length limited string.
---
include/linux/string.h | 1 + lib/string.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)
include/linux/string.h renamed from include/linux/string.h~lib-string-add-strnchrnul +1 -0
@@ -62,6 +62,7 @@ extern char * strchr(const char *,int);#ifndef __HAVE_ARCH_STRCHRNULextern char *strchrnul (const char *,int );#endif +extern char *strnchrnul (const char *,size_t ,int );#ifndef __HAVE_ARCH_STRNCHRextern char *strnchr (const char *,size_t ,int );#endif
lib/string.c renamed from lib/string.c~lib-string-add-strnchrnul +17 -0
@@ -434,6 +434,23 @@ char *strchrnul(const char *s, int c)EXPORT_SYMBOL (strchrnul);#endif +/** +* strnchrnul - Find and return a character in a length limited string, +* or end of string +* @s: The string to be searched +* @count: The number of characters to be searched +* @c: The character to search for +* +* Returns pointer to the first occurrence of 'c' in s. If c is not found, +* then return a pointer to the last character of the string. +*/ +char *strnchrnul (const char *s,size_t count,int c) +{ +while (count-- && *s && *s != (char )c) + s++; +return (char *)s; +} +#ifndef __HAVE_ARCH_STRRCHR/** * strrchr - Find the last occurrence of a character in a string
_
Andrew Morton
maintainerPATCH 60/67 bitops: more BITS_TO_* macros
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: bitops: more BITS_TO_* macros
Introduce BITS_TO_U64, BITS_TO_U32 and BITS_TO_BYTES as they are handy in the following patches (BITS_TO_U32 specifically). Reimplement tools/ version of the macros according to the kernel implementation.
Also fix indentation for BITS_PER_TYPE definition.
---
include/linux/bitops.h | 4 +++- tools/include/linux/bitops.h | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-)
include/linux/bitops.h renamed from include/linux/bitops.h~bitops-more-bits_to_-macros +3 -1
@@ -11,8 +11,10 @@# define aligned_byte_mask (n) (~0xffUL << (BITS_PER_LONG - 8 - 8*(n)))#endif -#define BITS_PER_TYPE (type) (sizeof(type) * BITS_PER_BYTE) +#define BITS_PER_TYPE (type) (sizeof(type) * BITS_PER_BYTE)#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(long)) +#define BITS_TO_U64 (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(u64)) +#define BITS_TO_U32 (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(u32))#define BITS_TO_BYTES (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(char))extern unsigned int __sw_hweight8 (unsigned int w);
tools/include/linux/bitops.h renamed from tools/include/linux/bitops.h~bitops-more-bits_to_-macros +5 -4
@@ -14,10 +14,11 @@#include <linux/bits.h> #include <linux/compiler.h> -#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) -#define BITS_TO_U64 (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64)) -#define BITS_TO_U32 (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) -#define BITS_TO_BYTES (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE) +#define BITS_PER_TYPE (type) (sizeof(type) * BITS_PER_BYTE) +#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(long)) +#define BITS_TO_U64 (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(u64)) +#define BITS_TO_U32 (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(u32)) +#define BITS_TO_BYTES (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(char))extern unsigned int __sw_hweight8 (unsigned int w);extern unsigned int __sw_hweight16 (unsigned int w);
_
Andrew Morton
maintainerPATCH 61/67 lib: add test for bitmap_parse()
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: lib: add test for bitmap_parse()
The test is derived from bitmap_parselist() NO_LEN is reserved for use in following patches.
---
lib/test_bitmap.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-)
lib/test_bitmap.c renamed from lib/test_bitmap.c~lib-add-test-for-bitmap_parse +95 -2
@@ -295,7 +295,8 @@ static void __init test_replace(void)expect_eq_bitmap (bmap, exp3_1_0, nbits); } -#define PARSE_TIME 0x1 +#define PARSE_TIME 0x1 +#define NO_LEN 0x2struct test_bitmap_parselist {const int errno;
@@ -349,7 +350,6 @@ static const struct test_bitmap_parselis {-EINVAL, "0-31:a/1", NULL, 8, 0}, {-EINVAL, "0-\n", NULL, 8, 0}, -#undef step };static void __init __test_bitmap_parselist (int is_user)
@@ -401,6 +401,87 @@ static void __init __test_bitmap_parseli } } +static const unsigned long parse_test[]__initconst = { +BITMAP_FROM_U64 (0 ), +BITMAP_FROM_U64 (1 ), +BITMAP_FROM_U64 (0xdeadbeef ), +BITMAP_FROM_U64 (0x100000000ULL ), +}; + +static const unsigned long parse_test2[]__initconst = { +BITMAP_FROM_U64 (0x100000000ULL ),BITMAP_FROM_U64 (0xdeadbeef ), +BITMAP_FROM_U64 (0x100000000ULL ),BITMAP_FROM_U64 (0xbaadf00ddeadbeef ), +BITMAP_FROM_U64 (0x100000000ULL ),BITMAP_FROM_U64 (0x0badf00ddeadbeef ), +}; + +static const struct test_bitmap_parselist parse_tests[]__initconst = { + {0 ,"0" , &parse_test[0 * step],32 ,0 }, + {0 ,"1" , &parse_test[1 * step],32 ,0 }, + {0 ,"deadbeef" , &parse_test[2 * step],32 ,0 }, + {0 ,"1,0" , &parse_test[3 * step],33 ,0 }, + + {0 ,"deadbeef,1,0" , &parse_test2[0 *2 * step],96 ,0 }, + {0 ,"baadf00d,deadbeef,1,0" , &parse_test2[1 *2 * step],128 ,0 }, + {0 ,"badf00d,deadbeef,1,0" , &parse_test2[2 *2 * step],124 ,0 }, + + {-EINVAL ,"goodfood,deadbeef,1,0" ,NULL ,128 ,0 }, + {-EOVERFLOW ,"3,0" ,NULL ,33 ,0 }, + {-EOVERFLOW ,"123badf00d,deadbeef,1,0" ,NULL ,128 ,0 }, + {-EOVERFLOW ,"badf00d,deadbeef,1,0" ,NULL ,90 ,0 }, + {-EOVERFLOW ,"fbadf00d,deadbeef,1,0" ,NULL ,95 ,0 }, + {-EOVERFLOW ,"badf00d,deadbeef,1,0" ,NULL ,100 ,0 }, +#undef step +}; + +static void __init __test_bitmap_parse (int is_user) +{ +int i; +int err; +ktime_t time; +DECLARE_BITMAP (bmap,2048 ); +char *mode = is_user ?"_user" :"" ; + +for (i =0 ; i <ARRAY_SIZE (parse_tests); i++) { +struct test_bitmap_parselist test = parse_tests[i]; + +if (is_user) { +size_t len =strlen (test.in); +mm_segment_t orig_fs =get_fs (); + +set_fs (KERNEL_DS ); + time =ktime_get (); + err =bitmap_parse_user ((__force const char __user *)test.in, len, + bmap, test.nbits); + time =ktime_get () - time; +set_fs (orig_fs); + }else { +size_t len = test.flags &NO_LEN ? +UINT_MAX :strlen (test.in); + time =ktime_get (); + err =bitmap_parse (test.in, len, bmap, test.nbits); + time =ktime_get () - time; + } + +if (err != test.errno) { +pr_err ("parse%s: %d: input is %s, errno is %d, expected %d\n" , + mode, i, test.in, err, test.errno); +continue ; + } + +if (!err && test.expected + && !__bitmap_equal (bmap, test.expected, test.nbits)) { +pr_err ("parse%s: %d: input is %s, result is 0x%lx, expected 0x%lx\n" , + mode, i, test.in, bmap[0 ], + *test.expected); +continue ; + } + +if (test.flags &PARSE_TIME ) +pr_err ("parse%s: %d: input is '%s' OK, Time: %llu\n" , + mode, i, test.in, time); + } +} +static void __init test_bitmap_parselist (void ) {__test_bitmap_parselist (0 );
@@ -411,6 +492,16 @@ static void __init test_bitmap_parselist__test_bitmap_parselist (1 ); } +static void __init test_bitmap_parse (void ) +{ +__test_bitmap_parse (0 ); +} + +static void __init test_bitmap_parse_user (void ) +{ +__test_bitmap_parse (1 ); +} +#define EXP1_IN_BITS (sizeof(exp1) * 8)static void __init test_bitmap_arr32 (void )
@@ -516,6 +607,8 @@ static void __init selftest(void)test_copy ();test_replace ();test_bitmap_arr32 (); +test_bitmap_parse (); +test_bitmap_parse_user ();test_bitmap_parselist ();test_bitmap_parselist_user ();test_mem_optimisations ();
_
Andrew Morton
maintainerPATCH 62/67 lib: make bitmap_parse_user a wrapper on bitmap_parse
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: lib: make bitmap_parse_user a wrapper on bitmap_parse
Currently we parse user data byte after byte which leads to overcomplicating of parsing algorithm. There are no performance critical users of bitmap_parse_user(), and so we can duplicate user data to kernel buffer and simply call bitmap_parselist(). This rework lets us unify and simplify bitmap_parse() and bitmap_parse_user(), which is done in the following patch.
---
lib/bitmap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
lib/bitmap.c renamed from lib/bitmap.c~lib-make-bitmap_parse_user-a-wrapper-on-bitmap_parse +10 -10
@@ -530,22 +530,22 @@ EXPORT_SYMBOL(__bitmap_parse);* then it must be terminated with a \0. * @maskp: pointer to bitmap array that will contain result. * @nmaskbits: size of bitmap, in bits. -* -* Wrapper for __bitmap_parse(), providing it with user buffer. -* -* We cannot have this as an inline function in bitmap.h because it needs -* linux/uaccess.h to get the access_ok() declaration and this causes -* cyclic dependencies. */ int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *maskp,int nmaskbits) { -if (!access_ok (ubuf, ulen)) -return -EFAULT ; -return __bitmap_parse ((const char __force *)ubuf, - ulen,1 , maskp, nmaskbits); +char *buf; +int ret; + buf =memdup_user_nul (ubuf, ulen); +if (IS_ERR (buf)) +return PTR_ERR (buf); + + ret =bitmap_parse (buf, ulen, maskp, nmaskbits); + +kfree (buf); +return ret; }EXPORT_SYMBOL (bitmap_parse_user);
_
Andrew Morton
maintainerPATCH 63/67 lib: rework bitmap_parse()
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: lib: rework bitmap_parse()
bitmap_parse() is ineffective and full of opaque variables and opencoded parts. It leads to hard understanding and usage of it. This rework includes:
- remove bitmap_shift_left() call from the cycle. Now it makes the complexity of the algorithm as O(nbits^2). In the suggested approach the input string is parsed in reverse direction, so no shifts needed;
- relax requirement on a single comma and no white spaces between chunks. It is considered useful in scripting, and it aligns with bitmap_parselist();
- split bitmap_parse() to small readable helpers;
- make an explicit calculation of the end of input line at the beginning, so users of the bitmap_parse() won't bother doing this.
---
include/linux/bitmap.h | 8 - lib/bitmap.c | 175 ++++++++++++++++++--------------------- 2 files changed, 84 insertions(+), 99 deletions(-)
include/linux/bitmap.h renamed from include/linux/bitmap.h~lib-rework-bitmap_parse +1 -7
@@ -186,7 +186,7 @@ bitmap_find_next_zero_area(unsigned long align_mask, 0); } -extern int __bitmap_parse (const char *buf,unsigned int buflen,int is_user, +extern int bitmap_parse (const char *buf,unsigned int buflen,unsigned long *dst,int nbits);extern int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits);
@@ -454,12 +454,6 @@ static inline void bitmap_replace(unsign__bitmap_replace (dst, old, new, mask, nbits); } -static inline int bitmap_parse (const char *buf,unsigned int buflen, -unsigned long *maskp,int nmaskbits) -{ -return __bitmap_parse (buf, buflen,0 , maskp, nmaskbits); -} -static inline void bitmap_next_clear_region (unsigned long *bitmap,unsigned int *rs,unsigned int *re,unsigned int end)
lib/bitmap.c renamed from lib/bitmap.c~lib-rework-bitmap_parse +83 -92
199 lines not on this page · raw message
_
Andrew Morton
maintainerPATCH 64/67 lib: new testcases for bitmap_parse{_user}
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: lib: new testcases for bitmap_parse{_user}
New version of bitmap_parse() is unified with bitmap_parse_list(), and therefore:
- weakens rules on whitespaces and commas between hex chunks;
- in addition to
- allows passing UINT_MAX or any other big number as the length of input string instead of actual string length.
The patch covers the cases.
---
lib/test_bitmap.c | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/test_bitmap.c renamed from lib/test_bitmap.c~lib-new-testcases-for-bitmap_parse_user +8 -0
@@ -415,14 +415,22 @@ static const unsigned long parse_test2[] };static const struct test_bitmap_parselist parse_tests[]__initconst = { + {0 ,"" , &parse_test[0 * step],32 ,0 }, + {0 ," " , &parse_test[0 * step],32 ,0 }, {0 ,"0" , &parse_test[0 * step],32 ,0 }, + {0 ,"0\n" , &parse_test[0 * step],32 ,0 }, {0 ,"1" , &parse_test[1 * step],32 ,0 }, {0 ,"deadbeef" , &parse_test[2 * step],32 ,0 }, {0 ,"1,0" , &parse_test[3 * step],33 ,0 }, + {0 ,"deadbeef,\n,0,1" , &parse_test[2 * step],96 ,0 }, {0 ,"deadbeef,1,0" , &parse_test2[0 *2 * step],96 ,0 }, {0 ,"baadf00d,deadbeef,1,0" , &parse_test2[1 *2 * step],128 ,0 }, {0 ,"badf00d,deadbeef,1,0" , &parse_test2[2 *2 * step],124 ,0 }, + {0 ,"badf00d,deadbeef,1,0" , &parse_test2[2 *2 * step],124 ,NO_LEN }, + {0 ," badf00d,deadbeef,1,0 " , &parse_test2[2 *2 * step],124 ,0 }, + {0 ," , badf00d,deadbeef,1,0 , " , &parse_test2[2 *2 * step],124 ,0 }, + {0 ," , badf00d, ,, ,,deadbeef,1,0 , " , &parse_test2[2 *2 * step],124 ,0 }, {-EINVAL ,"goodfood,deadbeef,1,0" ,NULL ,128 ,0 }, {-EOVERFLOW ,"3,0" ,NULL ,33 ,0 },
_
Andrew Morton
maintainerPATCH 65/67 include/linux/cpumask.h: don't calculate length of the input string
In reply to Andrew MortonFrom: Yury Norov <[email protected]>
Subject: include/linux/cpumask.h: don't calculate length of the input string
New design of inner bitmap_parse() allows to avoid calculating the size of a null-terminated string.
---
include/linux/cpumask.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/cpumask.h renamed from include/linux/cpumask.h~cpumask-dont-calculate-length-of-the-input-string +1 -3
@@ -663,9 +663,7 @@ static inline int cpumask_parselist_user*/ static inline int cpumask_parse (const char *buf,struct cpumask *dstp) { -unsigned int len =strchrnul (buf,'\n' ) - buf; - -return bitmap_parse (buf, len,cpumask_bits (dstp), nr_cpumask_bits); +return bitmap_parse (buf,UINT_MAX ,cpumask_bits (dstp), nr_cpumask_bits); }/**
_
Andrew Morton
maintainerPATCH 66/67 treewide: remove redundant IS_ERR() before error code check
In reply to Andrew MortonFrom: Masahiro Yamada <[email protected]>
Subject: treewide: remove redundant IS_ERR() before error code check
'PTR_ERR(p) == -E*' is a stronger condition than IS_ERR(p). Hence, IS_ERR(p) is unneeded.
The semantic patch that generates this commit is as follows:
// <smpl>
@@
expression ptr;
constant error_code;
@@
-IS_ERR(ptr) && (PTR_ERR(ptr) == - error_code)
+PTR_ERR(ptr) == - error_code
// </smpl>
---
crypto/af_alg.c | 2 +- drivers/acpi/scan.c | 2 +- drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/char/hw_random/omap-rng.c | 4 ++-- drivers/clk/clk.c | 2 +- drivers/dma/mv_xor_v2.c | 2 +- drivers/gpio/gpiolib-devres.c | 2 +- drivers/gpio/gpiolib-of.c | 8 ++++---- drivers/gpio/gpiolib.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 5 ++--- drivers/i2c/busses/i2c-synquacer.c | 2 +- drivers/mtd/ubi/build.c | 2 +- drivers/of/device.c | 2 +- drivers/pci/controller/pci-tegra.c | 2 +- drivers/phy/phy-core.c | 4 ++-- drivers/spi/spi-orion.c | 3 +-- drivers/video/fbdev/imxfb.c | 2 +- fs/ext4/super.c | 2 +- fs/f2fs/node.c | 2 +- fs/ocfs2/suballoc.c | 2 +- fs/sysfs/group.c | 2 +- net/core/dev.c | 2 +- net/core/filter.c | 2 +- net/xfrm/xfrm_policy.c | 2 +- sound/soc/codecs/ak4104.c | 3 +-- sound/soc/codecs/cs4270.c | 3 +-- sound/soc/codecs/tlv320aic32x4.c | 6 ++---- sound/soc/sunxi/sun4i-spdif.c | 2 +- 28 files changed, 35 insertions(+), 41 deletions(-)
crypto/af_alg.c renamed from crypto/af_alg.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -171,7 +171,7 @@ static int alg_bind(struct socket *sock, sa->salg_name[sizeof (sa->salg_name) + addr_len -sizeof (*sa) -1 ] =0 ; type =alg_get_type (sa->salg_type); -if (IS_ERR (type) &&PTR_ERR (type) == -ENOENT ) { +if (PTR_ERR (type) == -ENOENT ) {request_module ("algif-%s" , sa->salg_type); type =alg_get_type (sa->salg_type); }
drivers/acpi/scan.c renamed from drivers/acpi/scan.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -1462,7 +1462,7 @@ int acpi_dma_configure(struct device *deiort_dma_setup (dev, &dma_addr, &size); iommu =iort_iommu_configure (dev); -if (IS_ERR (iommu) &&PTR_ERR (iommu) == -EPROBE_DEFER ) +if (PTR_ERR (iommu) == -EPROBE_DEFER )return -EPROBE_DEFER ; arch_setup_dma_ops(dev, dma_addr, size,
drivers/char/hw_random/bcm2835-rng.c renamed from drivers/char/hw_random/bcm2835-rng.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -157,7 +157,7 @@ static int bcm2835_rng_probe(struct plat/* Clock is optional on most platforms */ priv->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (priv->clk) &&PTR_ERR (priv->clk) == -EPROBE_DEFER ) +if (PTR_ERR (priv->clk) == -EPROBE_DEFER )return -EPROBE_DEFER ; priv->rng.name = pdev->name;
drivers/char/hw_random/omap-rng.c renamed from drivers/char/hw_random/omap-rng.c~treewide-remove-redundent-is_err-before-error-code-check +2 -2
@@ -476,7 +476,7 @@ static int omap_rng_probe(struct platfor } priv->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (priv->clk) &&PTR_ERR (priv->clk) == -EPROBE_DEFER ) +if (PTR_ERR (priv->clk) == -EPROBE_DEFER )return -EPROBE_DEFER ;if (!IS_ERR (priv->clk)) { ret =clk_prepare_enable (priv->clk);
@@ -488,7 +488,7 @@ static int omap_rng_probe(struct platfor } priv->clk_reg =devm_clk_get (&pdev->dev,"reg" ); -if (IS_ERR (priv->clk_reg) &&PTR_ERR (priv->clk_reg) == -EPROBE_DEFER ) +if (PTR_ERR (priv->clk_reg) == -EPROBE_DEFER )return -EPROBE_DEFER ;if (!IS_ERR (priv->clk_reg)) { ret =clk_prepare_enable (priv->clk_reg);
drivers/clk/clk.c renamed from drivers/clk/clk.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -429,7 +429,7 @@ static void clk_core_fill_parent_index(s parent =ERR_PTR (-EPROBE_DEFER ); }else { parent =clk_core_get (core, index); -if (IS_ERR (parent) &&PTR_ERR (parent) == -ENOENT && entry->name) +if (PTR_ERR (parent) == -ENOENT && entry->name) parent =clk_core_lookup (entry->name); }
drivers/dma/mv_xor_v2.c renamed from drivers/dma/mv_xor_v2.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -750,7 +750,7 @@ static int mv_xor_v2_probe(struct platfo } xor_dev->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (xor_dev->clk) &&PTR_ERR (xor_dev->clk) == -EPROBE_DEFER ) { +if (PTR_ERR (xor_dev->clk) == -EPROBE_DEFER ) { ret =EPROBE_DEFER ; goto disable_reg_clk; }
drivers/gpio/gpiolib.c renamed from drivers/gpio/gpiolib.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -5039,7 +5039,7 @@ struct gpio_descs *__must_check gpiod_gestruct gpio_descs *descs; descs =gpiod_get_array (dev, con_id, flags); -if (IS_ERR (descs) && (PTR_ERR (descs) == -ENOENT )) +if (PTR_ERR (descs) == -ENOENT )return NULL ;return descs;
drivers/gpio/gpiolib-devres.c renamed from drivers/gpio/gpiolib-devres.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -308,7 +308,7 @@ devm_gpiod_get_array_optional(struct devstruct gpio_descs *descs; descs =devm_gpiod_get_array (dev, con_id, flags); -if (IS_ERR (descs) && (PTR_ERR (descs) == -ENOENT )) +if (PTR_ERR (descs) == -ENOENT )return NULL ;return descs;
drivers/gpio/gpiolib-of.c renamed from drivers/gpio/gpiolib-of.c~treewide-remove-redundent-is_err-before-error-code-check +4 -4
@@ -484,24 +484,24 @@ struct gpio_desc *of_find_gpio(struct debreak ; } -if (IS_ERR (desc) &&PTR_ERR (desc) == -ENOENT ) { +if (PTR_ERR (desc) == -ENOENT ) {/* Special handling for SPI GPIOs if used */ desc =of_find_spi_gpio (dev, con_id, &of_flags); } -if (IS_ERR (desc) &&PTR_ERR (desc) == -ENOENT ) { +if (PTR_ERR (desc) == -ENOENT ) {/* This quirk looks up flags and all */ desc =of_find_spi_cs_gpio (dev, con_id, idx, flags);if (!IS_ERR (desc))return desc; } -if (IS_ERR (desc) &&PTR_ERR (desc) == -ENOENT ) { +if (PTR_ERR (desc) == -ENOENT ) {/* Special handling for regulator GPIOs if used */ desc =of_find_regulator_gpio (dev, con_id, &of_flags); } -if (IS_ERR (desc) &&PTR_ERR (desc) == -ENOENT ) +if (PTR_ERR (desc) == -ENOENT ) desc =of_find_arizona_gpio (dev, con_id, &of_flags);if (IS_ERR (desc))
drivers/i2c/busses/i2c-mv64xxx.c renamed from drivers/i2c/busses/i2c-mv64xxx.c~treewide-remove-redundent-is_err-before-error-code-check +2 -3
@@ -901,14 +901,13 @@ mv64xxx_i2c_probe(struct platform_device/* Not all platforms have clocks */ drv_data->clk =devm_clk_get (&pd->dev,NULL ); -if (IS_ERR (drv_data->clk) &&PTR_ERR (drv_data->clk) == -EPROBE_DEFER ) +if (PTR_ERR (drv_data->clk) == -EPROBE_DEFER )return -EPROBE_DEFER ;if (!IS_ERR (drv_data->clk))clk_prepare_enable (drv_data->clk); drv_data->reg_clk =devm_clk_get (&pd->dev,"reg" ); -if (IS_ERR (drv_data->reg_clk) && -PTR_ERR (drv_data->reg_clk) == -EPROBE_DEFER ) +if (PTR_ERR (drv_data->reg_clk) == -EPROBE_DEFER )return -EPROBE_DEFER ;if (!IS_ERR (drv_data->reg_clk))clk_prepare_enable (drv_data->reg_clk);
drivers/i2c/busses/i2c-synquacer.c renamed from drivers/i2c/busses/i2c-synquacer.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -553,7 +553,7 @@ static int synquacer_i2c_probe(struct pl &i2c->pclkrate); i2c->pclk =devm_clk_get (&pdev->dev,"pclk" ); -if (IS_ERR (i2c->pclk) &&PTR_ERR (i2c->pclk) == -EPROBE_DEFER ) +if (PTR_ERR (i2c->pclk) == -EPROBE_DEFER )return -EPROBE_DEFER ;if (!IS_ERR_OR_NULL (i2c->pclk)) {dev_dbg (&pdev->dev,"clock source %p\n" , i2c->pclk);
drivers/mtd/ubi/build.c renamed from drivers/mtd/ubi/build.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -1180,7 +1180,7 @@ static struct mtd_info * __init open_mtd* MTD device name. */ mtd =get_mtd_device_nm (mtd_dev); -if (IS_ERR (mtd) &&PTR_ERR (mtd) == -ENODEV ) +if (PTR_ERR (mtd) == -ENODEV )/* Probably this is an MTD character device node path */ mtd =open_mtd_by_chdev (mtd_dev); }else
drivers/of/device.c renamed from drivers/of/device.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -161,7 +161,7 @@ int of_dma_configure(struct device *dev, coherent ? " " : " not "); iommu =of_iommu_configure (dev, np); -if (IS_ERR (iommu) &&PTR_ERR (iommu) == -EPROBE_DEFER ) +if (PTR_ERR (iommu) == -EPROBE_DEFER )return -EPROBE_DEFER ; dev_dbg(dev, "device is%sbehind an iommu\n",
drivers/pci/controller/pci-tegra.c renamed from drivers/pci/controller/pci-tegra.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -1406,7 +1406,7 @@ static struct phy *devm_of_phy_optional_ phy =devm_of_phy_get (dev, np, name);kfree (name); -if (IS_ERR (phy) &&PTR_ERR (phy) == -ENODEV ) +if (PTR_ERR (phy) == -ENODEV ) phy =NULL ;return phy;
drivers/phy/phy-core.c renamed from drivers/phy/phy-core.c~treewide-remove-redundent-is_err-before-error-code-check +2 -2
@@ -712,7 +712,7 @@ struct phy *phy_optional_get(struct devi {struct phy *phy =phy_get (dev, string); -if (IS_ERR (phy) && (PTR_ERR (phy) == -ENODEV )) +if (PTR_ERR (phy) == -ENODEV ) phy =NULL ;return phy;
@@ -766,7 +766,7 @@ struct phy *devm_phy_optional_get(struct {struct phy *phy =devm_phy_get (dev, string); -if (IS_ERR (phy) && (PTR_ERR (phy) == -ENODEV )) +if (PTR_ERR (phy) == -ENODEV ) phy =NULL ;return phy;
drivers/spi/spi-orion.c renamed from drivers/spi/spi-orion.c~treewide-remove-redundent-is_err-before-error-code-check +1 -2
@@ -646,8 +646,7 @@ static int orion_spi_probe(struct platfo/* The following clock is only used by some SoCs */ spi->axi_clk =devm_clk_get (&pdev->dev,"axi" ); -if (IS_ERR (spi->axi_clk) && -PTR_ERR (spi->axi_clk) == -EPROBE_DEFER ) { +if (PTR_ERR (spi->axi_clk) == -EPROBE_DEFER ) { status = -EPROBE_DEFER ; goto out_rel_clk; }
drivers/video/fbdev/imxfb.c renamed from drivers/video/fbdev/imxfb.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -1017,7 +1017,7 @@ static int imxfb_probe(struct platform_d } fbi->lcd_pwr =devm_regulator_get (&pdev->dev,"lcd" ); -if (IS_ERR (fbi->lcd_pwr) && (PTR_ERR (fbi->lcd_pwr) == -EPROBE_DEFER )) { +if (PTR_ERR (fbi->lcd_pwr) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto failed_lcd; }
fs/ext4/super.c renamed from fs/ext4/super.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -6043,7 +6043,7 @@ static ssize_t ext4_quota_write(struct s bh =ext4_bread (handle, inode, blk,EXT4_GET_BLOCKS_CREATE |EXT4_GET_BLOCKS_METADATA_NOFAIL ); - }while (IS_ERR (bh) && (PTR_ERR (bh) == -ENOSPC ) && + }while (PTR_ERR (bh) == -ENOSPC &&ext4_should_retry_alloc (inode->i_sb, &retries));if (IS_ERR (bh))return PTR_ERR (bh);
fs/f2fs/node.c renamed from fs/f2fs/node.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -875,7 +875,7 @@ static int truncate_dnode(struct dnode_o/* get direct node */ page =f2fs_get_node_page (F2FS_I_SB (dn->inode), dn->nid); -if (IS_ERR (page) &&PTR_ERR (page) == -ENOENT ) +if (PTR_ERR (page) == -ENOENT )return 1 ;else if (IS_ERR (page))return PTR_ERR (page);
fs/ocfs2/suballoc.c renamed from fs/ocfs2/suballoc.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -696,7 +696,7 @@ static int ocfs2_block_group_alloc(struc bg_bh =ocfs2_block_group_alloc_contig (osb, handle, alloc_inode, ac, cl); -if (IS_ERR (bg_bh) && (PTR_ERR (bg_bh) == -ENOSPC )) +if (PTR_ERR (bg_bh) == -ENOSPC ) bg_bh =ocfs2_block_group_alloc_discontig (handle, alloc_inode, ac, cl);
fs/sysfs/group.c renamed from fs/sysfs/group.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -449,7 +449,7 @@ int __compat_only_sysfs_link_entry_to_ko } link =kernfs_create_link (kobj->sd, target_name, entry); -if (IS_ERR (link) &&PTR_ERR (link) == -EEXIST ) +if (PTR_ERR (link) == -EEXIST )sysfs_warn_dup (kobj->sd, target_name);kernfs_put (entry);
net/core/dev.c renamed from net/core/dev.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -5792,7 +5792,7 @@ static enum gro_result dev_gro_receive(sif (&ptype->list == head) goto normal; -if (IS_ERR (pp) &&PTR_ERR (pp) == -EINPROGRESS ) { +if (PTR_ERR (pp) == -EINPROGRESS ) { ret =GRO_CONSUMED ; goto ok; }
net/core/filter.c renamed from net/core/filter.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -1573,7 +1573,7 @@ int sk_reuseport_attach_bpf(u32 ufd, strreturn -EPERM ; prog =bpf_prog_get_type (ufd,BPF_PROG_TYPE_SOCKET_FILTER ); -if (IS_ERR (prog) &&PTR_ERR (prog) == -EINVAL ) +if (PTR_ERR (prog) == -EINVAL ) prog =bpf_prog_get_type (ufd,BPF_PROG_TYPE_SK_REUSEPORT );if (IS_ERR (prog))return PTR_ERR (prog);
net/xfrm/xfrm_policy.c renamed from net/xfrm/xfrm_policy.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -3189,7 +3189,7 @@ struct dst_entry *xfrm_lookup_route(stru flags |XFRM_LOOKUP_QUEUE | XFRM_LOOKUP_KEEP_DST_REF); -if (IS_ERR (dst) &&PTR_ERR (dst) == -EREMOTE ) +if (PTR_ERR (dst) == -EREMOTE )return make_blackhole (net, dst_orig->ops->family, dst_orig);if (IS_ERR (dst))
sound/soc/codecs/ak4104.c renamed from sound/soc/codecs/ak4104.c~treewide-remove-redundent-is_err-before-error-code-check +1 -2
@@ -295,8 +295,7 @@ static int ak4104_spi_probe(struct spi_d reset_gpiod =devm_gpiod_get_optional (&spi->dev,"reset" ,GPIOD_OUT_HIGH ); -if (IS_ERR (reset_gpiod) && -PTR_ERR (reset_gpiod) == -EPROBE_DEFER ) +if (PTR_ERR (reset_gpiod) == -EPROBE_DEFER )return -EPROBE_DEFER ;/* read the 'reserved' register - according to the datasheet, it
sound/soc/codecs/cs4270.c renamed from sound/soc/codecs/cs4270.c~treewide-remove-redundent-is_err-before-error-code-check +1 -2
@@ -681,8 +681,7 @@ static int cs4270_i2c_probe(struct i2c_c reset_gpiod =devm_gpiod_get_optional (&i2c_client->dev,"reset" ,GPIOD_OUT_HIGH ); -if (IS_ERR (reset_gpiod) && -PTR_ERR (reset_gpiod) == -EPROBE_DEFER ) +if (PTR_ERR (reset_gpiod) == -EPROBE_DEFER )return -EPROBE_DEFER ; cs4270->regmap =devm_regmap_init_i2c (i2c_client, &cs4270_regmap);
sound/soc/codecs/tlv320aic32x4.c renamed from sound/soc/codecs/tlv320aic32x4.c~treewide-remove-redundent-is_err-before-error-code-check +2 -4
@@ -1098,11 +1098,9 @@ static int aic32x4_setup_regulators(strureturn PTR_ERR (aic32x4->supply_av); } }else { -if (IS_ERR (aic32x4->supply_dv) && -PTR_ERR (aic32x4->supply_dv) == -EPROBE_DEFER ) +if (PTR_ERR (aic32x4->supply_dv) == -EPROBE_DEFER )return -EPROBE_DEFER ; -if (IS_ERR (aic32x4->supply_av) && -PTR_ERR (aic32x4->supply_av) == -EPROBE_DEFER ) +if (PTR_ERR (aic32x4->supply_av) == -EPROBE_DEFER )return -EPROBE_DEFER ; }
sound/soc/sunxi/sun4i-spdif.c renamed from sound/soc/sunxi/sun4i-spdif.c~treewide-remove-redundent-is_err-before-error-code-check +1 -1
@@ -555,7 +555,7 @@ static int sun4i_spdif_probe(struct platif (quirks->has_reset) { host->rst =devm_reset_control_get_optional_exclusive (&pdev->dev,NULL ); -if (IS_ERR (host->rst) &&PTR_ERR (host->rst) == -EPROBE_DEFER ) { +if (PTR_ERR (host->rst) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ;dev_err (&pdev->dev,"Failed to get reset: %d\n" , ret);return ret;
_
Andrew Morton
maintainerPATCH 67/67 ARM: dma-api: fix max_pfn off-by-one error in __dma_supported()
In reply to Andrew MortonFrom: Chen-Yu Tsai <[email protected]>
Subject: ARM: dma-api: fix max_pfn off-by-one error in __dma_supported()
max_pfn, as set in arch/arm/mm/init.c:
static void __init find_limits(unsigned long *min,
unsigned long *max_low,
unsigned long *max_high)
{
*max_low = PFN_DOWN(memblock_get_current_limit());
*min = PFN_UP(memblock_start_of_DRAM());
*max_high = PFN_DOWN(memblock_end_of_DRAM());
}with memblock_end_of_DRAM() pointing to the next byte after DRAM. As such, max_pfn points to the PFN after the end of DRAM.
Thus when using max_pfn to check DMA masks, we should subtract one when checking DMA ranges against it.
Commit 8bf1268f48ad ("ARM: dma-api: fix off-by-one error in __dma_supported()") fixed the same issue, but missed this spot.
This issue was found while working on the sun4i-csi v4l2 driver on the Allwinner R40 SoC. On Allwinner SoCs, DRAM is offset at 0x40000000, and we are starting to use of_dma_configure() with the "dma-ranges" property in the device tree to have the DMA API handle the offset.
In this particular instance, dma-ranges was set to the same range as the actual available (2 GiB) DRAM. The following error appeared when the driver attempted to allocate a buffer:
sun4i-csi 1c09000.csi: Coherent DMA mask 0x7fffffff (pfn 0x40000-0xc0000)
covers a smaller range of system memory than the DMA zone pfn 0x0-0xc0001
sun4i-csi 1c09000.csi: dma_alloc_coherent of size 307200 failedFixing the off-by-one error makes things work.
---
arch/arm/mm/dma-mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mm/dma-mapping.c renamed from arch/arm/mm/dma-mapping.c~arm-dma-api-fix-max_pfn-off-by-one-error-in-__dma_supported +1 -1
@@ -221,7 +221,7 @@ EXPORT_SYMBOL(arm_coherent_dma_ops);static int __dma_supported (struct device *dev,u64 mask,bool warn) { -unsigned long max_dma_pfn =min (max_pfn, arm_dma_pfn_limit); +unsigned long max_dma_pfn =min (max_pfn -1 , arm_dma_pfn_limit);/* * Translate the device's DMA mask to a PFN limit. This
_
[merged] mips-kdb-remove-old-workaround-for-backtracing-on-other-cpus.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: MIPS: kdb: remove old workaround for backtracing on other CPUs has been removed from the -mm tree. Its filename was…
The patch titled
Subject: MIPS: kdb: remove old workaround for backtracing on other CPUs
has been removed from the -mm tree. Its filename was
mips-kdb-remove-old-workaround-for-backtracing-on-other-cpus.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: MIPS: kdb: remove old workaround for backtracing on other CPUs
Patch series "kdb: Don't implicitly change tasks; plus misc fixups".
This patch (of 5):
As of commit 2277b492582d ("kdb: Fix stack crawling on 'running' CPUs that aren't the master") we no longer need any special case for doing stack dumps on CPUs that are not the kdb master. Let's remove.
---
arch/mips/kernel/traps.c | 5 ----- 1 file changed, 5 deletions(-)
arch/mips/kernel/traps.c renamed from arch/mips/kernel/traps.c~mips-kdb-remove-old-workaround-for-backtracing-on-other-cpus +0 -5
@@ -210,11 +210,6 @@ void show_stack(struct task_struct *task regs.regs[29 ] = task->thread.reg29; regs.regs[31 ] =0 ; regs.cp0_epc = task->thread.reg31; -#ifdef CONFIG_KGDB_KDB - }else if (atomic_read (&kgdb_active) !=-1 && - kdb_current_regs) { -memcpy (®s, kdb_current_regs,sizeof (regs)); -#endif /* CONFIG_KGDB_KDB */ }else {prepare_frametrace (®s); }
_
Patches currently in -mm which might be from [email protected] are
kdb-kdb_current_regs-should-be-private.patch kdb-kdb_current_task-shouldnt-be-exported.patch kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch
[merged] kdb-kdb_current_regs-should-be-private.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: kdb: kdb_current_regs should be private has been removed from the -mm tree. Its filename was kdb-kdb_current_regs-should-be-private.patch
The patch titled
Subject: kdb: kdb_current_regs should be private
has been removed from the -mm tree. Its filename was
kdb-kdb_current_regs-should-be-private.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: kdb: kdb_current_regs should be private
As of the patch ("MIPS: kdb: Remove old workaround for backtracing on other CPUs") there is no reason for kdb_current_regs to be in the public "kdb.h". Let's move it next to kdb_current_task.
---
include/linux/kdb.h | 2 -- kernel/debug/kdb/kdb_private.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
include/linux/kdb.h renamed from include/linux/kdb.h~kdb-kdb_current_regs-should-be-private +0 -2
@@ -183,8 +183,6 @@ int kdb_process_cpu(const struct task_streturn cpu; } -/* kdb access to register set for stack dumping */ -extern struct pt_regs *kdb_current_regs;#ifdef CONFIG_KALLSYMS extern const char *kdb_walk_kallsyms (loff_t *pos);#else /* ! CONFIG_KALLSYMS */
kernel/debug/kdb/kdb_private.h renamed from kernel/debug/kdb/kdb_private.h~kdb-kdb_current_regs-should-be-private +1 -0
@@ -242,6 +242,7 @@ extern void debug_kusage(void);extern void kdb_set_current_task (struct task_struct *);extern struct task_struct *kdb_current_task; +extern struct pt_regs *kdb_current_regs;#ifdef CONFIG_KDB_KEYBOARD extern void kdb_kbd_cleanup_state (void );
_
Patches currently in -mm which might be from [email protected] are
kdb-kdb_current_task-shouldnt-be-exported.patch kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch
[merged] kdb-kdb_current_task-shouldnt-be-exported.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: kdb: kdb_current_task shouldn't be exported has been removed from the -mm tree. Its filename was kdb-kdb_current_task-shouldnt-be-exported.patch
The patch titled
Subject: kdb: kdb_current_task shouldn't be exported
has been removed from the -mm tree. Its filename was
kdb-kdb_current_task-shouldnt-be-exported.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: kdb: kdb_current_task shouldn't be exported
The kdb_current_task variable has been declared in "kernel/debug/kdb/kdb_private.h" since 2010 when kdb was added to the mainline kernel. This is not a public header. There should be no reason that kdb_current_task should be exported and there are no in-kernel users that need it. Remove the export.
---
kernel/debug/kdb/kdb_main.c | 1 - 1 file changed, 1 deletion(-)
kernel/debug/kdb/kdb_main.c renamed from kernel/debug/kdb/kdb_main.c~kdb-kdb_current_task-shouldnt-be-exported +0 -1
@@ -73,7 +73,6 @@ int kdb_nextline = 1;int kdb_state;/* General KDB state */ struct task_struct *kdb_current_task; -EXPORT_SYMBOL (kdb_current_task);struct pt_regs *kdb_current_regs;const char *kdb_diemsg;
_
Patches currently in -mm which might be from [email protected] are
kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch
[merged] kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: kdb: get rid of implicit setting of the current task/regs has been removed from the -mm tree. Its filename was kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch
The patch titled
Subject: kdb: get rid of implicit setting of the current task/regs
has been removed from the -mm tree. Its filename was
kdb-gid-rid-of-implicit-setting-of-the-current-task-regs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: kdb: get rid of implicit setting of the current task/regs
Some (but not all?) of the kdb backtrace paths would cause the kdb_current_task and kdb_current_regs to remain changed. As discussed in a review of a previous patch [1], this doesn't seem intuitive, so let's fix that.
...but, it turns out that there's actually no longer any reason to set the current task / current regs while backtracing anymore anyway. As of commit 2277b492582d ("kdb: Fix stack crawling on 'running' CPUs that aren't the master") if we're backtracing on a task running on a CPU we ask that CPU to do the backtrace itself. Linux can do that without anything fancy. If we're doing backtrace on a sleeping task we can also do that fine without updating globals. So this patch mostly just turns into deleting a bunch of code.
[1] https://lore.kernel.org/r/[email protected]
---
kernel/debug/kdb/kdb_bt.c | 8 +------- kernel/debug/kdb/kdb_main.c | 2 +- kernel/debug/kdb/kdb_private.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-)
kernel/debug/kdb/kdb_bt.c renamed from kernel/debug/kdb/kdb_bt.c~kdb-gid-rid-of-implicit-setting-of-the-current-task-regs +1 -7
@@ -119,7 +119,6 @@ kdb_bt_cpu(unsigned long cpu)return ; } -kdb_set_current_task (kdb_tsk);kdb_bt1 (kdb_tsk, ~0UL , false); }
@@ -166,10 +165,8 @@ kdb_bt(int argc, const char **argv)if (diag)return diag; p =find_task_by_pid_ns (pid, &init_pid_ns); -if (p) { -kdb_set_current_task (p); +if (p)return kdb_bt1 (p, ~0UL , false); - }kdb_printf ("No process with pid == %ld found\n" , pid);return 0 ; }else if (strcmp (argv[0 ],"btt" ) ==0 ) {
@@ -178,11 +175,9 @@ kdb_bt(int argc, const char **argv) diag =kdbgetularg ((char *)argv[1 ], &addr);if (diag)return diag; -kdb_set_current_task ((struct task_struct *)addr);return kdb_bt1 ((struct task_struct *)addr, ~0UL , false); }else if (strcmp (argv[0 ],"btc" ) ==0 ) {unsigned long cpu = ~0 ; -struct task_struct *save_current_task = kdb_current_task;if (argc >1 )return KDB_ARGCOUNT ;if (argc ==1 ) {
@@ -204,7 +199,6 @@ kdb_bt(int argc, const char **argv)kdb_bt_cpu (cpu);touch_nmi_watchdog (); } -kdb_set_current_task (save_current_task); }return 0 ; }else {
kernel/debug/kdb/kdb_main.c renamed from kernel/debug/kdb/kdb_main.c~kdb-gid-rid-of-implicit-setting-of-the-current-task-regs +1 -1
@@ -1138,7 +1138,7 @@ static void kdb_dumpregs(struct pt_regs console_loglevel = old_lvl; } -void kdb_set_current_task (struct task_struct *p) +static void kdb_set_current_task (struct task_struct *p) { kdb_current_task = p;
kernel/debug/kdb/kdb_private.h renamed from kernel/debug/kdb/kdb_private.h~kdb-gid-rid-of-implicit-setting-of-the-current-task-regs +0 -1
@@ -240,7 +240,6 @@ extern void *debug_kmalloc(size_t size,extern void debug_kfree (void *);extern void debug_kusage (void ); -extern void kdb_set_current_task (struct task_struct *);extern struct task_struct *kdb_current_task;extern struct pt_regs *kdb_current_regs;
_
Patches currently in -mm which might be from [email protected] are
kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch
[merged] kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: kdb: get rid of confusing diag msg from "rd" if current task has no regs has been removed from the -mm tree. Its filename was…
The patch titled
Subject: kdb: get rid of confusing diag msg from "rd" if current task has no regs
has been removed from the -mm tree. Its filename was
kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Douglas Anderson <[email protected]>
Subject: kdb: get rid of confusing diag msg from "rd" if current task has no regs
If you switch to a sleeping task with the "pid" command and then type "rd", kdb tells you this:
No current kdb registers. You may need to select another task
diag: -17: Invalid register name
The first message makes sense, but not the second. Fix it by just returning 0 after commands accessing the current registers finish if we've already printed the "No current kdb registers" error.
While fixing kdb_rd(), change the function to use "if" rather than "ifdef". It cleans the function up a bit and any modern compiler will have no trouble handling still producing good code.
---
kernel/debug/kdb/kdb_main.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
kernel/debug/kdb/kdb_main.c renamed from kernel/debug/kdb/kdb_main.c~kdb-get-rid-of-confusing-diag-msg-from-rd-if-current-task-has-no-regs +13 -15
@@ -543,9 +543,8 @@ int kdbgetaddrarg(int argc, const char *if (diag)return diag; }else if (symname[0 ] =='%' ) { - diag =kdb_check_regs (); -if (diag) -return diag; +if (kdb_check_regs ()) +return 0 ;/* Implement register values with % at a later time as it is * arch optional. */
@@ -1836,8 +1835,7 @@ static int kdb_go(int argc, const char **/ static int kdb_rd (int argc,const char **argv) { -int len =kdb_check_regs (); -#if DBG_MAX_REG_NUM >0 +int len =0 ;int i;char *rname;int rsize;
@@ -1846,8 +1844,14 @@ static int kdb_rd(int argc, const char *u16 reg16;u8 reg8; -if (len) -return len; +if (kdb_check_regs ()) +return 0 ; + +/* Fallback to Linux showregs() if we don't have DBG_MAX_REG_NUM */ +if (DBG_MAX_REG_NUM <=0 ) { +kdb_dumpregs (kdb_current_regs); +return 0 ; + }for (i =0 ; i <DBG_MAX_REG_NUM ; i++) { rsize = dbg_reg_def[i].size *2 ;
@@ -1889,12 +1893,7 @@ static int kdb_rd(int argc, const char * } }kdb_printf ("\n" ); -#else -if (len) -return len; -kdb_dumpregs (kdb_current_regs); -#endif return 0 ; }
@@ -1928,9 +1927,8 @@ static int kdb_rm(int argc, const char *if (diag)return diag; - diag =kdb_check_regs (); -if (diag) -return diag; +if (kdb_check_regs ()) +return 0 ; diag =KDB_BADREG ;for (i =0 ; i <DBG_MAX_REG_NUM ; i++) {
_
Patches currently in -mm which might be from [email protected] are
[obsolete] linux-next-git-rejects.patch removed from -mm tree
In reply to Andrew MortonThe patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch
The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <[email protected]>
Subject: linux-next-git-rejects
---
fs/f2fs/data.c | 13 ------------- fs/jbd2/journal.c | 3 --- fs/xfs/libxfs/xfs_attr_remote.c | 15 --------------- init/main.c | 10 ---------- 4 files changed, 41 deletions(-)
fs/f2fs/data.c renamed from fs/f2fs/data.c~linux-next-git-rejects +0 -13
@@ -2815,7 +2815,6 @@ readd: done =1 ;break ; } -<<<<<<< HEADif (!f2fs_cluster_can_merge_page (&cc, page->index)) {
@@ -2826,18 +2825,6 @@ readd: goto result; } -======= - -if (!f2fs_cluster_can_merge_page (&cc, - page->index)) { - ret =f2fs_write_multi_pages (&cc, - &submitted, wbc, io_type); -if (!ret) - need_readd = true; - goto result; - } - ->>>>>>> linux-next/akpm-baseif (unlikely (f2fs_cp_error (sbi))) goto lock_page;
fs/jbd2/journal.c renamed from fs/jbd2/journal.c~linux-next-git-rejects +0 -3
@@ -806,12 +806,9 @@ int jbd2_journal_bmap(journal_t *journal __func__, blocknr, journal->j_devname); err = -EIO ;jbd2_journal_abort (journal, err); -<<<<<<< HEAD -======= }else { *retp = block; ->>>>>>> linux-next/akpm-base } }else {
fs/xfs/libxfs/xfs_attr_remote.c renamed from fs/xfs/libxfs/xfs_attr_remote.c~linux-next-git-rejects +0 -15
@@ -418,24 +418,9 @@ xfs_attr_rmtval_get( (map[i].br_startblock != HOLESTARTBLOCK)); dblkno =XFS_FSB_TO_DADDR (mp, map[i].br_startblock); dblkcnt =XFS_FSB_TO_BB (mp, map[i].br_blockcount); -<<<<<<< HEAD - bp =xfs_buf_read (mp->m_ddev_targp, dblkno, dblkcnt,0 , - &xfs_attr3_rmt_buf_ops); -if (!bp) -return -ENOMEM ; - error = bp->b_error; -if (error) { -xfs_buf_ioerror_alert (bp, __func__); -xfs_buf_relse (bp); - -/* bad CRC means corrupted metadata */ -if (error == -EFSBADCRC ) - error = -EFSCORRUPTED ; -======= error =xfs_buf_read (mp->m_ddev_targp, dblkno, dblkcnt,0 , &bp, &xfs_attr3_rmt_buf_ops);if (error) ->>>>>>> linux-next/akpm-basereturn error; }
init/main.c renamed from init/main.c~linux-next-git-rejects +0 -6
@@ -1161,17 +1161,7 @@ static const char *initcall_level_names[ "late", }; -<<<<<<< HEAD -static int __init ignore_unknown_bootoption (char *param,char *val, -const char *unused,void *arg) -{ -return 0 ; -}
Quoted 2 lines · Andrew Morton
The rest of MM and the rest of everything else.
What's the base? You've changed your scripts or something, and that information is no longer in your cover letter..
Linus
Andrew Morton
maintainerQuoted 7 lines · On Tue, 4 Feb 2020 02:27:48 +0000 Linus Torvalds…
Quoted 2 lines · Andrew Morton
The rest of MM and the rest of everything else.
What's the base? You've changed your scripts or something, and that information is no longer in your cover letter..
Crap, sorry, geriatric.
d4e9056daedca3891414fe3c91de3449a5dad0f2
Quoted 9 lines · Andrew Morton
Quoted 2 lines · On Tue, 4 Feb 2020 02:27:48 +0000 Linus Torvalds…
What's the base? You've changed your scripts or something, and that information is no longer in your cover letter..
Crap, sorry, geriatric.
d4e9056daedca3891414fe3c91de3449a5dad0f2
Ok, I've tentatively applied it with the MIME decoding fixes I found, and I'll guess I'll let it build and sit for a while before merging it into my tree.
I didn't find anything else odd in there. But...
Linus
+ mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch added to -mm tree
In reply to Andrew MortonThe patch titled Subject: mm: don't prepare anon_vma if vma has VM_WIPEONFORK has been added to the -mm tree. Its filename is mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch
The patch titled
Subject: mm: don't prepare anon_vma if vma has VM_WIPEONFORK
has been added to the -mm tree. Its filename is
mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------
From: Li Xinhai <[email protected]>
Subject: mm: don't prepare anon_vma if vma has VM_WIPEONFORK
Patch series "mm: Fix misuse of parent anon_vma in dup_mmap path".
This patchset fixes the misuse of parenet anon_vma, which mainly caused by child vma's vm_next and vm_prev are left same as its parent after duplicate vma. Finally, code reached parent vma's neighbor by referring pointer of child vma and executed wrong logic.
The first two patches fix relevant issues, and the third patch sets vm_next and vm_prev to NULL when duplicate vma to prevent potential misuse in future.
This patch (of 3):
In dup_mmap(), anon_vma_prepare() is called for vma has VM_WIPEONFORK, and parameter 'tmp' (i.e., the new vma of child) has same ->vm_next and ->vm_prev as its parent vma. That allows anon_vma used by parent been mistakenly shared by child (find_mergeable_anon_vma() will do this reuse work).
Besides this issue, call anon_vma_prepare() should be avoided because we don't copy page for this vma. Preparing anon_vma will be handled during fault.
---
kernel/fork.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
kernel/fork.c renamed from kernel/fork.c~mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork +5 -3
@@ -552,10 +552,12 @@ static __latent_entropy int dup_mmap(strif (retval) goto fail_nomem_anon_vma_fork;if (tmp->vm_flags &VM_WIPEONFORK ) { -/* VM_WIPEONFORK gets a clean slate in the child. */ +/* +* VM_WIPEONFORK gets a clean slate in the child. +* Don't prepare anon_vma until fault since we don't +* copy page for current vma. +*/ tmp->anon_vma =NULL ; -if (anon_vma_prepare (tmp)) - goto fail_nomem_anon_vma_fork; }else if (anon_vma_fork (tmp, mpnt)) goto fail_nomem_anon_vma_fork; tmp->vm_flags &= ~(VM_LOCKED |VM_LOCKONFAULT );
_
Patches currently in -mm which might be from [email protected] are
mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch
+ revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch added to -mm tree
In reply to Andrew MortonThe patch titled Subject: Revert "mm/rmap.c: reuse mergeable anon_vma as parent when fork" has been added to the -mm tree. Its filename is…
The patch titled
Subject: Revert "mm/rmap.c: reuse mergeable anon_vma as parent when fork"
has been added to the -mm tree. Its filename is
revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------
From: Li Xinhai <[email protected]>
Subject: Revert "mm/rmap.c: reuse mergeable anon_vma as parent when fork"
This reverts commit 4e4a9eb921332b9d1 ("mm/rmap.c: reuse mergeable anon_vma as parent when fork").
In dup_mmap(), anon_vma_fork() is called for attaching anon_vma and parameter 'tmp' (i.e., the new vma of child) has same ->vm_next and ->vm_prev as its parent vma. That causes the anon_vma used by parent been mistakenly shared by child (In anon_vma_clone(), the code added by that commit will do this reuse work).
Besides this issue, the design of reusing anon_vma from vma which has gone through fork should be avoided ([1]). So, this patch reverts that commit and maintains the consistent logic of reusing anon_vma for fork/split/merge vma.
[1] commit d0e9fe1758f2 ("Simplify and comment on anon_vma re-use for anon_vma_prepare()") explains the test of "list_is_singular()".
---
mm/rmap.c | 13 ------------- 1 file changed, 13 deletions(-)
mm/rmap.c renamed from mm/rmap.c~revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork +0 -12
@@ -269,19 +269,6 @@ int anon_vma_clone(struct vm_area_struct {struct anon_vma_chain *avc, *pavc;struct anon_vma *root =NULL ; -struct vm_area_struct *prev = dst->vm_prev, *pprev = src->vm_prev; - -/* -* If parent share anon_vma with its vm_prev, keep this sharing in in -* child. -* -* 1. Parent has vm_prev, which implies we have vm_prev. -* 2. Parent and its vm_prev have the same anon_vma. -*/ -if (!dst->anon_vma && src->anon_vma && - pprev && pprev->anon_vma == src->anon_vma) - dst->anon_vma = prev->anon_vma;
+ mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch added to -mm tree
In reply to Andrew MortonThe patch titled Subject: mm: set vm_next and vm_prev to NULL in vm_area_dup() has been added to the -mm tree. Its filename is mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch
The patch titled
Subject: mm: set vm_next and vm_prev to NULL in vm_area_dup()
has been added to the -mm tree. Its filename is
mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------
From: Li Xinhai <[email protected]>
Subject: mm: set vm_next and vm_prev to NULL in vm_area_dup()
Set ->vm_next and ->vm_prev to NULL to prevent potential misuse from the new duplicated vma.
Currently, only in fork path there are misuse for handling anon_vma. No other bugs been revealed with this patch applied.
---
kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/fork.c renamed from kernel/fork.c~mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup +1 -1
@@ -361,6 +361,7 @@ struct vm_area_struct *vm_area_dup(strucif (new) { *new = *orig;INIT_LIST_HEAD (&new->anon_vma_chain); + new->vm_next = new->vm_prev =NULL ; }return new; }
@@ -561,7 +562,6 @@ static __latent_entropy int dup_mmap(str }else if (anon_vma_fork (tmp, mpnt)) goto fail_nomem_anon_vma_fork; tmp->vm_flags &= ~(VM_LOCKED |VM_LOCKONFAULT ); - tmp->vm_next = tmp->vm_prev =NULL ; file = tmp->vm_file;if (file) {struct inode *inode =file_inode (file);
_
Patches currently in -mm which might be from [email protected] are
mm-dont-prepare-anon_vma-if-vma-has-vm_wipeonfork.patch revert-mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch mm-set-vm_next-and-vm_prev-to-null-in-vm_area_dup.patch