* linux-next: Tree for Sep 12
@ 2023-09-12 5:26 Stephen Rothwell
2023-09-12 22:28 ` linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o) Randy Dunlap
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Stephen Rothwell @ 2023-09-12 5:26 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 34803 bytes --]
Hi all,
Changes since 20230911:
New tree: bcachefs
The bcachefs tree gained a semantic conflict against Linus' tree for
which I applied a patch.
The wireless-next tree gaind a conflict against the wireless tree.
Non-merge commits (relative to Linus' tree): 4095
1552 files changed, 346893 insertions(+), 22945 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 366 trees (counting Linus' and 104 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (9852809e1515 task_work: add kerneldoc annotation for 'data' argument)
Merging kbuild-current/fixes (6ccbd7fd4746 alpha: remove __init annotation from exported page_is_ram())
Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm-current/fixes (6995e2de6891 Linux 6.4)
Merging arm64-fixes/for-next/fixes (8bd795fedb84 arm64: csum: Fix OoB access in IP checksum code for negative lengths)
Merging arm-soc-fixes/arm/fixes (3c78dbf25135 Merge tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (eb1e6ccdcf78 zorro: Include zorro.h in names.c)
Merging powerpc-fixes/fixes (4f3175979e62 powerpc/rtas_flash: allow user copy to flash block cache objects)
Merging s390-fixes/fixes (e5b7ca09e9aa Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (5a124b1fd3e6 net: ethernet: mtk_eth_soc: fix pse_port configuration for MT7988)
Merging bpf/master (b772b70b6904 selftests/bpf: Update bpf_clone_redirect expected return code)
Merging ipsec/master (f7c4e3e5d4f6 xfrm: interface: use DEV_STATS_INC())
Merging netfilter/main (7153a404fb70 Merge tag 'nf-23-09-06' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
Merging ipvs/main (931abcdcad10 Merge branch 'mlxsw-fixes')
Merging wireless/for-next (37c20b2effe9 wifi: cfg80211: fix cqm_config access race)
Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support)
Merging rdma-fixes/for-rc (0bb80ecc33a8 Linux 6.6-rc1)
Merging sound-current/for-linus (83f2a5f5c8bf ALSA: hda: cs35l56: Call pm_runtime_dont_use_autosuspend() 85;95;0c Driver remove() must call pm_runtime_dont_use_autosuspend().)
Merging sound-asoc-fixes/for-linus (e616a916fe84 Add DMI ID for MSI Bravo 15 B7ED)
Merging regmap-fixes/for-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging regulator-fixes/for-linus (6223e073db78 regulator: Fix voltage range selection)
Merging spi-fixes/for-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging pci-current/for-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging driver-core.current/driver-core-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging tty.current/tty-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging usb.current/usb-linus (f26a679ed799 usb: typec: ucsi: Fix NULL pointer dereference)
Merging usb-serial-fixes/usb-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging phy/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging staging.current/staging-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging iio-fixes/fixes-togreg (528a8891a8a5 iio: pressure: dps310: Adjust Timeout Settings)
Merging counter-current/counter-current (df8fdd01c98b counter: microchip-tcb-capture: Fix the use of internal GCLK logic)
Merging char-misc.current/char-misc-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging soundwire-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging thunderbolt-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging input-current/for-linus (1ac731c529cd Merge branch 'next' into for-linus)
Merging crypto-current/master (ba22e81872c1 crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX)
Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page)
Merging kselftest-fixes/fixes (7ab6fe6625c9 selftests: user_events: create test-specific Kconfig fragments)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (c6abce60338a mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op())
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (e7f2e65699e2 media: vcodec: Fix potential array out-of-bounds in encoder queue_setup)
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
Merging mips-fixes/mips-fixes (6eaae1980760 Linux 6.5-rc3)
Merging at91-fixes/at91-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (d5ad9aae13dc selftests/rseq: Fix build with undefined __weak)
Merging kvms390-fixes/master (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE)
Merging hwmon-fixes/hwmon (0bb80ecc33a8 Linux 6.6-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function)
Merging cxl-fixes/fixes (ad64f5952ce3 cxl/memdev: Only show sanitize sysfs files when supported)
Merging btrfs-fixes/next-fixes (b4156063ffa6 Merge branch 'misc-6.6' into next-fixes)
Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
Merging drivers-x86-fixes/fixes (4106a70ddad5 platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode)
Merging samsung-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging pinctrl-samsung-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging devicetree-fixes/dt/linus (55e95bfccf6d of: dynamic: Fix potential memory leak in of_changeset_action())
Merging dt-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging scsi-fixes/fixes (812fe6420a6e scsi: storvsc: Handle additional SRB status values)
Merging drm-fixes/drm-fixes (afaf2b38025a Merge tag 'drm-misc-next-fixes-2023-09-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging mmc-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging hyperv-fixes/hyperv-fixes (6ad0f2f91ad1 Drivers: hv: vmbus: Remove unused extern declaration vmbus_ontimer())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging riscv-dt-fixes/riscv-dt-fixes (602afaaa6ef9 riscv: dts: starfive: fix NOR flash reserved-data partition size)
Merging riscv-soc-fixes/riscv-soc-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging spdx/spdx-linus (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl-fixes/gpio/for-current (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging erofs-fixes/fixes (4da3c7183e18 erofs: drop unnecessary WARN_ON() in erofs_kill_sb())
Merging kunit-fixes/kunit-fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (9e46e4dcd9d6 mm,memblock: reset memblock.reserved to system init state to prevent UAF)
Merging nfsd-fixes/nfsd-fixes (784e1afb0032 nfsd: fix change_info in NFSv4 RENAME replies)
Merging irqchip-fixes/irq/irqchip-fixes (6fe5c68ee6a1 irqchip/gic-v3: Workaround for GIC-700 erratum 2941627)
Merging renesas-fixes/fixes (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf-tools (45fc4628c15a perf parse-events: Fix driver config term)
Merging efi-fixes/urgent (d6c221df1e32 efi/unaccepted: Use ACPI reclaim memory for unaccepted memory table)
Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
Merging battery-fixes/fixes (779873ec8130 power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo())
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (0bb80ecc33a8 Linux 6.6-rc1)
Merging rust-fixes/rust-fixes (3fa7187eceee rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`))
Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5)
Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging genpd-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (dcbad727513d drm/radeon: make fence wait in suballocator uninterrruptable)
Merging mm-stable/mm-stable (0bb80ecc33a8 Linux 6.6-rc1)
Merging mm-nonmm-stable/mm-nonmm-stable (0bb80ecc33a8 Linux 6.6-rc1)
Merging mm/mm-everything (47020fb27cae Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (6099776f9f26 Merge tag '6.6-rc-ksmbd' of git://git.samba.org/ksmbd)
Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4)
Merging perf/perf-tools-next (45fc4628c15a perf parse-events: Fix driver config term)
Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4)
Merging dma-mapping/for-next (f875db4f20f4 Revert "dma-contiguous: check for memory region overlap")
Merging asm-generic/master (6e8d96909a23 asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch")
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (133789d4a458 Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm"))
Merging arm64/for-next/core (e1df27213941 Merge branch 'for-next/selftests' into for-next/core)
Merging arm-perf/for-next/perf (21b61fe48c2f drivers/perf: hisi: Update HiSilicon PMU maintainers)
Merging arm-soc/for-next (42ed07054d75 soc: document merges)
Merging amlogic/for-next (929266f846b3 Merge branch 'v6.7/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX)
CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile
Merging aspeed/for-next (05f42491c813 ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log)
Merging at91/at91-next (b04dba7c1c30 Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (a70e8c9ff89a Merge branch 'soc/next' into next)
Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging imx-mxs/for-next (246e2cc22265 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next)
Merging mvebu/for-next (a8e364c2c428 Merge branch 'mvebu/drivers' into mvebu/for-next)
Merging omap/for-next (6387fcbea64f Merge branch 'omap-for-v6.6/ti-sysc' into for-next)
Merging qcom/for-next (9c573e27d40a Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' into for-next)
Merging renesas/next (f1f80f16cf65 Merge branches 'renesas-drivers-for-v6.7' and 'renesas-dts-for-v6.7' into renesas-next)
Merging reset/reset/next (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata())
Merging rockchip/for-next (6d1fa8808888 Merge branch 'v6.5-armsoc/dtsfixes' into for-next)
Merging samsung-krzk/for-next (a942a9ea19e3 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (1e0e61df1b2c Merge branches 'for-next/vexpress/fixes', 'for-next/scmi/fixes', 'for-next/scmi/updates' and 'for-next/pcc/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (c848f884d1b4 ARM: dts: stm32: Add Octavo OSD32MP1-RED board)
Merging sunxi/sunxi/for-next (aa333f5e8461 Merge branch 'sunxi/dt-for-6.6' into sunxi/for-next)
Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy)
Merging tegra/for-next (c62440bd774b Merge branch for-6.6/arm64/dt into for-next)
Merging ti/ti-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging xilinx/for-next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging clk/clk-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging clk-imx/for-next (72d00e560d10 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz)
Merging clk-renesas/renesas-clk (f3ea14c6a243 clk: renesas: r9a06g032: Use for_each_compatible_node())
Merging csky/linux-next (5195c35ac4f0 csky: Fixup compile error)
Merging loongarch/loongarch-next (671eae93ae20 LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (eb1e6ccdcf78 zorro: Include zorro.h in names.c)
Merging m68knommu/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging microblaze/next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging mips/mips-next (e7513eccb7d7 MIPS: TXx9: Do PCI error checks on own line)
Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment)
Merging parisc-hd/for-next (e5ef93d02d6c parisc: BTLB: Initialize BTLB tables at CPU startup)
Merging powerpc/next (85a616416e9e macintosh/ams: linux/platform_device.h is needed)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging riscv-dt/riscv-dt-for-next (a3ce3ff28385 riscv: dts: change TH1520 files to dual license)
Merging riscv-soc/riscv-soc-for-next (30fb4784483b soc: starfive: Add JH7110 AON PMU support)
Merging s390/for-next (06fc3b0d2251 s390/vmem: do not silently ignore mapping limit)
Merging sh/for-next (246f80a0b17f sh: push-switch: Reorder cleanup operations to avoid use-after-free bug)
Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning)
Merging xtensa/xtensa-for-next (03ce34cf8f50 xtensa: add XIP-aware MTD support)
Merging bcachefs/for-next (c599d278d678 bcachefs: Fix silent enum conversion error)
Applying: bcachefs: convert to dynamically allocated shrinkers
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section)
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
Merging btrfs/for-next (1886ed000c2e Merge branch 'for-next-next-v6.6-20230911' into for-next-20230911)
Merging ceph/master (ce0d5bd3a6c1 ceph: make num_fwd and num_retry to __u32)
Merging cifs/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (91b1ad0815fb erofs: release ztailpacking pclusters properly)
Merging exfat/dev (b3a62a988600 exfat: support create zero-size directory)
Merging ext3/for_next (d3cc1b0be258 quota: explicitly forbid quota files from being encrypted)
Merging ext4/dev (147d4a092e9a jbd2: Remove page size assumptions)
Merging f2fs/dev (708283abf896 Merge tag 'dmaengine-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine)
Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty)
Merging fuse/for-next (f73016b63b09 fuse: conditionally fill kstat in fuse_do_statx())
Merging gfs2/for-next (2f06468197b1 gfs2: Remove freeze_go_demote_ok)
Merging jfs/jfs-next (0225e10972fa jfs: validate max amount of blocks before allocation.)
Merging ksmbd/ksmbd-for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging nfs/linux-next (2dde18cd1d8f Linux 6.5)
Merging nfs-anna/linux-next (c4a123d2e8c4 pNFS: Fix assignment of xprtdata.cred)
Merging nfsd/nfsd-next (2553b5424d7e NFSD: add trace points to track server copy progress)
Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (724768a39374 ovl: fix incorrect fdput() on aio completion)
Merging ubifs/next (017c73a34a66 ubi: Refuse attaching if mtd's erasesize is 0)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5)
Merging xfs/for-next (c1950a111dd8 fs/xfs: Fix typos in comments)
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging iomap/iomap-for-next (377698d4abe2 Merge tag 'xfs-async-dio.6-2023-08-01' of git://git.kernel.dk/linux into iomap-6.6-mergeA)
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (519141d0d2be Merge branch 'vfs.super' into vfs.all)
Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next)
Merging printk/for-next (189f53ec6668 Merge branch 'for-6.6-fixup' into for-next)
Merging pci/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging pstore/for-next/pstore (94160062396d pstore: Base compression input buffer size on estimated compressed size)
Merging hid/for-next (bd0ffb67f8d3 Merge branch 'for-6.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (6bd4bef7f554 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (80369d9e1f2f hwmon: (sch5627) Document behaviour of limit registers)
Merging jc_docs/docs-next (c63594f2d666 Docu: genericirq.rst: fix irq-example)
Merging v4l-dvb/master (9a5d660fdb25 media: ivsc: Add ACPI dependency)
Merging v4l-dvb-next/master (4c420b729238 media: ivsc: Depend on VIDEO_DEV)
Merging pm/linux-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging cpufreq-arm/cpufreq/arm/linux-next (16567117aa0c cpufreq: Add QCM6490 to cpufreq-dt-platdev blocklist)
Merging cpupower/cpupower (0bb80ecc33a8 Linux 6.6-rc1)
Merging devfreq/devfreq-next (5693d077595d PM / devfreq: Fix leak in devfreq_dev_release())
Merging genpd/next (864de5b78119 genpd: Merge branch genpd_dt into next)
Merging opp/opp/linux-next (e576a9a8603f dt-bindings: cpufreq: Convert ti-cpufreq to json schema)
Merging thermal/thermal/linux-next (edd220b33f47 thermal: core: Drop thermal_zone_device_register())
Merging dlm/next (7c53e847ff5e dlm: fix plock lookup when using multiple lockspaces)
Merging rdma/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging net-next/main (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf-next/for-next (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa)
Merging mlx5-next/mlx5-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging netfilter-next/main (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (c2e5f4fd1148 Merge branch 'netconsole-enable-compile-time-configuration')
Merging bluetooth/master (ec63120307a6 Bluetooth: Add support for Intel Misty Peak - 8087:0038)
Merging wireless-next/for-next (2cf254c1e24f wifi: iwlwifi: increase number of RX buffers for EHT devices)
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging mtd/mtd/next (54a3f6e89fbb Merge tag 'nand/for-6.6' into mtd/next)
Merging nand/nand/next (b9283ac01a27 dt-bindings: mtd: amlogic,meson-nand: drop unneeded quotes)
Merging spi-nor/spi-nor/next (69d50d0461a1 mtd: spi-nor: nxp-spifi: Use helper function devm_clk_get_enabled())
Merging crypto/master (85b9bf9a514d Revert "dt-bindings: crypto: qcom,prng: Add SM8450")
Merging drm/drm-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape)
Merging drm-misc/for-linux-next (d20b484c674d drm/drm_exec: Work around a WW mutex lockdep oddity)
Merging amdgpu/drm-next (86f2ec226535 drm/amdgpu: Handle null atom context in VBIOS info ioctl)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
Merging drm-intel/for-linux-next (30c220a6fdd8 drm/i915/dsc: use REG_BIT, REG_GENMASK, and friends for PPS0 and PPS1)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (34b149ecae85 drm/msm/a6xx: Bail out early if setting GPU OOB fails)
Merging drm-msm-lumag/msm-next-lumag (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done)
Merging etnaviv/etnaviv/next (88c31d2dd191 drm/etnaviv: fix error code in event_alloc())
Merging fbdev/for-next (2dde18cd1d8f Linux 6.5)
Merging regmap/for-next (d3601857e14d regmap: debugfs: Fix a erroneous check after snprintf())
Merging sound/for-next (83f2a5f5c8bf ALSA: hda: cs35l56: Call pm_runtime_dont_use_autosuspend() 85;95;0c Driver remove() must call pm_runtime_dont_use_autosuspend().)
Merging ieee1394/for-next (2dde18cd1d8f Linux 6.5)
Merging sound-asoc/for-next (dbc5c85d1a3e Merge remote-tracking branch 'asoc/for-6.7' into asoc-next)
Merging modules/modules-next (33c24bee4b78 kallsyms: Add more debug output for selftest)
Merging input/next (305dd7645503 Input: wdt87xx_i2c - use device core to create driver-specific device attributes)
Merging block/for-next (a30edd242a49 Merge branch 'io_uring-futex' into for-next)
Merging device-mapper/for-next (1e4ab7b4c881 dm cache policy smq: ensure IO doesn't prevent cleaner policy progress)
Merging libata/for-next (27fd071040e3 ata: libata-core: Disable NCQ_TRIM on Micron 1100 drives)
Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer())
Merging mmc/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging mfd/for-mfd-next (9aab92bc3a89 mfd: mc13xxx: Simplify device data fetching in probe())
Merging backlight/for-backlight-next (a4464092f2c5 backlight: led_bl: Remove redundant of_match_ptr())
Merging battery/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging regulator/for-next (b03f047d9f28 Merge remote-tracking branch 'regulator/for-6.7' into regulator-next)
Merging security/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging apparmor/apparmor-next (8884ba07786c apparmor: fix invalid reference on profile->disconnected)
Merging integrity/next-integrity (55e2b69649be kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging watchdog/master (8c776a0401f1 watchdog: Add support for Amlogic-T7 SoCs)
Merging iommu/next (d8fe59f11096 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging audit/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging devicetree/for-next (d117ca218b16 Merge branch 'dt/header-cleanups-for-6.6' into dt/next)
Merging dt-krzk/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting)
Merging spi/for-next (2d98bdad98ae Merge existing fixes from spi/for-6.6 into new branch)
Merging tip/master (995dbc49d82b Merge branch into tip/master: 'x86/urgent')
Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes)
Merging edac/edac-for-next (ce53ad81ed36 EDAC/igen6: Fix the issue of no error events)
Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs)
Merging ftrace/for-next (fc1653abba0d Merge probes/for-next)
Merging rcu/rcu/next (94e70d269433 Merge branch 'csd-lock.2023.07.14b' into HEAD)
Merging kvm/next (d011151616e7 Merge branch 'kvm-x86-mmu-6.6' into HEAD)
Merging kvm-arm/next (169c0f23cacc KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range())
Merging kvms390/next (899e2206f46a KVM: s390: pv: Allow AP-instructions for pv-guests)
Merging kvm-riscv/riscv_kvm_next (477069398ed6 KVM: riscv: selftests: Add get-reg-list test)
Merging kvm-x86/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging xen-tip/linux-next (475505975093 xen: simplify evtchn_do_upcall() call maze)
Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' into for-next)
Merging workqueues/for-next (96796025f400 Merge branch 'for-6.6' into for-next)
Merging drivers-x86/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging chrome-platform/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging chrome-platform-firmware/for-firmware-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging hsi/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (baca986e1f2c leds: aw2013: Enable pull-up supply for interrupt and I2C)
Merging ipmi/for-next (29aa98d0fe01 Merge tag 'for-linus-2023083101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid)
Merging driver-core/driver-core-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging usb/usb-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging thunderbolt/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging usb-serial/usb-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging tty/tty-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging char-misc/char-misc-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging accel/habanalabs-next (ef8b0cb1ba37 accel/habanalabs: fix ETR/ETF flush logic)
CONFLICT (content): Merge conflict in drivers/accel/habanalabs/common/habanalabs.h
Merging coresight/next (c0a232f1e19e coresight: trbe: Fix TRBE potential sleep in atomic context)
Merging fastrpc/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging fpga/for-next (1a22ec09a2c1 fpga: region: make fpga_region_class a static const structure)
Merging icc/icc-next (6ac3f01201fa Merge branch 'icc-debugfs' into icc-next)
Merging iio/togreg (cd04b554c075 iio: pressure: ms5637: Use i2c_get_match_data())
Merging phy-next/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging soundwire/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging extcon/extcon-next (d20a3a8a32e3 extcon: cht_wc: add POWER_SUPPLY dependency)
Merging gnss/gnss-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging vfio/next (642265e22ecc vfio/pds: Send type for SUSPEND_STATUS command)
Merging w1/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging staging/staging-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging counter-next/counter-next (631c15d5f14d counter: chrdev: remove a typo in header file comment)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (0bb80ecc33a8 Linux 6.6-rc1)
Merging cgroup/for-next (78d44b824ed0 cgroup: Avoid -Wstringop-overflow warnings)
Merging scsi/for-next (bd198f03568f Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (d32533d30e21 scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dfs.c
Merging vhost/linux-next (1acfe2c12258 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed)
Merging rpmsg/for-next (569e93d37475 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (b32415652a4d gpio: eic-sprd: use atomic notifiers to notify all chips about irqs)
Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl/for-next (2eb6e8b8bcf5 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (d5301c90716a pinctrl: cherryview: fix address_space_handler() argument)
Merging pinctrl-renesas/renesas-pinctrl (21c11421db1f pinctrl: renesas: r8a7779: s/LSBC/LBSC/)
Merging pinctrl-samsung/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging pwm/for-next (4aae44f65827 pwm: lpc32xx: Remove handling of PWM channels)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (3f3f384139ed selftests: Keep symlinks, when possible)
Merging kunit/test (0bb80ecc33a8 Linux 6.6-rc1)
Merging kunit-next/kunit (9076bc476d7e kunit: Fix possible memory leak in kunit_filter_suites())
Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next)
Merging rtc/rtc-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging nvdimm/libnvdimm-for-next (08ca6906a4b7 nvdimm: Fix dereference after free in register_nvdimm_pmu())
Merging at24/at24/for-next (4cdc5dbbc1df eeprom: at24: Drop at24_get_chip_data())
Merging ntb/ntb-next (643982232860 ntb: Check tx descriptors outstanding instead of head/tail for tx queue)
Merging seccomp/for-next/seccomp (46822860a5a9 seccomp: Add missing kerndoc notations)
Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment)
Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging nvmem/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (284930a0146a x86/hyperv: Remove duplicate include)
Merging auxdisplay/auxdisplay (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command)
Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file)
Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem)
Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set)
Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment)
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (b691118f2c44 Merge remote-tracking branch 'linux-efi/urgent' into efi/next)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/slab/for-next (46a9ea668190 mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy())
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (2a2015495142 selftests/landlock: Fix a resource leak)
Merging rust/rust-next (4af84c6a85c6 rust: init: update expanded macro explanation)
Merging sysctl/sysctl-next (53f3811dfd5e sysctl: Use ctl_table_size as stopping criteria for list macro)
Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2)
Merging bitmap/bitmap-for-next (bcafd8b927ed bitmap: Remove dead code, i.e. bitmap_copy_le())
Merging hte/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging kspp/for-next/kspp (5f536ac6a5a7 LoadPin: Annotate struct dm_verity_loadpin_trusted_root_digest with __counted_by)
Merging kspp-gustavo/for-next/kspp (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent)
Merging nolibc/nolibc (0bb80ecc33a8 Linux 6.6-rc1)
Merging iommufd/for-next (0bb80ecc33a8 Linux 6.6-rc1)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o)
2023-09-12 5:26 linux-next: Tree for Sep 12 Stephen Rothwell
@ 2023-09-12 22:28 ` Randy Dunlap
2023-09-21 9:39 ` Abel Vesa
2023-09-12 22:50 ` linux-next: Tree for Sep 12 [drivers/pinctrl/nuvoton/pinctrl-npcm8xx.ko] Randy Dunlap
` (2 subsequent siblings)
3 siblings, 1 reply; 19+ messages in thread
From: Randy Dunlap @ 2023-09-12 22:28 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, linux-clk, dl-linux-imx, Abel Vesa, Peng Fan
On 9/11/23 22:26, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20230911:
>
> New tree: bcachefs
>
> The bcachefs tree gained a semantic conflict against Linus' tree for
> which I applied a patch.
>
> The wireless-next tree gaind a conflict against the wireless tree.
>
> Non-merge commits (relative to Linus' tree): 4095
> 1552 files changed, 346893 insertions(+), 22945 deletions(-)
>
> ----------------------------------------------------------------------------
on arm64:
aarch64-linux-ld: drivers/clk/imx/clk-imx8-acm.o: in function `imx8_acm_clk_probe':
clk-imx8-acm.c:(.text+0x3d0): undefined reference to `imx_check_clk_hws'
when
CONFIG_CLK_IMX8QXP=y
CONFIG_MXC_CLK=m
Should CLK_IMX8QXP select MXC_CLK?
I'll leave that patch up to the maintainers.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
--
~Randy
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 [drivers/pinctrl/nuvoton/pinctrl-npcm8xx.ko]
2023-09-12 5:26 linux-next: Tree for Sep 12 Stephen Rothwell
2023-09-12 22:28 ` linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o) Randy Dunlap
@ 2023-09-12 22:50 ` Randy Dunlap
2023-09-12 23:36 ` linux-next: Tree for Sep 12 (bcachefs, objtool) Randy Dunlap
2023-09-14 1:17 ` linux-next: Tree for Sep 12 (bcachefs) Kees Cook
3 siblings, 0 replies; 19+ messages in thread
From: Randy Dunlap @ 2023-09-12 22:50 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, tomer.maimon, Linus Walleij, linux-gpio
On 9/11/23 22:26, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20230911:
>
> New tree: bcachefs
>
> The bcachefs tree gained a semantic conflict against Linus' tree for
> which I applied a patch.
>
> The wireless-next tree gaind a conflict against the wireless tree.
>
> Non-merge commits (relative to Linus' tree): 4095
> 1552 files changed, 346893 insertions(+), 22945 deletions(-)
>
> ----------------------------------------------------------------------------
on x86_64:
when
# CONFIG_OF is not set
ERROR: modpost: "pinconf_generic_dt_node_to_map" [drivers/pinctrl/nuvoton/pinctrl-npcm8xx.ko] undefined!
Reported-by: Randy Dunlap <rdunlap@infradead.org>
--
~Randy
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-12 5:26 linux-next: Tree for Sep 12 Stephen Rothwell
2023-09-12 22:28 ` linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o) Randy Dunlap
2023-09-12 22:50 ` linux-next: Tree for Sep 12 [drivers/pinctrl/nuvoton/pinctrl-npcm8xx.ko] Randy Dunlap
@ 2023-09-12 23:36 ` Randy Dunlap
2023-09-13 21:08 ` Josh Poimboeuf
2023-09-14 1:17 ` linux-next: Tree for Sep 12 (bcachefs) Kees Cook
3 siblings, 1 reply; 19+ messages in thread
From: Randy Dunlap @ 2023-09-12 23:36 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, Kent Overstreet, Josh Poimboeuf,
Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
On 9/11/23 22:26, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20230911:
>
> New tree: bcachefs
>
> The bcachefs tree gained a semantic conflict against Linus' tree for
> which I applied a patch.
>
> The wireless-next tree gaind a conflict against the wireless tree.
>
> Non-merge commits (relative to Linus' tree): 4095
> 1552 files changed, 346893 insertions(+), 22945 deletions(-)
>
> ----------------------------------------------------------------------------
on x86_64:
vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
Full randconfig file is attached.
--
~Randy
[-- Attachment #2: config-r6878.gz --]
[-- Type: application/gzip, Size: 44641 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-12 23:36 ` linux-next: Tree for Sep 12 (bcachefs, objtool) Randy Dunlap
@ 2023-09-13 21:08 ` Josh Poimboeuf
2023-09-13 21:39 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Josh Poimboeuf @ 2023-09-13 21:08 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Kent Overstreet, Peter Zijlstra
On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
>
>
> On 9/11/23 22:26, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20230911:
> >
> > New tree: bcachefs
> >
> > The bcachefs tree gained a semantic conflict against Linus' tree for
> > which I applied a patch.
> >
> > The wireless-next tree gaind a conflict against the wireless tree.
> >
> > Non-merge commits (relative to Linus' tree): 4095
> > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> >
> > ----------------------------------------------------------------------------
>
> on x86_64:
>
> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
Here ya go:
---8<---
From: Josh Poimboeuf <jpoimboe@kernel.org>
Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
In general it's a good idea to avoid using bare unreachable() because it
introduces undefined behavior in compiled code. In this case it even
confuses GCC into emitting an empty unused
bch2_dev_buckets_reserved.part.0() function.
Use BUG() instead, which is nice and defined. While in theory it should
never trigger, if something were to go awry and the BCH_WATERMARK_NR
case were to actually hit, the failure mode is much more robust.
Fixes the following warnings:
vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
fs/bcachefs/buckets.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index f192809f50cf..0eff05c79c65 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
switch (watermark) {
case BCH_WATERMARK_NR:
- unreachable();
+ BUG();
case BCH_WATERMARK_stripe:
reserved += ca->mi.nbuckets >> 6;
fallthrough;
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-13 21:08 ` Josh Poimboeuf
@ 2023-09-13 21:39 ` Randy Dunlap
2023-09-13 23:06 ` Kent Overstreet
2023-09-14 1:01 ` Kees Cook
2 siblings, 0 replies; 19+ messages in thread
From: Randy Dunlap @ 2023-09-13 21:39 UTC (permalink / raw)
To: Josh Poimboeuf
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Kent Overstreet, Peter Zijlstra
On 9/13/23 14:08, Josh Poimboeuf wrote:
> On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
>>
>>
>> On 9/11/23 22:26, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20230911:
>>>
>>> New tree: bcachefs
>>>
>>> The bcachefs tree gained a semantic conflict against Linus' tree for
>>> which I applied a patch.
>>>
>>> The wireless-next tree gaind a conflict against the wireless tree.
>>>
>>> Non-merge commits (relative to Linus' tree): 4095
>>> 1552 files changed, 346893 insertions(+), 22945 deletions(-)
>>>
>>> ----------------------------------------------------------------------------
>>
>> on x86_64:
>>
>> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Here ya go:
>
> ---8<---
>
> From: Josh Poimboeuf <jpoimboe@kernel.org>
> Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
>
> In general it's a good idea to avoid using bare unreachable() because it
> introduces undefined behavior in compiled code. In this case it even
> confuses GCC into emitting an empty unused
> bch2_dev_buckets_reserved.part.0() function.
>
> Use BUG() instead, which is nice and defined. While in theory it should
> never trigger, if something were to go awry and the BCH_WATERMARK_NR
> case were to actually hit, the failure mode is much more robust.
>
> Fixes the following warnings:
>
> vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Thanks, Josh.
> ---
> fs/bcachefs/buckets.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
> index f192809f50cf..0eff05c79c65 100644
> --- a/fs/bcachefs/buckets.h
> +++ b/fs/bcachefs/buckets.h
> @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
>
> switch (watermark) {
> case BCH_WATERMARK_NR:
> - unreachable();
> + BUG();
> case BCH_WATERMARK_stripe:
> reserved += ca->mi.nbuckets >> 6;
> fallthrough;
--
~Randy
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-13 21:08 ` Josh Poimboeuf
2023-09-13 21:39 ` Randy Dunlap
@ 2023-09-13 23:06 ` Kent Overstreet
2023-09-14 13:41 ` Josh Poimboeuf
2023-09-14 1:01 ` Kees Cook
2 siblings, 1 reply; 19+ messages in thread
From: Kent Overstreet @ 2023-09-13 23:06 UTC (permalink / raw)
To: Josh Poimboeuf
Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Peter Zijlstra
On Wed, Sep 13, 2023 at 11:08:29PM +0200, Josh Poimboeuf wrote:
> On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
> >
> >
> > On 9/11/23 22:26, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20230911:
> > >
> > > New tree: bcachefs
> > >
> > > The bcachefs tree gained a semantic conflict against Linus' tree for
> > > which I applied a patch.
> > >
> > > The wireless-next tree gaind a conflict against the wireless tree.
> > >
> > > Non-merge commits (relative to Linus' tree): 4095
> > > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> > >
> > > ----------------------------------------------------------------------------
> >
> > on x86_64:
> >
> > vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Here ya go:
>
> ---8<---
>
> From: Josh Poimboeuf <jpoimboe@kernel.org>
> Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
>
> In general it's a good idea to avoid using bare unreachable() because it
> introduces undefined behavior in compiled code. In this case it even
> confuses GCC into emitting an empty unused
> bch2_dev_buckets_reserved.part.0() function.
>
> Use BUG() instead, which is nice and defined. While in theory it should
> never trigger, if something were to go awry and the BCH_WATERMARK_NR
> case were to actually hit, the failure mode is much more robust.
Thanks, want to do the other two cases too? :)
>
> Fixes the following warnings:
>
> vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---
> fs/bcachefs/buckets.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
> index f192809f50cf..0eff05c79c65 100644
> --- a/fs/bcachefs/buckets.h
> +++ b/fs/bcachefs/buckets.h
> @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
>
> switch (watermark) {
> case BCH_WATERMARK_NR:
> - unreachable();
> + BUG();
> case BCH_WATERMARK_stripe:
> reserved += ca->mi.nbuckets >> 6;
> fallthrough;
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-13 21:08 ` Josh Poimboeuf
2023-09-13 21:39 ` Randy Dunlap
2023-09-13 23:06 ` Kent Overstreet
@ 2023-09-14 1:01 ` Kees Cook
2023-09-14 13:51 ` Josh Poimboeuf
2023-09-14 19:15 ` Kent Overstreet
2 siblings, 2 replies; 19+ messages in thread
From: Kees Cook @ 2023-09-14 1:01 UTC (permalink / raw)
To: Josh Poimboeuf
Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Kent Overstreet, Peter Zijlstra
On Wed, Sep 13, 2023 at 11:08:29PM +0200, Josh Poimboeuf wrote:
> On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
> >
> >
> > On 9/11/23 22:26, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20230911:
> > >
> > > New tree: bcachefs
> > >
> > > The bcachefs tree gained a semantic conflict against Linus' tree for
> > > which I applied a patch.
> > >
> > > The wireless-next tree gaind a conflict against the wireless tree.
> > >
> > > Non-merge commits (relative to Linus' tree): 4095
> > > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> > >
> > > ----------------------------------------------------------------------------
> >
> > on x86_64:
> >
> > vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Here ya go:
>
> ---8<---
>
> From: Josh Poimboeuf <jpoimboe@kernel.org>
> Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
>
> In general it's a good idea to avoid using bare unreachable() because it
> introduces undefined behavior in compiled code. In this case it even
> confuses GCC into emitting an empty unused
> bch2_dev_buckets_reserved.part.0() function.
>
> Use BUG() instead, which is nice and defined. While in theory it should
> never trigger, if something were to go awry and the BCH_WATERMARK_NR
> case were to actually hit, the failure mode is much more robust.
>
> Fixes the following warnings:
>
> vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---
> fs/bcachefs/buckets.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
> index f192809f50cf..0eff05c79c65 100644
> --- a/fs/bcachefs/buckets.h
> +++ b/fs/bcachefs/buckets.h
> @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
>
> switch (watermark) {
> case BCH_WATERMARK_NR:
> - unreachable();
> + BUG();
Linus gets really upset about new BUG() usage (takes out the entire
system):
https://docs.kernel.org/process/deprecated.html#bug-and-bug-on
It'd be nicer to actually handle the impossible case. (WARN and return
0?)
-Kees
> case BCH_WATERMARK_stripe:
> reserved += ca->mi.nbuckets >> 6;
> fallthrough;
> --
> 2.41.0
>
--
Kees Cook
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-12 5:26 linux-next: Tree for Sep 12 Stephen Rothwell
` (2 preceding siblings ...)
2023-09-12 23:36 ` linux-next: Tree for Sep 12 (bcachefs, objtool) Randy Dunlap
@ 2023-09-14 1:17 ` Kees Cook
2023-09-14 19:38 ` Kent Overstreet
3 siblings, 1 reply; 19+ messages in thread
From: Kees Cook @ 2023-09-14 1:17 UTC (permalink / raw)
To: Stephen Rothwell, Kent Overstreet
Cc: Linux Next Mailing List, Linux Kernel Mailing List, linux-hardening
On Tue, Sep 12, 2023 at 03:26:45PM +1000, Stephen Rothwell wrote:
> New tree: bcachefs
Thanks for going through and fixing all the fake flexible array members.
It looks much nicer. :)
I have some questions about the remaining "markers", for example:
$ git grep -A8 '\bkey_start\b' -- fs/bcachefs
fs/bcachefs/bcachefs_format.h: __u8 key_start[0];
...
fs/bcachefs/bcachefs_format.h- __u8 pad[sizeof(struct bkey) - 3];
--
fs/bcachefs/bkey.c: u8 *l = k->key_start;
Why isn't this just:
u8 *l = k->pad
and you can drop the marker?
And some seem entirely unused, like all of "struct bch_reflink_v".
And some are going to fail at runtime, since they're still zero-sized
and being used as an actual array:
struct bch_sb_field_journal_seq_blacklist {
struct bch_sb_field field;
struct journal_seq_blacklist_entry start[0];
__u64 _data[];
};
...
memmove(&bl->start[i],
&bl->start[i + 1],
sizeof(bl->start[0]) * (nr - i));
It looks like you just want a type union for the flexible array.
This can be done like this:
struct bch_sb_field_journal_seq_blacklist {
struct bch_sb_field field;
union {
DECLARE_FLEX_ARRAY(struct journal_seq_blacklist_entry, start);
DECLARE_FLEX_ARRAY(__u64, _data);
};
};
Hopefully that helps!
-Kees
--
Kees Cook
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-13 23:06 ` Kent Overstreet
@ 2023-09-14 13:41 ` Josh Poimboeuf
0 siblings, 0 replies; 19+ messages in thread
From: Josh Poimboeuf @ 2023-09-14 13:41 UTC (permalink / raw)
To: Kent Overstreet
Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Peter Zijlstra
On Wed, Sep 13, 2023 at 07:06:26PM -0400, Kent Overstreet wrote:
> On Wed, Sep 13, 2023 at 11:08:29PM +0200, Josh Poimboeuf wrote:
> > On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
> > >
> > >
> > > On 9/11/23 22:26, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Changes since 20230911:
> > > >
> > > > New tree: bcachefs
> > > >
> > > > The bcachefs tree gained a semantic conflict against Linus' tree for
> > > > which I applied a patch.
> > > >
> > > > The wireless-next tree gaind a conflict against the wireless tree.
> > > >
> > > > Non-merge commits (relative to Linus' tree): 4095
> > > > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> > > >
> > > > ----------------------------------------------------------------------------
> > >
> > > on x86_64:
> > >
> > > vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
> >
> > Here ya go:
> >
> > ---8<---
> >
> > From: Josh Poimboeuf <jpoimboe@kernel.org>
> > Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
> >
> > In general it's a good idea to avoid using bare unreachable() because it
> > introduces undefined behavior in compiled code. In this case it even
> > confuses GCC into emitting an empty unused
> > bch2_dev_buckets_reserved.part.0() function.
> >
> > Use BUG() instead, which is nice and defined. While in theory it should
> > never trigger, if something were to go awry and the BCH_WATERMARK_NR
> > case were to actually hit, the failure mode is much more robust.
>
> Thanks, want to do the other two cases too? :)
Hm, which cases are you referring to?
--
Josh
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-14 1:01 ` Kees Cook
@ 2023-09-14 13:51 ` Josh Poimboeuf
2023-09-14 16:51 ` Kees Cook
2023-09-14 19:15 ` Kent Overstreet
1 sibling, 1 reply; 19+ messages in thread
From: Josh Poimboeuf @ 2023-09-14 13:51 UTC (permalink / raw)
To: Kees Cook
Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Kent Overstreet, Peter Zijlstra
On Wed, Sep 13, 2023 at 06:01:42PM -0700, Kees Cook wrote:
> > +++ b/fs/bcachefs/buckets.h
> > @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
> >
> > switch (watermark) {
> > case BCH_WATERMARK_NR:
> > - unreachable();
> > + BUG();
>
> Linus gets really upset about new BUG() usage (takes out the entire
> system):
> https://docs.kernel.org/process/deprecated.html#bug-and-bug-on
>
> It'd be nicer to actually handle the impossible case. (WARN and return
> 0?)
Sure, see below.
BTW, I'm about to go off grid for 1.5 weeks, so there will be no v3
coming from me anytime soon :-)
---8<---
From: Josh Poimboeuf <jpoimboe@kernel.org>
Subject: [PATCH v2] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
In general it's a good idea to avoid using bare unreachable() because it
introduces undefined behavior in compiled code. In this case it even
confuses GCC into emitting an empty unused
bch2_dev_buckets_reserved.part.0() function.
Use WARN_ON(1) instead, which is nice and defined. While in theory it
should never trigger, if something were to go awry and the
BCH_WATERMARK_NR case were to actually hit, the failure mode is more
robust.
Fixes the following warnings:
vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
fs/bcachefs/buckets.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index f192809f50cf..211f054bf83d 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -180,7 +180,8 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
switch (watermark) {
case BCH_WATERMARK_NR:
- unreachable();
+ WARN_ON(1);
+ break;
case BCH_WATERMARK_stripe:
reserved += ca->mi.nbuckets >> 6;
fallthrough;
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-14 13:51 ` Josh Poimboeuf
@ 2023-09-14 16:51 ` Kees Cook
0 siblings, 0 replies; 19+ messages in thread
From: Kees Cook @ 2023-09-14 16:51 UTC (permalink / raw)
To: Josh Poimboeuf
Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, Kent Overstreet, Peter Zijlstra
On Thu, Sep 14, 2023 at 03:51:44PM +0200, Josh Poimboeuf wrote:
> On Wed, Sep 13, 2023 at 06:01:42PM -0700, Kees Cook wrote:
> > > +++ b/fs/bcachefs/buckets.h
> > > @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
> > >
> > > switch (watermark) {
> > > case BCH_WATERMARK_NR:
> > > - unreachable();
> > > + BUG();
> >
> > Linus gets really upset about new BUG() usage (takes out the entire
> > system):
> > https://docs.kernel.org/process/deprecated.html#bug-and-bug-on
> >
> > It'd be nicer to actually handle the impossible case. (WARN and return
> > 0?)
>
> Sure, see below.
Looks good to me; thanks!
-Kees
>
> BTW, I'm about to go off grid for 1.5 weeks, so there will be no v3
> coming from me anytime soon :-)
>
> ---8<---
>
> From: Josh Poimboeuf <jpoimboe@kernel.org>
> Subject: [PATCH v2] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
>
> In general it's a good idea to avoid using bare unreachable() because it
> introduces undefined behavior in compiled code. In this case it even
> confuses GCC into emitting an empty unused
> bch2_dev_buckets_reserved.part.0() function.
>
> Use WARN_ON(1) instead, which is nice and defined. While in theory it
> should never trigger, if something were to go awry and the
> BCH_WATERMARK_NR case were to actually hit, the failure mode is more
> robust.
>
> Fixes the following warnings:
>
> vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
> vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---
> fs/bcachefs/buckets.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
> index f192809f50cf..211f054bf83d 100644
> --- a/fs/bcachefs/buckets.h
> +++ b/fs/bcachefs/buckets.h
> @@ -180,7 +180,8 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
>
> switch (watermark) {
> case BCH_WATERMARK_NR:
> - unreachable();
> + WARN_ON(1);
> + break;
> case BCH_WATERMARK_stripe:
> reserved += ca->mi.nbuckets >> 6;
> fallthrough;
> --
> 2.41.0
>
--
Kees Cook
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs, objtool)
2023-09-14 1:01 ` Kees Cook
2023-09-14 13:51 ` Josh Poimboeuf
@ 2023-09-14 19:15 ` Kent Overstreet
1 sibling, 0 replies; 19+ messages in thread
From: Kent Overstreet @ 2023-09-14 19:15 UTC (permalink / raw)
To: Kees Cook
Cc: Josh Poimboeuf, Randy Dunlap, Stephen Rothwell,
Linux Next Mailing List, Linux Kernel Mailing List,
Peter Zijlstra
On Wed, Sep 13, 2023 at 06:01:42PM -0700, Kees Cook wrote:
> On Wed, Sep 13, 2023 at 11:08:29PM +0200, Josh Poimboeuf wrote:
> > On Tue, Sep 12, 2023 at 04:36:55PM -0700, Randy Dunlap wrote:
> > >
> > >
> > > On 9/11/23 22:26, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Changes since 20230911:
> > > >
> > > > New tree: bcachefs
> > > >
> > > > The bcachefs tree gained a semantic conflict against Linus' tree for
> > > > which I applied a patch.
> > > >
> > > > The wireless-next tree gaind a conflict against the wireless tree.
> > > >
> > > > Non-merge commits (relative to Linus' tree): 4095
> > > > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> > > >
> > > > ----------------------------------------------------------------------------
> > >
> > > on x86_64:
> > >
> > > vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
> >
> > Here ya go:
> >
> > ---8<---
> >
> > From: Josh Poimboeuf <jpoimboe@kernel.org>
> > Subject: [PATCH] bcachefs: Remove undefined behavior in bch2_dev_buckets_reserved()
> >
> > In general it's a good idea to avoid using bare unreachable() because it
> > introduces undefined behavior in compiled code. In this case it even
> > confuses GCC into emitting an empty unused
> > bch2_dev_buckets_reserved.part.0() function.
> >
> > Use BUG() instead, which is nice and defined. While in theory it should
> > never trigger, if something were to go awry and the BCH_WATERMARK_NR
> > case were to actually hit, the failure mode is much more robust.
> >
> > Fixes the following warnings:
> >
> > vmlinux.o: warning: objtool: bch2_bucket_alloc_trans() falls through to next function bch2_reset_alloc_cursors()
> > vmlinux.o: warning: objtool: bch2_dev_buckets_reserved.part.0() is missing an ELF size annotation
> >
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> > ---
> > fs/bcachefs/buckets.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
> > index f192809f50cf..0eff05c79c65 100644
> > --- a/fs/bcachefs/buckets.h
> > +++ b/fs/bcachefs/buckets.h
> > @@ -180,7 +180,7 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_waterma
> >
> > switch (watermark) {
> > case BCH_WATERMARK_NR:
> > - unreachable();
> > + BUG();
>
> Linus gets really upset about new BUG() usage (takes out the entire
> system):
> https://docs.kernel.org/process/deprecated.html#bug-and-bug-on
>
> It'd be nicer to actually handle the impossible case. (WARN and return
> 0?)
No, I'm not going to be doing that.
These are truly impossible cases, i.e. if we were writing code in a
language with embedded correctness proofs this is something the compiler
would be checking and proving.
Changing all the BUG()s to WARNS() and writing error paths would mean
etiher a shit ton of error paths that never get tested, or deleting a
lot of a assertions, and I'm not doing either of those things.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-14 1:17 ` linux-next: Tree for Sep 12 (bcachefs) Kees Cook
@ 2023-09-14 19:38 ` Kent Overstreet
2023-09-14 20:13 ` Gustavo A. R. Silva
2023-09-15 0:20 ` Kees Cook
0 siblings, 2 replies; 19+ messages in thread
From: Kent Overstreet @ 2023-09-14 19:38 UTC (permalink / raw)
To: Kees Cook
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-hardening
On Wed, Sep 13, 2023 at 06:17:00PM -0700, Kees Cook wrote:
> On Tue, Sep 12, 2023 at 03:26:45PM +1000, Stephen Rothwell wrote:
> > New tree: bcachefs
>
> Thanks for going through and fixing all the fake flexible array members.
> It looks much nicer. :)
>
> I have some questions about the remaining "markers", for example:
>
> $ git grep -A8 '\bkey_start\b' -- fs/bcachefs
> fs/bcachefs/bcachefs_format.h: __u8 key_start[0];
> ...
> fs/bcachefs/bcachefs_format.h- __u8 pad[sizeof(struct bkey) - 3];
> --
> fs/bcachefs/bkey.c: u8 *l = k->key_start;
>
> Why isn't this just:
>
> u8 *l = k->pad
>
> and you can drop the marker?
In this case, it's documentation. &k->pad tells us nothing; why is pad
significant? k->key_start documents the intent better.
> And some seem entirely unused, like all of "struct bch_reflink_v".
No, those aren't unused :)
bcachefs does the "list of variable size items" a lot - see vstructs.h.
start[] is the type of the item being stored, _data is what we use for
pointer arithmetic - because we always store sizes in units of u64s, for
alignment.
>
> And some are going to fail at runtime, since they're still zero-sized
> and being used as an actual array:
>
> struct bch_sb_field_journal_seq_blacklist {
> struct bch_sb_field field;
>
> struct journal_seq_blacklist_entry start[0];
> __u64 _data[];
> };
> ...
> memmove(&bl->start[i],
> &bl->start[i + 1],
> sizeof(bl->start[0]) * (nr - i));
>
> It looks like you just want a type union for the flexible array.
> This can be done like this:
>
> struct bch_sb_field_journal_seq_blacklist {
> struct bch_sb_field field;
>
> union {
> DECLARE_FLEX_ARRAY(struct journal_seq_blacklist_entry, start);
> DECLARE_FLEX_ARRAY(__u64, _data);
> };
> };
Eesh, why though?
Honestly, I'm not a fan of the change to get rid of zero size arrays,
this seems to be adding a whole lot of macro layering and indirection
for nothing.
The only thing a zero size array could possibly be is a flexible array
member or a marker, why couldn't we have just kept treating zero size
arrays like flexible array members?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-14 19:38 ` Kent Overstreet
@ 2023-09-14 20:13 ` Gustavo A. R. Silva
2023-09-15 0:20 ` Kees Cook
1 sibling, 0 replies; 19+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-14 20:13 UTC (permalink / raw)
To: Kent Overstreet, Kees Cook
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-hardening
On 9/14/23 13:38, Kent Overstreet wrote:
> On Wed, Sep 13, 2023 at 06:17:00PM -0700, Kees Cook wrote:
>> On Tue, Sep 12, 2023 at 03:26:45PM +1000, Stephen Rothwell wrote:
>>> New tree: bcachefs
>>
>> Thanks for going through and fixing all the fake flexible array members.
>> It looks much nicer. :)
>>
>> I have some questions about the remaining "markers", for example:
>>
>> $ git grep -A8 '\bkey_start\b' -- fs/bcachefs
>> fs/bcachefs/bcachefs_format.h: __u8 key_start[0];
>> ...
>> fs/bcachefs/bcachefs_format.h- __u8 pad[sizeof(struct bkey) - 3];
>> --
>> fs/bcachefs/bkey.c: u8 *l = k->key_start;
>>
>> Why isn't this just:
>>
>> u8 *l = k->pad
>>
>> and you can drop the marker?
>
> In this case, it's documentation. &k->pad tells us nothing; why is pad
> significant? k->key_start documents the intent better.
>
>> And some seem entirely unused, like all of "struct bch_reflink_v".
>
> No, those aren't unused :)
>
> bcachefs does the "list of variable size items" a lot - see vstructs.h.
> start[] is the type of the item being stored, _data is what we use for
> pointer arithmetic - because we always store sizes in units of u64s, for
> alignment.
>
>>
>> And some are going to fail at runtime, since they're still zero-sized
>> and being used as an actual array:
>>
>> struct bch_sb_field_journal_seq_blacklist {
>> struct bch_sb_field field;
>>
>> struct journal_seq_blacklist_entry start[0];
>> __u64 _data[];
>> };
>> ...
>> memmove(&bl->start[i],
>> &bl->start[i + 1],
>> sizeof(bl->start[0]) * (nr - i));
>>
>> It looks like you just want a type union for the flexible array.
>> This can be done like this:
>>
>> struct bch_sb_field_journal_seq_blacklist {
>> struct bch_sb_field field;
>>
>> union {
>> DECLARE_FLEX_ARRAY(struct journal_seq_blacklist_entry, start);
>> DECLARE_FLEX_ARRAY(__u64, _data);
>> };
>> };
>
> Eesh, why though?
>
> Honestly, I'm not a fan of the change to get rid of zero size arrays,
> this seems to be adding a whole lot of macro layering and indirection
> for nothing.
>
> The only thing a zero size array could possibly be is a flexible array
> member or a marker, why couldn't we have just kept treating zero size
> arrays like flexible array members?
Because zero-length arrays, when used as fake flexible arrays, make
things like -Warray-bounds (we've been trying to enable this compiler
option, globally) trip; among other things like being prone to result in
undefined behavior bugs when people introduce new members that make the
array end up in the middle of its containing structure.
With C99 flexible-array members, the compiler emits a warning when the
arrays are not at the end of the structure.
The DECLARE_FLEX_ARRAY() (in a union) helper allows for multiple C99
flexible-array members together at the end of a struct.
--
Gustavo
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-14 19:38 ` Kent Overstreet
2023-09-14 20:13 ` Gustavo A. R. Silva
@ 2023-09-15 0:20 ` Kees Cook
2023-09-19 21:23 ` Kent Overstreet
1 sibling, 1 reply; 19+ messages in thread
From: Kees Cook @ 2023-09-15 0:20 UTC (permalink / raw)
To: Kent Overstreet
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-hardening
On Thu, Sep 14, 2023 at 03:38:07PM -0400, Kent Overstreet wrote:
> On Wed, Sep 13, 2023 at 06:17:00PM -0700, Kees Cook wrote:
> > It looks like you just want a type union for the flexible array.
> > This can be done like this:
> >
> > struct bch_sb_field_journal_seq_blacklist {
> > struct bch_sb_field field;
> >
> > union {
> > DECLARE_FLEX_ARRAY(struct journal_seq_blacklist_entry, start);
> > DECLARE_FLEX_ARRAY(__u64, _data);
> > };
> > };
>
> Eesh, why though?
>
> Honestly, I'm not a fan of the change to get rid of zero size arrays,
> this seems to be adding a whole lot of macro layering and indirection
> for nothing.
The C standard doesn't help us in that regard, that's true. But we've
been working to get it fixed. For example, there's discussion happening
next week at GNU Cauldron about flexible arrays in unions. It's already
possible, so better to just fix the standard -- real world code needs it
and uses it, as the bcachefs code illustrates. :)
> The only thing a zero size array could possibly be is a flexible array
> member or a marker, why couldn't we have just kept treating zero size
> arrays like flexible array members?
Because they're ambiguous and then the compiler can't do appropriate
bounds checking, compile-time diagnostics, etc. Maybe it's actually zero
sized, maybe it's not. Nothing stops them from being in the middle of
the structure so if someone accidentally tries to put members after it
(which has happened before), we end up with bizarre corruptions, etc,
etc. Flexible arrays are unambiguous, and that's why we committed to
converting all the fake flex arrays. The compiler does not have to guess
(or as has been the case: give up on) figuring out what was intended.
Regardless, I'm just trying to help make sure folks that run with
CONFIG_UBSAN_BOUNDS=y (as done in Android, Ubuntu, etc) will be able to
use bcachefs without runtime warnings, etc. Indexing through a 0-sized
array is going to trip the diagnostic either at runtime or when building
with -Warray-bounds.
-Kees
--
Kees Cook
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-15 0:20 ` Kees Cook
@ 2023-09-19 21:23 ` Kent Overstreet
2023-09-20 15:21 ` Kees Cook
0 siblings, 1 reply; 19+ messages in thread
From: Kent Overstreet @ 2023-09-19 21:23 UTC (permalink / raw)
To: Kees Cook
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-hardening
On Thu, Sep 14, 2023 at 05:20:41PM -0700, Kees Cook wrote:
> Because they're ambiguous and then the compiler can't do appropriate
> bounds checking, compile-time diagnostics, etc. Maybe it's actually zero
> sized, maybe it's not. Nothing stops them from being in the middle of
> the structure so if someone accidentally tries to put members after it
> (which has happened before), we end up with bizarre corruptions, etc,
> etc. Flexible arrays are unambiguous, and that's why we committed to
> converting all the fake flex arrays. The compiler does not have to guess
> (or as has been the case: give up on) figuring out what was intended.
So it does seem like we need to be able to distinguish between normal
flex arrays that go at the end of a struct vs. - what should we call
them, markers? that go in the middle.
> Regardless, I'm just trying to help make sure folks that run with
> CONFIG_UBSAN_BOUNDS=y (as done in Android, Ubuntu, etc) will be able to
> use bcachefs without runtime warnings, etc. Indexing through a 0-sized
> array is going to trip the diagnostic either at runtime or when building
> with -Warray-bounds.
I do have CONFIG_UBSAN_BOUNDS=y testing in my own CI, so all the runtime
errors should be fixed now (some of them with casts, but the casts are
in helpers that know what they're doing, not scattered around at
random).
So I think we're good for now - I'm going to hold off on more cleanup
for now unless reports of actual ubsan splats turn up, since I'm getting
a bit bombarded at the moment :)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (bcachefs)
2023-09-19 21:23 ` Kent Overstreet
@ 2023-09-20 15:21 ` Kees Cook
0 siblings, 0 replies; 19+ messages in thread
From: Kees Cook @ 2023-09-20 15:21 UTC (permalink / raw)
To: Kent Overstreet
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-hardening
On Tue, Sep 19, 2023 at 05:23:18PM -0400, Kent Overstreet wrote:
> On Thu, Sep 14, 2023 at 05:20:41PM -0700, Kees Cook wrote:
> > Because they're ambiguous and then the compiler can't do appropriate
> > bounds checking, compile-time diagnostics, etc. Maybe it's actually zero
> > sized, maybe it's not. Nothing stops them from being in the middle of
> > the structure so if someone accidentally tries to put members after it
> > (which has happened before), we end up with bizarre corruptions, etc,
> > etc. Flexible arrays are unambiguous, and that's why we committed to
> > converting all the fake flex arrays. The compiler does not have to guess
> > (or as has been the case: give up on) figuring out what was intended.
>
> So it does seem like we need to be able to distinguish between normal
> flex arrays that go at the end of a struct vs. - what should we call
> them, markers? that go in the middle.
As long as markers are just treated as address offsets in an struct, I
don't see a problem with them being 0-length arrays. I personally find
them confusing since whatever follows the marker is usually what I'm
trying to address, so the marker serves no purpose.
In the case of finding the offset to a subset of struct members, we
moved all of those in the kernel to using struct_group() instead. But
again, this was just for removing ambiguity for the compiler's ability
to enforce bounds checking (in this case on the memcpy()-family of
functions).
>
> > Regardless, I'm just trying to help make sure folks that run with
> > CONFIG_UBSAN_BOUNDS=y (as done in Android, Ubuntu, etc) will be able to
> > use bcachefs without runtime warnings, etc. Indexing through a 0-sized
> > array is going to trip the diagnostic either at runtime or when building
> > with -Warray-bounds.
>
> I do have CONFIG_UBSAN_BOUNDS=y testing in my own CI, so all the runtime
> errors should be fixed now (some of them with casts, but the casts are
> in helpers that know what they're doing, not scattered around at
> random).
Great! Thank you for chasing them all down. If you also have
CONFIG_FORTIFY_SOURCE=y then that should also be checking all the
strcpy()/memcpy() families too. The only thing that may be a problem in
the future is our effort to enable -Warray-bounds at build time. GCC
still has one false positive[1] remaining, but once that's fixed
(hopefully for GCC 14) the rest of the kernel is (was?) warning-free
(in our local testing where CONFIG_CC_NO_ARRAY_BOUNDS has been disabled).
>
> So I think we're good for now - I'm going to hold off on more cleanup
> for now unless reports of actual ubsan splats turn up, since I'm getting
> a bit bombarded at the moment :)
Understood! :)
-Kees
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109071
--
Kees Cook
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o)
2023-09-12 22:28 ` linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o) Randy Dunlap
@ 2023-09-21 9:39 ` Abel Vesa
0 siblings, 0 replies; 19+ messages in thread
From: Abel Vesa @ 2023-09-21 9:39 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, Linux Next Mailing List,
Linux Kernel Mailing List, linux-clk, dl-linux-imx, Abel Vesa,
Peng Fan
On 23-09-12 15:28:29, Randy Dunlap wrote:
>
>
> On 9/11/23 22:26, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20230911:
> >
> > New tree: bcachefs
> >
> > The bcachefs tree gained a semantic conflict against Linus' tree for
> > which I applied a patch.
> >
> > The wireless-next tree gaind a conflict against the wireless tree.
> >
> > Non-merge commits (relative to Linus' tree): 4095
> > 1552 files changed, 346893 insertions(+), 22945 deletions(-)
> >
> > ----------------------------------------------------------------------------
>
> on arm64:
>
> aarch64-linux-ld: drivers/clk/imx/clk-imx8-acm.o: in function `imx8_acm_clk_probe':
> clk-imx8-acm.c:(.text+0x3d0): undefined reference to `imx_check_clk_hws'
>
> when
> CONFIG_CLK_IMX8QXP=y
> CONFIG_MXC_CLK=m
>
> Should CLK_IMX8QXP select MXC_CLK?
> I'll leave that patch up to the maintainers.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
Thanks for reporting this.
Sent a patch for it:
https://lore.kernel.org/all/20230921093647.3901752-1-abel.vesa@linaro.org/
> --
> ~Randy
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2023-09-21 18:48 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-12 5:26 linux-next: Tree for Sep 12 Stephen Rothwell
2023-09-12 22:28 ` linux-next: Tree for Sep 12 (drivers/clk/imx/clk-imx8-acm.o) Randy Dunlap
2023-09-21 9:39 ` Abel Vesa
2023-09-12 22:50 ` linux-next: Tree for Sep 12 [drivers/pinctrl/nuvoton/pinctrl-npcm8xx.ko] Randy Dunlap
2023-09-12 23:36 ` linux-next: Tree for Sep 12 (bcachefs, objtool) Randy Dunlap
2023-09-13 21:08 ` Josh Poimboeuf
2023-09-13 21:39 ` Randy Dunlap
2023-09-13 23:06 ` Kent Overstreet
2023-09-14 13:41 ` Josh Poimboeuf
2023-09-14 1:01 ` Kees Cook
2023-09-14 13:51 ` Josh Poimboeuf
2023-09-14 16:51 ` Kees Cook
2023-09-14 19:15 ` Kent Overstreet
2023-09-14 1:17 ` linux-next: Tree for Sep 12 (bcachefs) Kees Cook
2023-09-14 19:38 ` Kent Overstreet
2023-09-14 20:13 ` Gustavo A. R. Silva
2023-09-15 0:20 ` Kees Cook
2023-09-19 21:23 ` Kent Overstreet
2023-09-20 15:21 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).