linux56-tkg: Remove for incoming legacy branch inclusion
This commit is contained in:
Tk-Glitch
parent
c7ff176dba
commit
ed069e3a03
@ -1,407 +0,0 @@
|
|||||||
# Based on the file created for Arch Linux by:
|
|
||||||
# Tobias Powalowski <tpowa@archlinux.org>
|
|
||||||
# Thomas Baechler <thomas@archlinux.org>
|
|
||||||
|
|
||||||
# Contributor: Tk-Glitch <ti3nou at gmail dot com>
|
|
||||||
|
|
||||||
plain ' .---.` `.---.'
|
|
||||||
plain ' `/syhhhyso- -osyhhhys/`'
|
|
||||||
plain ' .syNMdhNNhss/``.---.``/sshNNhdMNys.'
|
|
||||||
plain ' +sdMh.`+MNsssssssssssssssNM+`.hMds+'
|
|
||||||
plain ' :syNNdhNNhssssssssssssssshNNhdNNys:'
|
|
||||||
plain ' /ssyhhhysssssssssssssssssyhhhyss/'
|
|
||||||
plain ' .ossssssssssssssssssssssssssssso.'
|
|
||||||
plain ' :sssssssssssssssssssssssssssssssss:'
|
|
||||||
plain ' /sssssssssssssssssssssssssssssssssss/'
|
|
||||||
plain ' :sssssssssssssoosssssssoosssssssssssss:'
|
|
||||||
plain ' osssssssssssssoosssssssoossssssssssssso'
|
|
||||||
plain ' osssssssssssyyyyhhhhhhhyyyyssssssssssso'
|
|
||||||
plain ' /yyyyyyhhdmmmmNNNNNNNNNNNmmmmdhhyyyyyy/'
|
|
||||||
plain ' smmmNNNNNNNNNNNNNNNNNNNNNNNNNNNNNmmms'
|
|
||||||
plain ' /dNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNd/'
|
|
||||||
plain ' `:sdNNNNNNNNNNNNNNNNNNNNNNNNNds:`'
|
|
||||||
plain ' `-+shdNNNNNNNNNNNNNNNdhs+-`'
|
|
||||||
plain ' `.-:///////:-.`'
|
|
||||||
|
|
||||||
_where="$PWD" # track basedir as different Arch based distros are moving srcdir around
|
|
||||||
|
|
||||||
cp "$_where"/linux56-tkg-patches/* "$_where" # copy patches inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
|
|
||||||
cp "$_where"/linux56-tkg-config/* "$_where" # copy config files and hooks inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
|
|
||||||
|
|
||||||
source "$_where"/customization.cfg # load default configuration from file
|
|
||||||
|
|
||||||
# Load external configuration file if present. Available variable values will overwrite customization.cfg ones.
|
|
||||||
if [ -e "$_EXT_CONFIG_PATH" ]; then
|
|
||||||
source "$_EXT_CONFIG_PATH" && msg2 "External configuration file $_EXT_CONFIG_PATH will be used to override customization.cfg values." && msg2 ""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$_OPTIPROFILE" ] && [ ! -e "$_where"/cpuschedset ]; then
|
|
||||||
# Prompt about optimized configurations. Available variable values will overwrite customization.cfg/external config ones.
|
|
||||||
plain "Do you want to use a predefined optimized profile?"
|
|
||||||
read -rp "`echo $' > 1.Custom\n 2.Ryzen Desktop (Performance)\n 3.Other Desktop (Performance)\nchoice[1-3?]: '`" _OPTIPROFILE;
|
|
||||||
fi
|
|
||||||
if [ "$_OPTIPROFILE" == "2" ]; then
|
|
||||||
source "$_where"/ryzen-desktop-profile.cfg && msg2 "Ryzen Desktop (Performance) profile will be used." && msg2 ""
|
|
||||||
elif [ "$_OPTIPROFILE" == "3" ]; then
|
|
||||||
source "$_where"/generic-desktop-profile.cfg && msg2 "Generic Desktop (Performance) profile will be used." && msg2 ""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# source cpuschedset early if present
|
|
||||||
if [ -e "$_where"/cpuschedset ]; then
|
|
||||||
source "$_where"/cpuschedset
|
|
||||||
fi
|
|
||||||
|
|
||||||
# CPU SCHED selector
|
|
||||||
if [ -z "$_cpusched" ] && [ ! -e "$_where"/cpuschedset ]; then
|
|
||||||
plain "What CPU sched variant do you want to build/install?"
|
|
||||||
read -rp "`echo $' > 1.PDS\n 2.MuQSS\n 3.BMQ\n 4.CFS\nchoice[1-4?]: '`" CONDITION;
|
|
||||||
if [ "$CONDITION" == "2" ]; then
|
|
||||||
echo "_cpusched=\"MuQSS\"" > "$_where"/cpuschedset
|
|
||||||
elif [ "$CONDITION" == "3" ]; then
|
|
||||||
echo "_cpusched=\"bmq\"" > "$_where"/cpuschedset
|
|
||||||
elif [ "$CONDITION" == "4" ]; then
|
|
||||||
echo "_cpusched=\"cfs\"" > "$_where"/cpuschedset
|
|
||||||
else
|
|
||||||
echo "_cpusched=\"pds\"" > "$_where"/cpuschedset
|
|
||||||
fi
|
|
||||||
if [ -n "$_custom_pkgbase" ]; then
|
|
||||||
echo "_custom_pkgbase=\"${_custom_pkgbase}\"" >> "$_where"/cpuschedset
|
|
||||||
fi
|
|
||||||
elif [ "$_cpusched" == "muqss" ] || [ "$_cpusched" == "MuQSS" ]; then
|
|
||||||
echo "_cpusched=\"MuQSS\"" > "$_where"/cpuschedset
|
|
||||||
elif [ "$_cpusched" == "pds" ]; then
|
|
||||||
echo "_cpusched=\"pds\"" > "$_where"/cpuschedset
|
|
||||||
elif [ "$_cpusched" == "bmq" ]; then
|
|
||||||
echo "_cpusched=\"bmq\"" > "$_where"/cpuschedset
|
|
||||||
else
|
|
||||||
echo "_cpusched=\"cfs\"" > "$_where"/cpuschedset
|
|
||||||
fi
|
|
||||||
|
|
||||||
source "$_where"/cpuschedset
|
|
||||||
|
|
||||||
_basever=56
|
|
||||||
if [ -n "$_custom_pkgbase" ]; then
|
|
||||||
pkgbase="${_custom_pkgbase}"
|
|
||||||
else
|
|
||||||
pkgbase=linux"${_basever}"-tkg-"${_cpusched}"
|
|
||||||
fi
|
|
||||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
|
||||||
_basekernel=5.6
|
|
||||||
_sub=19
|
|
||||||
pkgver="${_basekernel}"."${_sub}"
|
|
||||||
pkgrel=37
|
|
||||||
pkgdesc='Linux-tkg'
|
|
||||||
arch=('x86_64') # no i686 in here
|
|
||||||
url="http://www.kernel.org/"
|
|
||||||
license=('GPL2')
|
|
||||||
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf' 'patchutils' 'flex' 'python-sphinx' 'python-sphinx_rtd_theme' 'graphviz' 'imagemagick' 'git')
|
|
||||||
optdepends=('schedtool')
|
|
||||||
options=('!strip')
|
|
||||||
source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.xz"
|
|
||||||
"https://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
|
|
||||||
"https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.5-v5.6.patch"
|
|
||||||
'config.x86_64' # stock Arch config - https://www.archlinux.org/packages/core/x86_64/linux/
|
|
||||||
'config_hardened.x86_64' # hardened Arch config - https://www.archlinux.org/packages/extra/x86_64/linux-hardened/
|
|
||||||
90-cleanup.hook
|
|
||||||
cleanup
|
|
||||||
# ARCH Patches
|
|
||||||
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
|
||||||
# TkG
|
|
||||||
0002-clear-patches.patch
|
|
||||||
0003-glitched-base.patch
|
|
||||||
0003-glitched-cfs.patch
|
|
||||||
0004-glitched-ondemand-muqss.patch
|
|
||||||
0004-glitched-muqss.patch
|
|
||||||
0004-5.6-ck2.patch
|
|
||||||
0005-glitched-ondemand-pds.patch
|
|
||||||
0005-glitched-pds.patch
|
|
||||||
0005-v5.6_undead-pds099o.patch
|
|
||||||
0006-add-acs-overrides_iommu.patch
|
|
||||||
0007-v5.6-fsync.patch
|
|
||||||
0008-5.6-bcachefs.patch
|
|
||||||
0009-glitched-ondemand-bmq.patch
|
|
||||||
0009-glitched-bmq.patch
|
|
||||||
0009-bmq_v5.6-r4.patch
|
|
||||||
0011-ZFS-fix.patch
|
|
||||||
0012-linux-hardened.patch # https://github.com/anthraxx/linux-hardened
|
|
||||||
)
|
|
||||||
sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
|
|
||||||
'523e014b8432252f9739216e63811e60e6f8da5318122ec880c24d752a493e0f'
|
|
||||||
'54923e20c2cdbb2dfe6d32b39abc019c68eac6b728950670a0e279c2d43e028e'
|
|
||||||
'6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c'
|
|
||||||
'116c8bee112e4bbf65fb7ef4770a24ed8e4d17dbb9d6d7911fa7b8cf13c1b086'
|
|
||||||
'1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
|
|
||||||
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
|
|
||||||
'31dc68e84aecfb7d069efb1305049122c65694676be8b955634abcf0675922a2'
|
|
||||||
'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa'
|
|
||||||
'2b210ce8efff012c803177dbf766e60df874e55ed78ff7a1d8540c33aec6864e'
|
|
||||||
'7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
|
|
||||||
'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
|
|
||||||
'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
|
|
||||||
'5590a33a6030b78d766a05bab5ac8552be2441c23aac30300b2dcdad9ffb5704'
|
|
||||||
'62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
|
|
||||||
'7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74'
|
|
||||||
'9ddfb1abaa01acf70e1352db1564fba591c2229d71d3c912213915388e944d6f'
|
|
||||||
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
|
|
||||||
'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
|
|
||||||
'5e8cafb3bd22d8f6c843265036a1e76ffe97c49dfd21ca16ad407d743f344275'
|
|
||||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
|
||||||
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
|
|
||||||
'1b95d36635c7dc48ce45a33d6b1f4eb6d34f51600901395d28fd22f28daee8e9'
|
|
||||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
|
||||||
'573914ae79eb564032dce7e0c805fd59440696c148037b77013c8a4d5c4bd3b6')
|
|
||||||
|
|
||||||
export KBUILD_BUILD_HOST=archlinux
|
|
||||||
export KBUILD_BUILD_USER=$pkgbase
|
|
||||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
rm -rf $pkgdir # Nuke the entire pkg folder so it'll get regenerated clean on next build
|
|
||||||
|
|
||||||
ln -s "${_where}/customization.cfg" "${srcdir}" # workaround
|
|
||||||
|
|
||||||
cd "${srcdir}/linux-${_basekernel}"
|
|
||||||
|
|
||||||
source "$_where/linux$_basever-tkg-config/prepare"
|
|
||||||
_tkg_srcprep
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd "${srcdir}/linux-${_basekernel}"
|
|
||||||
|
|
||||||
# Use custom compiler paths if defined
|
|
||||||
if [ -n "${CUSTOM_GCC_PATH}" ]; then
|
|
||||||
PATH=${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$_force_all_threads" == "true" ]; then
|
|
||||||
_force_all_threads="-j$((`nproc`*2))"
|
|
||||||
else
|
|
||||||
_force_all_threads="${MAKEFLAGS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ccache
|
|
||||||
if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then
|
|
||||||
export PATH="/usr/lib/ccache/bin/:$PATH"
|
|
||||||
export CCACHE_SLOPPINESS="file_macro,locale,time_macros"
|
|
||||||
export CCACHE_NOHASHDIR="true"
|
|
||||||
msg2 'ccache was found and will be used'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# build!
|
|
||||||
_runtime=$( time ( schedtool -B -n 1 -e ionice -n 1 make ${_force_all_threads} LOCALVERSION= bzImage modules 2>&1 ) 3>&1 1>&2 2>&3 ) || _runtime=$( time ( make ${_force_all_threads} LOCALVERSION= bzImage modules 2>&1 ) 3>&1 1>&2 2>&3 )
|
|
||||||
}
|
|
||||||
|
|
||||||
hackbase() {
|
|
||||||
pkgdesc="The $pkgdesc kernel and modules"
|
|
||||||
depends=('coreutils' 'kmod' 'initramfs')
|
|
||||||
optdepends=('linux-docs: Kernel hackers manual - HTML documentation that comes with the Linux kernel.'
|
|
||||||
'crda: to set the correct wireless channels of your country.'
|
|
||||||
'linux-firmware: Firmware files for Linux'
|
|
||||||
'modprobed-db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.'
|
|
||||||
'nvidia-tkg: NVIDIA drivers for all installed kernels - non-dkms version.'
|
|
||||||
'nvidia-dkms-tkg: NVIDIA drivers for all installed kernels - dkms version.'
|
|
||||||
'update-grub: Simple wrapper around grub-mkconfig.')
|
|
||||||
provides=("linux=${pkgver}" "${pkgbase}" VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
|
|
||||||
replaces=(virtualbox-guest-modules-arch wireguard-arch)
|
|
||||||
|
|
||||||
cd "${srcdir}/linux-${_basekernel}"
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
local _kernver="$(<version)"
|
|
||||||
local modulesdir="$pkgdir/usr/lib/modules/$_kernver"
|
|
||||||
|
|
||||||
msg2 "Installing boot image..."
|
|
||||||
# systemd expects to find the kernel here to allow hibernation
|
|
||||||
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
|
|
||||||
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
|
|
||||||
|
|
||||||
# Used by mkinitcpio to name the kernel
|
|
||||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
|
||||||
|
|
||||||
msg2 "Installing modules..."
|
|
||||||
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
|
|
||||||
|
|
||||||
# remove build and source links
|
|
||||||
rm "$modulesdir"/{source,build}
|
|
||||||
|
|
||||||
# install cleanup pacman hook and script
|
|
||||||
sed -e "s|cleanup|${pkgbase}-cleanup|g" "${srcdir}"/90-cleanup.hook |
|
|
||||||
install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
|
|
||||||
install -Dm755 "${srcdir}"/cleanup "${pkgdir}/usr/share/libalpm/scripts/${pkgbase}-cleanup"
|
|
||||||
|
|
||||||
msg2 "Fixing permissions..."
|
|
||||||
chmod -Rc u=rwX,go=rX "$pkgdir"
|
|
||||||
}
|
|
||||||
|
|
||||||
hackheaders() {
|
|
||||||
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
|
|
||||||
provides=("linux-headers=${pkgver}" "${pkgbase}-headers=${pkgver}")
|
|
||||||
|
|
||||||
cd "${srcdir}/linux-${_basekernel}"
|
|
||||||
local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
|
|
||||||
|
|
||||||
msg2 "Installing build files..."
|
|
||||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
|
|
||||||
localversion.* version vmlinux
|
|
||||||
install -Dt "$builddir/kernel" -m644 kernel/Makefile
|
|
||||||
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
|
|
||||||
cp -t "$builddir" -a scripts
|
|
||||||
|
|
||||||
# add objtool for external module building and enabled VALIDATION_STACK option
|
|
||||||
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
|
|
||||||
|
|
||||||
# add xfs and shmem for aufs building
|
|
||||||
mkdir -p "$builddir"/{fs/xfs,mm}
|
|
||||||
|
|
||||||
msg2 "Installing headers..."
|
|
||||||
cp -t "$builddir" -a include
|
|
||||||
cp -t "$builddir/arch/x86" -a arch/x86/include
|
|
||||||
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
|
|
||||||
|
|
||||||
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
|
|
||||||
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
|
|
||||||
|
|
||||||
# http://bugs.archlinux.org/task/13146
|
|
||||||
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
|
|
||||||
|
|
||||||
# http://bugs.archlinux.org/task/20402
|
|
||||||
install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
|
|
||||||
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
|
|
||||||
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
|
|
||||||
|
|
||||||
msg2 "Installing KConfig files..."
|
|
||||||
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
|
|
||||||
|
|
||||||
msg2 "Removing unneeded architectures..."
|
|
||||||
local arch
|
|
||||||
for arch in "$builddir"/arch/*/; do
|
|
||||||
[[ $arch = */x86/ ]] && continue
|
|
||||||
echo "Removing $(basename "$arch")"
|
|
||||||
rm -r "$arch"
|
|
||||||
done
|
|
||||||
|
|
||||||
msg2 "Removing documentation..."
|
|
||||||
rm -r "$builddir/Documentation"
|
|
||||||
|
|
||||||
msg2 "Removing broken symlinks..."
|
|
||||||
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
|
|
||||||
|
|
||||||
msg2 "Removing loose objects..."
|
|
||||||
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
|
|
||||||
|
|
||||||
msg2 "Stripping build tools..."
|
|
||||||
local file
|
|
||||||
while read -rd '' file; do
|
|
||||||
case "$(file -bi "$file")" in
|
|
||||||
application/x-sharedlib\;*) # Libraries (.so)
|
|
||||||
strip -v $STRIP_SHARED "$file" ;;
|
|
||||||
application/x-archive\;*) # Libraries (.a)
|
|
||||||
strip -v $STRIP_STATIC "$file" ;;
|
|
||||||
application/x-executable\;*) # Binaries
|
|
||||||
strip -v $STRIP_BINARIES "$file" ;;
|
|
||||||
application/x-pie-executable\;*) # Relocatable binaries
|
|
||||||
strip -v $STRIP_SHARED "$file" ;;
|
|
||||||
esac
|
|
||||||
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
|
|
||||||
|
|
||||||
msg2 "Adding symlink..."
|
|
||||||
mkdir -p "$pkgdir/usr/src"
|
|
||||||
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
|
|
||||||
|
|
||||||
msg2 "Fixing permissions..."
|
|
||||||
chmod -Rc u=rwX,go=rX "$pkgdir"
|
|
||||||
|
|
||||||
if [ $_NUKR == "true" ]; then
|
|
||||||
rm -rf "$srcdir" # Nuke the entire src folder so it'll get regenerated clean on next build
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
source /dev/stdin <<EOF
|
|
||||||
package_${pkgbase}() {
|
|
||||||
hackbase
|
|
||||||
}
|
|
||||||
|
|
||||||
package_${pkgbase}-headers() {
|
|
||||||
hackheaders
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
function exit_cleanup {
|
|
||||||
# Remove state tracker
|
|
||||||
rm -f "$_where"/cpuschedset
|
|
||||||
|
|
||||||
# Remove temporarily copied files
|
|
||||||
rm -rf "$_where"/*.patch
|
|
||||||
rm -rf "$_where"/*-profile.cfg
|
|
||||||
rm -f "$_where"/config*
|
|
||||||
rm -f "$_where"/*.hook
|
|
||||||
rm -f "$_where"/cleanup
|
|
||||||
rm -f "$_where"/prepare
|
|
||||||
|
|
||||||
# Community patches removal in case of failure
|
|
||||||
for _p in ${_community_patches[@]}; do
|
|
||||||
rm -f "$_where"/"$_p"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "$_NUKR" == "true" ]; then
|
|
||||||
rm -rf "$_where"/src/*
|
|
||||||
# Double tap
|
|
||||||
rm -rf "$srcdir"/linux-*
|
|
||||||
rm -rf "$srcdir"/*.xz
|
|
||||||
rm -rf "$srcdir"/*.patch
|
|
||||||
rm -rf "$srcdir"/*-profile.cfg
|
|
||||||
rm -f "$srcdir"/config.x86_64
|
|
||||||
rm -f "$srcdir"/customization.cfg
|
|
||||||
else
|
|
||||||
# Meh
|
|
||||||
rm -rf "$srcdir"/linux-${_basekernel}/Documentation/filesystems/aufs/*
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/ABI/testing/*-aufs
|
|
||||||
rm -rf "$srcdir"/linux-${_basekernel}/fs/aufs/*
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/include/uapi/linux/aufs*
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/mm/prfile.c
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/block/bfq*
|
|
||||||
|
|
||||||
rm -rf "$srcdir"/linux-${_basekernel}/drivers/scsi/vhba/*
|
|
||||||
|
|
||||||
rm -rf "$srcdir"/linux-${_basekernel}/fs/exfat/*
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/include/trace/events/fs.h
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-PDS-mq.txt
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/include/linux/skip_list.h
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/pds.c
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/pds_sched.h
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-BMQ.txt
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/bmq.c
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/bmq_sched.h
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-BFS.txt
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-MuQSS.txt
|
|
||||||
rm -rf "$srcdir"/linux-${_basekernel}/arch/blackfin/*
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/arch/powerpc/configs/c2k_defconfig
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/arch/score/configs/spct6600_defconfig
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/arch/tile/configs/tilegx_defconfig
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/arch/tile/configs/tilepro_defconfig
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/drivers/staging/lustre/lnet/lnet/lib-eq.c
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/MuQSS*
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/kernel/skip_list.c
|
|
||||||
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/Documentation/vm/uksm.txt
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/include/linux/sradix-tree.h
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/include/linux/uksm.h
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/lib/sradix-tree.c
|
|
||||||
rm -f "$srcdir"/linux-${_basekernel}/mm/uksm.c
|
|
||||||
fi
|
|
||||||
|
|
||||||
remove_deps
|
|
||||||
|
|
||||||
msg2 'exit cleanup done\n'
|
|
||||||
if [ -n "$_runtime" ]; then
|
|
||||||
msg2 "compilation time : \n$_runtime"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
trap exit_cleanup EXIT
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
**Due to intel_pstate poor performances as of late, I have decided to set it to passive mode to make use of the acpi_cpufreq governors passthrough, keeping full support for turbo frequencies.**
|
|
||||||
|
|
||||||
A custom Linux kernel 5.6.y with specific PDS, MuQSS and BMQ CPU schedulers related patchsets selector (stock CFS is also an option) and added tweaks for a nice interactivity/performance balance, aiming for the best gaming experience.
|
|
||||||
|
|
||||||
Various personalization options available and userpatches support (put your own patches in the same dir as the PKGBUILD, with the ".mypatch" extension.
|
|
||||||
|
|
||||||
MuQSS : http://ck-hack.blogspot.com/
|
|
||||||
|
|
||||||
BMQ : http://cchalpha.blogspot.com/
|
|
||||||
|
|
||||||
PDS-mq was originally created by Alfred Chen : http://cchalpha.blogspot.com/
|
|
||||||
|
|
||||||
While he dropped it with kernel 5.1 in favor of its BMQ evolution/rework, my pretty bad gaming experiences with BMQ up to this point convinced me to keep PDS afloat for as long as it'll make sense/I'll be able to.
|
|
||||||
|
|
||||||
You can find prebuilts on chaotic-aur, but if you need the extra-spice of per-arch optimized prebuilts, you can find PDS and MuQSS variants daily builds here : https://repo.kitsuna.net/ - Thanks to LordKitsuna.
|
|
||||||
|
|
||||||
Comes with a slightly modified Arch config asking for a few core personalization settings at compilation time.
|
|
||||||
If you want to streamline your kernel config for lower footprint and faster compilations : https://wiki.archlinux.org/index.php/Modprobed-db
|
|
||||||
You can enable support for it at the beginning of the PKGBUILD file. Make sure to read everything you need to know about it.
|
|
||||||
|
|
||||||
## Other stuff included:
|
|
||||||
- Graysky's per-CPU-arch native optimizations - https://github.com/graysky2/kernel_gcc_patch
|
|
||||||
- memory management and swapping tweaks
|
|
||||||
- scheduling tweaks
|
|
||||||
- using prefered raid6 gen function directly
|
|
||||||
- using lz4 algo for zswap by default
|
|
||||||
- optional "Zenify" patchset using core blk, mm and scheduler tweaks from Zen
|
|
||||||
- CFS tweaks
|
|
||||||
- using yeah TCP congestion algo by default
|
|
||||||
- using cake network queue management system
|
|
||||||
- using vm.max_map_count=262144 by default
|
|
||||||
- intel E1000 fixes
|
|
||||||
- cherry-picked clear linux patches
|
|
||||||
- **optional** overrides for missing ACS capabilities
|
|
||||||
- **optional** ZFS fpu symbols
|
|
||||||
- **optional** Fsync support (proton)
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
git clone https://github.com/Frogging-Family/linux-tkg.git
|
|
||||||
cd linux-tkg/linux56-tkg
|
|
||||||
makepkg -si
|
|
||||||
```
|
|
||||||
@ -1,178 +0,0 @@
|
|||||||
# linux56-TkG config file
|
|
||||||
|
|
||||||
|
|
||||||
#### MISC OPTIONS ####
|
|
||||||
|
|
||||||
# External config file to use - If the given file exists in path, it will override default config (customization.cfg) - Default is ~/.config/frogminer/linux52-tkg.cfg
|
|
||||||
_EXT_CONFIG_PATH=~/.config/frogminer/linux56-tkg.cfg
|
|
||||||
|
|
||||||
# Set to anything else than "true" to limit cleanup operations and keep source and files generated during compilation.
|
|
||||||
# Default is "true".
|
|
||||||
_NUKR="true"
|
|
||||||
|
|
||||||
# Custom compiler root dirs - Leave empty to use system compilers
|
|
||||||
# Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
|
|
||||||
CUSTOM_GCC_PATH=""
|
|
||||||
|
|
||||||
# Set to the number corresponding to a predefined profile to use it. Current list of available profiles :
|
|
||||||
# 1 - Custom (meaning nothing will be enforced and you get to configure everything)
|
|
||||||
# 2 - Ryzen desktop (performance)
|
|
||||||
# 3 - Generic Desktop (Performance)
|
|
||||||
_OPTIPROFILE=""
|
|
||||||
|
|
||||||
# Set to true to bypass makepkg.conf and use all available threads for compilation. False will respect your makepkg.conf options.
|
|
||||||
_force_all_threads="true"
|
|
||||||
|
|
||||||
# Set to true to prevent ccache from being used and set CONFIG_GCC_PLUGINS=y (which needs to be disabled for ccache to work properly)
|
|
||||||
_noccache="false"
|
|
||||||
|
|
||||||
# Set to true to use modprobed db to clean config from unneeded modules. Speeds up compilation considerably. Requires root - https://wiki.archlinux.org/index.php/Modprobed-db
|
|
||||||
# !!!! Make sure to have a well populated db !!!! - Leave empty to be asked about it at build time
|
|
||||||
_modprobeddb="false"
|
|
||||||
|
|
||||||
# Set to "1" to call make menuconfig or "2" to call make nconfig before building the kernel. Set to false to disable and skip the prompt.
|
|
||||||
_menunconfig=""
|
|
||||||
|
|
||||||
# Set to true to generate a kernel config fragment from your changes in menuconfig/nconfig. Set to false to disable and skip the prompt.
|
|
||||||
_diffconfig=""
|
|
||||||
|
|
||||||
# Set to the file name where the generated config fragment should be written to. Only used if _diffconfig is active.
|
|
||||||
_diffconfig_name=""
|
|
||||||
|
|
||||||
#### KERNEL OPTIONS ####
|
|
||||||
|
|
||||||
# Name of the default config file to use from the linux???-tkg-config folder. Arch default is "config.x86_64" and Arch hardened is "config_hardened.x86_64".
|
|
||||||
# To get a complete hardened setup, you have to use "cfs" as _cpusched
|
|
||||||
_configfile="config.x86_64"
|
|
||||||
|
|
||||||
# Disable some non-module debugging - See PKGBUILD for the list
|
|
||||||
_debugdisable="false"
|
|
||||||
|
|
||||||
# LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME
|
|
||||||
|
|
||||||
# CPU scheduler - Options are "pds", "muqss", "bmq", "cfs" or "cfsturbo" (experimental, for power CPUs https://lkml.org/lkml/2019/7/25/296)
|
|
||||||
# "pds" is the recommended option for gaming
|
|
||||||
_cpusched=""
|
|
||||||
|
|
||||||
# CPU sched_yield_type - Choose what sort of yield sched_yield will perform
|
|
||||||
# For PDS and MuQSS: 0: No yield. (Recommended option for gaming on PDS and MuQSS)
|
|
||||||
# 1: Yield only to better priority/deadline tasks. (Default - can be unstable with PDS on some platforms)
|
|
||||||
# 2: Expire timeslice and recalculate deadline. (Usually the slowest option for PDS and MuQSS, not recommended)
|
|
||||||
# For BMQ: 0: No yield.
|
|
||||||
# 1: Deboost and requeue task. (Default)
|
|
||||||
# 2: Set rq skip task.
|
|
||||||
_sched_yield_type=""
|
|
||||||
|
|
||||||
# Round Robin interval is the longest duration two tasks with the same nice level will be delayed for. When CPU time is requested by a task, it receives a time slice equal
|
|
||||||
# to the rr_interval in addition to a virtual deadline. When using yield_type 2, a low value can help offset the disadvantages of rescheduling a process that has yielded.
|
|
||||||
# MuQSS default: 6ms"
|
|
||||||
# PDS default: 4ms"
|
|
||||||
# BMQ default: 2ms"
|
|
||||||
# Set to "1" for 2ms, "2" for 4ms, "3" for 6ms, "4" for 8ms, or "default" to keep the chosen scheduler defaults.
|
|
||||||
_rr_interval=""
|
|
||||||
|
|
||||||
# Set to "true" to disable FUNCTION_TRACER/GRAPH_TRACER, lowering overhead but limiting debugging and analyzing of kernel functions - Kernel default is "false"
|
|
||||||
_ftracedisable="false"
|
|
||||||
|
|
||||||
# Set to "true" to disable NUMA, lowering overhead, but breaking CUDA/NvEnc on Nvidia equipped systems - Kernel default is "false"
|
|
||||||
_numadisable="false"
|
|
||||||
|
|
||||||
# Set to "1" to use CattaRappa mode (enabling full tickless), "2" for tickless idle only, or "0" for periodic ticks.
|
|
||||||
# Full tickless can give higher performances in various cases but, depending on hardware, lower consistency. Just tickless idle can perform better on some platforms (mostly AMD based).
|
|
||||||
_tickless=""
|
|
||||||
|
|
||||||
# Setting this to to "true" can improve latency on PDS (at the cost of throughput) and improve throughput on other schedulers (at the cost of latency) - Can improve VMs performance - Kernel default is "false"
|
|
||||||
_voluntary_preempt=""
|
|
||||||
|
|
||||||
# Set to "true" to enable Device Tree and Open Firmware support. If you don't know about it, you don't need it - Default is "false"
|
|
||||||
_OFenable="false"
|
|
||||||
|
|
||||||
# Set to "true" to use ACS override patch - https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_.28ACS_override_patch.29 - Kernel default is "false"
|
|
||||||
_acs_override=""
|
|
||||||
|
|
||||||
# Set to "true" to add Bcache filesystem support. You'll have to install bcachefs-tools-git from AUR for utilities - https://bcachefs.org/ - If in doubt, set to "false"
|
|
||||||
_bcachefs=""
|
|
||||||
|
|
||||||
# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false"
|
|
||||||
_zfsfix=""
|
|
||||||
|
|
||||||
# Set to "true" to enable support for fsync, an experimental replacement for esync found in Valve Proton 4.11+ - https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305
|
|
||||||
_fsync=""
|
|
||||||
|
|
||||||
# A selection of patches from Zen/Liquorix kernel and additional tweaks for a better gaming experience (ZENIFY) - Default is "true"
|
|
||||||
_zenify="true"
|
|
||||||
|
|
||||||
# compiler optimization level - 1. Optimize for performance (-O2); 2. Optimize harder (-O3); 3. Optimize for size (-Os) - Kernel default is "1"
|
|
||||||
_compileroptlevel="1"
|
|
||||||
|
|
||||||
# CPU compiler optimizations - Defaults to generic optimizations if left empty
|
|
||||||
# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2"
|
|
||||||
# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake"
|
|
||||||
# Other options :
|
|
||||||
# - "generic" (to share the package between machines with different CPUs)
|
|
||||||
# - "native" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
|
|
||||||
_processor_opt=""
|
|
||||||
|
|
||||||
# MuQSS only - Make IRQ threading compulsory (FORCE_IRQ_THREADING) - Default is "false"
|
|
||||||
_irq_threading="false"
|
|
||||||
|
|
||||||
# MuQSS and PDS only - SMT (Hyperthreading) aware nice priority and policy support (SMT_NICE) - Kernel default is "true" - You can disable this on non-SMT/HT CPUs for lower overhead
|
|
||||||
_smt_nice=""
|
|
||||||
|
|
||||||
# Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
|
|
||||||
_random_trust_cpu="false"
|
|
||||||
|
|
||||||
# MuQSS only - CPU scheduler runqueue sharing - No sharing (RQ_NONE), SMT (hyperthread) siblings (RQ_SMT), Multicore siblings (RQ_MC), Symmetric Multi-Processing (RQ_SMP), NUMA (RQ_ALL)
|
|
||||||
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
|
|
||||||
_runqueue_sharing=""
|
|
||||||
|
|
||||||
# Timer frequency - "100" "500", "750" or "1000" - More options available in kernel config prompt when left empty depending on selected cpusched - Kernel default is "500" - For MuQSS, 100Hz is recommended
|
|
||||||
_timer_freq=""
|
|
||||||
|
|
||||||
# Default CPU governor - "performance", "ondemand", "schedutil" or leave empty for default (schedutil)
|
|
||||||
_default_cpu_gov="ondemand"
|
|
||||||
|
|
||||||
# Use an aggressive ondemand governor instead of default ondemand to improve performance on low loads/high core count CPUs while keeping some power efficiency from frequency scaling.
|
|
||||||
# It still requires you to either set ondemand as default governor or to select it some way.
|
|
||||||
_aggressive_ondemand="true"
|
|
||||||
|
|
||||||
# On some platforms, an acpi_cpufreq bug affects performance negatively. Set to "true" to disable it as a workaround, but it will use more power.
|
|
||||||
# https://github.com/Tk-Glitch/PKGBUILDS/issues/263
|
|
||||||
_disable_acpi_cpufreq=""
|
|
||||||
|
|
||||||
# You can pass a default set of kernel command line options here - example: "intel_pstate=passive nowatchdog amdgpu.ppfeaturemask=0xfffd7fff mitigations=off"
|
|
||||||
_custom_commandline="intel_pstate=passive"
|
|
||||||
|
|
||||||
|
|
||||||
#### SPESHUL OPTION ####
|
|
||||||
|
|
||||||
# If you want to bypass the stock naming scheme and enforce something else (example : "linux") - Useful for some bootloaders requiring manual entry editing on each release.
|
|
||||||
# !!! It will also change pkgname - If you don't explicitely need this, don't use it !!!
|
|
||||||
_custom_pkgbase=""
|
|
||||||
|
|
||||||
|
|
||||||
#### USER PATCHES ####
|
|
||||||
|
|
||||||
# community patches - add patches (separated by a space) of your choice by name from the community-patches dir
|
|
||||||
# example: _community_patches="clear_nack_in_tend_isr.myrevert ffb_regression_fix.mypatch 0008-drm-amd-powerplay-force-the-trim-of-the-mclk-dpm-levels-if-OD-is-enabled.mypatch"
|
|
||||||
_community_patches=""
|
|
||||||
|
|
||||||
# You can use your own patches by putting them in the same folder as the PKGBUILD and giving them the .mypatch extension.
|
|
||||||
# You can also revert patches by putting them in the same folder as the PKGBUILD and giving them the .myrevert extension.
|
|
||||||
|
|
||||||
# Also, userpatches variable below must be set to true for the above to work.
|
|
||||||
_user_patches="true"
|
|
||||||
|
|
||||||
# Apply all user patches without confirmation - !!! NOT RECOMMENDED !!!
|
|
||||||
_user_patches_no_confirm="false"
|
|
||||||
|
|
||||||
|
|
||||||
#### CONFIG FRAGMENTS ####
|
|
||||||
|
|
||||||
# You can use your own kernel config fragments by putting them in the same folder as the PKGBUILD and giving them the .myfrag extension.
|
|
||||||
|
|
||||||
# Also, the config fragments variable below must be set to true for the above to work.
|
|
||||||
_config_fragments="true"
|
|
||||||
|
|
||||||
# Apply all config fragments without confirmation - !!! NOT RECOMMENDED !!!
|
|
||||||
_config_fragments_no_confirm="false"
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
[Trigger]
|
|
||||||
Type = File
|
|
||||||
Operation = Install
|
|
||||||
Operation = Upgrade
|
|
||||||
Operation = Remove
|
|
||||||
Target = usr/lib/modules/*/
|
|
||||||
Target = !usr/lib/modules/*/?*
|
|
||||||
|
|
||||||
[Action]
|
|
||||||
Description = Cleaning up...
|
|
||||||
When = PostTransaction
|
|
||||||
Exec = /usr/share/libalpm/scripts/cleanup
|
|
||||||
NeedsTargets
|
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
for _f in /usr/lib/modules/*tkg*; do
|
|
||||||
if [[ ! -e ${_f}/vmlinuz ]]; then
|
|
||||||
rm -rf "$_f"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# vim:set ft=sh sw=2 et:
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,55 +0,0 @@
|
|||||||
# linux56-TkG config file
|
|
||||||
# Generic Desktop
|
|
||||||
|
|
||||||
|
|
||||||
#### MISC OPTIONS ####
|
|
||||||
|
|
||||||
# External config file to use - If the given file exists in path, it will override default config (customization.cfg) - Default is ~/.config/frogminer/linux50-tkg.cfg
|
|
||||||
_EXT_CONFIG_PATH=~/.config/frogminer/linux56-tkg.cfg
|
|
||||||
|
|
||||||
#### KERNEL OPTIONS ####
|
|
||||||
|
|
||||||
# Name of the default config file to use from the linux???-tkg-config folder. Arch default is "config.x86_64".
|
|
||||||
_configfile="config.x86_64"
|
|
||||||
|
|
||||||
# Disable some non-module debugging - See PKGBUILD for the list
|
|
||||||
_debugdisable="false"
|
|
||||||
|
|
||||||
# LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME
|
|
||||||
|
|
||||||
# Set to "true" to disable FUNCTION_TRACER/GRAPH_TRACER, lowering overhead but limiting debugging and analyzing of kernel functions - Kernel default is "false"
|
|
||||||
_ftracedisable="false"
|
|
||||||
|
|
||||||
# Set to "true" to disable NUMA, lowering overhead, but breaking CUDA/NvEnc on Nvidia equipped systems - Kernel default is "false"
|
|
||||||
_numadisable="false"
|
|
||||||
|
|
||||||
# Set to "true" to use explicit preemption points to lower latency at the cost of a small throughput loss - Can give a nice perf boost in VMs - Kernel default is "false"
|
|
||||||
_voluntary_preempt="false"
|
|
||||||
|
|
||||||
# A selection of patches from Zen/Liquorix kernel and additional tweaks for a better gaming experience (ZENIFY) - Default is "true"
|
|
||||||
_zenify="true"
|
|
||||||
|
|
||||||
# compiler optimization level - 1. Optimize for performance (-O2); 2. Optimize harder (-O3); 3. Optimize for size (-Os) - Kernel default is "2"
|
|
||||||
_compileroptlevel="1"
|
|
||||||
|
|
||||||
# Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
|
|
||||||
_random_trust_cpu="false"
|
|
||||||
|
|
||||||
# CPU scheduler runqueue sharing - No sharing (RQ_NONE), SMT (hyperthread) siblings (RQ_SMT), Multicore siblings (RQ_MC), Symmetric Multi-Processing (RQ_SMP), NUMA (RQ_ALL)
|
|
||||||
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "mc"
|
|
||||||
_runqueue_sharing="mc"
|
|
||||||
|
|
||||||
# Timer frequency - "500", "750" or "1000" - More options available in kernel config prompt when left empty depending on selected cpusched - Kernel default is "750"
|
|
||||||
_timer_freq="500"
|
|
||||||
|
|
||||||
|
|
||||||
#### USER PATCHES ####
|
|
||||||
|
|
||||||
# You can use your own patches by putting them in the same folder as the PKGBUILD and giving them the .mypatch extension.
|
|
||||||
# You can also revert patches by putting them in the same folder as the PKGBUILD and giving them the .myrevert extension.
|
|
||||||
|
|
||||||
# Also, userpatches variable below must be set to true for the above to work.
|
|
||||||
_user_patches="true"
|
|
||||||
|
|
||||||
# Apply all user patches without confirmation - !!! NOT RECOMMENDED !!!
|
|
||||||
_user_patches_no_confirm="false"
|
|
||||||
@ -1,748 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
user_patcher() {
|
|
||||||
# To patch the user because all your base are belong to us
|
|
||||||
local _patches=("$_where"/*."${_userpatch_ext}revert")
|
|
||||||
if [ ${#_patches[@]} -ge 2 ] || [ -e "${_patches}" ]; then
|
|
||||||
if [ "$_user_patches_no_confirm" != "true" ]; then
|
|
||||||
msg2 "Found ${#_patches[@]} 'to revert' userpatches for ${_userpatch_target}:"
|
|
||||||
printf '%s\n' "${_patches[@]}"
|
|
||||||
read -rp "Do you want to install it/them? - Be careful with that ;)"$'\n> N/y : ' _CONDITION;
|
|
||||||
fi
|
|
||||||
if [ "$_CONDITION" == "y" ] || [ "$_user_patches_no_confirm" == "true" ]; then
|
|
||||||
for _f in "${_patches[@]}"; do
|
|
||||||
if [ -e "${_f}" ]; then
|
|
||||||
msg2 "######################################################"
|
|
||||||
msg2 ""
|
|
||||||
msg2 "Reverting your own ${_userpatch_target} patch ${_f}"
|
|
||||||
msg2 ""
|
|
||||||
msg2 "######################################################"
|
|
||||||
patch -Np1 -R < "${_f}"
|
|
||||||
echo "Reverted your own patch ${_f}" >> "$_where"/last_build_config.log
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
_patches=("$_where"/*."${_userpatch_ext}patch")
|
|
||||||
if [ ${#_patches[@]} -ge 2 ] || [ -e "${_patches}" ]; then
|
|
||||||
if [ "$_user_patches_no_confirm" != "true" ]; then
|
|
||||||
msg2 "Found ${#_patches[@]} userpatches for ${_userpatch_target}:"
|
|
||||||
printf '%s\n' "${_patches[@]}"
|
|
||||||
read -rp "Do you want to install it/them? - Be careful with that ;)"$'\n> N/y : ' _CONDITION;
|
|
||||||
fi
|
|
||||||
if [ "$_CONDITION" == "y" ] || [ "$_user_patches_no_confirm" == "true" ]; then
|
|
||||||
for _f in "${_patches[@]}"; do
|
|
||||||
if [ -e "${_f}" ]; then
|
|
||||||
msg2 "######################################################"
|
|
||||||
msg2 ""
|
|
||||||
msg2 "Applying your own ${_userpatch_target} patch ${_f}"
|
|
||||||
msg2 ""
|
|
||||||
msg2 "######################################################"
|
|
||||||
patch -Np1 < "${_f}"
|
|
||||||
echo "Applied your own patch ${_f}" >> "$_where"/last_build_config.log
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_tkg_srcprep() {
|
|
||||||
msg2 "Setting version..."
|
|
||||||
scripts/setlocalversion --save-scmversion
|
|
||||||
echo "-$pkgrel-tkg-${_cpusched}" > localversion.10-pkgrel
|
|
||||||
echo "" > localversion.20-pkgname
|
|
||||||
|
|
||||||
# add upstream patch
|
|
||||||
patch -p1 -i ../patch-"${pkgver}"
|
|
||||||
|
|
||||||
# ARCH Patches
|
|
||||||
if [ "${_configfile}" == "config_hardened.x86_64" ] && [ "${_cpusched}" == "cfs" ]; then
|
|
||||||
msg2 "Using linux hardened patchset"
|
|
||||||
patch -Np1 -i ../0012-linux-hardened.patch
|
|
||||||
else
|
|
||||||
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
# graysky's cpu opts - https://github.com/graysky2/kernel_gcc_patch
|
|
||||||
msg2 "Applying graysky's cpu opts patch"
|
|
||||||
patch -Np1 -i ../enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.5-v5.6.patch
|
|
||||||
|
|
||||||
# TkG
|
|
||||||
msg2 "Applying clear linux patches"
|
|
||||||
patch -Np1 -i ../0002-clear-patches.patch
|
|
||||||
|
|
||||||
msg2 "Applying glitched base patch"
|
|
||||||
patch -Np1 -i ../0003-glitched-base.patch
|
|
||||||
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
|
||||||
# MuQSS
|
|
||||||
patch -Np1 -i ../0004-5.6-ck2.patch
|
|
||||||
if [ "${_aggressive_ondemand}" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0004-glitched-ondemand-muqss.patch
|
|
||||||
fi
|
|
||||||
patch -Np1 -i ../0004-glitched-muqss.patch
|
|
||||||
elif [ "${_cpusched}" == "pds" ]; then
|
|
||||||
# PDS-mq
|
|
||||||
patch -Np1 -i ../0005-v5.6_undead-pds099o.patch
|
|
||||||
if [ "${_aggressive_ondemand}" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0005-glitched-ondemand-pds.patch
|
|
||||||
fi
|
|
||||||
patch -Np1 -i ../0005-glitched-pds.patch
|
|
||||||
elif [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
# BMQ
|
|
||||||
patch -Np1 -i ../0009-bmq_v5.6-r4.patch
|
|
||||||
if [ "${_aggressive_ondemand}" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0009-glitched-ondemand-bmq.patch
|
|
||||||
fi
|
|
||||||
patch -Np1 -i ../0009-glitched-bmq.patch
|
|
||||||
else
|
|
||||||
patch -Np1 -i ../0003-glitched-cfs.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${_configfile}" ]; then
|
|
||||||
_configfile="config.x86_64"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat "${srcdir}/${_configfile}" > ./.config
|
|
||||||
|
|
||||||
# Set some -tkg defaults
|
|
||||||
echo "# CONFIG_DYNAMIC_FAULT is not set" >> ./.config
|
|
||||||
sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config
|
|
||||||
echo "CONFIG_DEFAULT_CAKE=y" >> ./.config
|
|
||||||
echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config
|
|
||||||
echo "CONFIG_RAID6_USE_PREFER_GEN=y" >> ./.config
|
|
||||||
echo "# CONFIG_NTP_PPS is not set" >> ./.config
|
|
||||||
sed -i -e 's/CONFIG_CRYPTO_LZ4=m/CONFIG_CRYPTO_LZ4=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_CRYPTO_LZ4HC=m/CONFIG_CRYPTO_LZ4HC=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_LZ4_COMPRESS=m/CONFIG_LZ4_COMPRESS=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_LZ4HC_COMPRESS=m/CONFIG_LZ4HC_COMPRESS=y/' ./.config
|
|
||||||
#sed -i -e 's/CONFIG_RCU_BOOST_DELAY=500/CONFIG_RCU_BOOST_DELAY=0/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_CMDLINE_BOOL is not set/CONFIG_CMDLINE_BOOL=y/' ./.config
|
|
||||||
echo "CONFIG_CMDLINE=\"${_custom_commandline}\"" >> ./.config
|
|
||||||
echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> ./.config
|
|
||||||
if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then
|
|
||||||
sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$_font_autoselect" != "false" ]; then
|
|
||||||
sed -i -e 's/CONFIG_FONT_TER16x32=y/# CONFIG_FONT_TER16x32 is not set\nCONFIG_FONT_AUTOSELECT=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Inject cpuopts options
|
|
||||||
echo "# CONFIG_MK8SSE3 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MK10 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MBARCELONA is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MBOBCAT is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MJAGUAR is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MBULLDOZER is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MPILEDRIVER is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MSTEAMROLLER is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MEXCAVATOR is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MZEN is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MZEN2 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MATOM is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MNEHALEM is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MWESTMERE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MSILVERMONT is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MSANDYBRIDGE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MIVYBRIDGE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MHASWELL is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MBROADWELL is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MSKYLAKE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MSKYLAKEX is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MCANNONLAKE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MICELAKE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MGOLDMONT is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MGOLDMONTPLUS is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MCASCADELAKE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MCOOPERLAKE is not set" >> ./.config
|
|
||||||
echo "# CONFIG_MTIGERLAKE is not set" >> ./.config
|
|
||||||
|
|
||||||
# Disable some debugging
|
|
||||||
if [ "${_debugdisable}" == "true" ]; then
|
|
||||||
sed -i -e 's/CONFIG_SLUB_DEBUG=y/# CONFIG_SLUB_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_PM_DEBUG=y/# CONFIG_PM_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_PM_ADVANCED_DEBUG=y/# CONFIG_PM_ADVANCED_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_PM_SLEEP_DEBUG=y/# CONFIG_PM_SLEEP_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_SCHED_DEBUG=y/# CONFIG_SCHED_DEBUG is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_DEBUG_PREEMPT=y/# CONFIG_DEBUG_PREEMPT is not set/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
|
||||||
# MuQSS default config
|
|
||||||
echo "CONFIG_SCHED_MUQSS=y" >> ./.config
|
|
||||||
elif [ "${_cpusched}" == "pds" ]; then
|
|
||||||
# PDS default config
|
|
||||||
echo "CONFIG_SCHED_PDS=y" >> ./.config
|
|
||||||
elif [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
# BMQ default config
|
|
||||||
echo "CONFIG_SCHED_BMQ=y" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ] || [ "${_cpusched}" == "pds" ] || [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
# Disable CFS
|
|
||||||
sed -i -e 's/CONFIG_FAIR_GROUP_SCHED=y/# CONFIG_FAIR_GROUP_SCHED is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_CFS_BANDWIDTH=y/# CONFIG_CFS_BANDWIDTH is not set/' ./.config
|
|
||||||
# sched yield type
|
|
||||||
if [ -n "$_sched_yield_type" ]; then
|
|
||||||
CONDITION0="$_sched_yield_type"
|
|
||||||
else
|
|
||||||
plain ""
|
|
||||||
plain "CPU sched_yield_type - Choose what sort of yield sched_yield will perform."
|
|
||||||
plain ""
|
|
||||||
plain "For PDS and MuQSS:"
|
|
||||||
plain "0: No yield."
|
|
||||||
plain "1: Yield only to better priority/deadline tasks."
|
|
||||||
plain "2: Expire timeslice and recalculate deadline."
|
|
||||||
plain ""
|
|
||||||
plain "For BMQ (experimental) - No recommended value yet, so try for yourself x) :"
|
|
||||||
plain "0: No yield."
|
|
||||||
plain "1: Deboost and requeue task. (default)"
|
|
||||||
plain "2: Set rq skip task."
|
|
||||||
read -rp "`echo $'\n > 0. Recommended option for gaming on PDS and MuQSS - "tkg" default\n 1. Default, but can lead to stability issues on some platforms\n 2. Can be a good option with low rr_interval on MuQSS\n [0-2?]: '`" CONDITION0;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION0" == "1" ]; then
|
|
||||||
msg2 "Using default CPU sched yield type (1)"
|
|
||||||
elif [ "$CONDITION0" == "2" ]; then
|
|
||||||
sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 2;/' ./kernel/sched/"${_cpusched}".c
|
|
||||||
else
|
|
||||||
sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/"${_cpusched}".c
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Round Robin interval
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ] || [ "${_cpusched}" == "pds" ] || [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
if [ -n "$_rr_interval" ]; then
|
|
||||||
CONDITION1="$_rr_interval"
|
|
||||||
else
|
|
||||||
plain ""
|
|
||||||
plain "Round Robin interval is the longest duration two tasks with the same nice level will"
|
|
||||||
plain "be delayed for. When CPU time is requested by a task, it receives a time slice equal"
|
|
||||||
plain "to the rr_interval in addition to a virtual deadline. When using yield_type 2, a low"
|
|
||||||
plain "value can help offset the disadvantages of rescheduling a process that has yielded."
|
|
||||||
plain ""
|
|
||||||
plain "MuQSS default: 6ms"
|
|
||||||
plain "PDS default: 4ms"
|
|
||||||
plain "BMQ default: 2ms"
|
|
||||||
read -rp "`echo $'\n > 0.Keep defaults\n 1.2ms\n 2.4ms\n 3.6ms\n 4.8ms\n [0-4?]: '`" CONDITION1;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION1" == "1" ]; then
|
|
||||||
msg2 "Using 2ms rr_interval"
|
|
||||||
_rrvalue="2"
|
|
||||||
elif [ "$CONDITION1" == "2" ]; then
|
|
||||||
msg2 "Using 4ms rr_interval"
|
|
||||||
_rrvalue="4"
|
|
||||||
elif [ "$CONDITION1" == "3" ]; then
|
|
||||||
msg2 "Using 6ms rr_interval"
|
|
||||||
_rrvalue="6"
|
|
||||||
elif [ "$CONDITION1" == "4" ]; then
|
|
||||||
msg2 "Using 8ms rr_interval"
|
|
||||||
_rrvalue="8"
|
|
||||||
else
|
|
||||||
msg2 "Using default rr_interval"
|
|
||||||
_rrvalue="default"
|
|
||||||
fi
|
|
||||||
if [ "$_rrvalue" != "default" ]; then
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
|
||||||
sed -i -e "s/int rr_interval __read_mostly = 6;/int rr_interval __read_mostly = ${_rrvalue};/" ./kernel/sched/"${_cpusched}".c
|
|
||||||
elif [ "${_cpusched}" == "pds" ]; then
|
|
||||||
sed -i -e "s/#define SCHED_DEFAULT_RR (4)/#define SCHED_DEFAULT_RR (${_rrvalue})/" ./kernel/sched/"${_cpusched}".c
|
|
||||||
elif [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
sed -i -e "s/u64 sched_timeslice_ns __read_mostly = (4 * 1000 * 1000);/u64 sched_timeslice_ns __read_mostly = (${_rrvalue} * 1000 * 1000);/" ./kernel/sched/"${_cpusched}".c
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "${_cpusched}" == "bmq" ]; then
|
|
||||||
sed -i -e "s/u64 sched_timeslice_ns __read_mostly = (4 * 1000 * 1000);/u64 sched_timeslice_ns __read_mostly = (2 * 1000 * 1000);/" ./kernel/sched/"${_cpusched}".c
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# zenify
|
|
||||||
if [ "$_zenify" == "true" ]; then
|
|
||||||
echo "CONFIG_ZENIFY=y" >> ./.config
|
|
||||||
elif [ "$_zenify" == "false" ]; then
|
|
||||||
echo "# CONFIG_ZENIFY is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# compiler optimization level
|
|
||||||
if [ "$_compileroptlevel" == "1" ]; then
|
|
||||||
echo "# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 is not set" >> ./.config
|
|
||||||
elif [ "$_compileroptlevel" == "2" ]; then
|
|
||||||
sed -i -e 's/CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y/# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set/' ./.config
|
|
||||||
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y" >> ./.config
|
|
||||||
elif [ "$_compileroptlevel" == "3" ]; then
|
|
||||||
sed -i -e 's/CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y/# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set/CONFIG_CC_OPTIMIZE_FOR_SIZE=y/' ./.config
|
|
||||||
echo "# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# cpu opt
|
|
||||||
if [ -n "$_processor_opt" ] && [ "$_processor_opt" != "native" ]; then
|
|
||||||
echo "# CONFIG_MNATIVE is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$_processor_opt" ] && [ "$_processor_opt" != "generic" ]; then
|
|
||||||
sed -i -e 's/CONFIG_GENERIC_CPU=y/# CONFIG_GENERIC_CPU is not set/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$_processor_opt" == "native" ]; then
|
|
||||||
echo "CONFIG_MNATIVE=y" >> ./.config
|
|
||||||
elif [ "$_processor_opt" == "k8" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MK8 is not set/CONFIG_MK8=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "k8sse3" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MK8SSE3 is not set/CONFIG_MK8SSE3=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "k10" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MK10 is not set/CONFIG_MK10=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "barcelona" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MBARCELONA is not set/CONFIG_MBARCELONA=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "bobcat" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MBOBCAT is not set/CONFIG_MBOBCAT=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "jaguar" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MJAGUAR is not set/CONFIG_MJAGUAR=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "bulldozer" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MBULLDOZER is not set/CONFIG_MBULLDOZER=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "piledriver" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MPILEDRIVER is not set/CONFIG_MPILEDRIVER=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "steamroller" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MSTEAMROLLER is not set/CONFIG_MSTEAMROLLER=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "excavator" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MEXCAVATOR is not set/CONFIG_MEXCAVATOR=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "zen" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MZEN is not set/CONFIG_MZEN=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "zen2" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MZEN2 is not set/CONFIG_MZEN2=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "mpsc" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MPSC is not set/CONFIG_MPSC=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "atom" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MATOM is not set/CONFIG_MATOM=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "core2" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MCORE2 is not set/CONFIG_MCORE2=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "nehalem" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MNEHALEM is not set/CONFIG_MNEHALEM=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "westmere" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MWESTMERE is not set/CONFIG_MWESTMERE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "silvermont" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MSILVERMONT is not set/CONFIG_MSILVERMONT=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "sandybridge" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MSANDYBRIDGE is not set/CONFIG_MSANDYBRIDGE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "ivybridge" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MIVYBRIDGE is not set/CONFIG_MIVYBRIDGE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "haswell" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MHASWELL is not set/CONFIG_MHASWELL=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "broadwell" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MBROADWELL is not set/CONFIG_MBROADWELL=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "skylake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MSKYLAKE is not set/CONFIG_MSKYLAKE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "skylakex" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MSKYLAKEX is not set/CONFIG_MSKYLAKEX=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "cannonlake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MCANNONLAKE is not set/CONFIG_MCANNONLAKE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "icelake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MICELAKE is not set/CONFIG_MICELAKE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "goldmont" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MGOLDMONT is not set/CONFIG_MGOLDMONT=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "goldmontplus" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MGOLDMONTPLUS is not set/CONFIG_MGOLDMONTPLUS=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "cascadelake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MCASCADELAKE is not set/CONFIG_MCASCADELAKE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "cooperlake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MCOOPERLAKE is not set/CONFIG_MCOOPERLAKE=y/' ./.config
|
|
||||||
elif [ "$_processor_opt" == "tigerlake" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_MTIGERLAKE is not set/CONFIG_MTIGERLAKE=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# irq threading
|
|
||||||
if [ "$_irq_threading" == "true" ]; then
|
|
||||||
echo "CONFIG_FORCE_IRQ_THREADING=y" >> ./.config
|
|
||||||
elif [ "$_irq_threading" == "false" ]; then
|
|
||||||
echo "# CONFIG_FORCE_IRQ_THREADING is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# smt nice
|
|
||||||
if [ "$_smt_nice" == "true" ]; then
|
|
||||||
echo "CONFIG_SMT_NICE=y" >> ./.config
|
|
||||||
elif [ "$_smt_nice" == "false" ]; then
|
|
||||||
echo "# CONFIG_SMT_NICE is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# random trust cpu
|
|
||||||
if [ "$_random_trust_cpu" == "true" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_RANDOM_TRUST_CPU is not set/CONFIG_RANDOM_TRUST_CPU=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# rq sharing
|
|
||||||
if [ "$_runqueue_sharing" == "none" ]; then
|
|
||||||
echo -e "CONFIG_RQ_NONE=y\n# CONFIG_RQ_SMT is not set\n# CONFIG_RQ_MC is not set\n# CONFIG_RQ_MC_LLC is not set\n# CONFIG_RQ_SMP is not set\n# CONFIG_RQ_ALL is not set" >> ./.config
|
|
||||||
elif [ -z "$_runqueue_sharing" ] || [ "$_runqueue_sharing" == "smt" ]; then
|
|
||||||
echo -e "# CONFIG_RQ_NONE is not set\nCONFIG_RQ_SMT=y\n# CONFIG_RQ_MC is not set\n# CONFIG_RQ_MC_LLC is not set\n# CONFIG_RQ_SMP is not set\n# CONFIG_RQ_ALL is not set" >> ./.config
|
|
||||||
elif [ "$_runqueue_sharing" == "mc" ]; then
|
|
||||||
echo -e "# CONFIG_RQ_NONE is not set\n# CONFIG_RQ_SMT is not set\nCONFIG_RQ_MC=y\n# CONFIG_RQ_MC_LLC is not set\n# CONFIG_RQ_SMP is not set\n# CONFIG_RQ_ALL is not set" >> ./.config
|
|
||||||
elif [ "$_runqueue_sharing" == "smp" ]; then
|
|
||||||
echo -e "# CONFIG_RQ_NONE is not set\n# CONFIG_RQ_SMT is not set\n# CONFIG_RQ_MC is not set\n# CONFIG_RQ_MC_LLC is not set\nCONFIG_RQ_SMP=y\n# CONFIG_RQ_ALL is not set" >> ./.config
|
|
||||||
elif [ "$_runqueue_sharing" == "all" ]; then
|
|
||||||
echo -e "# CONFIG_RQ_NONE is not set\n# CONFIG_RQ_SMT is not set\n# CONFIG_RQ_MC is not set\n# CONFIG_RQ_MC_LLC is not set\n# CONFIG_RQ_SMP is not set\nCONFIG_RQ_ALL=y" >> ./.config
|
|
||||||
elif [ "$_runqueue_sharing" == "mc-llc" ]; then
|
|
||||||
echo -e "# CONFIG_RQ_NONE is not set\n# CONFIG_RQ_SMT is not set\n# CONFIG_RQ_MC is not set\nCONFIG_RQ_MC_LLC=y\n# CONFIG_RQ_SMP is not set\n# CONFIG_RQ_ALL is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# timer freq
|
|
||||||
if [ -n "$_timer_freq" ] && [ "$_timer_freq" != "300" ]; then
|
|
||||||
sed -i -e 's/CONFIG_HZ_300=y/# CONFIG_HZ_300 is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ_300_NODEF=y/# CONFIG_HZ_300_NODEF is not set/' ./.config
|
|
||||||
if [ "$_timer_freq" == "1000" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_HZ_1000 is not set/CONFIG_HZ_1000=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=1000/' ./.config
|
|
||||||
echo "# CONFIG_HZ_500 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_500_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750_NODEF is not set" >> ./.config
|
|
||||||
echo "CONFIG_HZ_1000_NODEF=y" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
elif [ "$_timer_freq" == "750" ]; then
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=750/' ./.config
|
|
||||||
echo "# CONFIG_HZ_500 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_500_NODEF is not set" >> ./.config
|
|
||||||
echo "CONFIG_HZ_750=y" >> ./.config
|
|
||||||
echo "CONFIG_HZ_750_NODEF=y" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_1000_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
elif [ "$_timer_freq" == "500" ]; then
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=500/' ./.config
|
|
||||||
echo "CONFIG_HZ_500=y" >> ./.config
|
|
||||||
echo "CONFIG_HZ_500_NODEF=y" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_1000_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
elif [ "$_timer_freq" == "100" ]; then
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=100/' ./.config
|
|
||||||
echo "# CONFIG_HZ_500 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_1000_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_500_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
echo "CONFIG_HZ_100=y" >> ./.config
|
|
||||||
echo "CONFIG_HZ_100_NODEF=y" >> ./.config
|
|
||||||
fi
|
|
||||||
elif [ "${_cpusched}" == "MuQSS" ] && [ -z "$_timer_freq" ]; then
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=100/' ./.config
|
|
||||||
echo "# CONFIG_HZ_500 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750 is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_1000_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_750_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_500_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
echo "CONFIG_HZ_100=y" >> ./.config
|
|
||||||
echo "CONFIG_HZ_100_NODEF=y" >> ./.config
|
|
||||||
else
|
|
||||||
sed -i -e 's/CONFIG_HZ_300=y/# CONFIG_HZ_300 is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ_300_NODEF=y/# CONFIG_HZ_300_NODEF is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ=300/CONFIG_HZ=500/' ./.config
|
|
||||||
echo "CONFIG_HZ_500=y" >> ./.config
|
|
||||||
echo "CONFIG_HZ_500_NODEF=y" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_250_NODEF is not set" >> ./.config
|
|
||||||
echo "# CONFIG_HZ_300_NODEF is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# default cpu gov
|
|
||||||
if [ "$_default_cpu_gov" == "performance" ]; then
|
|
||||||
sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y/' ./.config
|
|
||||||
elif [ "$_default_cpu_gov" == "ondemand" ]; then
|
|
||||||
sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ACPI_CPUFREQ disablement
|
|
||||||
if [ "$_disable_acpi_cpufreq" == "true" ]; then
|
|
||||||
sed -i -e 's/CONFIG_X86_ACPI_CPUFREQ=m/# CONFIG_X86_ACPI_CPUFREQ is not set/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ftrace
|
|
||||||
if [ -z "$_ftracedisable" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Disable FUNCTION_TRACER/GRAPH_TRACER? Lowers overhead but limits debugging"
|
|
||||||
plain "and analyzing of kernel functions."
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION2;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION2" == "y" ] || [ "$_ftracedisable" == "true" ]; then
|
|
||||||
sed -i -e 's/CONFIG_FUNCTION_TRACER=y/# CONFIG_FUNCTION_TRACER is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_FUNCTION_GRAPH_TRACER=y/# CONFIG_FUNCTION_GRAPH_TRACER is not set/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# disable numa
|
|
||||||
if [ -z "$_numadisable" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Disable NUMA? Lowers overhead, but breaks CUDA/NvEnc on Nvidia if disabled."
|
|
||||||
plain "https://bbs.archlinux.org/viewtopic.php?id=239174"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION3;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION3" == "y" ] || [ "$_numadisable" == "true" ]; then
|
|
||||||
# disable NUMA since 99.9% of users do not have multiple CPUs but do have multiple cores in one CPU
|
|
||||||
sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
|
|
||||||
-i -e '/CONFIG_AMD_NUMA=y/d' \
|
|
||||||
-i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
|
|
||||||
-i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
|
|
||||||
-i -e '/# CONFIG_NUMA_EMU is not set/d' \
|
|
||||||
-i -e '/CONFIG_NODES_SHIFT=6/d' \
|
|
||||||
-i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
|
|
||||||
-i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
|
|
||||||
-i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# tickless
|
|
||||||
if [ -z "$_tickless" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Use CattaRappa mode (Tickless/Dynticks) ?"
|
|
||||||
plain "Can give higher performances in many cases but lower consistency on some hardware."
|
|
||||||
plain "Just tickless idle can perform better with some platforms (mostly AMD) or CPU schedulers (mostly MuQSS)."
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
|
||||||
read -rp "`echo $'\n 0.No, use periodic ticks\n 1.Yes, full tickless baby!\n > 2.Just tickless idle plz\n [0-2?]: '`" CONDITION4;
|
|
||||||
else
|
|
||||||
read -rp "`echo $'\n 0.No, use periodic ticks\n > 1.Yes, full tickless baby!\n 2.Just tickless idle plz\n [0-2?]: '`" CONDITION4;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION4" == "0" ] || [ "$_tickless" == "0" ]; then
|
|
||||||
echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
|
|
||||||
sed -i -e 's/# CONFIG_HZ_PERIODIC is not set/CONFIG_HZ_PERIODIC=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ=y/# CONFIG_NO_HZ is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_COMMON=y/# CONFIG_NO_HZ_COMMON is not set/' ./.config
|
|
||||||
elif [ "$CONDITION4" == "2" ] || [ "$_tickless" == "2" ]; then
|
|
||||||
echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
|
|
||||||
else
|
|
||||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
|
||||||
echo "# CONFIG_NO_HZ_FULL_NODEF is not set" >> ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_IDLE is not set/CONFIG_NO_HZ_IDLE=y/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_FULL=y/# CONFIG_NO_HZ_FULL is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
|
|
||||||
else
|
|
||||||
echo "CONFIG_NO_HZ_FULL_NODEF=y" >> ./.config
|
|
||||||
sed -i -e 's/CONFIG_HZ_PERIODIC=y/# CONFIG_HZ_PERIODIC is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_NO_HZ_IDLE=y/# CONFIG_NO_HZ_IDLE is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_FULL is not set/CONFIG_NO_HZ_FULL=y/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ is not set/CONFIG_NO_HZ=y/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_NO_HZ_COMMON is not set/CONFIG_NO_HZ_COMMON=y/' ./.config
|
|
||||||
echo "CONFIG_CONTEXT_TRACKING=y" >> ./.config
|
|
||||||
echo "# CONFIG_CONTEXT_TRACKING_FORCE is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# voluntary preempt
|
|
||||||
if [ -z "$_voluntary_preempt" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Use explicit preemption points?"
|
|
||||||
plain "It can improve latency on PDS (at the cost of throughput)"
|
|
||||||
plain "and improve throughput on other schedulers (at the cost of latency)"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION5;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION5" == "y" ] || [ "$_voluntary_preempt" == "true" ]; then
|
|
||||||
sed -i -e 's/CONFIG_PREEMPT=y/# CONFIG_PREEMPT is not set/' ./.config
|
|
||||||
sed -i -e 's/CONFIG_PREEMPT_LL=y/# CONFIG_PREEMPT_LL is not set/' ./.config
|
|
||||||
sed -i -e 's/# CONFIG_PREEMPT_VOLUNTARY is not set/CONFIG_PREEMPT_VOLUNTARY=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Open Firmware support
|
|
||||||
if [ -z "$_OFenable" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Enable Device Tree and Open Firmware support?"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION6;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION6" == "y" ] || [ "$_OFenable" == "true" ]; then
|
|
||||||
sed -i -e 's/# CONFIG_OF is not set/CONFIG_OF=y/' ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# acs override
|
|
||||||
if [ -z "$_acs_override" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Use ACS override patch?"
|
|
||||||
plain "https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_.28ACS_override_patch.29"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION7;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION7" == "y" ] || [ "$_acs_override" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0006-add-acs-overrides_iommu.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
# bcachefs
|
|
||||||
if [ -z "$_bcachefs" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Add Bcache filesystem support? You'll have to install bcachefs-tools-git from AUR for utilities."
|
|
||||||
plain "https://bcachefs.org/"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION8;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION8" == "y" ] || [ "$_bcachefs" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0008-5.6-bcachefs.patch
|
|
||||||
echo "CONFIG_BCACHEFS_FS=m" >> ./.config
|
|
||||||
echo "CONFIG_BCACHEFS_QUOTA=y" >> ./.config
|
|
||||||
echo "CONFIG_BCACHEFS_POSIX_ACL=y" >> ./.config
|
|
||||||
echo "# CONFIG_BCACHEFS_DEBUG is not set" >> ./.config
|
|
||||||
echo "# CONFIG_BCACHEFS_TESTS is not set" >> ./.config
|
|
||||||
echo "# CONFIG_DEBUG_CLOSURES is not set" >> ./.config
|
|
||||||
fi
|
|
||||||
|
|
||||||
# fsync support
|
|
||||||
if [ -z "$_fsync" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Enable support for fsync, an experimental replacement for esync in Valve Proton 4.11+"
|
|
||||||
plain "https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION9;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION9" == "y" ] || [ "$_fsync" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0007-v5.6-fsync.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ZFS fix
|
|
||||||
if [ -z "$_zfsfix" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Add back missing symbol for AES-NI/AVX support on ZFS"
|
|
||||||
plain "https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions_5_3.patch"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITION11;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITION11" == "y" ] || [ "$_zfsfix" == "true" ]; then
|
|
||||||
patch -Np1 -i ../0011-ZFS-fix.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Community patches
|
|
||||||
if [ -n "$_community_patches" ]; then
|
|
||||||
if [ ! -d "$_where/../../community-patches" ]; then
|
|
||||||
cd "$_where/../.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${srcdir}/linux-${_basekernel}"
|
|
||||||
fi
|
|
||||||
_community_patches=($_community_patches)
|
|
||||||
for _p in ${_community_patches[@]}; do
|
|
||||||
ln -s "$_where"/../../community-patches/linux56-tkg/$_p "$_where"/
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# userpatches
|
|
||||||
if [ "$_user_patches" == "true" ]; then
|
|
||||||
_userpatch_target="linux-${_basekernel}"
|
|
||||||
_userpatch_ext="my"
|
|
||||||
user_patcher
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Community patches removal
|
|
||||||
for _p in ${_community_patches[@]}; do
|
|
||||||
rm -f "$_where"/$_p
|
|
||||||
done
|
|
||||||
|
|
||||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
|
||||||
sed -i '2iexit 0' scripts/depmod.sh
|
|
||||||
|
|
||||||
# get kernel version
|
|
||||||
make prepare
|
|
||||||
|
|
||||||
# modprobed-db
|
|
||||||
if [ -z "$_modprobeddb" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "Use modprobed db to clean config from unneeded modules?"
|
|
||||||
plain "Speeds up compilation considerably. Requires root."
|
|
||||||
plain "https://wiki.archlinux.org/index.php/Modprobed-db"
|
|
||||||
plain "!!!! Make sure to have a well populated db !!!!"
|
|
||||||
read -rp "`echo $' > N/y : '`" CONDITIONMPDB;
|
|
||||||
fi
|
|
||||||
if [ "$CONDITIONMPDB" == "y" ] || [ "$_modprobeddb" == "true" ]; then
|
|
||||||
sudo modprobed-db recall
|
|
||||||
make localmodconfig
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ true = "$_config_fragments" ]; then
|
|
||||||
local fragments=()
|
|
||||||
mapfile -d '' -t fragments < <(find "$_where"/ -type f -name "*.myfrag" -print0)
|
|
||||||
|
|
||||||
if [ true = "$_config_fragments_no_confirm" ]; then
|
|
||||||
printf 'Using config fragment %s\n' "${fragments[@]#$_where/}"
|
|
||||||
else
|
|
||||||
for i in "${!fragments[@]}"; do
|
|
||||||
while true; do
|
|
||||||
read -r -p 'Found config fragment '"${fragments[$i]#$_where/}"', apply it? [y/N] ' CONDITIONMPDB
|
|
||||||
CONDITIONMPDB="$(printf '%s' "$CONDITIONMPDB" | tr '[:upper:]' '[:lower:]')"
|
|
||||||
case "$CONDITIONMPDB" in
|
|
||||||
y|yes)
|
|
||||||
break;;
|
|
||||||
n|no|'')
|
|
||||||
unset fragments[$i]
|
|
||||||
break;;
|
|
||||||
*)
|
|
||||||
echo 'Please answer with yes or no'
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ 0 -lt "${#fragments[@]}" ]; then
|
|
||||||
scripts/kconfig/merge_config.sh -m .config "${fragments[@]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# menuconfig / nconfig
|
|
||||||
if [ -z "$_menunconfig" ]; then
|
|
||||||
plain ""
|
|
||||||
plain "*Optional* For advanced users - Do you want to use make menuconfig or nconfig"
|
|
||||||
plain "to configure the kernel before building it?"
|
|
||||||
plain "If you do, make sure your terminal is currently"
|
|
||||||
plain "at least 19 lines by 80 columns large or you'll get an error :D"
|
|
||||||
read -rp "`echo $' > 0. nope\n 1. menuconfig\n 2. nconfig\n choice[0-2?]: '`" CONDITIONMNC;
|
|
||||||
_menunconfig="$CONDITIONMNC"
|
|
||||||
fi
|
|
||||||
if [ 1 = "$_menunconfig" ]; then
|
|
||||||
cp .config .config.orig
|
|
||||||
make menuconfig
|
|
||||||
elif [ 2 = "$_menunconfig" ]; then
|
|
||||||
cp .config .config.orig
|
|
||||||
make nconfig
|
|
||||||
else
|
|
||||||
# rewrite configuration
|
|
||||||
yes "" | make config >/dev/null
|
|
||||||
fi
|
|
||||||
if [ 1 = "$_menunconfig" ] || [ 2 = "$_menunconfig" ]; then
|
|
||||||
if [ -z "${_diffconfig}" ]; then
|
|
||||||
while true; do
|
|
||||||
read -r -p 'Generate a config fragment from your changes? [y/N] ' CONDITIONF
|
|
||||||
CONDITIONF="$(printf '%s' "$CONDITIONF" | tr '[:upper:]' '[:lower:]')"
|
|
||||||
case "$CONDITIONF" in
|
|
||||||
y|yes)
|
|
||||||
_diffconfig=true
|
|
||||||
break;;
|
|
||||||
n|no|'')
|
|
||||||
_diffconfig=false
|
|
||||||
break;;
|
|
||||||
*)
|
|
||||||
echo 'Please answer with yes or no'
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
if [ true = "$_diffconfig" ]; then
|
|
||||||
if [ -z "$_diffconfig_name" ]; then
|
|
||||||
IFS= read -r -p 'Filename for the config fragment [leave empty to not generate fragment]: ' _diffconfig_name
|
|
||||||
fi
|
|
||||||
if [ -z "$_diffconfig_name" ]; then
|
|
||||||
echo 'No file name given, not generating config fragment.'
|
|
||||||
else (
|
|
||||||
prev_pwd="${PWD:-$(pwd)}"
|
|
||||||
cd "$_where"
|
|
||||||
"${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
|
|
||||||
) fi
|
|
||||||
fi
|
|
||||||
rm .config.orig
|
|
||||||
fi
|
|
||||||
|
|
||||||
make -s kernelrelease > version
|
|
||||||
msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
# linux56-TkG config file
|
|
||||||
# Ryzen Desktop
|
|
||||||
|
|
||||||
|
|
||||||
#### MISC OPTIONS ####
|
|
||||||
|
|
||||||
# External config file to use - If the given file exists in path, it will override default config (customization.cfg) - Default is ~/.config/frogminer/linux52-tkg.cfg
|
|
||||||
_EXT_CONFIG_PATH=~/.config/frogminer/linux56-tkg.cfg
|
|
||||||
|
|
||||||
#### KERNEL OPTIONS ####
|
|
||||||
|
|
||||||
# Name of the default config file to use from the linux???-tkg-config folder. Arch default is "config.x86_64".
|
|
||||||
_configfile="config.x86_64"
|
|
||||||
|
|
||||||
# Disable some non-module debugging - See PKGBUILD for the list
|
|
||||||
_debugdisable="false"
|
|
||||||
|
|
||||||
# LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME
|
|
||||||
|
|
||||||
# Set to "true" to disable FUNCTION_TRACER/GRAPH_TRACER, lowering overhead but limiting debugging and analyzing of kernel functions - Kernel default is "false"
|
|
||||||
_ftracedisable="false"
|
|
||||||
|
|
||||||
# Set to "true" to disable NUMA, lowering overhead, but breaking CUDA/NvEnc on Nvidia equipped systems - Kernel default is "false"
|
|
||||||
_numadisable="false"
|
|
||||||
|
|
||||||
# Set to "true" to use explicit preemption points to lower latency at the cost of a small throughput loss - Can give a nice perf boost in VMs - Kernel default is "false"
|
|
||||||
_voluntary_preempt="false"
|
|
||||||
|
|
||||||
# A selection of patches from Zen/Liquorix kernel and additional tweaks for a better gaming experience (ZENIFY) - Default is "true"
|
|
||||||
_zenify="true"
|
|
||||||
|
|
||||||
# compiler optimization level - 1. Optimize for performance (-O2); 2. Optimize harder (-O3); 3. Optimize for size (-Os) - Kernel default is "2"
|
|
||||||
_compileroptlevel="1"
|
|
||||||
|
|
||||||
# Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
|
|
||||||
_random_trust_cpu="false"
|
|
||||||
|
|
||||||
# CPU scheduler runqueue sharing - No sharing (RQ_NONE), SMT (hyperthread) siblings (RQ_SMT), Multicore siblings (RQ_MC), Symmetric Multi-Processing (RQ_SMP), NUMA (RQ_ALL)
|
|
||||||
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "mc"
|
|
||||||
_runqueue_sharing="mc-llc"
|
|
||||||
|
|
||||||
# Timer frequency - "500", "750" or "1000" - More options available in kernel config prompt when left empty depending on selected cpusched - Kernel default is "500"
|
|
||||||
_timer_freq="500"
|
|
||||||
|
|
||||||
# Default CPU governor - "performance", "ondemand" (tweaked), "schedutil" or leave empty for default (schedutil on AMD and legacy Intel, intel_pstate on modern Intel) - Enforcing an option will disable intel_pstate altogether!
|
|
||||||
_default_cpu_gov="performance"
|
|
||||||
|
|
||||||
|
|
||||||
#### USER PATCHES ####
|
|
||||||
|
|
||||||
# You can use your own patches by putting them in the same folder as the PKGBUILD and giving them the .mypatch extension.
|
|
||||||
# You can also revert patches by putting them in the same folder as the PKGBUILD and giving them the .myrevert extension.
|
|
||||||
|
|
||||||
# Also, userpatches variable below must be set to true for the above to work.
|
|
||||||
_user_patches="true"
|
|
||||||
|
|
||||||
# Apply all user patches without confirmation - !!! NOT RECOMMENDED !!!
|
|
||||||
_user_patches_no_confirm="false"
|
|
||||||
@ -1,156 +0,0 @@
|
|||||||
From 5ec2dd3a095442ec1a21d86042a4994f2ba24e63 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <5ec2dd3a095442ec1a21d86042a4994f2ba24e63.1512651251.git.jan.steffens@gmail.com>
|
|
||||||
From: Serge Hallyn <serge.hallyn@canonical.com>
|
|
||||||
Date: Fri, 31 May 2013 19:12:12 +0100
|
|
||||||
Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default
|
|
||||||
|
|
||||||
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
|
|
||||||
[bwh: Remove unneeded binary sysctl bits]
|
|
||||||
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
|
|
||||||
---
|
|
||||||
kernel/fork.c | 15 +++++++++++++++
|
|
||||||
kernel/sysctl.c | 12 ++++++++++++
|
|
||||||
kernel/user_namespace.c | 3 +++
|
|
||||||
3 files changed, 30 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
|
||||||
index 07cc743698d3668e..4011d68a8ff9305c 100644
|
|
||||||
--- a/kernel/fork.c
|
|
||||||
+++ b/kernel/fork.c
|
|
||||||
@@ -102,6 +102,11 @@
|
|
||||||
|
|
||||||
#define CREATE_TRACE_POINTS
|
|
||||||
#include <trace/events/task.h>
|
|
||||||
+#ifdef CONFIG_USER_NS
|
|
||||||
+extern int unprivileged_userns_clone;
|
|
||||||
+#else
|
|
||||||
+#define unprivileged_userns_clone 0
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Minimum number of threads to boot the kernel
|
|
||||||
@@ -1555,6 +1560,10 @@ static __latent_entropy struct task_struct *copy_process(
|
|
||||||
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
|
|
||||||
return ERR_PTR(-EINVAL);
|
|
||||||
|
|
||||||
+ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
|
|
||||||
+ if (!capable(CAP_SYS_ADMIN))
|
|
||||||
+ return ERR_PTR(-EPERM);
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Thread groups must share signals as well, and detached threads
|
|
||||||
* can only be started up within the thread group.
|
|
||||||
@@ -2348,6 +2357,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
|
|
||||||
if (unshare_flags & CLONE_NEWNS)
|
|
||||||
unshare_flags |= CLONE_FS;
|
|
||||||
|
|
||||||
+ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
|
|
||||||
+ err = -EPERM;
|
|
||||||
+ if (!capable(CAP_SYS_ADMIN))
|
|
||||||
+ goto bad_unshare_out;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
err = check_unshare_flags(unshare_flags);
|
|
||||||
if (err)
|
|
||||||
goto bad_unshare_out;
|
|
||||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
|
||||||
index b86520ed3fb60fbf..f7dab3760839f1a1 100644
|
|
||||||
--- a/kernel/sysctl.c
|
|
||||||
+++ b/kernel/sysctl.c
|
|
||||||
@@ -105,6 +105,9 @@ extern int core_uses_pid;
|
|
||||||
extern char core_pattern[];
|
|
||||||
extern unsigned int core_pipe_limit;
|
|
||||||
#endif
|
|
||||||
+#ifdef CONFIG_USER_NS
|
|
||||||
+extern int unprivileged_userns_clone;
|
|
||||||
+#endif
|
|
||||||
extern int pid_max;
|
|
||||||
extern int pid_max_min, pid_max_max;
|
|
||||||
extern int percpu_pagelist_fraction;
|
|
||||||
@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = {
|
|
||||||
.proc_handler = proc_dointvec,
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
+#ifdef CONFIG_USER_NS
|
|
||||||
+ {
|
|
||||||
+ .procname = "unprivileged_userns_clone",
|
|
||||||
+ .data = &unprivileged_userns_clone,
|
|
||||||
+ .maxlen = sizeof(int),
|
|
||||||
+ .mode = 0644,
|
|
||||||
+ .proc_handler = proc_dointvec,
|
|
||||||
+ },
|
|
||||||
+#endif
|
|
||||||
#ifdef CONFIG_PROC_SYSCTL
|
|
||||||
{
|
|
||||||
.procname = "tainted",
|
|
||||||
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
|
|
||||||
index c490f1e4313b998a..dd03bd39d7bf194d 100644
|
|
||||||
--- a/kernel/user_namespace.c
|
|
||||||
+++ b/kernel/user_namespace.c
|
|
||||||
@@ -24,6 +24,9 @@
|
|
||||||
#include <linux/projid.h>
|
|
||||||
#include <linux/fs_struct.h>
|
|
||||||
|
|
||||||
+/* sysctl */
|
|
||||||
+int unprivileged_userns_clone;
|
|
||||||
+
|
|
||||||
static struct kmem_cache *user_ns_cachep __read_mostly;
|
|
||||||
static DEFINE_MUTEX(userns_state_mutex);
|
|
||||||
|
|
||||||
--
|
|
||||||
2.15.1
|
|
||||||
|
|
||||||
From b5202296055dd333db4425120d3f93ef4e6a0573 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
||||||
Date: Thu, 7 Dec 2017 13:50:48 +0100
|
|
||||||
Subject: ZEN: Add CONFIG for unprivileged_userns_clone
|
|
||||||
|
|
||||||
This way our default behavior continues to match the vanilla kernel.
|
|
||||||
---
|
|
||||||
init/Kconfig | 16 ++++++++++++++++
|
|
||||||
kernel/user_namespace.c | 4 ++++
|
|
||||||
2 files changed, 20 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
|
||||||
index 4592bf7997c0..f3df02990aff 100644
|
|
||||||
--- a/init/Kconfig
|
|
||||||
+++ b/init/Kconfig
|
|
||||||
@@ -1004,6 +1004,22 @@ config USER_NS
|
|
||||||
|
|
||||||
If unsure, say N.
|
|
||||||
|
|
||||||
+config USER_NS_UNPRIVILEGED
|
|
||||||
+ bool "Allow unprivileged users to create namespaces"
|
|
||||||
+ default y
|
|
||||||
+ depends on USER_NS
|
|
||||||
+ help
|
|
||||||
+ When disabled, unprivileged users will not be able to create
|
|
||||||
+ new namespaces. Allowing users to create their own namespaces
|
|
||||||
+ has been part of several recent local privilege escalation
|
|
||||||
+ exploits, so if you need user namespaces but are
|
|
||||||
+ paranoid^Wsecurity-conscious you want to disable this.
|
|
||||||
+
|
|
||||||
+ This setting can be overridden at runtime via the
|
|
||||||
+ kernel.unprivileged_userns_clone sysctl.
|
|
||||||
+
|
|
||||||
+ If unsure, say Y.
|
|
||||||
+
|
|
||||||
config PID_NS
|
|
||||||
bool "PID Namespaces"
|
|
||||||
default y
|
|
||||||
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
|
|
||||||
index 6b9dbc257e34..107b17f0d528 100644
|
|
||||||
--- a/kernel/user_namespace.c
|
|
||||||
+++ b/kernel/user_namespace.c
|
|
||||||
@@ -27,7 +27,11 @@
|
|
||||||
#include <linux/sort.h>
|
|
||||||
|
|
||||||
/* sysctl */
|
|
||||||
+#ifdef CONFIG_USER_NS_UNPRIVILEGED
|
|
||||||
+int unprivileged_userns_clone = 1;
|
|
||||||
+#else
|
|
||||||
int unprivileged_userns_clone;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static struct kmem_cache *user_ns_cachep __read_mostly;
|
|
||||||
static DEFINE_MUTEX(userns_state_mutex);
|
|
||||||
@ -1,354 +0,0 @@
|
|||||||
From 2ac70785613ef4c6b16414986bb18bd7b60d2a13 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arjan van de Ven <arjan@linux.intel.com>
|
|
||||||
Date: Mon, 14 Mar 2016 11:10:58 -0600
|
|
||||||
Subject: [PATCH] pci pme wakeups
|
|
||||||
|
|
||||||
Reduce wakeups for PME checks, which are a workaround for miswired
|
|
||||||
boards (sadly, too many of them) in laptops.
|
|
||||||
---
|
|
||||||
drivers/pci/pci.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
|
||||||
index c25acace7d91..0ddebdad9f5b 100644
|
|
||||||
--- a/drivers/pci/pci.c
|
|
||||||
+++ b/drivers/pci/pci.c
|
|
||||||
@@ -61,7 +61,7 @@ struct pci_pme_device {
|
|
||||||
struct pci_dev *dev;
|
|
||||||
};
|
|
||||||
|
|
||||||
-#define PME_TIMEOUT 1000 /* How long between PME checks */
|
|
||||||
+#define PME_TIMEOUT 4000 /* How long between PME checks */
|
|
||||||
|
|
||||||
static void pci_dev_d3_sleep(struct pci_dev *dev)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
From 7e7e36c67aa71d6a1ec5676d99d37c1fea389ceb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arjan van de Ven <arjan@linux.intel.com>
|
|
||||||
Date: Sat, 19 Mar 2016 21:32:19 -0400
|
|
||||||
Subject: [PATCH] intel_idle: tweak cpuidle cstates
|
|
||||||
|
|
||||||
Increase target_residency in cpuidle cstate
|
|
||||||
|
|
||||||
Tune intel_idle to be a bit less agressive;
|
|
||||||
Clear linux is cleaner in hygiene (wakupes) than the average linux,
|
|
||||||
so we can afford changing these in a way that increases
|
|
||||||
performance while keeping power efficiency
|
|
||||||
---
|
|
||||||
drivers/idle/intel_idle.c | 44 +++++++++++++++++++--------------------
|
|
||||||
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
|
|
||||||
index 8b5d85c91e9d..5e2d813a048d 100644
|
|
||||||
--- a/drivers/idle/intel_idle.c
|
|
||||||
+++ b/drivers/idle/intel_idle.c
|
|
||||||
@@ -466,7 +466,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x01",
|
|
||||||
.flags = MWAIT2flg(0x01),
|
|
||||||
.exit_latency = 10,
|
|
||||||
- .target_residency = 20,
|
|
||||||
+ .target_residency = 120,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -474,7 +474,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x10",
|
|
||||||
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 33,
|
|
||||||
- .target_residency = 100,
|
|
||||||
+ .target_residency = 900,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -482,7 +482,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x20",
|
|
||||||
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 133,
|
|
||||||
- .target_residency = 400,
|
|
||||||
+ .target_residency = 1000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -490,7 +490,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x32",
|
|
||||||
.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 166,
|
|
||||||
- .target_residency = 500,
|
|
||||||
+ .target_residency = 1500,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -498,7 +498,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x40",
|
|
||||||
.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 300,
|
|
||||||
- .target_residency = 900,
|
|
||||||
+ .target_residency = 2000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -506,7 +506,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x50",
|
|
||||||
.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 600,
|
|
||||||
- .target_residency = 1800,
|
|
||||||
+ .target_residency = 5000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -514,7 +514,7 @@ static struct cpuidle_state hsw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x60",
|
|
||||||
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 2600,
|
|
||||||
- .target_residency = 7700,
|
|
||||||
+ .target_residency = 9000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -534,7 +534,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x01",
|
|
||||||
.flags = MWAIT2flg(0x01),
|
|
||||||
.exit_latency = 10,
|
|
||||||
- .target_residency = 20,
|
|
||||||
+ .target_residency = 120,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -542,7 +542,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x10",
|
|
||||||
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 40,
|
|
||||||
- .target_residency = 100,
|
|
||||||
+ .target_residency = 1000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -550,7 +550,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x20",
|
|
||||||
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 133,
|
|
||||||
- .target_residency = 400,
|
|
||||||
+ .target_residency = 1000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -558,7 +558,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x32",
|
|
||||||
.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 166,
|
|
||||||
- .target_residency = 500,
|
|
||||||
+ .target_residency = 2000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -566,7 +566,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x40",
|
|
||||||
.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 300,
|
|
||||||
- .target_residency = 900,
|
|
||||||
+ .target_residency = 4000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -574,7 +574,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x50",
|
|
||||||
.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 600,
|
|
||||||
- .target_residency = 1800,
|
|
||||||
+ .target_residency = 7000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -582,7 +582,7 @@ static struct cpuidle_state bdw_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x60",
|
|
||||||
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 2600,
|
|
||||||
- .target_residency = 7700,
|
|
||||||
+ .target_residency = 9000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -603,7 +603,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x01",
|
|
||||||
.flags = MWAIT2flg(0x01),
|
|
||||||
.exit_latency = 10,
|
|
||||||
- .target_residency = 20,
|
|
||||||
+ .target_residency = 120,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -611,7 +611,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x10",
|
|
||||||
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 70,
|
|
||||||
- .target_residency = 100,
|
|
||||||
+ .target_residency = 1000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -619,7 +619,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x20",
|
|
||||||
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 85,
|
|
||||||
- .target_residency = 200,
|
|
||||||
+ .target_residency = 600,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -627,7 +627,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x33",
|
|
||||||
.flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 124,
|
|
||||||
- .target_residency = 800,
|
|
||||||
+ .target_residency = 3000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -635,7 +635,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x40",
|
|
||||||
.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 200,
|
|
||||||
- .target_residency = 800,
|
|
||||||
+ .target_residency = 3200,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -643,7 +643,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x50",
|
|
||||||
.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 480,
|
|
||||||
- .target_residency = 5000,
|
|
||||||
+ .target_residency = 9000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -651,7 +651,7 @@ static struct cpuidle_state skl_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x60",
|
|
||||||
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
|
|
||||||
.exit_latency = 890,
|
|
||||||
- .target_residency = 5000,
|
|
||||||
+ .target_residency = 9000,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
@@ -672,7 +672,7 @@ static struct cpuidle_state skx_cstates[] = {
|
|
||||||
.desc = "MWAIT 0x01",
|
|
||||||
.flags = MWAIT2flg(0x01),
|
|
||||||
.exit_latency = 10,
|
|
||||||
- .target_residency = 20,
|
|
||||||
+ .target_residency = 300,
|
|
||||||
.enter = &intel_idle,
|
|
||||||
.enter_s2idle = intel_idle_s2idle, },
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
From b8211d4f79dd88dfc2d4bd52be46103ea0b70e3e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arjan van de Ven <arjan@linux.intel.com>
|
|
||||||
Date: Fri, 6 Jan 2017 15:34:09 +0000
|
|
||||||
Subject: [PATCH] ipv4/tcp: allow the memory tuning for tcp to go a little
|
|
||||||
bigger than default
|
|
||||||
|
|
||||||
---
|
|
||||||
net/ipv4/tcp.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
|
|
||||||
index cf3c5095c10e..b30d51837b2d 100644
|
|
||||||
--- a/net/ipv4/tcp.c
|
|
||||||
+++ b/net/ipv4/tcp.c
|
|
||||||
@@ -3897,8 +3897,8 @@ void __init tcp_init(void)
|
|
||||||
tcp_init_mem();
|
|
||||||
/* Set per-socket limits to no more than 1/128 the pressure threshold */
|
|
||||||
limit = nr_free_buffer_pages() << (PAGE_SHIFT - 7);
|
|
||||||
- max_wshare = min(4UL*1024*1024, limit);
|
|
||||||
- max_rshare = min(6UL*1024*1024, limit);
|
|
||||||
+ max_wshare = min(16UL*1024*1024, limit);
|
|
||||||
+ max_rshare = min(16UL*1024*1024, limit);
|
|
||||||
|
|
||||||
init_net.ipv4.sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;
|
|
||||||
init_net.ipv4.sysctl_tcp_wmem[1] = 16*1024;
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
From 050223869257b87e22636158a80da38d877248ed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arjan van de Ven <arjan@linux.intel.com>
|
|
||||||
Date: Sun, 18 Feb 2018 23:35:41 +0000
|
|
||||||
Subject: [PATCH] locking: rwsem: spin faster
|
|
||||||
|
|
||||||
tweak rwsem owner spinning a bit
|
|
||||||
---
|
|
||||||
kernel/locking/rwsem.c | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
|
|
||||||
index eef04551eae7..1ec5ab4c8ff7 100644
|
|
||||||
--- a/kernel/locking/rwsem.c
|
|
||||||
+++ b/kernel/locking/rwsem.c
|
|
||||||
@@ -720,6 +720,7 @@ rwsem_spin_on_owner(struct rw_semaphore *sem, unsigned long nonspinnable)
|
|
||||||
struct task_struct *new, *owner;
|
|
||||||
unsigned long flags, new_flags;
|
|
||||||
enum owner_state state;
|
|
||||||
+ int i = 0;
|
|
||||||
|
|
||||||
owner = rwsem_owner_flags(sem, &flags);
|
|
||||||
state = rwsem_owner_state(owner, flags, nonspinnable);
|
|
||||||
@@ -753,7 +754,8 @@ rwsem_spin_on_owner(struct rw_semaphore *sem, unsigned long nonspinnable)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- cpu_relax();
|
|
||||||
+ if (i++ > 1000)
|
|
||||||
+ cpu_relax();
|
|
||||||
}
|
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
From b836ea320114643d4354b43acb6ec8bb06ada487 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Arjan van de Ven <arjan@linux.intel.com>
|
|
||||||
Date: Thu, 2 Jun 2016 23:36:32 -0500
|
|
||||||
Subject: [PATCH] drivers: Initialize ata before graphics
|
|
||||||
|
|
||||||
ATA init is the long pole in the boot process, and its asynchronous.
|
|
||||||
move the graphics init after it so that ata and graphics initialize
|
|
||||||
in parallel
|
|
||||||
---
|
|
||||||
drivers/Makefile | 15 ++++++++-------
|
|
||||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/Makefile b/drivers/Makefile
|
|
||||||
index aaef17cc6512..d08f3a394929 100644
|
|
||||||
--- a/drivers/Makefile
|
|
||||||
+++ b/drivers/Makefile
|
|
||||||
@@ -58,15 +58,8 @@ obj-y += char/
|
|
||||||
# iommu/ comes before gpu as gpu are using iommu controllers
|
|
||||||
obj-y += iommu/
|
|
||||||
|
|
||||||
-# gpu/ comes after char for AGP vs DRM startup and after iommu
|
|
||||||
-obj-y += gpu/
|
|
||||||
-
|
|
||||||
obj-$(CONFIG_CONNECTOR) += connector/
|
|
||||||
|
|
||||||
-# i810fb and intelfb depend on char/agp/
|
|
||||||
-obj-$(CONFIG_FB_I810) += video/fbdev/i810/
|
|
||||||
-obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
|
|
||||||
-
|
|
||||||
obj-$(CONFIG_PARPORT) += parport/
|
|
||||||
obj-$(CONFIG_NVM) += lightnvm/
|
|
||||||
obj-y += base/ block/ misc/ mfd/ nfc/
|
|
||||||
@@ -79,6 +72,14 @@ obj-$(CONFIG_IDE) += ide/
|
|
||||||
obj-y += scsi/
|
|
||||||
obj-y += nvme/
|
|
||||||
obj-$(CONFIG_ATA) += ata/
|
|
||||||
+
|
|
||||||
+# gpu/ comes after char for AGP vs DRM startup and after iommu
|
|
||||||
+obj-y += gpu/
|
|
||||||
+
|
|
||||||
+# i810fb and intelfb depend on char/agp/
|
|
||||||
+obj-$(CONFIG_FB_I810) += video/fbdev/i810/
|
|
||||||
+obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
|
|
||||||
+
|
|
||||||
obj-$(CONFIG_TARGET_CORE) += target/
|
|
||||||
obj-$(CONFIG_MTD) += mtd/
|
|
||||||
obj-$(CONFIG_SPI) += spi/
|
|
||||||
@ -1,900 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched
|
|
||||||
|
|
||||||
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
|
|
||||||
index 87f1fc9..b3be470 100755
|
|
||||||
--- a/scripts/mkcompile_h
|
|
||||||
+++ b/scripts/mkcompile_h
|
|
||||||
@@ -50,8 +50,8 @@ else
|
|
||||||
fi
|
|
||||||
|
|
||||||
UTS_VERSION="#$VERSION"
|
|
||||||
-CONFIG_FLAGS=""
|
|
||||||
-if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
|
|
||||||
+CONFIG_FLAGS="TKG"
|
|
||||||
+if [ -n "$SMP" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS SMP"; fi
|
|
||||||
if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
|
|
||||||
UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
|
|
||||||
|
|
||||||
diff --git a/fs/dcache.c b/fs/dcache.c
|
|
||||||
index 2acfc69878f5..3f1131431e06 100644
|
|
||||||
--- a/fs/dcache.c
|
|
||||||
+++ b/fs/dcache.c
|
|
||||||
@@ -69,7 +69,7 @@
|
|
||||||
* If no ancestor relationship:
|
|
||||||
* arbitrary, since it's serialized on rename_lock
|
|
||||||
*/
|
|
||||||
-int sysctl_vfs_cache_pressure __read_mostly = 100;
|
|
||||||
+int sysctl_vfs_cache_pressure __read_mostly = 50;
|
|
||||||
EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
|
|
||||||
|
|
||||||
__cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);
|
|
||||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
||||||
index 211890edf37e..37121563407d 100644
|
|
||||||
--- a/kernel/sched/core.c
|
|
||||||
+++ b/kernel/sched/core.c
|
|
||||||
@@ -41,7 +41,7 @@ const_debug unsigned int sysctl_sched_features =
|
|
||||||
* Number of tasks to iterate in a single balance run.
|
|
||||||
* Limited because this is done with IRQs disabled.
|
|
||||||
*/
|
|
||||||
-const_debug unsigned int sysctl_sched_nr_migrate = 32;
|
|
||||||
+const_debug unsigned int sysctl_sched_nr_migrate = 128;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* period over which we average the RT time consumption, measured
|
|
||||||
@@ -61,9 +61,9 @@ __read_mostly int scheduler_running;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* part of the period that we allow rt tasks to run in us.
|
|
||||||
- * default: 0.95s
|
|
||||||
+ * XanMod default: 0.98s
|
|
||||||
*/
|
|
||||||
-int sysctl_sched_rt_runtime = 950000;
|
|
||||||
+int sysctl_sched_rt_runtime = 980000;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* __task_rq_lock - lock the rq @p resides on.
|
|
||||||
diff --git a/mm/zswap.c b/mm/zswap.c
|
|
||||||
index 61a5c41972db..2674c2806130 100644
|
|
||||||
--- a/mm/zswap.c
|
|
||||||
+++ b/mm/zswap.c
|
|
||||||
@@ -91,7 +91,7 @@ static struct kernel_param_ops zswap_enabled_param_ops = {
|
|
||||||
module_param_cb(enabled, &zswap_enabled_param_ops, &zswap_enabled, 0644);
|
|
||||||
|
|
||||||
/* Crypto compressor to use */
|
|
||||||
-#define ZSWAP_COMPRESSOR_DEFAULT "lzo"
|
|
||||||
+#define ZSWAP_COMPRESSOR_DEFAULT "lz4"
|
|
||||||
static char *zswap_compressor = ZSWAP_COMPRESSOR_DEFAULT;
|
|
||||||
static int zswap_compressor_param_set(const char *,
|
|
||||||
const struct kernel_param *);
|
|
||||||
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
|
|
||||||
index 71f39410691b..288f9679e883 100755
|
|
||||||
--- a/scripts/setlocalversion
|
|
||||||
+++ b/scripts/setlocalversion
|
|
||||||
@@ -54,7 +54,7 @@ scm_version()
|
|
||||||
# If only the short version is requested, don't bother
|
|
||||||
# running further git commands
|
|
||||||
if $short; then
|
|
||||||
- echo "+"
|
|
||||||
+ # echo "+"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
# If we are past a tagged commit (like
|
|
||||||
|
|
||||||
From f85ed068b4d0e6c31edce8574a95757a60e58b87 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Etienne Juvigny <Ti3noU@gmail.com>
|
|
||||||
Date: Mon, 3 Sep 2018 17:36:25 +0200
|
|
||||||
Subject: Zenify & stuff
|
|
||||||
|
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
|
||||||
index b4daad2bac23..c1e59dc04209 100644
|
|
||||||
--- a/init/Kconfig
|
|
||||||
+++ b/init/Kconfig
|
|
||||||
@@ -1244,7 +1244,6 @@ config CC_OPTIMIZE_FOR_PERFORMANCE
|
|
||||||
|
|
||||||
config CC_OPTIMIZE_FOR_PERFORMANCE_O3
|
|
||||||
bool "Optimize more for performance (-O3)"
|
|
||||||
- depends on ARC
|
|
||||||
help
|
|
||||||
Choosing this option will pass "-O3" to your compiler to optimize
|
|
||||||
the kernel yet more for performance.
|
|
||||||
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
|
|
||||||
index 4f32c4062fb6..c0bf039e1b40 100644
|
|
||||||
--- a/drivers/infiniband/core/addr.c
|
|
||||||
+++ b/drivers/infiniband/core/addr.c
|
|
||||||
@@ -721,6 +721,7 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
|
|
||||||
struct sockaddr _sockaddr;
|
|
||||||
struct sockaddr_in _sockaddr_in;
|
|
||||||
struct sockaddr_in6 _sockaddr_in6;
|
|
||||||
+ struct sockaddr_ib _sockaddr_ib;
|
|
||||||
} sgid_addr, dgid_addr;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
|
||||||
index 0840d27381ea..73aba9a31064 100644
|
|
||||||
--- a/drivers/tty/Kconfig
|
|
||||||
+++ b/drivers/tty/Kconfig
|
|
||||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
|
||||||
def_bool y
|
|
||||||
depends on VT_CONSOLE && PM_SLEEP
|
|
||||||
|
|
||||||
+config NR_TTY_DEVICES
|
|
||||||
+ int "Maximum tty device number"
|
|
||||||
+ depends on VT
|
|
||||||
+ range 12 63
|
|
||||||
+ default 63
|
|
||||||
+ ---help---
|
|
||||||
+ This option is used to change the number of tty devices in /dev.
|
|
||||||
+ The default value is 63. The lowest number you can set is 12,
|
|
||||||
+ 63 is also the upper limit so we don't overrun the serial
|
|
||||||
+ consoles.
|
|
||||||
+
|
|
||||||
+ If unsure, say 63.
|
|
||||||
+
|
|
||||||
config HW_CONSOLE
|
|
||||||
bool
|
|
||||||
depends on VT && !UML
|
|
||||||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
|
|
||||||
index 79226ca8f80f..2a30060e7e1d 100644
|
|
||||||
--- a/include/linux/blkdev.h
|
|
||||||
+++ b/include/linux/blkdev.h
|
|
||||||
@@ -47,7 +47,11 @@ struct blk_queue_stats;
|
|
||||||
struct blk_stat_callback;
|
|
||||||
|
|
||||||
#define BLKDEV_MIN_RQ 4
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+#define BLKDEV_MAX_RQ 512
|
|
||||||
+#else
|
|
||||||
#define BLKDEV_MAX_RQ 128 /* Default maximum */
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Must be consistent with blk_mq_poll_stats_bkt() */
|
|
||||||
#define BLK_MQ_POLL_STATS_BKTS 16
|
|
||||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
|
||||||
index e9d39c48520a..3bceead8da40 100644
|
|
||||||
--- a/include/uapi/linux/vt.h
|
|
||||||
+++ b/include/uapi/linux/vt.h
|
|
||||||
@@ -3,12 +3,25 @@
|
|
||||||
#define _UAPI_LINUX_VT_H
|
|
||||||
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * We will make this definition solely for the purpose of making packages
|
|
||||||
+ * such as splashutils build, because they can not understand that
|
|
||||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
|
||||||
+ */
|
|
||||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
|
||||||
+#define CONFIG_NR_TTY_DEVICES 63
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* These constants are also useful for user-level apps (e.g., VC
|
|
||||||
* resizing).
|
|
||||||
*/
|
|
||||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
|
||||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
|
||||||
+/*
|
|
||||||
+ * NR_TTY_DEVICES:
|
|
||||||
+ * Value MUST be at least 12 and must never be higher then 63
|
|
||||||
+ */
|
|
||||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
|
||||||
/* Note: the ioctl VT_GETSTATE does not work for
|
|
||||||
consoles 16 and higher (since it returns a short) */
|
|
||||||
|
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
|
||||||
index 041f3a022122..5ed70eb1ad3a 100644
|
|
||||||
--- a/init/Kconfig
|
|
||||||
+++ b/init/Kconfig
|
|
||||||
@@ -45,6 +45,38 @@ config THREAD_INFO_IN_TASK
|
|
||||||
|
|
||||||
menu "General setup"
|
|
||||||
|
|
||||||
+config ZENIFY
|
|
||||||
+ bool "A selection of patches from Zen/Liquorix kernel and additional tweaks for a better gaming experience"
|
|
||||||
+ default y
|
|
||||||
+ help
|
|
||||||
+ Tunes the kernel for responsiveness at the cost of throughput and power usage.
|
|
||||||
+
|
|
||||||
+ --- Virtual Memory Subsystem ---------------------------
|
|
||||||
+
|
|
||||||
+ Mem dirty before bg writeback..: 10 % -> 20 %
|
|
||||||
+ Mem dirty before sync writeback: 20 % -> 50 %
|
|
||||||
+
|
|
||||||
+ --- Block Layer ----------------------------------------
|
|
||||||
+
|
|
||||||
+ Queue depth...............: 128 -> 512
|
|
||||||
+ Default MQ scheduler......: mq-deadline -> bfq
|
|
||||||
+
|
|
||||||
+ --- CFS CPU Scheduler ----------------------------------
|
|
||||||
+
|
|
||||||
+ Scheduling latency.............: 6 -> 3 ms
|
|
||||||
+ Minimal granularity............: 0.75 -> 0.3 ms
|
|
||||||
+ Wakeup granularity.............: 1 -> 0.5 ms
|
|
||||||
+ CPU migration cost.............: 0.5 -> 0.25 ms
|
|
||||||
+ Bandwidth slice size...........: 5 -> 3 ms
|
|
||||||
+ Ondemand fine upscaling limit..: 95 % -> 85 %
|
|
||||||
+
|
|
||||||
+ --- MuQSS CPU Scheduler --------------------------------
|
|
||||||
+
|
|
||||||
+ Scheduling interval............: 6 -> 3 ms
|
|
||||||
+ ISO task max realtime use......: 70 % -> 25 %
|
|
||||||
+ Ondemand coarse upscaling limit: 80 % -> 45 %
|
|
||||||
+ Ondemand fine upscaling limit..: 95 % -> 45 %
|
|
||||||
+
|
|
||||||
config BROKEN
|
|
||||||
bool
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
|
|
||||||
index 2f0a0be4d344..bada807c7e59 100644
|
|
||||||
--- a/kernel/sched/fair.c
|
|
||||||
+++ b/kernel/sched/fair.c
|
|
||||||
@@ -37,8 +37,13 @@
|
|
||||||
*
|
|
||||||
* (default: 6ms * (1 + ilog(ncpus)), units: nanoseconds)
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+unsigned int sysctl_sched_latency = 3000000ULL;
|
|
||||||
+static unsigned int normalized_sysctl_sched_latency = 3000000ULL;
|
|
||||||
+#else
|
|
||||||
unsigned int sysctl_sched_latency = 6000000ULL;
|
|
||||||
static unsigned int normalized_sysctl_sched_latency = 6000000ULL;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The initial- and re-scaling of tunables is configurable
|
|
||||||
@@ -58,13 +63,22 @@ enum sched_tunable_scaling sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_L
|
|
||||||
*
|
|
||||||
* (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+unsigned int sysctl_sched_min_granularity = 300000ULL;
|
|
||||||
+static unsigned int normalized_sysctl_sched_min_granularity = 300000ULL;
|
|
||||||
+#else
|
|
||||||
unsigned int sysctl_sched_min_granularity = 750000ULL;
|
|
||||||
static unsigned int normalized_sysctl_sched_min_granularity = 750000ULL;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This value is kept at sysctl_sched_latency/sysctl_sched_min_granularity
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+static unsigned int sched_nr_latency = 10;
|
|
||||||
+#else
|
|
||||||
static unsigned int sched_nr_latency = 8;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* After fork, child runs first. If set to 0 (default) then
|
|
||||||
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
|
|
||||||
*
|
|
||||||
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
|
|
||||||
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
|
|
||||||
+
|
|
||||||
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
|
|
||||||
+#else
|
|
||||||
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
|
|
||||||
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
|
|
||||||
|
|
||||||
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
/*
|
|
||||||
@@ -107,8 +128,12 @@ int __weak arch_asym_cpu_priority(int cpu)
|
|
||||||
*
|
|
||||||
* (default: 5 msec, units: microseconds)
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+unsigned int sysctl_sched_cfs_bandwidth_slice = 3000UL;
|
|
||||||
+#else
|
|
||||||
unsigned int sysctl_sched_cfs_bandwidth_slice = 5000UL;
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The margin used when comparing utilization with CPU capacity:
|
|
||||||
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
|
|
||||||
index 337c6afb3345..9315e358f292 100644
|
|
||||||
--- a/mm/page-writeback.c
|
|
||||||
+++ b/mm/page-writeback.c
|
|
||||||
@@ -71,7 +71,11 @@ static long ratelimit_pages = 32;
|
|
||||||
/*
|
|
||||||
* Start background writeback (via writeback threads) at this percentage
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+int dirty_background_ratio = 20;
|
|
||||||
+#else
|
|
||||||
int dirty_background_ratio = 10;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* dirty_background_bytes starts at 0 (disabled) so that it is a function of
|
|
||||||
@@ -88,7 +92,11 @@ int vm_highmem_is_dirtyable;
|
|
||||||
/*
|
|
||||||
* The generator of dirty data starts writeback at this percentage
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+int vm_dirty_ratio = 50;
|
|
||||||
+#else
|
|
||||||
int vm_dirty_ratio = 20;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* vm_dirty_bytes starts at 0 (disabled) so that it is a function of
|
|
||||||
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
|
|
||||||
index 80dad301361d..42b7fa7d01f8 100644
|
|
||||||
--- a/net/ipv4/Kconfig
|
|
||||||
+++ b/net/ipv4/Kconfig
|
|
||||||
@@ -702,6 +702,9 @@ choice
|
|
||||||
config DEFAULT_VEGAS
|
|
||||||
bool "Vegas" if TCP_CONG_VEGAS=y
|
|
||||||
|
|
||||||
+ config DEFAULT_YEAH
|
|
||||||
+ bool "YeAH" if TCP_CONG_YEAH=y
|
|
||||||
+
|
|
||||||
config DEFAULT_VENO
|
|
||||||
bool "Veno" if TCP_CONG_VENO=y
|
|
||||||
|
|
||||||
@@ -735,6 +738,7 @@ config DEFAULT_TCP_CONG
|
|
||||||
default "htcp" if DEFAULT_HTCP
|
|
||||||
default "hybla" if DEFAULT_HYBLA
|
|
||||||
default "vegas" if DEFAULT_VEGAS
|
|
||||||
+ default "yeah" if DEFAULT_YEAH
|
|
||||||
default "westwood" if DEFAULT_WESTWOOD
|
|
||||||
default "veno" if DEFAULT_VENO
|
|
||||||
default "reno" if DEFAULT_RENO
|
|
||||||
|
|
||||||
From: Nick Desaulniers <ndesaulniers@google.com>
|
|
||||||
Date: Mon, 24 Dec 2018 13:37:41 +0200
|
|
||||||
Subject: include/linux/compiler*.h: define asm_volatile_goto
|
|
||||||
|
|
||||||
asm_volatile_goto should also be defined for other compilers that
|
|
||||||
support asm goto.
|
|
||||||
|
|
||||||
Fixes commit 815f0dd ("include/linux/compiler*.h: make compiler-*.h
|
|
||||||
mutually exclusive").
|
|
||||||
|
|
||||||
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
|
|
||||||
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
|
|
||||||
|
|
||||||
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
|
|
||||||
index ba814f1..e77eeb0 100644
|
|
||||||
--- a/include/linux/compiler_types.h
|
|
||||||
+++ b/include/linux/compiler_types.h
|
|
||||||
@@ -188,6 +188,10 @@ struct ftrace_likely_data {
|
|
||||||
#define asm_volatile_goto(x...) asm goto(x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef asm_volatile_goto
|
|
||||||
+#define asm_volatile_goto(x...) asm goto(x)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* Are two types/vars the same type (ignoring qualifiers)? */
|
|
||||||
#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
|
|
||||||
|
|
||||||
From: Andy Lavr <andy.lavr@gmail.com>
|
|
||||||
Date: Mon, 24 Dec 2018 14:57:47 +0200
|
|
||||||
Subject: avl: Use [defer+madvise] as default khugepaged defrag strategy
|
|
||||||
|
|
||||||
For some reason, the default strategy to respond to THP fault fallbacks
|
|
||||||
is still just madvise, meaning stall if the program wants transparent
|
|
||||||
hugepages, but don't trigger a background reclaim / compaction if THP
|
|
||||||
begins to fail allocations. This creates a snowball affect where we
|
|
||||||
still use the THP code paths, but we almost always fail once a system
|
|
||||||
has been active and busy for a while.
|
|
||||||
|
|
||||||
The option "defer" was created for interactive systems where THP can
|
|
||||||
still improve performance. If we have to fallback to a regular page due
|
|
||||||
to an allocation failure or anything else, we will trigger a background
|
|
||||||
reclaim and compaction so future THP attempts succeed and previous
|
|
||||||
attempts eventually have their smaller pages combined without stalling
|
|
||||||
running applications.
|
|
||||||
|
|
||||||
We still want madvise to stall applications that explicitely want THP,
|
|
||||||
so defer+madvise _does_ make a ton of sense. Make it the default for
|
|
||||||
interactive systems, especially if the kernel maintainer left
|
|
||||||
transparent hugepages on "always".
|
|
||||||
|
|
||||||
Reasoning and details in the original patch:
|
|
||||||
https://lwn.net/Articles/711248/
|
|
||||||
|
|
||||||
Signed-off-by: Andy Lavr <andy.lavr@gmail.com>
|
|
||||||
|
|
||||||
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
|
|
||||||
index e84a10b..21d62b7 100644
|
|
||||||
--- a/mm/huge_memory.c
|
|
||||||
+++ b/mm/huge_memory.c
|
|
||||||
@@ -53,7 +53,11 @@ unsigned long transparent_hugepage_flags __read_mostly =
|
|
||||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
|
|
||||||
(1<<TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG)|
|
|
||||||
#endif
|
|
||||||
+#ifdef CONFIG_AVL_INTERACTIVE
|
|
||||||
+ (1<<TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG)|
|
|
||||||
+#else
|
|
||||||
(1<<TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG)|
|
|
||||||
+#endif
|
|
||||||
(1<<TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG)|
|
|
||||||
(1<<TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG);
|
|
||||||
|
|
||||||
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
|
|
||||||
--- a/net/sched/Kconfig
|
|
||||||
+++ b/net/sched/Kconfig
|
|
||||||
@@ -429,6 +429,9 @@
|
|
||||||
Select the queueing discipline that will be used by default
|
|
||||||
for all network devices.
|
|
||||||
|
|
||||||
+ config DEFAULT_CAKE
|
|
||||||
+ bool "Common Applications Kept Enhanced" if NET_SCH_CAKE
|
|
||||||
+
|
|
||||||
config DEFAULT_FQ
|
|
||||||
bool "Fair Queue" if NET_SCH_FQ
|
|
||||||
|
|
||||||
@@ -448,6 +451,7 @@
|
|
||||||
config DEFAULT_NET_SCH
|
|
||||||
string
|
|
||||||
default "pfifo_fast" if DEFAULT_PFIFO_FAST
|
|
||||||
+ default "cake" if DEFAULT_CAKE
|
|
||||||
default "fq" if DEFAULT_FQ
|
|
||||||
default "fq_codel" if DEFAULT_FQ_CODEL
|
|
||||||
default "sfq" if DEFAULT_SFQ
|
|
||||||
|
|
||||||
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
|
||||||
index a29043ea9..3fb219747 100644
|
|
||||||
--- a/mm/page_alloc.c
|
|
||||||
+++ b/mm/page_alloc.c
|
|
||||||
@@ -263,7 +263,7 @@ compound_page_dtor * const compound_page_dtors[] = {
|
|
||||||
#else
|
|
||||||
int watermark_boost_factor __read_mostly = 15000;
|
|
||||||
#endif
|
|
||||||
-int watermark_scale_factor = 10;
|
|
||||||
+int watermark_scale_factor = 200;
|
|
||||||
|
|
||||||
static unsigned long nr_kernel_pages __initdata;
|
|
||||||
static unsigned long nr_all_pages __initdata;
|
|
||||||
|
|
||||||
diff --git a/include/linux/mm.h b/include/linux/mm.h
|
|
||||||
index 80bb6408f..6c8b55cd1 100644
|
|
||||||
--- a/include/linux/mm.h
|
|
||||||
+++ b/include/linux/mm.h
|
|
||||||
@@ -146,8 +146,7 @@ extern int mmap_rnd_compat_bits __read_mostly;
|
|
||||||
* not a hard limit any more. Although some userspace tools can be surprised by
|
|
||||||
* that.
|
|
||||||
*/
|
|
||||||
-#define MAPCOUNT_ELF_CORE_MARGIN (5)
|
|
||||||
-#define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
|
|
||||||
+#define DEFAULT_MAX_MAP_COUNT (262144)
|
|
||||||
|
|
||||||
extern int sysctl_max_map_count;
|
|
||||||
|
|
||||||
From adb1f9df27f08e6488bcd80b1607987c6114a77a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Mon, 25 Nov 2019 15:13:06 -0300
|
|
||||||
Subject: [PATCH] elevator: set default scheduler to bfq for blk-mq
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
block/elevator.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/block/elevator.c b/block/elevator.c
|
|
||||||
index 076ba7308e65..81f89095aa77 100644
|
|
||||||
--- a/block/elevator.c
|
|
||||||
+++ b/block/elevator.c
|
|
||||||
@@ -623,15 +623,15 @@ static inline bool elv_support_iosched(struct request_queue *q)
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
- * For single queue devices, default to using mq-deadline. If we have multiple
|
|
||||||
- * queues or mq-deadline is not available, default to "none".
|
|
||||||
+ * For single queue devices, default to using bfq. If we have multiple
|
|
||||||
+ * queues or bfq is not available, default to "none".
|
|
||||||
*/
|
|
||||||
static struct elevator_type *elevator_get_default(struct request_queue *q)
|
|
||||||
{
|
|
||||||
if (q->nr_hw_queues != 1)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
- return elevator_get(q, "mq-deadline", false);
|
|
||||||
+ return elevator_get(q, "bfq", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
From c3ec05777c46e19a8a26d0fc4ca0c0db8a19de97 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Fri, 10 May 2019 16:45:59 -0300
|
|
||||||
Subject: [PATCH] block: set rq_affinity = 2 for full multithreading I/O
|
|
||||||
requests
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
include/linux/blkdev.h | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
|
|
||||||
index f3ea78b0c91c..4dbacc6b073b 100644
|
|
||||||
--- a/include/linux/blkdev.h
|
|
||||||
+++ b/include/linux/blkdev.h
|
|
||||||
@@ -621,7 +621,8 @@ struct request_queue {
|
|
||||||
#define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */
|
|
||||||
|
|
||||||
#define QUEUE_FLAG_MQ_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
|
|
||||||
- (1 << QUEUE_FLAG_SAME_COMP))
|
|
||||||
+ (1 << QUEUE_FLAG_SAME_COMP) | \
|
|
||||||
+ (1 << QUEUE_FLAG_SAME_FORCE))
|
|
||||||
|
|
||||||
void blk_queue_flag_set(unsigned int flag, struct request_queue *q);
|
|
||||||
void blk_queue_flag_clear(unsigned int flag, struct request_queue *q);
|
|
||||||
From 8171d33d0b84a953649863538fdbe4c26c035e4f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Fri, 10 May 2019 14:32:50 -0300
|
|
||||||
Subject: [PATCH] mm: set 2 megabytes for address_space-level file read-ahead
|
|
||||||
pages size
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
include/linux/mm.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/linux/mm.h b/include/linux/mm.h
|
|
||||||
index a2adf95b3f9c..e804d9f7583a 100644
|
|
||||||
--- a/include/linux/mm.h
|
|
||||||
+++ b/include/linux/mm.h
|
|
||||||
@@ -2416,7 +2416,7 @@ int __must_check write_one_page(struct page *page);
|
|
||||||
void task_dirty_inc(struct task_struct *tsk);
|
|
||||||
|
|
||||||
/* readahead.c */
|
|
||||||
-#define VM_READAHEAD_PAGES (SZ_128K / PAGE_SIZE)
|
|
||||||
+#define VM_READAHEAD_PAGES (SZ_2M / PAGE_SIZE)
|
|
||||||
|
|
||||||
int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
|
|
||||||
pgoff_t offset, unsigned long nr_to_read);
|
|
||||||
From de7119e3db9fdb4c704355854a02a7e9fad931d4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Steven Barrett <steven@liquorix.net>
|
|
||||||
Date: Wed, 15 Jan 2020 20:43:56 -0600
|
|
||||||
Subject: [PATCH] ZEN: intel-pstate: Implement "enable" parameter
|
|
||||||
|
|
||||||
If intel-pstate is compiled into the kernel, it will preempt the loading
|
|
||||||
of acpi-cpufreq so you can take advantage of hardware p-states without
|
|
||||||
any friction.
|
|
||||||
|
|
||||||
However, intel-pstate is not completely superior to cpufreq's ondemand
|
|
||||||
for one reason. There's no concept of an up_threshold property.
|
|
||||||
|
|
||||||
In ondemand, up_threshold essentially reduces the maximum utilization to
|
|
||||||
compare against, allowing you to hit max frequencies and turbo boost
|
|
||||||
from a much lower core utilization.
|
|
||||||
|
|
||||||
With intel-pstate, you have the concept of minimum and maximum
|
|
||||||
performance, but no tunable that lets you define, maximum frequency
|
|
||||||
means 50% core utilization. For just this oversight, there's reasons
|
|
||||||
you may want ondemand.
|
|
||||||
|
|
||||||
Lets support setting "enable" in kernel boot parameters. This lets
|
|
||||||
kernel maintainers include "intel_pstate=disable" statically in the
|
|
||||||
static boot parameters, but let users of the kernel override this
|
|
||||||
selection.
|
|
||||||
---
|
|
||||||
Documentation/admin-guide/kernel-parameters.txt | 3 +++
|
|
||||||
drivers/cpufreq/intel_pstate.c | 2 ++
|
|
||||||
2 files changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
index ade4e6ec23e03..0b613370d28d8 100644
|
|
||||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
@@ -1765,6 +1765,9 @@
|
|
||||||
disable
|
|
||||||
Do not enable intel_pstate as the default
|
|
||||||
scaling driver for the supported processors
|
|
||||||
+ enable
|
|
||||||
+ Enable intel_pstate in-case "disable" was passed
|
|
||||||
+ previously in the kernel boot parameters
|
|
||||||
passive
|
|
||||||
Use intel_pstate as a scaling driver, but configure it
|
|
||||||
to work with generic cpufreq governors (instead of
|
|
||||||
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
|
|
||||||
index d2fa3e9ccd97c..bd10cb02fc0ff 100644
|
|
||||||
--- a/drivers/cpufreq/intel_pstate.c
|
|
||||||
+++ b/drivers/cpufreq/intel_pstate.c
|
|
||||||
@@ -2826,6 +2826,8 @@ static int __init intel_pstate_setup(char *str)
|
|
||||||
pr_info("HWP disabled\n");
|
|
||||||
no_hwp = 1;
|
|
||||||
}
|
|
||||||
+ if (!strcmp(str, "enable"))
|
|
||||||
+ no_load = 0;
|
|
||||||
if (!strcmp(str, "force"))
|
|
||||||
force_load = 1;
|
|
||||||
if (!strcmp(str, "hwp_only"))
|
|
||||||
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Mon, 6 Apr 2020 7:20:12 +0100
|
|
||||||
Subject: Import backported drm amd patchset based on
|
|
||||||
https://patchwork.freedesktop.org/series/74931/#rev2
|
|
||||||
|
|
||||||
Due to recent firmware changes, powerplay power limit
|
|
||||||
isn't being applied/used. This patchset addresses
|
|
||||||
the issue.
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
index 657a6f17e91f..323e7e61493b 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
@@ -570,6 +570,7 @@ struct pptable_funcs {
|
|
||||||
int (*override_pcie_parameters)(struct smu_context *smu);
|
|
||||||
uint32_t (*get_pptable_power_limit)(struct smu_context *smu);
|
|
||||||
int (*disable_umc_cdr_12gbps_workaround)(struct smu_context *smu);
|
|
||||||
+ int (*set_power_source)(struct smu_context *smu, enum smu_power_src_type power_src);
|
|
||||||
};
|
|
||||||
|
|
||||||
int smu_load_microcode(struct smu_context *smu);
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h
|
|
||||||
index 6900877de845..40c35bcc5a0a 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
|
|
||||||
@@ -211,4 +211,7 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ
|
|
||||||
#define smu_disable_umc_cdr_12gbps_workaround(smu) \
|
|
||||||
((smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround ? (smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround((smu)) : 0)
|
|
||||||
|
|
||||||
+#define smu_set_power_source(smu, power_src) \
|
|
||||||
+ ((smu)->ppt_funcs->set_power_source ? (smu)->ppt_funcs->set_power_source((smu), (power_src)) : 0)
|
|
||||||
+
|
|
||||||
#endif
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
|
|
||||||
index 1c88219fe403..674e426ed59b 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
|
|
||||||
@@ -267,4 +267,7 @@ uint32_t smu_v11_0_get_max_power_limit(struct smu_context *smu);
|
|
||||||
int smu_v11_0_set_performance_level(struct smu_context *smu,
|
|
||||||
enum amd_dpm_forced_level level);
|
|
||||||
|
|
||||||
+int smu_v11_0_set_power_source(struct smu_context *smu,
|
|
||||||
+ enum smu_power_src_type power_src);
|
|
||||||
+
|
|
||||||
#endif
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
index 4fd77c7cfc80..20174bed11ce 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
@@ -1939,3 +1939,17 @@ int smu_v11_0_set_performance_level(struct smu_context *smu,
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+int smu_v11_0_set_power_source(struct smu_context *smu,
|
|
||||||
+ enum smu_power_src_type power_src)
|
|
||||||
+{
|
|
||||||
+ int pwr_source;
|
|
||||||
+
|
|
||||||
+ pwr_source = smu_power_get_index(smu, (uint32_t)power_src);
|
|
||||||
+ if (pwr_source < 0)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ return smu_send_smc_msg_with_param(smu,
|
|
||||||
+ SMU_MSG_NotifyPowerSource,
|
|
||||||
+ pwr_source);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
index d66dfa7410b6..a23eaac28095 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
@@ -2369,6 +2369,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
|
|
||||||
.get_pptable_power_limit = navi10_get_pptable_power_limit,
|
|
||||||
.run_btc = navi10_run_btc,
|
|
||||||
.disable_umc_cdr_12gbps_workaround = navi10_disable_umc_cdr_12gbps_workaround,
|
|
||||||
+ .set_power_source = smu_v11_0_set_power_source,
|
|
||||||
};
|
|
||||||
|
|
||||||
void navi10_set_ppt_funcs(struct smu_context *smu)
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
index f6d4b0ef46ad..2cfb911ab370 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
@@ -1154,6 +1154,21 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ if (adev->asic_type >= CHIP_NAVI10 &&
|
|
||||||
+ adev->asic_type <= CHIP_NAVI12) {
|
|
||||||
+ /*
|
|
||||||
+ * For Navi1X, manually switch it to AC mode as PMFW
|
|
||||||
+ * may boot it with DC mode.
|
|
||||||
+ * TODO: should check whether we are indeed under AC
|
|
||||||
+ * mode before doing this.
|
|
||||||
+ */
|
|
||||||
+ ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_err("Failed to switch to AC mode!\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
if (adev->asic_type != CHIP_ARCTURUS) {
|
|
||||||
ret = smu_notify_display_change(smu);
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
index 2cfb911ab370..54d156bbc0f3 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
@@ -1155,15 +1155,15 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (adev->asic_type >= CHIP_NAVI10 &&
|
|
||||||
- adev->asic_type <= CHIP_NAVI12) {
|
|
||||||
+ if (smu->ppt_funcs->set_power_source) {
|
|
||||||
/*
|
|
||||||
* For Navi1X, manually switch it to AC mode as PMFW
|
|
||||||
* may boot it with DC mode.
|
|
||||||
- * TODO: should check whether we are indeed under AC
|
|
||||||
- * mode before doing this.
|
|
||||||
*/
|
|
||||||
- ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
|
|
||||||
+ if (adev->pm.ac_power)
|
|
||||||
+ ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
|
|
||||||
+ else
|
|
||||||
+ ret = smu_set_power_source(smu, SMU_POWER_SOURCE_DC);
|
|
||||||
if (ret) {
|
|
||||||
pr_err("Failed to switch to AC mode!\n");
|
|
||||||
return ret;
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
index 323e7e61493b..18172dfec947 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
@@ -408,6 +408,7 @@ struct smu_context
|
|
||||||
uint32_t smc_if_version;
|
|
||||||
|
|
||||||
bool uploading_custom_pp_table;
|
|
||||||
+ bool dc_controlled_by_gpio;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct i2c_adapter;
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
index a23eaac28095..9c60b38ab53a 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
|
|
||||||
@@ -347,7 +347,6 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
|
|
||||||
| FEATURE_MASK(FEATURE_DS_DCEFCLK_BIT)
|
|
||||||
| FEATURE_MASK(FEATURE_FW_DSTATE_BIT)
|
|
||||||
| FEATURE_MASK(FEATURE_BACO_BIT)
|
|
||||||
- | FEATURE_MASK(FEATURE_ACDC_BIT)
|
|
||||||
| FEATURE_MASK(FEATURE_GFX_SS_BIT)
|
|
||||||
| FEATURE_MASK(FEATURE_APCC_DFLL_BIT)
|
|
||||||
| FEATURE_MASK(FEATURE_FW_CTF_BIT)
|
|
||||||
@@ -391,6 +390,9 @@ navi10_get_allowed_feature_mask(struct smu_context *smu,
|
|
||||||
if (smu->adev->pg_flags & AMD_PG_SUPPORT_JPEG)
|
|
||||||
*(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_JPEG_PG_BIT);
|
|
||||||
|
|
||||||
+ if (smu->dc_controlled_by_gpio)
|
|
||||||
+ *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ACDC_BIT);
|
|
||||||
+
|
|
||||||
/* disable DPM UCLK and DS SOCCLK on navi10 A0 secure board */
|
|
||||||
if (is_asic_secure(smu)) {
|
|
||||||
/* only for navi10 A0 */
|
|
||||||
@@ -525,6 +527,9 @@ static int navi10_store_powerplay_table(struct smu_context *smu)
|
|
||||||
|
|
||||||
table_context->thermal_controller_type = powerplay_table->thermal_controller_type;
|
|
||||||
|
|
||||||
+ if (powerplay_table->platform_caps & SMU_11_0_PP_PLATFORM_CAP_HARDWAREDC)
|
|
||||||
+ smu->dc_controlled_by_gpio = true;
|
|
||||||
+
|
|
||||||
mutex_lock(&smu_baco->mutex);
|
|
||||||
if (powerplay_table->platform_caps & SMU_11_0_PP_PLATFORM_CAP_BACO ||
|
|
||||||
powerplay_table->platform_caps & SMU_11_0_PP_PLATFORM_CAP_MACO)
|
|
||||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
|
|
||||||
index bc3cf04a1a94..f197f1be0969 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
|
|
||||||
@@ -92,6 +92,9 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev)
|
|
||||||
if (adev->powerplay.pp_funcs->enable_bapm)
|
|
||||||
amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power);
|
|
||||||
mutex_unlock(&adev->pm.mutex);
|
|
||||||
+
|
|
||||||
+ if (is_support_sw_smu(adev))
|
|
||||||
+ smu_set_ac_dc(&adev->smu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
index 54d156bbc0f3..6f4015f87781 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
|
|
||||||
@@ -2087,6 +2087,29 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+int smu_set_ac_dc(struct smu_context *smu)
|
|
||||||
+{
|
|
||||||
+ int ret = 0;
|
|
||||||
+
|
|
||||||
+ /* controlled by firmware */
|
|
||||||
+ if (smu->dc_controlled_by_gpio)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&smu->mutex);
|
|
||||||
+ if (smu->ppt_funcs->set_power_source) {
|
|
||||||
+ if (smu->adev->pm.ac_power)
|
|
||||||
+ ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
|
|
||||||
+ else
|
|
||||||
+ ret = smu_set_power_source(smu, SMU_POWER_SOURCE_DC);
|
|
||||||
+ if (ret)
|
|
||||||
+ pr_err("Failed to switch to %s mode!\n",
|
|
||||||
+ smu->adev->pm.ac_power ? "AC" : "DC");
|
|
||||||
+ }
|
|
||||||
+ mutex_unlock(&smu->mutex);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
const struct amd_ip_funcs smu_ip_funcs = {
|
|
||||||
.name = "smu",
|
|
||||||
.early_init = smu_early_init,
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
index 18172dfec947..ae2c318dd6fa 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
|
|
||||||
@@ -720,6 +720,7 @@ int smu_get_dpm_level_range(struct smu_context *smu, enum smu_clk_type clk_type,
|
|
||||||
enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu);
|
|
||||||
int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level);
|
|
||||||
int smu_set_display_count(struct smu_context *smu, uint32_t count);
|
|
||||||
+int smu_set_ac_dc(struct smu_context *smu);
|
|
||||||
bool smu_clk_dpm_is_enabled(struct smu_context *smu, enum smu_clk_type clk_type);
|
|
||||||
const char *smu_get_message_name(struct smu_context *smu, enum smu_message_type type);
|
|
||||||
const char *smu_get_feature_name(struct smu_context *smu, enum smu_feature_mask feature);
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
index 20174bed11ce..d19e1d0d56c0 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
|
|
||||||
@@ -1525,6 +1525,12 @@ int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int smu_v11_0_ack_ac_dc_interrupt(struct smu_context *smu)
|
|
||||||
+{
|
|
||||||
+ return smu_send_smc_msg(smu,
|
|
||||||
+ SMU_MSG_ReenableAcDcInterrupt);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
#define THM_11_0__SRCID__THM_DIG_THERM_L2H 0 /* ASIC_TEMP > CG_THERMAL_INT.DIG_THERM_INTH */
|
|
||||||
#define THM_11_0__SRCID__THM_DIG_THERM_H2L 1 /* ASIC_TEMP < CG_THERMAL_INT.DIG_THERM_INTL */
|
|
||||||
|
|
||||||
@@ -1558,6 +1565,9 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
|
||||||
+ } else if (client_id == SOC15_IH_CLIENTID_MP1) {
|
|
||||||
+ if (src_id == 0xfe)
|
|
||||||
+ smu_v11_0_ack_ac_dc_interrupt(&adev->smu);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
@@ -1597,6 +1607,12 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
+ ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1,
|
|
||||||
+ 0xfe,
|
|
||||||
+ irq_src);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
|
||||||
--- a/virt/kvm/kvm_main.c
|
|
||||||
+++ b/virt/kvm/kvm_main.c
|
|
||||||
@@ -2214,7 +2214,7 @@ static int __kvm_gfn_to_hva_cache_init(struct kvm_memslots *slots,
|
|
||||||
gfn_t start_gfn = gpa >> PAGE_SHIFT;
|
|
||||||
gfn_t end_gfn = (gpa + len - 1) >> PAGE_SHIFT;
|
|
||||||
gfn_t nr_pages_needed = end_gfn - start_gfn + 1;
|
|
||||||
- gfn_t nr_pages_avail;
|
|
||||||
+ gfn_t nr_pages_avail = 0;
|
|
||||||
|
|
||||||
/* Update ghc->generation before performing any error checks. */
|
|
||||||
ghc->generation = slots->generation;
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_250
|
|
||||||
+ default HZ_500
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -39,6 +39,13 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a balanced timer frequency. Provides fast interactivity
|
|
||||||
+ on desktops with great smoothness without increasing CPU power
|
|
||||||
+ consumption and sacrificing the battery life on laptops.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -52,6 +59,7 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
+ default 500 if HZ_500
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_500
|
|
||||||
+ default HZ_750
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -46,6 +46,13 @@ choice
|
|
||||||
on desktops with great smoothness without increasing CPU power
|
|
||||||
consumption and sacrificing the battery life on laptops.
|
|
||||||
|
|
||||||
+ config HZ_750
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -60,6 +67,7 @@ config HZ
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
default 500 if HZ_500
|
|
||||||
+ default 750 if HZ_750
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,78 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched - MuQSS
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/MuQSS.c b/kernel/sched/MuQSS.c
|
|
||||||
index 84a1d08d68551..57c3036a68952 100644
|
|
||||||
--- a/kernel/sched/MuQSS.c
|
|
||||||
+++ b/kernel/sched/MuQSS.c
|
|
||||||
@@ -163,7 +167,11 @@ int sched_interactive __read_mostly = 1;
|
|
||||||
* are allowed to run five seconds as real time tasks. This is the total over
|
|
||||||
* all online cpus.
|
|
||||||
*/
|
|
||||||
+#ifdef CONFIG_ZENIFY
|
|
||||||
+int sched_iso_cpu __read_mostly = 25;
|
|
||||||
+#else
|
|
||||||
int sched_iso_cpu __read_mostly = 70;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* sched_yield_type - Choose what sort of yield sched_yield will perform.
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
default HZ_100 if SCHED_MUQSS
|
|
||||||
- default HZ_250_NODEF if !SCHED_MUQSS
|
|
||||||
+ default HZ_500_NODEF if !SCHED_MUQSS
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -50,6 +50,20 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500_NODEF
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
+ config HZ_750_NODEF
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000_NODEF
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -63,6 +70,8 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250_NODEF
|
|
||||||
default 300 if HZ_300_NODEF
|
|
||||||
+ default 500 if HZ_500_NODEF
|
|
||||||
+ default 750 if HZ_750_NODEF
|
|
||||||
default 1000 if HZ_1000_NODEF
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index d4d36c61940b..4a9dfe471f1f 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -15,7 +15,6 @@ NAME = Kleptomaniac Octopus
|
|
||||||
|
|
||||||
CKVERSION = -ck1
|
|
||||||
CKNAME = MuQSS Powered
|
|
||||||
-EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
|
|
||||||
|
|
||||||
# We are using a recursive build, so we need to do a little thinking
|
|
||||||
# to get the ordering right.
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
index 6b423eebfd5d..61e3271675d6 100644
|
|
||||||
--- a/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
+++ b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
@@ -21,10 +21,10 @@
|
|
||||||
#include "cpufreq_ondemand.h"
|
|
||||||
|
|
||||||
/* On-demand governor macros */
|
|
||||||
-#define DEF_FREQUENCY_UP_THRESHOLD (80)
|
|
||||||
-#define DEF_SAMPLING_DOWN_FACTOR (1)
|
|
||||||
+#define DEF_FREQUENCY_UP_THRESHOLD (45)
|
|
||||||
+#define DEF_SAMPLING_DOWN_FACTOR (5)
|
|
||||||
#define MAX_SAMPLING_DOWN_FACTOR (100000)
|
|
||||||
-#define MICRO_FREQUENCY_UP_THRESHOLD (95)
|
|
||||||
+#define MICRO_FREQUENCY_UP_THRESHOLD (45)
|
|
||||||
#define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000)
|
|
||||||
#define MIN_FREQUENCY_UP_THRESHOLD (1)
|
|
||||||
#define MAX_FREQUENCY_UP_THRESHOLD (100)
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
index 6b423eebfd5d..61e3271675d6 100644
|
|
||||||
--- a/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
+++ b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
@@ -21,10 +21,10 @@
|
|
||||||
#include "cpufreq_ondemand.h"
|
|
||||||
|
|
||||||
/* On-demand governor macros */
|
|
||||||
-#define DEF_FREQUENCY_UP_THRESHOLD (63)
|
|
||||||
-#define DEF_SAMPLING_DOWN_FACTOR (1)
|
|
||||||
+#define DEF_FREQUENCY_UP_THRESHOLD (55)
|
|
||||||
+#define DEF_SAMPLING_DOWN_FACTOR (5)
|
|
||||||
#define MAX_SAMPLING_DOWN_FACTOR (100000)
|
|
||||||
-#define MICRO_FREQUENCY_UP_THRESHOLD (95)
|
|
||||||
+#define MICRO_FREQUENCY_UP_THRESHOLD (63)
|
|
||||||
#define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000)
|
|
||||||
#define MIN_FREQUENCY_UP_THRESHOLD (1)
|
|
||||||
#define MAX_FREQUENCY_UP_THRESHOLD (100)
|
|
||||||
@ -1,166 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched - PDS
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_250
|
|
||||||
+ default HZ_500
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -39,6 +39,13 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a balanced timer frequency. Provides fast interactivity
|
|
||||||
+ on desktops with great smoothness without increasing CPU power
|
|
||||||
+ consumption and sacrificing the battery life on laptops.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -52,6 +59,7 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
+ default 500 if HZ_500
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_500
|
|
||||||
+ default HZ_750
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -46,6 +46,13 @@ choice
|
|
||||||
on desktops with great smoothness without increasing CPU power
|
|
||||||
consumption and sacrificing the battery life on laptops.
|
|
||||||
|
|
||||||
+ config HZ_750
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -60,6 +67,7 @@ config HZ
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
default 500 if HZ_500
|
|
||||||
+ default 750 if HZ_750
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/mm/vmscan.c b/mm/vmscan.c
|
|
||||||
index 9270a4370d54..30d01e647417 100644
|
|
||||||
--- a/mm/vmscan.c
|
|
||||||
+++ b/mm/vmscan.c
|
|
||||||
@@ -159,7 +159,7 @@ struct scan_control {
|
|
||||||
/*
|
|
||||||
* From 0 .. 100. Higher means more swappy.
|
|
||||||
*/
|
|
||||||
-int vm_swappiness = 60;
|
|
||||||
+int vm_swappiness = 20;
|
|
||||||
/*
|
|
||||||
* The total number of pages which are beyond the high watermark within all
|
|
||||||
* zones.
|
|
||||||
|
|
||||||
diff --git a/init/Kconfig b/init/Kconfig
|
|
||||||
index 11fd9b502d06..e9bc34d3019b 100644
|
|
||||||
--- a/init/Kconfig
|
|
||||||
+++ b/init/Kconfig
|
|
||||||
@@ -715,6 +715,7 @@ menu "Scheduler features"
|
|
||||||
config UCLAMP_TASK
|
|
||||||
bool "Enable utilization clamping for RT/FAIR tasks"
|
|
||||||
depends on CPU_FREQ_GOV_SCHEDUTIL
|
|
||||||
+ depends on !SCHED_PDS
|
|
||||||
help
|
|
||||||
This feature enables the scheduler to track the clamped utilization
|
|
||||||
of each CPU based on RUNNABLE tasks scheduled on that CPU.
|
|
||||||
@@ -948,7 +948,6 @@ config CGROUP_DEVICE
|
|
||||||
|
|
||||||
config CGROUP_CPUACCT
|
|
||||||
bool "Simple CPU accounting controller"
|
|
||||||
- depends on !SCHED_PDS
|
|
||||||
help
|
|
||||||
Provides a simple controller for monitoring the
|
|
||||||
total CPU consumed by the tasks in a cgroup.
|
|
||||||
diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
|
|
||||||
index b23231bae996..cab4e5c5b38e 100644
|
|
||||||
--- a/kernel/sched/Makefile
|
|
||||||
+++ b/kernel/sched/Makefile
|
|
||||||
@@ -24,13 +24,13 @@ obj-y += fair.o rt.o deadline.o
|
|
||||||
obj-$(CONFIG_SMP) += cpudeadline.o topology.o stop_task.o
|
|
||||||
obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o
|
|
||||||
obj-$(CONFIG_SCHED_DEBUG) += debug.o
|
|
||||||
-obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
|
|
||||||
endif
|
|
||||||
obj-y += loadavg.o clock.o cputime.o
|
|
||||||
obj-y += idle.o
|
|
||||||
obj-y += wait.o wait_bit.o swait.o completion.o
|
|
||||||
obj-$(CONFIG_SMP) += cpupri.o pelt.o
|
|
||||||
obj-$(CONFIG_SCHEDSTATS) += stats.o
|
|
||||||
+obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
|
|
||||||
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
|
||||||
obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
|
|
||||||
obj-$(CONFIG_MEMBARRIER) += membarrier.o
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/pds.c b/kernel/sched/pds.c
|
|
||||||
index 9281ad164..f09a609cf 100644
|
|
||||||
--- a/kernel/sched/pds.c
|
|
||||||
+++ b/kernel/sched/pds.c
|
|
||||||
@@ -81,6 +81,18 @@ enum {
|
|
||||||
NR_CPU_AFFINITY_CHK_LEVEL
|
|
||||||
};
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * This allows printing both to /proc/sched_debug and
|
|
||||||
+ * to the console
|
|
||||||
+ */
|
|
||||||
+#define SEQ_printf(m, x...) \
|
|
||||||
+ do { \
|
|
||||||
+ if (m) \
|
|
||||||
+ seq_printf(m, x); \
|
|
||||||
+ else \
|
|
||||||
+ pr_cont(x); \
|
|
||||||
+ } while (0)
|
|
||||||
+
|
|
||||||
static inline void print_scheduler_version(void)
|
|
||||||
{
|
|
||||||
printk(KERN_INFO "pds: PDS-mq CPU Scheduler 0.99o by Alfred Chen.\n");
|
|
||||||
@@ -6353,7 +6365,10 @@ void ia64_set_curr_task(int cpu, struct task_struct *p)
|
|
||||||
#ifdef CONFIG_SCHED_DEBUG
|
|
||||||
void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns,
|
|
||||||
struct seq_file *m)
|
|
||||||
-{}
|
|
||||||
+{
|
|
||||||
+ SEQ_printf(m, "%s (%d, #threads: %d)\n", p->comm, task_pid_nr_ns(p, ns),
|
|
||||||
+ get_nr_threads(p));
|
|
||||||
+}
|
|
||||||
|
|
||||||
void proc_sched_set_task(struct task_struct *p)
|
|
||||||
{}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,193 +0,0 @@
|
|||||||
From cdeab384f48dd9c88e2dff2e9ad8d57dca1a1b1c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Weiman <mark.weiman@markzz.com>
|
|
||||||
Date: Sun, 12 Aug 2018 11:36:21 -0400
|
|
||||||
Subject: [PATCH] pci: Enable overrides for missing ACS capabilities
|
|
||||||
|
|
||||||
This an updated version of Alex Williamson's patch from:
|
|
||||||
https://lkml.org/lkml/2013/5/30/513
|
|
||||||
|
|
||||||
Original commit message follows:
|
|
||||||
|
|
||||||
PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that
|
|
||||||
allows us to control whether transactions are allowed to be redirected
|
|
||||||
in various subnodes of a PCIe topology. For instance, if two
|
|
||||||
endpoints are below a root port or downsteam switch port, the
|
|
||||||
downstream port may optionally redirect transactions between the
|
|
||||||
devices, bypassing upstream devices. The same can happen internally
|
|
||||||
on multifunction devices. The transaction may never be visible to the
|
|
||||||
upstream devices.
|
|
||||||
|
|
||||||
One upstream device that we particularly care about is the IOMMU. If
|
|
||||||
a redirection occurs in the topology below the IOMMU, then the IOMMU
|
|
||||||
cannot provide isolation between devices. This is why the PCIe spec
|
|
||||||
encourages topologies to include ACS support. Without it, we have to
|
|
||||||
assume peer-to-peer DMA within a hierarchy can bypass IOMMU isolation.
|
|
||||||
|
|
||||||
Unfortunately, far too many topologies do not support ACS to make this
|
|
||||||
a steadfast requirement. Even the latest chipsets from Intel are only
|
|
||||||
sporadically supporting ACS. We have trouble getting interconnect
|
|
||||||
vendors to include the PCIe spec required PCIe capability, let alone
|
|
||||||
suggested features.
|
|
||||||
|
|
||||||
Therefore, we need to add some flexibility. The pcie_acs_override=
|
|
||||||
boot option lets users opt-in specific devices or sets of devices to
|
|
||||||
assume ACS support. The "downstream" option assumes full ACS support
|
|
||||||
on root ports and downstream switch ports. The "multifunction"
|
|
||||||
option assumes the subset of ACS features available on multifunction
|
|
||||||
endpoints and upstream switch ports are supported. The "id:nnnn:nnnn"
|
|
||||||
option enables ACS support on devices matching the provided vendor
|
|
||||||
and device IDs, allowing more strategic ACS overrides. These options
|
|
||||||
may be combined in any order. A maximum of 16 id specific overrides
|
|
||||||
are available. It's suggested to use the most limited set of options
|
|
||||||
necessary to avoid completely disabling ACS across the topology.
|
|
||||||
Note to hardware vendors, we have facilities to permanently quirk
|
|
||||||
specific devices which enforce isolation but not provide an ACS
|
|
||||||
capability. Please contact me to have your devices added and save
|
|
||||||
your customers the hassle of this boot option.
|
|
||||||
|
|
||||||
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
|
|
||||||
---
|
|
||||||
.../admin-guide/kernel-parameters.txt | 9 ++
|
|
||||||
drivers/pci/quirks.c | 101 ++++++++++++++++++
|
|
||||||
2 files changed, 110 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
index aefd358a5ca3..173b3596fd9e 100644
|
|
||||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
||||||
@@ -3190,6 +3190,15 @@
|
|
||||||
nomsi [MSI] If the PCI_MSI kernel config parameter is
|
|
||||||
enabled, this kernel boot option can be used to
|
|
||||||
disable the use of MSI interrupts system-wide.
|
|
||||||
+ pcie_acs_override =
|
|
||||||
+ [PCIE] Override missing PCIe ACS support for:
|
|
||||||
+ downstream
|
|
||||||
+ All downstream ports - full ACS capabilities
|
|
||||||
+ multifunction
|
|
||||||
+ All multifunction devices - multifunction ACS subset
|
|
||||||
+ id:nnnn:nnnn
|
|
||||||
+ Specific device - full ACS capabilities
|
|
||||||
+ Specified as vid:did (vendor/device ID) in hex
|
|
||||||
noioapicquirk [APIC] Disable all boot interrupt quirks.
|
|
||||||
Safety option to keep boot IRQs enabled. This
|
|
||||||
should never be necessary.
|
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
|
||||||
index 4700d24e5d55..8f7a3d7fd9c1 100644
|
|
||||||
--- a/drivers/pci/quirks.c
|
|
||||||
+++ b/drivers/pci/quirks.c
|
|
||||||
@@ -3372,6 +3372,106 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
|
|
||||||
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static bool acs_on_downstream;
|
|
||||||
+static bool acs_on_multifunction;
|
|
||||||
+
|
|
||||||
+#define NUM_ACS_IDS 16
|
|
||||||
+struct acs_on_id {
|
|
||||||
+ unsigned short vendor;
|
|
||||||
+ unsigned short device;
|
|
||||||
+};
|
|
||||||
+static struct acs_on_id acs_on_ids[NUM_ACS_IDS];
|
|
||||||
+static u8 max_acs_id;
|
|
||||||
+
|
|
||||||
+static __init int pcie_acs_override_setup(char *p)
|
|
||||||
+{
|
|
||||||
+ if (!p)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ while (*p) {
|
|
||||||
+ if (!strncmp(p, "downstream", 10))
|
|
||||||
+ acs_on_downstream = true;
|
|
||||||
+ if (!strncmp(p, "multifunction", 13))
|
|
||||||
+ acs_on_multifunction = true;
|
|
||||||
+ if (!strncmp(p, "id:", 3)) {
|
|
||||||
+ char opt[5];
|
|
||||||
+ int ret;
|
|
||||||
+ long val;
|
|
||||||
+
|
|
||||||
+ if (max_acs_id >= NUM_ACS_IDS - 1) {
|
|
||||||
+ pr_warn("Out of PCIe ACS override slots (%d)\n",
|
|
||||||
+ NUM_ACS_IDS);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ p += 3;
|
|
||||||
+ snprintf(opt, 5, "%s", p);
|
|
||||||
+ ret = kstrtol(opt, 16, &val);
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_warn("PCIe ACS ID parse error %d\n", ret);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+ acs_on_ids[max_acs_id].vendor = val;
|
|
||||||
+
|
|
||||||
+ p += strcspn(p, ":");
|
|
||||||
+ if (*p != ':') {
|
|
||||||
+ pr_warn("PCIe ACS invalid ID\n");
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ p++;
|
|
||||||
+ snprintf(opt, 5, "%s", p);
|
|
||||||
+ ret = kstrtol(opt, 16, &val);
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_warn("PCIe ACS ID parse error %d\n", ret);
|
|
||||||
+ goto next;
|
|
||||||
+ }
|
|
||||||
+ acs_on_ids[max_acs_id].device = val;
|
|
||||||
+ max_acs_id++;
|
|
||||||
+ }
|
|
||||||
+next:
|
|
||||||
+ p += strcspn(p, ",");
|
|
||||||
+ if (*p == ',')
|
|
||||||
+ p++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (acs_on_downstream || acs_on_multifunction || max_acs_id)
|
|
||||||
+ pr_warn("Warning: PCIe ACS overrides enabled; This may allow non-IOMMU protected peer-to-peer DMA\n");
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+early_param("pcie_acs_override", pcie_acs_override_setup);
|
|
||||||
+
|
|
||||||
+static int pcie_acs_overrides(struct pci_dev *dev, u16 acs_flags)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ /* Never override ACS for legacy devices or devices with ACS caps */
|
|
||||||
+ if (!pci_is_pcie(dev) ||
|
|
||||||
+ pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS))
|
|
||||||
+ return -ENOTTY;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < max_acs_id; i++)
|
|
||||||
+ if (acs_on_ids[i].vendor == dev->vendor &&
|
|
||||||
+ acs_on_ids[i].device == dev->device)
|
|
||||||
+ return 1;
|
|
||||||
+
|
|
||||||
+ switch (pci_pcie_type(dev)) {
|
|
||||||
+ case PCI_EXP_TYPE_DOWNSTREAM:
|
|
||||||
+ case PCI_EXP_TYPE_ROOT_PORT:
|
|
||||||
+ if (acs_on_downstream)
|
|
||||||
+ return 1;
|
|
||||||
+ break;
|
|
||||||
+ case PCI_EXP_TYPE_ENDPOINT:
|
|
||||||
+ case PCI_EXP_TYPE_UPSTREAM:
|
|
||||||
+ case PCI_EXP_TYPE_LEG_END:
|
|
||||||
+ case PCI_EXP_TYPE_RC_END:
|
|
||||||
+ if (acs_on_multifunction && dev->multifunction)
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return -ENOTTY;
|
|
||||||
+}
|
|
||||||
/*
|
|
||||||
* Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
|
|
||||||
* The device will throw a Link Down error on AER-capable systems and
|
|
||||||
@@ -4513,6 +4613,7 @@ static const struct pci_dev_acs_enabled {
|
|
||||||
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
|
|
||||||
/* Zhaoxin Root/Downstream Ports */
|
|
||||||
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
|
|
||||||
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
|
|
||||||
{ 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,908 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Mon, 20 Apr 2020 14:09:11 +0200
|
|
||||||
Subject: Import Fsync v3 patchset - Squashed from https://gitlab.collabora.com/tonyk/linux/-/commits/futex-proton-v3
|
|
||||||
|
|
||||||
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
|
|
||||||
index a89eb0accd5e2ee527be1e3e11b1117ff5bf94b4..580001e89c6caed57dd8b3cb491d65dce846caff 100644
|
|
||||||
--- a/include/uapi/linux/futex.h
|
|
||||||
+++ b/include/uapi/linux/futex.h
|
|
||||||
@@ -21,6 +21,7 @@
|
|
||||||
#define FUTEX_WAKE_BITSET 10
|
|
||||||
#define FUTEX_WAIT_REQUEUE_PI 11
|
|
||||||
#define FUTEX_CMP_REQUEUE_PI 12
|
|
||||||
+#define FUTEX_WAIT_MULTIPLE 13
|
|
||||||
|
|
||||||
#define FUTEX_PRIVATE_FLAG 128
|
|
||||||
#define FUTEX_CLOCK_REALTIME 256
|
|
||||||
@@ -40,6 +41,8 @@
|
|
||||||
FUTEX_PRIVATE_FLAG)
|
|
||||||
#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \
|
|
||||||
FUTEX_PRIVATE_FLAG)
|
|
||||||
+#define FUTEX_WAIT_MULTIPLE_PRIVATE (FUTEX_WAIT_MULTIPLE | \
|
|
||||||
+ FUTEX_PRIVATE_FLAG)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Support for robust futexes: the kernel cleans up held futexes at
|
|
||||||
@@ -150,4 +153,21 @@ struct robust_list_head {
|
|
||||||
(((op & 0xf) << 28) | ((cmp & 0xf) << 24) \
|
|
||||||
| ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * Maximum number of multiple futexes to wait for
|
|
||||||
+ */
|
|
||||||
+#define FUTEX_MULTIPLE_MAX_COUNT 128
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * struct futex_wait_block - Block of futexes to be waited for
|
|
||||||
+ * @uaddr: User address of the futex
|
|
||||||
+ * @val: Futex value expected by userspace
|
|
||||||
+ * @bitset: Bitset for the optional bitmasked wakeup
|
|
||||||
+ */
|
|
||||||
+struct futex_wait_block {
|
|
||||||
+ __u32 __user *uaddr;
|
|
||||||
+ __u32 val;
|
|
||||||
+ __u32 bitset;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
#endif /* _UAPI_LINUX_FUTEX_H */
|
|
||||||
diff --git a/kernel/futex.c b/kernel/futex.c
|
|
||||||
index 0cf84c8664f207c574325b899ef2e57f01295a94..58cf9eb2b851b4858e29b5ef4114a29a92e676ba 100644
|
|
||||||
--- a/kernel/futex.c
|
|
||||||
+++ b/kernel/futex.c
|
|
||||||
@@ -215,6 +215,8 @@ struct futex_pi_state {
|
|
||||||
* @rt_waiter: rt_waiter storage for use with requeue_pi
|
|
||||||
* @requeue_pi_key: the requeue_pi target futex key
|
|
||||||
* @bitset: bitset for the optional bitmasked wakeup
|
|
||||||
+ * @uaddr: userspace address of futex
|
|
||||||
+ * @uval: expected futex's value
|
|
||||||
*
|
|
||||||
* We use this hashed waitqueue, instead of a normal wait_queue_entry_t, so
|
|
||||||
* we can wake only the relevant ones (hashed queues may be shared).
|
|
||||||
@@ -237,6 +239,8 @@ struct futex_q {
|
|
||||||
struct rt_mutex_waiter *rt_waiter;
|
|
||||||
union futex_key *requeue_pi_key;
|
|
||||||
u32 bitset;
|
|
||||||
+ u32 __user *uaddr;
|
|
||||||
+ u32 uval;
|
|
||||||
} __randomize_layout;
|
|
||||||
|
|
||||||
static const struct futex_q futex_q_init = {
|
|
||||||
@@ -2420,6 +2424,29 @@ static int unqueue_me(struct futex_q *q)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * unqueue_multiple() - Remove several futexes from their futex_hash_bucket
|
|
||||||
+ * @q: The list of futexes to unqueue
|
|
||||||
+ * @count: Number of futexes in the list
|
|
||||||
+ *
|
|
||||||
+ * Helper to unqueue a list of futexes. This can't fail.
|
|
||||||
+ *
|
|
||||||
+ * Return:
|
|
||||||
+ * - >=0 - Index of the last futex that was awoken;
|
|
||||||
+ * - -1 - If no futex was awoken
|
|
||||||
+ */
|
|
||||||
+static int unqueue_multiple(struct futex_q *q, int count)
|
|
||||||
+{
|
|
||||||
+ int ret = -1;
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ if (!unqueue_me(&q[i]))
|
|
||||||
+ ret = i;
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* PI futexes can not be requeued and must remove themself from the
|
|
||||||
* hash bucket. The hash bucket lock (i.e. lock_ptr) is held on entry
|
|
||||||
@@ -2783,6 +2810,211 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * futex_wait_multiple_setup() - Prepare to wait and enqueue multiple futexes
|
|
||||||
+ * @qs: The corresponding futex list
|
|
||||||
+ * @count: The size of the lists
|
|
||||||
+ * @flags: Futex flags (FLAGS_SHARED, etc.)
|
|
||||||
+ * @awaken: Index of the last awoken futex
|
|
||||||
+ *
|
|
||||||
+ * Prepare multiple futexes in a single step and enqueue them. This may fail if
|
|
||||||
+ * the futex list is invalid or if any futex was already awoken. On success the
|
|
||||||
+ * task is ready to interruptible sleep.
|
|
||||||
+ *
|
|
||||||
+ * Return:
|
|
||||||
+ * - 1 - One of the futexes was awaken by another thread
|
|
||||||
+ * - 0 - Success
|
|
||||||
+ * - <0 - -EFAULT, -EWOULDBLOCK or -EINVAL
|
|
||||||
+ */
|
|
||||||
+static int futex_wait_multiple_setup(struct futex_q *qs, int count,
|
|
||||||
+ unsigned int flags, int *awaken)
|
|
||||||
+{
|
|
||||||
+ struct futex_hash_bucket *hb;
|
|
||||||
+ int ret, i;
|
|
||||||
+ u32 uval;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Enqueuing multiple futexes is tricky, because we need to
|
|
||||||
+ * enqueue each futex in the list before dealing with the next
|
|
||||||
+ * one to avoid deadlocking on the hash bucket. But, before
|
|
||||||
+ * enqueuing, we need to make sure that current->state is
|
|
||||||
+ * TASK_INTERRUPTIBLE, so we don't absorb any awake events, which
|
|
||||||
+ * cannot be done before the get_futex_key of the next key,
|
|
||||||
+ * because it calls get_user_pages, which can sleep. Thus, we
|
|
||||||
+ * fetch the list of futexes keys in two steps, by first pinning
|
|
||||||
+ * all the memory keys in the futex key, and only then we read
|
|
||||||
+ * each key and queue the corresponding futex.
|
|
||||||
+ */
|
|
||||||
+retry:
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ qs[i].key = FUTEX_KEY_INIT;
|
|
||||||
+ ret = get_futex_key(qs[i].uaddr, flags & FLAGS_SHARED,
|
|
||||||
+ &qs[i].key, FUTEX_READ);
|
|
||||||
+ if (unlikely(ret)) {
|
|
||||||
+ for (--i; i >= 0; i--)
|
|
||||||
+ put_futex_key(&qs[i].key);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ set_current_state(TASK_INTERRUPTIBLE);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ struct futex_q *q = &qs[i];
|
|
||||||
+
|
|
||||||
+ hb = queue_lock(q);
|
|
||||||
+
|
|
||||||
+ ret = get_futex_value_locked(&uval, q->uaddr);
|
|
||||||
+ if (ret) {
|
|
||||||
+ /*
|
|
||||||
+ * We need to try to handle the fault, which
|
|
||||||
+ * cannot be done without sleep, so we need to
|
|
||||||
+ * undo all the work already done, to make sure
|
|
||||||
+ * we don't miss any wake ups. Therefore, clean
|
|
||||||
+ * up, handle the fault and retry from the
|
|
||||||
+ * beginning.
|
|
||||||
+ */
|
|
||||||
+ queue_unlock(hb);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Keys 0..(i-1) are implicitly put
|
|
||||||
+ * on unqueue_multiple.
|
|
||||||
+ */
|
|
||||||
+ put_futex_key(&q->key);
|
|
||||||
+
|
|
||||||
+ *awaken = unqueue_multiple(qs, i);
|
|
||||||
+
|
|
||||||
+ __set_current_state(TASK_RUNNING);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * On a real fault, prioritize the error even if
|
|
||||||
+ * some other futex was awoken. Userspace gave
|
|
||||||
+ * us a bad address, -EFAULT them.
|
|
||||||
+ */
|
|
||||||
+ ret = get_user(uval, q->uaddr);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Even if the page fault was handled, If
|
|
||||||
+ * something was already awaken, we can safely
|
|
||||||
+ * give up and succeed to give a hint for userspace to
|
|
||||||
+ * acquire the right futex faster.
|
|
||||||
+ */
|
|
||||||
+ if (*awaken >= 0)
|
|
||||||
+ return 1;
|
|
||||||
+
|
|
||||||
+ goto retry;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (uval != q->uval) {
|
|
||||||
+ queue_unlock(hb);
|
|
||||||
+
|
|
||||||
+ put_futex_key(&qs[i].key);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * If something was already awaken, we can
|
|
||||||
+ * safely ignore the error and succeed.
|
|
||||||
+ */
|
|
||||||
+ *awaken = unqueue_multiple(qs, i);
|
|
||||||
+ __set_current_state(TASK_RUNNING);
|
|
||||||
+ if (*awaken >= 0)
|
|
||||||
+ return 1;
|
|
||||||
+
|
|
||||||
+ return -EWOULDBLOCK;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * The bucket lock can't be held while dealing with the
|
|
||||||
+ * next futex. Queue each futex at this moment so hb can
|
|
||||||
+ * be unlocked.
|
|
||||||
+ */
|
|
||||||
+ queue_me(&qs[i], hb);
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * futex_wait_multiple() - Prepare to wait on and enqueue several futexes
|
|
||||||
+ * @qs: The list of futexes to wait on
|
|
||||||
+ * @op: Operation code from futex's syscall
|
|
||||||
+ * @count: The number of objects
|
|
||||||
+ * @abs_time: Timeout before giving up and returning to userspace
|
|
||||||
+ *
|
|
||||||
+ * Entry point for the FUTEX_WAIT_MULTIPLE futex operation, this function
|
|
||||||
+ * sleeps on a group of futexes and returns on the first futex that
|
|
||||||
+ * triggered, or after the timeout has elapsed.
|
|
||||||
+ *
|
|
||||||
+ * Return:
|
|
||||||
+ * - >=0 - Hint to the futex that was awoken
|
|
||||||
+ * - <0 - On error
|
|
||||||
+ */
|
|
||||||
+static int futex_wait_multiple(struct futex_q *qs, int op,
|
|
||||||
+ u32 count, ktime_t *abs_time)
|
|
||||||
+{
|
|
||||||
+ struct hrtimer_sleeper timeout, *to;
|
|
||||||
+ int ret, flags = 0, hint = 0;
|
|
||||||
+ unsigned int i;
|
|
||||||
+
|
|
||||||
+ if (!(op & FUTEX_PRIVATE_FLAG))
|
|
||||||
+ flags |= FLAGS_SHARED;
|
|
||||||
+
|
|
||||||
+ if (op & FUTEX_CLOCK_REALTIME)
|
|
||||||
+ flags |= FLAGS_CLOCKRT;
|
|
||||||
+
|
|
||||||
+ to = futex_setup_timer(abs_time, &timeout, flags, 0);
|
|
||||||
+ while (1) {
|
|
||||||
+ ret = futex_wait_multiple_setup(qs, count, flags, &hint);
|
|
||||||
+ if (ret) {
|
|
||||||
+ if (ret > 0) {
|
|
||||||
+ /* A futex was awaken during setup */
|
|
||||||
+ ret = hint;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (to)
|
|
||||||
+ hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Avoid sleeping if another thread already tried to
|
|
||||||
+ * wake us.
|
|
||||||
+ */
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ if (plist_node_empty(&qs[i].list))
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (i == count && (!to || to->task))
|
|
||||||
+ freezable_schedule();
|
|
||||||
+
|
|
||||||
+ ret = unqueue_multiple(qs, count);
|
|
||||||
+
|
|
||||||
+ __set_current_state(TASK_RUNNING);
|
|
||||||
+
|
|
||||||
+ if (ret >= 0)
|
|
||||||
+ break;
|
|
||||||
+ if (to && !to->task) {
|
|
||||||
+ ret = -ETIMEDOUT;
|
|
||||||
+ break;
|
|
||||||
+ } else if (signal_pending(current)) {
|
|
||||||
+ ret = -ERESTARTSYS;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ /*
|
|
||||||
+ * The final case is a spurious wakeup, for
|
|
||||||
+ * which just retry.
|
|
||||||
+ */
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (to) {
|
|
||||||
+ hrtimer_cancel(&to->timer);
|
|
||||||
+ destroy_hrtimer_on_stack(&to->timer);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val,
|
|
||||||
ktime_t *abs_time, u32 bitset)
|
|
||||||
{
|
|
||||||
@@ -3907,6 +4139,43 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * futex_read_wait_block - Read an array of futex_wait_block from userspace
|
|
||||||
+ * @uaddr: Userspace address of the block
|
|
||||||
+ * @count: Number of blocks to be read
|
|
||||||
+ *
|
|
||||||
+ * This function creates and allocate an array of futex_q (we zero it to
|
|
||||||
+ * initialize the fields) and then, for each futex_wait_block element from
|
|
||||||
+ * userspace, fill a futex_q element with proper values.
|
|
||||||
+ */
|
|
||||||
+inline struct futex_q *futex_read_wait_block(u32 __user *uaddr, u32 count)
|
|
||||||
+{
|
|
||||||
+ unsigned int i;
|
|
||||||
+ struct futex_q *qs;
|
|
||||||
+ struct futex_wait_block fwb;
|
|
||||||
+ struct futex_wait_block __user *entry =
|
|
||||||
+ (struct futex_wait_block __user *)uaddr;
|
|
||||||
+
|
|
||||||
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
|
||||||
+ return ERR_PTR(-EINVAL);
|
|
||||||
+
|
|
||||||
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
|
||||||
+ if (!qs)
|
|
||||||
+ return ERR_PTR(-ENOMEM);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
|
||||||
+ kfree(qs);
|
|
||||||
+ return ERR_PTR(-EFAULT);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ qs[i].uaddr = fwb.uaddr;
|
|
||||||
+ qs[i].uval = fwb.val;
|
|
||||||
+ qs[i].bitset = fwb.bitset;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return qs;
|
|
||||||
+}
|
|
||||||
|
|
||||||
SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
struct __kernel_timespec __user *, utime, u32 __user *, uaddr2,
|
|
||||||
@@ -3919,7 +4188,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
|
|
||||||
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
|
|
||||||
cmd == FUTEX_WAIT_BITSET ||
|
|
||||||
- cmd == FUTEX_WAIT_REQUEUE_PI)) {
|
|
||||||
+ cmd == FUTEX_WAIT_REQUEUE_PI ||
|
|
||||||
+ cmd == FUTEX_WAIT_MULTIPLE)) {
|
|
||||||
if (unlikely(should_fail_futex(!(op & FUTEX_PRIVATE_FLAG))))
|
|
||||||
return -EFAULT;
|
|
||||||
if (get_timespec64(&ts, utime))
|
|
||||||
@@ -3940,6 +4210,25 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
|
|
||||||
val2 = (u32) (unsigned long) utime;
|
|
||||||
|
|
||||||
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
|
||||||
+ int ret;
|
|
||||||
+ struct futex_q *qs;
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_X86_X32
|
|
||||||
+ if (unlikely(in_x32_syscall()))
|
|
||||||
+ return -ENOSYS;
|
|
||||||
+#endif
|
|
||||||
+ qs = futex_read_wait_block(uaddr, val);
|
|
||||||
+
|
|
||||||
+ if (IS_ERR(qs))
|
|
||||||
+ return PTR_ERR(qs);
|
|
||||||
+
|
|
||||||
+ ret = futex_wait_multiple(qs, op, val, tp);
|
|
||||||
+ kfree(qs);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -4102,6 +4391,57 @@ COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
|
|
||||||
#endif /* CONFIG_COMPAT */
|
|
||||||
|
|
||||||
#ifdef CONFIG_COMPAT_32BIT_TIME
|
|
||||||
+/**
|
|
||||||
+ * struct compat_futex_wait_block - Block of futexes to be waited for
|
|
||||||
+ * @uaddr: User address of the futex (compatible pointer)
|
|
||||||
+ * @val: Futex value expected by userspace
|
|
||||||
+ * @bitset: Bitset for the optional bitmasked wakeup
|
|
||||||
+ */
|
|
||||||
+struct compat_futex_wait_block {
|
|
||||||
+ compat_uptr_t uaddr;
|
|
||||||
+ __u32 val;
|
|
||||||
+ __u32 bitset;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * compat_futex_read_wait_block - Read an array of futex_wait_block from
|
|
||||||
+ * userspace
|
|
||||||
+ * @uaddr: Userspace address of the block
|
|
||||||
+ * @count: Number of blocks to be read
|
|
||||||
+ *
|
|
||||||
+ * This function does the same as futex_read_wait_block(), except that it
|
|
||||||
+ * converts the pointer to the futex from the compat version to the regular one.
|
|
||||||
+ */
|
|
||||||
+inline struct futex_q *compat_futex_read_wait_block(u32 __user *uaddr,
|
|
||||||
+ u32 count)
|
|
||||||
+{
|
|
||||||
+ unsigned int i;
|
|
||||||
+ struct futex_q *qs;
|
|
||||||
+ struct compat_futex_wait_block fwb;
|
|
||||||
+ struct compat_futex_wait_block __user *entry =
|
|
||||||
+ (struct compat_futex_wait_block __user *)uaddr;
|
|
||||||
+
|
|
||||||
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
|
||||||
+ return ERR_PTR(-EINVAL);
|
|
||||||
+
|
|
||||||
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
|
||||||
+ if (!qs)
|
|
||||||
+ return ERR_PTR(-ENOMEM);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < count; i++) {
|
|
||||||
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
|
||||||
+ kfree(qs);
|
|
||||||
+ return ERR_PTR(-EFAULT);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ qs[i].uaddr = compat_ptr(fwb.uaddr);
|
|
||||||
+ qs[i].uval = fwb.val;
|
|
||||||
+ qs[i].bitset = fwb.bitset;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return qs;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
|
|
||||||
u32, val3)
|
|
||||||
@@ -4113,7 +4453,8 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
|
|
||||||
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
|
|
||||||
cmd == FUTEX_WAIT_BITSET ||
|
|
||||||
- cmd == FUTEX_WAIT_REQUEUE_PI)) {
|
|
||||||
+ cmd == FUTEX_WAIT_REQUEUE_PI ||
|
|
||||||
+ cmd == FUTEX_WAIT_MULTIPLE)) {
|
|
||||||
if (get_old_timespec32(&ts, utime))
|
|
||||||
return -EFAULT;
|
|
||||||
if (!timespec64_valid(&ts))
|
|
||||||
@@ -4128,6 +4469,19 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
|
|
||||||
val2 = (int) (unsigned long) utime;
|
|
||||||
|
|
||||||
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
|
||||||
+ int ret;
|
|
||||||
+ struct futex_q *qs = compat_futex_read_wait_block(uaddr, val);
|
|
||||||
+
|
|
||||||
+ if (IS_ERR(qs))
|
|
||||||
+ return PTR_ERR(qs);
|
|
||||||
+
|
|
||||||
+ ret = futex_wait_multiple(qs, op, val, tp);
|
|
||||||
+ kfree(qs);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_COMPAT_32BIT_TIME */
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c
|
|
||||||
index ee55e6d389a3f053194435342c4e471dc7cf8786..2a63e1c2cfb6407a5988233217cff2e52787bc66 100644
|
|
||||||
--- a/tools/testing/selftests/futex/functional/futex_wait_timeout.c
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
*
|
|
||||||
* HISTORY
|
|
||||||
* 2009-Nov-6: Initial version by Darren Hart <dvhart@linux.intel.com>
|
|
||||||
+ * 2019-Dec-13: Add WAIT_MULTIPLE test by Krisman <krisman@collabora.com>
|
|
||||||
*
|
|
||||||
*****************************************************************************/
|
|
||||||
|
|
||||||
@@ -41,6 +42,8 @@ int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
futex_t f1 = FUTEX_INITIALIZER;
|
|
||||||
struct timespec to;
|
|
||||||
+ time_t secs;
|
|
||||||
+ struct futex_wait_block fwb = {&f1, f1, 0};
|
|
||||||
int res, ret = RET_PASS;
|
|
||||||
int c;
|
|
||||||
|
|
||||||
@@ -65,7 +68,7 @@ int main(int argc, char *argv[])
|
|
||||||
}
|
|
||||||
|
|
||||||
ksft_print_header();
|
|
||||||
- ksft_set_plan(1);
|
|
||||||
+ ksft_set_plan(2);
|
|
||||||
ksft_print_msg("%s: Block on a futex and wait for timeout\n",
|
|
||||||
basename(argv[0]));
|
|
||||||
ksft_print_msg("\tArguments: timeout=%ldns\n", timeout_ns);
|
|
||||||
@@ -79,8 +82,39 @@ int main(int argc, char *argv[])
|
|
||||||
if (!res || errno != ETIMEDOUT) {
|
|
||||||
fail("futex_wait returned %d\n", ret < 0 ? errno : ret);
|
|
||||||
ret = RET_FAIL;
|
|
||||||
+ } else
|
|
||||||
+ ksft_test_result_pass("futex_wait timeout succeeds\n");
|
|
||||||
+
|
|
||||||
+ info("Calling futex_wait_multiple on f1: %u @ %p\n", f1, &f1);
|
|
||||||
+
|
|
||||||
+ /* Setup absolute time */
|
|
||||||
+ ret = clock_gettime(CLOCK_REALTIME, &to);
|
|
||||||
+ secs = (to.tv_nsec + timeout_ns) / 1000000000;
|
|
||||||
+ to.tv_nsec = ((int64_t)to.tv_nsec + timeout_ns) % 1000000000;
|
|
||||||
+ to.tv_sec += secs;
|
|
||||||
+ info("to.tv_sec = %ld\n", to.tv_sec);
|
|
||||||
+ info("to.tv_nsec = %ld\n", to.tv_nsec);
|
|
||||||
+
|
|
||||||
+ res = futex_wait_multiple(&fwb, 1, &to,
|
|
||||||
+ FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
|
|
||||||
+
|
|
||||||
+#ifdef __ILP32__
|
|
||||||
+ if (res == -1 && errno == ENOSYS) {
|
|
||||||
+ ksft_test_result_skip("futex_wait_multiple not supported at x32\n");
|
|
||||||
+ } else {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ if (!res || errno != ETIMEDOUT) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
+ } else
|
|
||||||
+ ksft_test_result_pass("futex_wait_multiple timeout succeeds\n");
|
|
||||||
+#endif /* __ILP32__ */
|
|
||||||
|
|
||||||
- print_result(TEST_NAME, ret);
|
|
||||||
+ ksft_print_cnts();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h
|
|
||||||
index ddbcfc9b7bac4aebb5bac2f249e26ecfd948aa84..bb103bef4557012ef9a389ca74c868e4476a8a31 100644
|
|
||||||
--- a/tools/testing/selftests/futex/include/futextest.h
|
|
||||||
+++ b/tools/testing/selftests/futex/include/futextest.h
|
|
||||||
@@ -38,6 +38,14 @@ typedef volatile u_int32_t futex_t;
|
|
||||||
#ifndef FUTEX_CMP_REQUEUE_PI
|
|
||||||
#define FUTEX_CMP_REQUEUE_PI 12
|
|
||||||
#endif
|
|
||||||
+#ifndef FUTEX_WAIT_MULTIPLE
|
|
||||||
+#define FUTEX_WAIT_MULTIPLE 13
|
|
||||||
+struct futex_wait_block {
|
|
||||||
+ futex_t *uaddr;
|
|
||||||
+ futex_t val;
|
|
||||||
+ __u32 bitset;
|
|
||||||
+};
|
|
||||||
+#endif
|
|
||||||
#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE
|
|
||||||
#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \
|
|
||||||
FUTEX_PRIVATE_FLAG)
|
|
||||||
@@ -80,6 +88,20 @@ futex_wait(futex_t *uaddr, futex_t val, struct timespec *timeout, int opflags)
|
|
||||||
return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags);
|
|
||||||
}
|
|
||||||
|
|
||||||
+/**
|
|
||||||
+ * futex_wait_multiple() - block on several futexes with optional timeout
|
|
||||||
+ * @fwb: wait block user space address
|
|
||||||
+ * @count: number of entities at fwb
|
|
||||||
+ * @timeout: absolute timeout
|
|
||||||
+ */
|
|
||||||
+static inline int
|
|
||||||
+futex_wait_multiple(struct futex_wait_block *fwb, int count,
|
|
||||||
+ struct timespec *timeout, int opflags)
|
|
||||||
+{
|
|
||||||
+ return futex(fwb, FUTEX_WAIT_MULTIPLE, count, timeout, NULL, 0,
|
|
||||||
+ opflags);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* futex_wake() - wake one or more tasks blocked on uaddr
|
|
||||||
* @nr_wake: wake up to this many tasks
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
|
|
||||||
index 0ae390ff816449c88d0bb655a26eb014382c2b4f..bcbac042992d447e0bc9ef5fefe94e875de310f2 100644
|
|
||||||
--- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
*
|
|
||||||
* HISTORY
|
|
||||||
* 2009-Nov-14: Initial version by Gowrishankar <gowrishankar.m@in.ibm.com>
|
|
||||||
+ * 2019-Dec-13: Add WAIT_MULTIPLE test by Krisman <krisman@collabora.com>
|
|
||||||
*
|
|
||||||
*****************************************************************************/
|
|
||||||
|
|
||||||
@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns};
|
|
||||||
futex_t f1 = FUTEX_INITIALIZER;
|
|
||||||
+ struct futex_wait_block fwb = {&f1, f1+1, 0};
|
|
||||||
int res, ret = RET_PASS;
|
|
||||||
int c;
|
|
||||||
|
|
||||||
@@ -61,7 +63,7 @@ int main(int argc, char *argv[])
|
|
||||||
}
|
|
||||||
|
|
||||||
ksft_print_header();
|
|
||||||
- ksft_set_plan(1);
|
|
||||||
+ ksft_set_plan(2);
|
|
||||||
ksft_print_msg("%s: Test the unexpected futex value in FUTEX_WAIT\n",
|
|
||||||
basename(argv[0]));
|
|
||||||
|
|
||||||
@@ -71,8 +73,30 @@ int main(int argc, char *argv[])
|
|
||||||
fail("futex_wait returned: %d %s\n",
|
|
||||||
res ? errno : res, res ? strerror(errno) : "");
|
|
||||||
ret = RET_FAIL;
|
|
||||||
+ } else
|
|
||||||
+ ksft_test_result_pass("futex_wait wouldblock succeeds\n");
|
|
||||||
+
|
|
||||||
+ info("Calling futex_wait_multiple on f1: %u @ %p with val=%u\n",
|
|
||||||
+ f1, &f1, f1+1);
|
|
||||||
+ res = futex_wait_multiple(&fwb, 1, NULL, FUTEX_PRIVATE_FLAG);
|
|
||||||
+
|
|
||||||
+#ifdef __ILP32__
|
|
||||||
+ if (res != -1 || errno != ENOSYS) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
+ } else {
|
|
||||||
+ ksft_test_result_skip("futex_wait_multiple not supported at x32\n");
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
+ if (!res || errno != EWOULDBLOCK) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
}
|
|
||||||
+ ksft_test_result_pass("futex_wait_multiple wouldblock succeeds\n");
|
|
||||||
+#endif /* __ILP32__ */
|
|
||||||
|
|
||||||
- print_result(TEST_NAME, ret);
|
|
||||||
+ ksft_print_cnts();
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/.gitignore b/tools/testing/selftests/futex/functional/.gitignore
|
|
||||||
index a09f570619023750f558c84004aff166b4337d72..4660128a545edb04a17cc6bd9760931c1386122f 100644
|
|
||||||
--- a/tools/testing/selftests/futex/functional/.gitignore
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/.gitignore
|
|
||||||
@@ -5,3 +5,4 @@ futex_wait_private_mapped_file
|
|
||||||
futex_wait_timeout
|
|
||||||
futex_wait_uninitialized_heap
|
|
||||||
futex_wait_wouldblock
|
|
||||||
+futex_wait_multiple
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
|
|
||||||
index 30996306cabcfe89a47977643e529b122893bb7e..75f9fface11fa3c90c1bdb9a49b3ea51291afd58 100644
|
|
||||||
--- a/tools/testing/selftests/futex/functional/Makefile
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/Makefile
|
|
||||||
@@ -14,7 +14,8 @@ TEST_GEN_FILES := \
|
|
||||||
futex_requeue_pi_signal_restart \
|
|
||||||
futex_requeue_pi_mismatched_ops \
|
|
||||||
futex_wait_uninitialized_heap \
|
|
||||||
- futex_wait_private_mapped_file
|
|
||||||
+ futex_wait_private_mapped_file \
|
|
||||||
+ futex_wait_multiple
|
|
||||||
|
|
||||||
TEST_PROGS := run.sh
|
|
||||||
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/futex_wait_multiple.c b/tools/testing/selftests/futex/functional/futex_wait_multiple.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..b48422e79f42edba1653bb0bd2a4c4fd98d2d48d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/futex_wait_multiple.c
|
|
||||||
@@ -0,0 +1,173 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
+/******************************************************************************
|
|
||||||
+ *
|
|
||||||
+ * Copyright © Collabora, Ltd., 2019
|
|
||||||
+ *
|
|
||||||
+ * DESCRIPTION
|
|
||||||
+ * Test basic semantics of FUTEX_WAIT_MULTIPLE
|
|
||||||
+ *
|
|
||||||
+ * AUTHOR
|
|
||||||
+ * Gabriel Krisman Bertazi <krisman@collabora.com>
|
|
||||||
+ *
|
|
||||||
+ * HISTORY
|
|
||||||
+ * 2019-Dec-13: Initial version by Krisman <krisman@collabora.com>
|
|
||||||
+ *
|
|
||||||
+ *****************************************************************************/
|
|
||||||
+
|
|
||||||
+#include <errno.h>
|
|
||||||
+#include <getopt.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <string.h>
|
|
||||||
+#include <time.h>
|
|
||||||
+#include <pthread.h>
|
|
||||||
+#include "futextest.h"
|
|
||||||
+#include "logging.h"
|
|
||||||
+
|
|
||||||
+#define TEST_NAME "futex-wait-multiple"
|
|
||||||
+#define timeout_ns 100000
|
|
||||||
+#define MAX_COUNT 128
|
|
||||||
+#define WAKE_WAIT_US 3000000
|
|
||||||
+
|
|
||||||
+int ret = RET_PASS;
|
|
||||||
+char *progname;
|
|
||||||
+futex_t f[MAX_COUNT] = {0};
|
|
||||||
+struct futex_wait_block fwb[MAX_COUNT];
|
|
||||||
+
|
|
||||||
+void usage(char *prog)
|
|
||||||
+{
|
|
||||||
+ printf("Usage: %s\n", prog);
|
|
||||||
+ printf(" -c Use color\n");
|
|
||||||
+ printf(" -h Display this help message\n");
|
|
||||||
+ printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",
|
|
||||||
+ VQUIET, VCRITICAL, VINFO);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void test_count_overflow(void)
|
|
||||||
+{
|
|
||||||
+ futex_t f = FUTEX_INITIALIZER;
|
|
||||||
+ struct futex_wait_block fwb[MAX_COUNT+1];
|
|
||||||
+ int res, i;
|
|
||||||
+
|
|
||||||
+ ksft_print_msg("%s: Test a too big number of futexes\n", progname);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MAX_COUNT+1; i++) {
|
|
||||||
+ fwb[i].uaddr = &f;
|
|
||||||
+ fwb[i].val = f;
|
|
||||||
+ fwb[i].bitset = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ res = futex_wait_multiple(fwb, MAX_COUNT+1, NULL, FUTEX_PRIVATE_FLAG);
|
|
||||||
+
|
|
||||||
+#ifdef __ILP32__
|
|
||||||
+ if (res != -1 || errno != ENOSYS) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
+ } else {
|
|
||||||
+ ksft_test_result_skip("futex_wait_multiple not supported at x32\n");
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
+ if (res != -1 || errno != EINVAL) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
+ } else {
|
|
||||||
+ ksft_test_result_pass("futex_wait_multiple count overflow succeed\n");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#endif /* __ILP32__ */
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void *waiterfn(void *arg)
|
|
||||||
+{
|
|
||||||
+ int res;
|
|
||||||
+
|
|
||||||
+ res = futex_wait_multiple(fwb, MAX_COUNT, NULL, FUTEX_PRIVATE_FLAG);
|
|
||||||
+
|
|
||||||
+#ifdef __ILP32__
|
|
||||||
+ if (res != -1 || errno != ENOSYS) {
|
|
||||||
+ ksft_test_result_fail("futex_wait_multiple returned %d\n",
|
|
||||||
+ res < 0 ? errno : res);
|
|
||||||
+ ret = RET_FAIL;
|
|
||||||
+ } else {
|
|
||||||
+ ksft_test_result_skip("futex_wait_multiple not supported at x32\n");
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
+ if (res < 0)
|
|
||||||
+ ksft_print_msg("waiter failed %d\n", res);
|
|
||||||
+
|
|
||||||
+ info("futex_wait_multiple: Got hint futex %d was freed\n", res);
|
|
||||||
+#endif /* __ILP32__ */
|
|
||||||
+
|
|
||||||
+ return NULL;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void test_fwb_wakeup(void)
|
|
||||||
+{
|
|
||||||
+ int res, i;
|
|
||||||
+ pthread_t waiter;
|
|
||||||
+
|
|
||||||
+ ksft_print_msg("%s: Test wake up in a list of futex\n", progname);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MAX_COUNT; i++) {
|
|
||||||
+ fwb[i].uaddr = &f[i];
|
|
||||||
+ fwb[i].val = f[i];
|
|
||||||
+ fwb[i].bitset = 0xffffffff;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ res = pthread_create(&waiter, NULL, waiterfn, NULL);
|
|
||||||
+ if (res) {
|
|
||||||
+ ksft_test_result_fail("Creating waiting thread failed");
|
|
||||||
+ ksft_exit_fail();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ usleep(WAKE_WAIT_US);
|
|
||||||
+ res = futex_wake(&(f[MAX_COUNT-1]), 1, FUTEX_PRIVATE_FLAG);
|
|
||||||
+ if (res != 1) {
|
|
||||||
+ ksft_test_result_fail("Failed to wake thread res=%d\n", res);
|
|
||||||
+ ksft_exit_fail();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ pthread_join(waiter, NULL);
|
|
||||||
+ ksft_test_result_pass("%s succeed\n", __func__);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int main(int argc, char *argv[])
|
|
||||||
+{
|
|
||||||
+ int c;
|
|
||||||
+
|
|
||||||
+ while ((c = getopt(argc, argv, "cht:v:")) != -1) {
|
|
||||||
+ switch (c) {
|
|
||||||
+ case 'c':
|
|
||||||
+ log_color(1);
|
|
||||||
+ break;
|
|
||||||
+ case 'h':
|
|
||||||
+ usage(basename(argv[0]));
|
|
||||||
+ exit(0);
|
|
||||||
+ case 'v':
|
|
||||||
+ log_verbosity(atoi(optarg));
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ usage(basename(argv[0]));
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ progname = basename(argv[0]);
|
|
||||||
+
|
|
||||||
+ ksft_print_header();
|
|
||||||
+ ksft_set_plan(2);
|
|
||||||
+
|
|
||||||
+ test_count_overflow();
|
|
||||||
+
|
|
||||||
+#ifdef __ILP32__
|
|
||||||
+ // if it's a 32x binary, there's no futex to wakeup
|
|
||||||
+ ksft_test_result_skip("futex_wait_multiple not supported at x32\n");
|
|
||||||
+#else
|
|
||||||
+ test_fwb_wakeup();
|
|
||||||
+#endif /* __ILP32__ */
|
|
||||||
+
|
|
||||||
+ ksft_print_cnts();
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh
|
|
||||||
index 1acb6ace1680e8f3d6b3ee2dc528c19ddfdb018e..a8be94f28ff78b4879d2d19bca5d9b0fcb26c1f8 100755
|
|
||||||
--- a/tools/testing/selftests/futex/functional/run.sh
|
|
||||||
+++ b/tools/testing/selftests/futex/functional/run.sh
|
|
||||||
@@ -73,3 +73,6 @@ echo
|
|
||||||
echo
|
|
||||||
./futex_wait_uninitialized_heap $COLOR
|
|
||||||
./futex_wait_private_mapped_file $COLOR
|
|
||||||
+
|
|
||||||
+echo
|
|
||||||
+./futex_wait_multiple $COLOR
|
|
||||||
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
|
|
||||||
index 580001e89c6caed57dd8b3cb491d65dce846caff..a3e760886b8e7e74285fdcf2caaaa6f66ad16675 100644
|
|
||||||
--- a/include/uapi/linux/futex.h
|
|
||||||
+++ b/include/uapi/linux/futex.h
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
#define FUTEX_WAKE_BITSET 10
|
|
||||||
#define FUTEX_WAIT_REQUEUE_PI 11
|
|
||||||
#define FUTEX_CMP_REQUEUE_PI 12
|
|
||||||
-#define FUTEX_WAIT_MULTIPLE 13
|
|
||||||
+#define FUTEX_WAIT_MULTIPLE 31
|
|
||||||
|
|
||||||
#define FUTEX_PRIVATE_FLAG 128
|
|
||||||
#define FUTEX_CLOCK_REALTIME 256
|
|
||||||
diff --git a/kernel/futex.c b/kernel/futex.c
|
|
||||||
index 58cf9eb2b851b4858e29b5ef4114a29a92e676ba..e0bb628a5e1988dcc9ae5442a4259edc229d578d 100644
|
|
||||||
--- a/kernel/futex.c
|
|
||||||
+++ b/kernel/futex.c
|
|
||||||
@@ -4198,7 +4198,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
t = timespec64_to_ktime(ts);
|
|
||||||
- if (cmd == FUTEX_WAIT)
|
|
||||||
+ if (cmd == FUTEX_WAIT || cmd == FUTEX_WAIT_MULTIPLE)
|
|
||||||
t = ktime_add_safe(ktime_get(), t);
|
|
||||||
tp = &t;
|
|
||||||
}
|
|
||||||
@@ -4399,6 +4399,7 @@ COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
|
|
||||||
*/
|
|
||||||
struct compat_futex_wait_block {
|
|
||||||
compat_uptr_t uaddr;
|
|
||||||
+ __u32 pad;
|
|
||||||
__u32 val;
|
|
||||||
__u32 bitset;
|
|
||||||
};
|
|
||||||
@@ -4461,7 +4462,7 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
t = timespec64_to_ktime(ts);
|
|
||||||
- if (cmd == FUTEX_WAIT)
|
|
||||||
+ if (cmd == FUTEX_WAIT || cmd == FUTEX_WAIT_MULTIPLE)
|
|
||||||
t = ktime_add_safe(ktime_get(), t);
|
|
||||||
tp = &t;
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,90 +0,0 @@
|
|||||||
From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tk-Glitch <ti3nou@gmail.com>
|
|
||||||
Date: Wed, 4 Jul 2018 04:30:08 +0200
|
|
||||||
Subject: glitched - BMQ
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_250
|
|
||||||
+ default HZ_500
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -39,6 +39,13 @@ choice
|
|
||||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
|
||||||
NTSC frame rates for video and multimedia work.
|
|
||||||
|
|
||||||
+ config HZ_500
|
|
||||||
+ bool "500 HZ"
|
|
||||||
+ help
|
|
||||||
+ 500 Hz is a balanced timer frequency. Provides fast interactivity
|
|
||||||
+ on desktops with great smoothness without increasing CPU power
|
|
||||||
+ consumption and sacrificing the battery life on laptops.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -52,6 +59,7 @@ config HZ
|
|
||||||
default 100 if HZ_100
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
+ default 500 if HZ_500
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
|
|
||||||
index 2a202a846757..1d9c7ed79b11 100644
|
|
||||||
--- a/kernel/Kconfig.hz
|
|
||||||
+++ b/kernel/Kconfig.hz
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "Timer frequency"
|
|
||||||
- default HZ_500
|
|
||||||
+ default HZ_750
|
|
||||||
help
|
|
||||||
Allows the configuration of the timer frequency. It is customary
|
|
||||||
to have the timer interrupt run at 1000 Hz but 100 Hz may be more
|
|
||||||
@@ -46,6 +46,13 @@ choice
|
|
||||||
on desktops with great smoothness without increasing CPU power
|
|
||||||
consumption and sacrificing the battery life on laptops.
|
|
||||||
|
|
||||||
+ config HZ_750
|
|
||||||
+ bool "750 HZ"
|
|
||||||
+ help
|
|
||||||
+ 750 Hz is a good timer frequency for desktops. Provides fast
|
|
||||||
+ interactivity with great smoothness without sacrificing too
|
|
||||||
+ much throughput.
|
|
||||||
+
|
|
||||||
config HZ_1000
|
|
||||||
bool "1000 HZ"
|
|
||||||
help
|
|
||||||
@@ -60,6 +67,7 @@ config HZ
|
|
||||||
default 250 if HZ_250
|
|
||||||
default 300 if HZ_300
|
|
||||||
default 500 if HZ_500
|
|
||||||
+ default 750 if HZ_750
|
|
||||||
default 1000 if HZ_1000
|
|
||||||
|
|
||||||
config SCHED_HRTICK
|
|
||||||
|
|
||||||
diff --git a/mm/vmscan.c b/mm/vmscan.c
|
|
||||||
index 9270a4370d54..30d01e647417 100644
|
|
||||||
--- a/mm/vmscan.c
|
|
||||||
+++ b/mm/vmscan.c
|
|
||||||
@@ -159,7 +159,7 @@ struct scan_control {
|
|
||||||
/*
|
|
||||||
* From 0 .. 100. Higher means more swappy.
|
|
||||||
*/
|
|
||||||
-int vm_swappiness = 60;
|
|
||||||
+int vm_swappiness = 20;
|
|
||||||
/*
|
|
||||||
* The total number of pages which are beyond the high watermark within all
|
|
||||||
* zones.
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
index 6b423eebfd5d..61e3271675d6 100644
|
|
||||||
--- a/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
+++ b/drivers/cpufreq/cpufreq_ondemand.c
|
|
||||||
@@ -21,10 +21,10 @@
|
|
||||||
#include "cpufreq_ondemand.h"
|
|
||||||
|
|
||||||
/* On-demand governor macros */
|
|
||||||
-#define DEF_FREQUENCY_UP_THRESHOLD (80)
|
|
||||||
-#define DEF_SAMPLING_DOWN_FACTOR (1)
|
|
||||||
+#define DEF_FREQUENCY_UP_THRESHOLD (55)
|
|
||||||
+#define DEF_SAMPLING_DOWN_FACTOR (5)
|
|
||||||
#define MAX_SAMPLING_DOWN_FACTOR (100000)
|
|
||||||
-#define MICRO_FREQUENCY_UP_THRESHOLD (95)
|
|
||||||
+#define MICRO_FREQUENCY_UP_THRESHOLD (63)
|
|
||||||
#define MICRO_FREQUENCY_MIN_SAMPLE_RATE (10000)
|
|
||||||
#define MIN_FREQUENCY_UP_THRESHOLD (1)
|
|
||||||
#define MAX_FREQUENCY_UP_THRESHOLD (100)
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
||||||
Date: Thu, 2 May 2019 05:28:08 +0100
|
|
||||||
Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with
|
|
||||||
EXPORT_SYMBOL_GPL
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
We need these symbols in zfs as the fpu implementation breaks userspace:
|
|
||||||
|
|
||||||
https://github.com/zfsonlinux/zfs/issues/9346
|
|
||||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
|
||||||
---
|
|
||||||
arch/x86/kernel/fpu/core.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
|
|
||||||
index 12c70840980e..352538b3bb5d 100644
|
|
||||||
--- a/arch/x86/kernel/fpu/core.c
|
|
||||||
+++ b/arch/x86/kernel/fpu/core.c
|
|
||||||
@@ -102,7 +102,7 @@ void kernel_fpu_begin(void)
|
|
||||||
}
|
|
||||||
__cpu_invalidate_fpregs_state();
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(kernel_fpu_begin);
|
|
||||||
+EXPORT_SYMBOL(kernel_fpu_begin);
|
|
||||||
|
|
||||||
void kernel_fpu_end(void)
|
|
||||||
{
|
|
||||||
@@ -111,7 +111,7 @@ void kernel_fpu_end(void)
|
|
||||||
this_cpu_write(in_kernel_fpu, false);
|
|
||||||
preempt_enable();
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(kernel_fpu_end);
|
|
||||||
+EXPORT_SYMBOL(kernel_fpu_end);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Save the FPU state (mark it for reload if necessary):
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user