# git rev-parse -q --verify c36c04c2e132fc39f6b658bf607aed4425427fd7^{commit} c36c04c2e132fc39f6b658bf607aed4425427fd7 already have revision, skipping fetch # git checkout -q -f -B kisskb c36c04c2e132fc39f6b658bf607aed4425427fd7 # git clean -qxdf # < git log -1 # commit c36c04c2e132fc39f6b658bf607aed4425427fd7 # Author: John Hubbard # Date: Tue Feb 1 19:23:17 2022 -0800 # # Revert "mm/gup: small refactoring: simplify try_grab_page()" # # This reverts commit 54d516b1d62ff8f17cee2da06e5e4706a0d00b8a # # That commit did a refactoring that effectively combined fast and slow # gup paths (again). And that was again incorrect, for two reasons: # # a) Fast gup and slow gup get reference counts on pages in different # ways and with different goals: see Linus' writeup in commit # cd1adf1b63a1 ("Revert "mm/gup: remove try_get_page(), call # try_get_compound_head() directly""), and # # b) try_grab_compound_head() also has a specific check for # "FOLL_LONGTERM && !is_pinned(page)", that assumes that the caller # can fall back to slow gup. This resulted in new failures, as # recently report by Will McVicker [1]. # # But (a) has problems too, even though they may not have been reported # yet. So just revert this. # # Link: https://lore.kernel.org/r/20220131203504.3458775-1-willmcvicker@google.com [1] # Fixes: 54d516b1d62f ("mm/gup: small refactoring: simplify try_grab_page()") # Reported-and-tested-by: Will McVicker # Cc: Christoph Hellwig # Cc: Minchan Kim # Cc: Matthew Wilcox # Cc: Christian Borntraeger # Cc: Heiko Carstens # Cc: Vasily Gorbik # Cc: stable@vger.kernel.org # 5.15 # Signed-off-by: John Hubbard # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 c36c04c2e132fc39f6b658bf607aed4425427fd7 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12008:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12011:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12013:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12015:warning: override: reassigning to symbol UML_NET_SLIP .config:12018:warning: override: reassigning to symbol UML_NET_MCAST .config:12020:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1556:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:13:08.270249