# 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-11.3.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 de5cb0dcb74c294ec527eddfe5094acfdb21ff21 # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig 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] # < make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig 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] # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- 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:37: warning: conversion from 'long long unsigned int' to 'resource_size_t' {aka 'unsigned int'} changes value from '18446744073709551615' to '4294967295' [-Woverflow] 93 | ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) | ^ /kisskb/src/include/linux/minmax.h:96:9: note: in expansion of macro '__cmp_once_unique' 96 | __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' 213 | #define min_t(type, x, y) __cmp_once(min, type, x, y) | ^~~~~~~~~~ /kisskb/src/kernel/resource.c:1874:23: note: in expansion of macro 'min_t' 1874 | 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:37: warning: conversion from 'long long unsigned int' to 'resource_size_t' {aka 'unsigned int'} changes value from '18446744073709551615' to '4294967295' [-Woverflow] 93 | ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) | ^ /kisskb/src/include/linux/minmax.h:96:9: note: in expansion of macro '__cmp_once_unique' 96 | __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' 213 | #define min_t(type, x, y) __cmp_once(min, type, x, y) | ^~~~~~~~~~ /kisskb/src/kernel/resource.c:1891:24: note: in expansion of macro 'min_t' 1891 | addr <= min_t(resource_size_t, base->end, PHYSMEM_END); | ^~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:01:03.607064