# git rev-parse -q --verify f8eb5bd9a818cc5f2a1e50b22b0091830b28cc36^{commit} f8eb5bd9a818cc5f2a1e50b22b0091830b28cc36 already have revision, skipping fetch # git checkout -q -f -B kisskb f8eb5bd9a818cc5f2a1e50b22b0091830b28cc36 # git clean -qxdf # < git log -1 # commit f8eb5bd9a818cc5f2a1e50b22b0091830b28cc36 # Author: Linus Torvalds # Date: Mon Sep 23 08:58:31 2024 -0700 # # mm: fix build on 32-bit targets without MAX_PHYSMEM_BITS # # The merge resolution to deal with the conflict between commits # ea72ce5da228 ("x86/kaslr: Expose and use the end of the physical memory # address space") and 99185c10d5d9 ("resource, kunit: add test case for # region_intersects()") ended up being broken in configurations didn't # define a MAX_PHYSMEM_BITS and that had a 32-bit 'phys_addr_t'. # # The fallback to using all bits set (ie "(-1ULL)") ended up causing a # build error: # # kernel/resource.c: In function ‘gfr_start’: # include/linux/minmax.h:93:30: error: conversion from ‘long long unsigned int’ to ‘resource_size_t’ {aka ‘unsigned int’} changes value from ‘18446744073709551615’ to ‘4294967295’ [-Werror=overflow] # # this was reported by Geert for m68k, but he points out that it happens # on other 32-bit architectures too, eg mips, xtensa, parisc, and powerpc. # # Limiting 'PHYSMEM_END' to a 'phys_addr_t' (which is the same as # 'resource_size_t') fixes the build, but Geert points out that it will # then cause a silent overflow in mm/sparse.c: # # unsigned long max_sparsemem_pfn = (PHYSMEM_END + 1) >> PAGE_SHIFT; # # so we actually do want PHYSMEM_END to be defined a 64-bit type - just # not all ones, and not larger than 'phys_addr_t'. # # The proper fix is probably to not have some kind of default fallback at # all, but just make sure every architecture has a valid MAX_PHYSMEM_BITS. # But in the meantime, this just applies the rule that PHYSMEM_END is the # largest value that fits in a 'phys_addr_t', but does not have the high # bit set in 64 bits. # # Ugly, ugly. # # Reported-by: Geert Uytterhoeven # Cc: Andrew Morton # Cc: Huang Ying # Cc: Thomas Gleixner # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 f8eb5bd9a818cc5f2a1e50b22b0091830b28cc36 # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # < make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/linus_pseries_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_defconfig_powerpc-gcc5 # Build took: 0:01:54.943622