# git rev-parse -q --verify de5cb0dcb74c294ec527eddfe5094acfdb21ff21^{commit} de5cb0dcb74c294ec527eddfe5094acfdb21ff21 already have revision, skipping fetch # git checkout -q -f -B kisskb de5cb0dcb74c294ec527eddfe5094acfdb21ff21 # git clean -qxdf # < git log -1 # commit de5cb0dcb74c294ec527eddfe5094acfdb21ff21 # Merge: af9c191ac2a0 533ab223aa1a # Author: Linus Torvalds # Date: Sun Sep 22 11:19:35 2024 -0700 # # Merge branch 'address-masking' # # Merge user access fast validation using address masking. # # This allows architectures to optionally use a data dependent address # masking model instead of a conditional branch for validating user # accesses. That avoids the Spectre-v1 speculation barriers. # # Right now only x86-64 takes advantage of this, and not all architectures # will be able to do it. It requires a guard region between the user and # kernel address spaces (so that you can't overflow from one to the # other), and an easy way to generate a guaranteed-to-fault address for # invalid user pointers. # # Also note that this currently assumes that there is no difference # between user read and write accesses. If extended to architectures like # powerpc, we'll also need to separate out the user read-vs-write cases. # # * address-masking: # x86: make the masked_user_access_begin() macro use its argument only once # x86: do the user address masking outside the user access area # x86: support user address masking instead of non-speculative conditional # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 de5cb0dcb74c294ec527eddfe5094acfdb21ff21 # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- allmodconfig WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:15304:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is not an interrupt provider /kisskb/src/arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' found, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' In file included from /kisskb/src/include/linux/ioport.h:15, from /kisskb/src/kernel/resource.c:15: /kisskb/src/kernel/resource.c: In function 'gfr_start': /kisskb/src/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] ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) ^ /kisskb/src/include/linux/minmax.h:96:2: note: in expansion of macro '__cmp_once_unique' __cmp_once_unique(op, type, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_)) ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/minmax.h:213:27: note: in expansion of macro '__cmp_once' #define min_t(type, x, y) __cmp_once(min, type, x, y) ^~~~~~~~~~ /kisskb/src/kernel/resource.c:1874:9: note: in expansion of macro 'min_t' end = min_t(resource_size_t, base->end, PHYSMEM_END); ^~~~~ /kisskb/src/kernel/resource.c: In function 'gfr_continue': /kisskb/src/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] ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) ^ /kisskb/src/include/linux/minmax.h:96:2: note: in expansion of macro '__cmp_once_unique' __cmp_once_unique(op, type, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_)) ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/minmax.h:213:27: note: in expansion of macro '__cmp_once' #define min_t(type, x, y) __cmp_once(min, type, x, y) ^~~~~~~~~~ /kisskb/src/kernel/resource.c:1891:17: note: in expansion of macro 'min_t' addr <= min_t(resource_size_t, base->end, PHYSMEM_END); ^~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: kernel/resource.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1926: .] Error 2 make[1]: *** [/kisskb/src/Makefile:224: __sub-make] Error 2 make: *** [Makefile:224: __sub-make] Error 2 Command 'make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_mips-gcc8 # Build took: 0:10:32.392338