Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
783961cc63 |
5
PKGBUILD
5
PKGBUILD
@@ -31,6 +31,7 @@ _distro="Arch"
|
|||||||
declare -p -x > current_env
|
declare -p -x > current_env
|
||||||
|
|
||||||
source "$_where"/customization.cfg # load default configuration from file
|
source "$_where"/customization.cfg # load default configuration from file
|
||||||
|
source "$_where"/linux-tkg-config/prepare
|
||||||
|
|
||||||
if [ -e "$_EXT_CONFIG_PATH" ]; then
|
if [ -e "$_EXT_CONFIG_PATH" ]; then
|
||||||
msg2 "External configuration file $_EXT_CONFIG_PATH will be used and will override customization.cfg values."
|
msg2 "External configuration file $_EXT_CONFIG_PATH will be used and will override customization.cfg values."
|
||||||
@@ -39,8 +40,6 @@ fi
|
|||||||
|
|
||||||
source current_env
|
source current_env
|
||||||
|
|
||||||
source "$_where"/linux-tkg-config/prepare
|
|
||||||
|
|
||||||
# Make sure we're in a clean state
|
# Make sure we're in a clean state
|
||||||
if [ ! -e "$_where"/BIG_UGLY_FROGMINER ]; then
|
if [ ! -e "$_where"/BIG_UGLY_FROGMINER ]; then
|
||||||
_tkg_initscript
|
_tkg_initscript
|
||||||
@@ -57,7 +56,7 @@ else
|
|||||||
fi
|
fi
|
||||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
||||||
pkgver="${_basekernel}"."${_sub}"
|
pkgver="${_basekernel}"."${_sub}"
|
||||||
pkgrel=272
|
pkgrel=271
|
||||||
pkgdesc='Linux-tkg'
|
pkgdesc='Linux-tkg'
|
||||||
arch=('x86_64') # no i686 in here
|
arch=('x86_64') # no i686 in here
|
||||||
url="https://www.kernel.org/"
|
url="https://www.kernel.org/"
|
||||||
|
@@ -20,7 +20,7 @@ _EXT_CONFIG_PATH=~/.config/frogminer/linux-tkg.cfg
|
|||||||
# Default is "true".
|
# Default is "true".
|
||||||
_NUKR="true"
|
_NUKR="true"
|
||||||
|
|
||||||
# Git mirror to use to get the kernel sources, possible values are "kernel.org", "googlesource.com", "github.com" and "torvalds"
|
# Git mirror to use to get the kernel sources, possible values are "kernel.org", "googlesource.com" and "github.com"
|
||||||
_git_mirror="kernel.org"
|
_git_mirror="kernel.org"
|
||||||
|
|
||||||
# Custom compiler root dirs - Leave empty to use system compilers
|
# Custom compiler root dirs - Leave empty to use system compilers
|
||||||
@@ -144,9 +144,7 @@ _numadisable="false"
|
|||||||
_misc_adds="true"
|
_misc_adds="true"
|
||||||
|
|
||||||
# Set to "0" for periodic ticks, "1" to use CattaRappa mode (enabling full tickless) and "2" for tickless idle only.
|
# Set to "0" for periodic ticks, "1" to use CattaRappa mode (enabling full tickless) and "2" for tickless idle only.
|
||||||
# Full tickless can give higher performances in case you use isolation of CPUs for tasks
|
# 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).
|
||||||
# and it works only when using the nohz_full kernel parameter, otherwise behaves like idle.
|
|
||||||
# Just tickless idle perform better for most platforms.
|
|
||||||
_tickless="2"
|
_tickless="2"
|
||||||
|
|
||||||
# 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"
|
# 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"
|
||||||
@@ -218,7 +216,7 @@ _tt_high_hz="false"
|
|||||||
_smt_nice="true"
|
_smt_nice="true"
|
||||||
|
|
||||||
# Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
|
# Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
|
||||||
_random_trust_cpu="true"
|
_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)
|
# 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"
|
# Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
|
||||||
|
@@ -44,12 +44,6 @@ plain() {
|
|||||||
|
|
||||||
declare -p -x > current_env
|
declare -p -x > current_env
|
||||||
source customization.cfg
|
source customization.cfg
|
||||||
|
|
||||||
if [ -e "$_EXT_CONFIG_PATH" ]; then
|
|
||||||
msg2 "External configuration file $_EXT_CONFIG_PATH will be used and will override customization.cfg values."
|
|
||||||
source "$_EXT_CONFIG_PATH"
|
|
||||||
fi
|
|
||||||
|
|
||||||
. current_env
|
. current_env
|
||||||
|
|
||||||
source linux-tkg-config/prepare
|
source linux-tkg-config/prepare
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 6.0.5-arch1 Kernel Configuration
|
# Linux/x86 6.0.0-arch1 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
|
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
|||||||
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
|
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
|
||||||
CONFIG_CC_HAS_ASM_INLINE=y
|
CONFIG_CC_HAS_ASM_INLINE=y
|
||||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||||
CONFIG_PAHOLE_VERSION=124
|
CONFIG_PAHOLE_VERSION=123
|
||||||
CONFIG_IRQ_WORK=y
|
CONFIG_IRQ_WORK=y
|
||||||
CONFIG_BUILDTIME_TABLE_SORT=y
|
CONFIG_BUILDTIME_TABLE_SORT=y
|
||||||
CONFIG_THREAD_INFO_IN_TASK=y
|
CONFIG_THREAD_INFO_IN_TASK=y
|
||||||
@@ -7596,7 +7596,6 @@ CONFIG_HID_SMARTJOYPLUS=m
|
|||||||
CONFIG_SMARTJOYPLUS_FF=y
|
CONFIG_SMARTJOYPLUS_FF=y
|
||||||
CONFIG_HID_TIVO=m
|
CONFIG_HID_TIVO=m
|
||||||
CONFIG_HID_TOPSEED=m
|
CONFIG_HID_TOPSEED=m
|
||||||
CONFIG_HID_TOPRE=m
|
|
||||||
CONFIG_HID_THINGM=m
|
CONFIG_HID_THINGM=m
|
||||||
CONFIG_HID_THRUSTMASTER=m
|
CONFIG_HID_THRUSTMASTER=m
|
||||||
CONFIG_THRUSTMASTER_FF=y
|
CONFIG_THRUSTMASTER_FF=y
|
||||||
@@ -10375,7 +10374,6 @@ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"
|
|||||||
# Memory initialization
|
# Memory initialization
|
||||||
#
|
#
|
||||||
CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
|
CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
|
||||||
CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
|
|
||||||
CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
|
CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
|
||||||
# CONFIG_INIT_STACK_NONE is not set
|
# CONFIG_INIT_STACK_NONE is not set
|
||||||
# CONFIG_INIT_STACK_ALL_PATTERN is not set
|
# CONFIG_INIT_STACK_ALL_PATTERN is not set
|
||||||
@@ -10851,7 +10849,6 @@ CONFIG_DEBUG_KERNEL=y
|
|||||||
# Compile-time checks and compiler options
|
# Compile-time checks and compiler options
|
||||||
#
|
#
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
CONFIG_AS_HAS_NON_CONST_LEB128=y
|
|
||||||
# CONFIG_DEBUG_INFO_NONE is not set
|
# CONFIG_DEBUG_INFO_NONE is not set
|
||||||
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
|
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
|
||||||
# CONFIG_DEBUG_INFO_DWARF4 is not set
|
# CONFIG_DEBUG_INFO_DWARF4 is not set
|
||||||
|
@@ -1,17 +1,16 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# List of kernels that are maintained upstream
|
# List of kernels that are maintained upstream
|
||||||
_current_kernels=("6.1" "6.0" "5.15" "5.10" "5.4")
|
_current_kernels=("6.1" "6.0" "5.19" "5.15" "5.10" "5.4")
|
||||||
|
|
||||||
# List of kernels that are no longer maintained upstream
|
# List of kernels that are no longer maintained upstream
|
||||||
_eol_kernels=("5.19" "5.18" "5.17" "5.16" "5.14" "5.13" "5.12" "5.11" "5.9" "5.8" "5.7")
|
_eol_kernels=("5.18" "5.17" "5.16" "5.14" "5.13" "5.12" "5.11" "5.9" "5.8" "5.7")
|
||||||
|
|
||||||
typeset -Ag _kernel_git_remotes
|
typeset -Ag _kernel_git_remotes
|
||||||
_kernel_git_remotes=(
|
_kernel_git_remotes=(
|
||||||
["kernel.org"]="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
|
["kernel.org"]="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
|
||||||
["googlesource.com"]="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable"
|
["googlesource.com"]="https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable"
|
||||||
["github.com"]="https://github.com/gregkh/linux.git"
|
["github.com"]="https://github.com/gregkh/linux.git"
|
||||||
["torvalds"]="https://github.com/torvalds/linux.git"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
_git_remote_names=( "${!_kernel_git_remotes[@]}" )
|
_git_remote_names=( "${!_kernel_git_remotes[@]}" )
|
||||||
@@ -36,35 +35,53 @@ for _key in "${_current_kernels[@]}" "${_eol_kernels[@]}"; do
|
|||||||
_kver_latest_tags_map[$_key]=$(echo "$_kernel_tags" | grep -F "v$_key" | tail -1 | cut -c1-)
|
_kver_latest_tags_map[$_key]=$(echo "$_kernel_tags" | grep -F "v$_key" | tail -1 | cut -c1-)
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# only used by workflow trigger script
|
||||||
|
typeset -Ag _kver_subver_map
|
||||||
|
_kver_subver_map=(
|
||||||
|
["5.4"]="214"
|
||||||
|
["5.7"]="19"
|
||||||
|
["5.8"]="18"
|
||||||
|
["5.9"]="16"
|
||||||
|
["5.10"]="144"
|
||||||
|
["5.11"]="22"
|
||||||
|
["5.12"]="19"
|
||||||
|
["5.13"]="19"
|
||||||
|
["5.14"]="21"
|
||||||
|
["5.15"]="69"
|
||||||
|
["5.16"]="20"
|
||||||
|
["5.17"]="15"
|
||||||
|
["5.18"]="19"
|
||||||
|
["5.19"]="10"
|
||||||
|
["6.0"]="rc6"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# PREEMPT_RT's supported kernel subversion
|
# PREEMPT_RT's supported kernel subversion
|
||||||
typeset -Ag _rt_subver_map
|
typeset -Ag _rt_subver_map
|
||||||
_rt_subver_map=(
|
_rt_subver_map=(
|
||||||
["5.4"]="209"
|
["5.4"]="188"
|
||||||
["5.9"]="1"
|
["5.9"]="1"
|
||||||
["5.10"]="153"
|
["5.10"]="109"
|
||||||
["5.11"]="4"
|
["5.11"]="4"
|
||||||
["5.14"]="2"
|
["5.14"]="2"
|
||||||
["5.15"]="76"
|
["5.15"]="32"
|
||||||
["5.16"]="2"
|
["5.16"]="2"
|
||||||
["5.17"]="1"
|
["5.17"]="1"
|
||||||
["6.0"]="5"
|
|
||||||
["6.1"]="rc3"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# PREEMPT_RT's patch revision for the kernel
|
# PREEMPT_RT's patch revision for the kernel
|
||||||
# We separated this to allow for forcing the application of the patch when _preempt_rt_force=1 on version mismatch
|
# We separated this to allow for forcing the application of the patch when _preempt_rt_force=1 on version mismatch
|
||||||
typeset -Ag _rt_rev_map
|
typeset -Ag _rt_rev_map
|
||||||
_rt_rev_map=(
|
_rt_rev_map=(
|
||||||
["5.4"]="77"
|
["5.4"]="73"
|
||||||
["5.9"]="20"
|
["5.9"]="20"
|
||||||
["5.10"]="76"
|
["5.10"]="65"
|
||||||
["5.11"]="11"
|
["5.11"]="11"
|
||||||
["5.14"]="21"
|
["5.14"]="21"
|
||||||
["5.15"]="53"
|
["5.15"]="39"
|
||||||
["5.16"]="19"
|
["5.16"]="19"
|
||||||
["5.17"]="17"
|
["5.17"]="17"
|
||||||
["6.0"]="14"
|
|
||||||
["6.1"]="2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
_undefine() {
|
_undefine() {
|
||||||
@@ -270,7 +287,7 @@ _set_cpu_scheduler() {
|
|||||||
elif [ "$_kver" = "514" ]; then
|
elif [ "$_kver" = "514" ]; then
|
||||||
_avail_cpu_scheds=("pds" "bmq" "cacule" "cfs")
|
_avail_cpu_scheds=("pds" "bmq" "cacule" "cfs")
|
||||||
elif [ "$_kver" = "515" ]; then
|
elif [ "$_kver" = "515" ]; then
|
||||||
_avail_cpu_scheds=("pds" "bmq" "cacule" "tt" "bore" "cfs")
|
_avail_cpu_scheds=("pds" "bmq" "cacule" "tt" "cfs")
|
||||||
elif [ "$_kver" = "516" ]; then
|
elif [ "$_kver" = "516" ]; then
|
||||||
_avail_cpu_scheds=("pds" "bmq" "cacule" "cfs")
|
_avail_cpu_scheds=("pds" "bmq" "cacule" "cfs")
|
||||||
elif [ "$_kver" = "517" ]; then
|
elif [ "$_kver" = "517" ]; then
|
||||||
@@ -280,31 +297,19 @@ _set_cpu_scheduler() {
|
|||||||
elif [ "$_kver" = "519" ]; then
|
elif [ "$_kver" = "519" ]; then
|
||||||
_avail_cpu_scheds=("cfs" "pds" "bmq" "cacule" "tt" "bore")
|
_avail_cpu_scheds=("cfs" "pds" "bmq" "cacule" "tt" "bore")
|
||||||
elif [ "$_kver" = "600" ]; then
|
elif [ "$_kver" = "600" ]; then
|
||||||
_avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
|
_avail_cpu_scheds=("cfs" "tt" "bore")
|
||||||
_projectc_unoff="1"
|
|
||||||
elif [ "$_kver" = "601" ]; then
|
|
||||||
_avail_cpu_scheds=("cfs" "bore")
|
|
||||||
else
|
else
|
||||||
_avail_cpu_scheds=("cfs")
|
_avail_cpu_scheds=("cfs")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${_preempt_rt}" = "1" ]; then
|
if [ "${_preempt_rt}" = "1" ]; then
|
||||||
warning "! Since you have enabled _preempt_rt, incompatible cpu schedulers will not be available !"
|
_avail_cpu_scheds=("cfs")
|
||||||
if [[ "${_avail_cpu_scheds[*]}" =~ "bore" ]]; then
|
|
||||||
_avail_cpu_scheds=("cfs" "bore")
|
|
||||||
else
|
|
||||||
_avail_cpu_scheds=("cfs")
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Populate descriptions of the available CPU schedulers
|
# Populate descriptions of the available CPU schedulers
|
||||||
_avail_cpu_scheds_text=()
|
_avail_cpu_scheds_text=()
|
||||||
for _sched in "${_avail_cpu_scheds[@]}"; do
|
for _sched in "${_avail_cpu_scheds[@]}"; do
|
||||||
if [ "$_sched" = "pds" ] || [ "$_sched" = "bmq" ] && [ "$_projectc_unoff" = "1" ]; then
|
_avail_cpu_scheds_text+=("${_sched_description_array[$_sched]}")
|
||||||
_avail_cpu_scheds_text+=("Project C / ${_sched^^} (unofficial port - ! possibly unstable !)")
|
|
||||||
else
|
|
||||||
_avail_cpu_scheds_text+=("${_sched_description_array[$_sched]}")
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if ! [[ ${_avail_cpu_scheds[*]} =~ "$_cpusched" ]]; then
|
if ! [[ ${_avail_cpu_scheds[*]} =~ "$_cpusched" ]]; then
|
||||||
@@ -427,7 +432,6 @@ _linux_git_branch_checkout() {
|
|||||||
msg2 "master branch doesn't locally exist, shallow cloning..."
|
msg2 "master branch doesn't locally exist, shallow cloning..."
|
||||||
git remote set-branches --add kernel.org master
|
git remote set-branches --add kernel.org master
|
||||||
git remote set-branches --add googlesource.com master
|
git remote set-branches --add googlesource.com master
|
||||||
git remote set-branches --add torvalds master
|
|
||||||
git fetch --depth=1 $_git_mirror master
|
git fetch --depth=1 $_git_mirror master
|
||||||
git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
|
git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
|
||||||
git checkout -b master-${_git_mirror} ${_git_mirror}/master
|
git checkout -b master-${_git_mirror} ${_git_mirror}/master
|
||||||
@@ -445,7 +449,6 @@ _linux_git_branch_checkout() {
|
|||||||
msg2 "${_basekernel}.y branch doesn't locally exist, shallow cloning..."
|
msg2 "${_basekernel}.y branch doesn't locally exist, shallow cloning..."
|
||||||
git remote set-branches --add kernel.org linux-${_basekernel}.y
|
git remote set-branches --add kernel.org linux-${_basekernel}.y
|
||||||
git remote set-branches --add googlesource.com linux-${_basekernel}.y
|
git remote set-branches --add googlesource.com linux-${_basekernel}.y
|
||||||
git remote set-branches --add torvalds linux-${_basekernel}.y
|
|
||||||
git fetch --depth=1 $_git_mirror linux-${_basekernel}.y
|
git fetch --depth=1 $_git_mirror linux-${_basekernel}.y
|
||||||
git fetch --depth=1 $_git_mirror tag "$_kernel_git_tag"
|
git fetch --depth=1 $_git_mirror tag "$_kernel_git_tag"
|
||||||
git checkout -b linux-${_basekernel}-${_git_mirror} ${_git_mirror}/linux-${_basekernel}.y
|
git checkout -b linux-${_basekernel}-${_git_mirror} ${_git_mirror}/linux-${_basekernel}.y
|
||||||
@@ -647,13 +650,8 @@ _tkg_srcprep() {
|
|||||||
if [ ${_rt_subver_map[$_basekernel]+_} = "_" ]; then
|
if [ ${_rt_subver_map[$_basekernel]+_} = "_" ]; then
|
||||||
preempt_rt_ksubver="${_rt_subver_map[$_basekernel]}"
|
preempt_rt_ksubver="${_rt_subver_map[$_basekernel]}"
|
||||||
# Check if subversion is supported, skip check if forced
|
# Check if subversion is supported, skip check if forced
|
||||||
if [ "${_preempt_rt_force}" = "1" ] || [ "${preempt_rt_ksubver}" = "${_sub}" ]; then
|
if [ "${_preempt_rt_force}" = "1" ] || [ "${preempt_rt_ksubver}" = "${_kver_subver_map[$_basekernel]}" ]; then
|
||||||
if [[ "${_sub}" == *rc* ]]; then
|
preempt_rt_file_gz="patch-${_basekernel}.${preempt_rt_ksubver}-rt${_rt_rev_map["$_basekernel"]}.patch.gz"
|
||||||
_separator="-"
|
|
||||||
else
|
|
||||||
_separator="."
|
|
||||||
fi
|
|
||||||
preempt_rt_file_gz="patch-${_basekernel}${_separator}${preempt_rt_ksubver}-rt${_rt_rev_map["$_basekernel"]}.patch.gz"
|
|
||||||
preempt_rt_file=`basename ${preempt_rt_file_gz} .gz`
|
preempt_rt_file=`basename ${preempt_rt_file_gz} .gz`
|
||||||
curl "https://cdn.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/${preempt_rt_file_gz}" > "$srcdir"/"${preempt_rt_file_gz}"
|
curl "https://cdn.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/${preempt_rt_file_gz}" > "$srcdir"/"${preempt_rt_file_gz}"
|
||||||
last_pwd=`pwd`
|
last_pwd=`pwd`
|
||||||
@@ -663,10 +661,10 @@ _tkg_srcprep() {
|
|||||||
tkgpatch="$srcdir/${preempt_rt_file}"
|
tkgpatch="$srcdir/${preempt_rt_file}"
|
||||||
_msg="Applying PREEMPT_RT patch" && _tkg_patcher
|
_msg="Applying PREEMPT_RT patch" && _tkg_patcher
|
||||||
else
|
else
|
||||||
warning "Skipping PREEMPT_RT patch for ${_basekernel}.${_sub} (last known good ${_basekernel}.${preempt_rt_ksubver})"
|
msg2 "Skipping PREEMPT_RT patch for ${_basekernel}.${_sub}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
warning "Skipping PREEMPT_RT patch on unsupported kernel version"
|
msg2 "Skipping PREEMPT_RT patch on unsupported kernel version"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -679,11 +677,6 @@ _tkg_srcprep() {
|
|||||||
tkgpatch="$srcdir/0003-glitched-base.patch"
|
tkgpatch="$srcdir/0003-glitched-base.patch"
|
||||||
_msg="Applying glitched base patch" && _tkg_patcher
|
_msg="Applying glitched base patch" && _tkg_patcher
|
||||||
|
|
||||||
if [ "${_preempt_rt}" != "1" ]; then
|
|
||||||
tkgpatch="$srcdir/0003-glitched-base-nonrt.patch"
|
|
||||||
_msg="Applying glitched base non-rt additions patch" && _tkg_patcher
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then
|
if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then
|
||||||
tkgpatch="$srcdir/0013-fedora-rpm.patch"
|
tkgpatch="$srcdir/0013-fedora-rpm.patch"
|
||||||
_msg="RPM: fixing spec generator" && _tkg_patcher
|
_msg="RPM: fixing spec generator" && _tkg_patcher
|
||||||
@@ -712,7 +705,7 @@ _tkg_srcprep() {
|
|||||||
elif [ "$_kver" = "509" ]; then
|
elif [ "$_kver" = "509" ]; then
|
||||||
rev=3
|
rev=3
|
||||||
elif [ "$_kver" = "510" ]; then
|
elif [ "$_kver" = "510" ]; then
|
||||||
rev=5
|
rev=3
|
||||||
elif [ "$_kver" = "511" ]; then
|
elif [ "$_kver" = "511" ]; then
|
||||||
rev=3
|
rev=3
|
||||||
elif [ "$_kver" = "512" ]; then
|
elif [ "$_kver" = "512" ]; then
|
||||||
@@ -948,10 +941,10 @@ _tkg_srcprep() {
|
|||||||
# cpu opt
|
# cpu opt
|
||||||
_cpu_marchs=("native_amd" "native_intel" "generic_cpu" "generic_cpu2" "generic_cpu3" "generic_cpu4")
|
_cpu_marchs=("native_amd" "native_intel" "generic_cpu" "generic_cpu2" "generic_cpu3" "generic_cpu4")
|
||||||
_cpu_marchs+=("k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver")
|
_cpu_marchs+=("k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver")
|
||||||
_cpu_marchs+=("steamroller" "excavator" "zen" "zen2" "zen3" "zen4" "mpsc" "atom" "core2" "nehalem" "westmere")
|
_cpu_marchs+=("steamroller" "excavator" "zen" "zen2" "zen3" "mpsc" "atom" "core2" "nehalem" "westmere")
|
||||||
_cpu_marchs+=("bonnell" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake")
|
_cpu_marchs+=("bonnell" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake")
|
||||||
_cpu_marchs+=("skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake")
|
_cpu_marchs+=("skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake")
|
||||||
_cpu_marchs+=("cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake" "meteorlake")
|
_cpu_marchs+=("cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake")
|
||||||
|
|
||||||
typeset -A _generic_march_map
|
typeset -A _generic_march_map
|
||||||
_generic_march_map=(
|
_generic_march_map=(
|
||||||
@@ -1335,7 +1328,7 @@ _tkg_srcprep() {
|
|||||||
plain "Use CattaRappa mode (Tickless/Dynticks) ?"
|
plain "Use CattaRappa mode (Tickless/Dynticks) ?"
|
||||||
_tickless_array_text=(
|
_tickless_array_text=(
|
||||||
"No, use periodic ticks."
|
"No, use periodic ticks."
|
||||||
"Yes, full tickless baby!\n Full tickless can give higher performances in case you use isolation of CPUs for task, in other cases it behaves as Idle."
|
"Yes, full tickless baby!\n Can give higher performances in many cases but lower consistency on some hardware."
|
||||||
"Just tickless idle plz.\n Just tickless idle can perform better with some platforms (mostly AMD) or CPU schedulers (mostly MuQSS)."
|
"Just tickless idle plz.\n Just tickless idle can perform better with some platforms (mostly AMD) or CPU schedulers (mostly MuQSS)."
|
||||||
)
|
)
|
||||||
_default_index="2"
|
_default_index="2"
|
||||||
|
@@ -1,38 +0,0 @@
|
|||||||
From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Mon, 29 Jan 2018 18:29:13 +0000
|
|
||||||
Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks
|
|
||||||
to iterate in a single balance run.
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
kernel/sched/core.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
||||||
index f788cd61df21..2bfbb4213707 100644
|
|
||||||
--- a/kernel/sched/core.c
|
|
||||||
+++ b/kernel/sched/core.c
|
|
||||||
@@ -59,7 +59,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 measure -rt task CPU usage in us.
|
|
||||||
@@ -71,9 +71,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.
|
|
||||||
--
|
|
||||||
2.28.0
|
|
@@ -54,6 +54,46 @@ index 361ea7ab30ea..0c5cf69b241a 100644
|
|||||||
2.28.0
|
2.28.0
|
||||||
|
|
||||||
|
|
||||||
|
From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexandre Frade <admfrade@gmail.com>
|
||||||
|
Date: Mon, 29 Jan 2018 18:29:13 +0000
|
||||||
|
Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks
|
||||||
|
to iterate in a single balance run.
|
||||||
|
|
||||||
|
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
||||||
|
---
|
||||||
|
kernel/sched/core.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||||
|
index f788cd61df21..2bfbb4213707 100644
|
||||||
|
--- a/kernel/sched/core.c
|
||||||
|
+++ b/kernel/sched/core.c
|
||||||
|
@@ -59,7 +59,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 measure -rt task CPU usage in us.
|
||||||
|
@@ -71,9 +71,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.
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
||||||
From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001
|
From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
From: Alexandre Frade <admfrade@gmail.com>
|
||||||
Date: Mon, 29 Jan 2018 17:41:29 +0000
|
Date: Mon, 29 Jan 2018 17:41:29 +0000
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,38 +0,0 @@
|
|||||||
From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Mon, 29 Jan 2018 18:29:13 +0000
|
|
||||||
Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks
|
|
||||||
to iterate in a single balance run.
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
kernel/sched/core.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
||||||
index f788cd61df21..2bfbb4213707 100644
|
|
||||||
--- a/kernel/sched/core.c
|
|
||||||
+++ b/kernel/sched/core.c
|
|
||||||
@@ -59,7 +59,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 measure -rt task CPU usage in us.
|
|
||||||
@@ -71,9 +71,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.
|
|
||||||
--
|
|
||||||
2.28.0
|
|
@@ -54,6 +54,46 @@ index 361ea7ab30ea..0c5cf69b241a 100644
|
|||||||
2.28.0
|
2.28.0
|
||||||
|
|
||||||
|
|
||||||
|
From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexandre Frade <admfrade@gmail.com>
|
||||||
|
Date: Mon, 29 Jan 2018 18:29:13 +0000
|
||||||
|
Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks
|
||||||
|
to iterate in a single balance run.
|
||||||
|
|
||||||
|
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
||||||
|
---
|
||||||
|
kernel/sched/core.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||||
|
index f788cd61df21..2bfbb4213707 100644
|
||||||
|
--- a/kernel/sched/core.c
|
||||||
|
+++ b/kernel/sched/core.c
|
||||||
|
@@ -59,7 +59,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 measure -rt task CPU usage in us.
|
||||||
|
@@ -71,9 +71,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.
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
||||||
From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001
|
From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
From: Alexandre Frade <admfrade@gmail.com>
|
||||||
Date: Mon, 29 Jan 2018 17:41:29 +0000
|
Date: Mon, 29 Jan 2018 17:41:29 +0000
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,38 +0,0 @@
|
|||||||
From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
Date: Mon, 29 Jan 2018 18:29:13 +0000
|
|
||||||
Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks
|
|
||||||
to iterate in a single balance run.
|
|
||||||
|
|
||||||
Signed-off-by: Alexandre Frade <admfrade@gmail.com>
|
|
||||||
---
|
|
||||||
kernel/sched/core.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
||||||
index f788cd61df21..2bfbb4213707 100644
|
|
||||||
--- a/kernel/sched/core.c
|
|
||||||
+++ b/kernel/sched/core.c
|
|
||||||
@@ -59,7 +59,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 measure -rt task CPU usage in us.
|
|
||||||
@@ -71,9 +71,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.
|
|
||||||
--
|
|
||||||
2.28.0
|
|
@@ -31,6 +31,31 @@ index 2acfc69878f5..3f1131431e06 100644
|
|||||||
EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
|
EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
|
||||||
|
|
||||||
__cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);
|
__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/lib/Kconfig b/lib/Kconfig
|
diff --git a/lib/Kconfig b/lib/Kconfig
|
||||||
index 5fe577673b98..c44c27cd6e05 100644
|
index 5fe577673b98..c44c27cd6e05 100644
|
||||||
--- a/lib/Kconfig
|
--- a/lib/Kconfig
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
From 711a56e8f6314d77141b0f661e6c13c8a2c4dddf Mon Sep 17 00:00:00 2001
|
From b53bf730e6bba71ebc0ec8452cc2ca399137090e Mon Sep 17 00:00:00 2001
|
||||||
From: Tor Vic <torvic9@mailbox.org>
|
From: Tor Vic <torvic9@mailbox.org>
|
||||||
Date: Wed, 16 Nov 2022 11:29:00 +0100
|
Date: Mon, 3 Oct 2022 11:19:50 +0200
|
||||||
Subject: [PATCH] Project-C 6.0-rc0-vd
|
Subject: [PATCH] Project-C 6.0-rc0-vd
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -22,7 +22,7 @@ Subject: [PATCH] Project-C 6.0-rc0-vd
|
|||||||
kernel/exit.c | 4 +-
|
kernel/exit.c | 4 +-
|
||||||
kernel/locking/rtmutex.c | 16 +-
|
kernel/locking/rtmutex.c | 16 +-
|
||||||
kernel/sched/Makefile | 5 +
|
kernel/sched/Makefile | 5 +
|
||||||
kernel/sched/alt_core.c | 7959 +++++++++++++++++
|
kernel/sched/alt_core.c | 7937 +++++++++++++++++
|
||||||
kernel/sched/alt_debug.c | 31 +
|
kernel/sched/alt_debug.c | 31 +
|
||||||
kernel/sched/alt_sched.h | 645 ++
|
kernel/sched/alt_sched.h | 645 ++
|
||||||
kernel/sched/bmq.h | 110 +
|
kernel/sched/bmq.h | 110 +
|
||||||
@@ -43,7 +43,7 @@ Subject: [PATCH] Project-C 6.0-rc0-vd
|
|||||||
kernel/time/hrtimer.c | 2 +
|
kernel/time/hrtimer.c | 2 +
|
||||||
kernel/time/posix-cpu-timers.c | 10 +-
|
kernel/time/posix-cpu-timers.c | 10 +-
|
||||||
kernel/trace/trace_selftest.c | 5 +
|
kernel/trace/trace_selftest.c | 5 +
|
||||||
39 files changed, 9267 insertions(+), 23 deletions(-)
|
39 files changed, 9245 insertions(+), 23 deletions(-)
|
||||||
create mode 100644 Documentation/scheduler/sched-BMQ.txt
|
create mode 100644 Documentation/scheduler/sched-BMQ.txt
|
||||||
create mode 100644 kernel/sched/alt_core.c
|
create mode 100644 kernel/sched/alt_core.c
|
||||||
create mode 100644 kernel/sched/alt_debug.c
|
create mode 100644 kernel/sched/alt_debug.c
|
||||||
@@ -685,10 +685,10 @@ index 976092b7bd45..31d587c16ec1 100644
|
|||||||
obj-y += build_utility.o
|
obj-y += build_utility.o
|
||||||
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..18dfee354f9b
|
index 000000000000..f3bac14124c3
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/kernel/sched/alt_core.c
|
+++ b/kernel/sched/alt_core.c
|
||||||
@@ -0,0 +1,7959 @@
|
@@ -0,0 +1,7937 @@
|
||||||
+/*
|
+/*
|
||||||
+ * kernel/sched/alt_core.c
|
+ * kernel/sched/alt_core.c
|
||||||
+ *
|
+ *
|
||||||
@@ -3111,6 +3111,13 @@ index 000000000000..18dfee354f9b
|
|||||||
+ if (!llist)
|
+ if (!llist)
|
||||||
+ return;
|
+ return;
|
||||||
+
|
+
|
||||||
|
+ /*
|
||||||
|
+ * rq::ttwu_pending racy indication of out-standing wakeups.
|
||||||
|
+ * Races such that false-negatives are possible, since they
|
||||||
|
+ * are shorter lived that false-positives would be.
|
||||||
|
+ */
|
||||||
|
+ WRITE_ONCE(rq->ttwu_pending, 0);
|
||||||
|
+
|
||||||
+ rq_lock_irqsave(rq, &rf);
|
+ rq_lock_irqsave(rq, &rf);
|
||||||
+ update_rq_clock(rq);
|
+ update_rq_clock(rq);
|
||||||
+
|
+
|
||||||
@@ -3124,17 +3131,6 @@ index 000000000000..18dfee354f9b
|
|||||||
+ ttwu_do_activate(rq, p, p->sched_remote_wakeup ? WF_MIGRATED : 0);
|
+ ttwu_do_activate(rq, p, p->sched_remote_wakeup ? WF_MIGRATED : 0);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /*
|
|
||||||
+ * Must be after enqueueing at least once task such that
|
|
||||||
+ * idle_cpu() does not observe a false-negative -- if it does,
|
|
||||||
+ * it is possible for select_idle_siblings() to stack a number
|
|
||||||
+ * of tasks on this CPU during that window.
|
|
||||||
+ *
|
|
||||||
+ * It is ok to clear ttwu_pending when another task pending.
|
|
||||||
+ * We will receive IPI after local irq enabled and then enqueue it.
|
|
||||||
+ * Since now nr_running > 0, idle_cpu() will always get correct result.
|
|
||||||
+ */
|
|
||||||
+ WRITE_ONCE(rq->ttwu_pending, 0);
|
|
||||||
+ rq_unlock_irqrestore(rq, &rf);
|
+ rq_unlock_irqrestore(rq, &rf);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
@@ -3605,40 +3601,6 @@ index 000000000000..18dfee354f9b
|
|||||||
+ return success;
|
+ return success;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+static bool __task_needs_rq_lock(struct task_struct *p)
|
|
||||||
+{
|
|
||||||
+ unsigned int state = READ_ONCE(p->__state);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Since pi->lock blocks try_to_wake_up(), we don't need rq->lock when
|
|
||||||
+ * the task is blocked. Make sure to check @state since ttwu() can drop
|
|
||||||
+ * locks at the end, see ttwu_queue_wakelist().
|
|
||||||
+ */
|
|
||||||
+ if (state == TASK_RUNNING || state == TASK_WAKING)
|
|
||||||
+ return true;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Ensure we load p->on_rq after p->__state, otherwise it would be
|
|
||||||
+ * possible to, falsely, observe p->on_rq == 0.
|
|
||||||
+ *
|
|
||||||
+ * See try_to_wake_up() for a longer comment.
|
|
||||||
+ */
|
|
||||||
+ smp_rmb();
|
|
||||||
+ if (p->on_rq)
|
|
||||||
+ return true;
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_SMP
|
|
||||||
+ /*
|
|
||||||
+ * Ensure the task has finished __schedule() and will not be referenced
|
|
||||||
+ * anymore. Again, see try_to_wake_up() for a longer comment.
|
|
||||||
+ */
|
|
||||||
+ smp_rmb();
|
|
||||||
+ smp_cond_load_acquire(&p->on_cpu, !VAL);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/**
|
+/**
|
||||||
+ * task_call_func - Invoke a function on task in fixed state
|
+ * task_call_func - Invoke a function on task in fixed state
|
||||||
+ * @p: Process for which the function is to be invoked, can be @current.
|
+ * @p: Process for which the function is to be invoked, can be @current.
|
||||||
@@ -3656,12 +3618,28 @@ index 000000000000..18dfee354f9b
|
|||||||
+int task_call_func(struct task_struct *p, task_call_f func, void *arg)
|
+int task_call_func(struct task_struct *p, task_call_f func, void *arg)
|
||||||
+{
|
+{
|
||||||
+ struct rq *rq = NULL;
|
+ struct rq *rq = NULL;
|
||||||
|
+ unsigned int state;
|
||||||
+ struct rq_flags rf;
|
+ struct rq_flags rf;
|
||||||
+ int ret;
|
+ int ret;
|
||||||
+
|
+
|
||||||
+ raw_spin_lock_irqsave(&p->pi_lock, rf.flags);
|
+ raw_spin_lock_irqsave(&p->pi_lock, rf.flags);
|
||||||
+
|
+
|
||||||
+ if (__task_needs_rq_lock(p))
|
+ state = READ_ONCE(p->__state);
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Ensure we load p->on_rq after p->__state, otherwise it would be
|
||||||
|
+ * possible to, falsely, observe p->on_rq == 0.
|
||||||
|
+ *
|
||||||
|
+ * See try_to_wake_up() for a longer comment.
|
||||||
|
+ */
|
||||||
|
+ smp_rmb();
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Since pi->lock blocks try_to_wake_up(), we don't need rq->lock when
|
||||||
|
+ * the task is blocked. Make sure to check @state since ttwu() can drop
|
||||||
|
+ * locks at the end, see ttwu_queue_wakelist().
|
||||||
|
+ */
|
||||||
|
+ if (state == TASK_RUNNING || state == TASK_WAKING || p->on_rq)
|
||||||
+ rq = __task_rq_lock(p, &rf);
|
+ rq = __task_rq_lock(p, &rf);
|
||||||
+
|
+
|
||||||
+ /*
|
+ /*
|
||||||
@@ -10152,55 +10130,5 @@ index a2d301f58ced..2ccdede8585c 100644
|
|||||||
struct wakeup_test_data *x = data;
|
struct wakeup_test_data *x = data;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.38.1
|
2.37.3
|
||||||
|
|
||||||
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
|
||||||
index f3bac14124c3..27eafbccf23d 100644
|
|
||||||
--- a/kernel/sched/alt_core.c
|
|
||||||
+++ b/kernel/sched/alt_core.c
|
|
||||||
@@ -1448,11 +1448,13 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
|
|
||||||
|
|
||||||
WARN_ON_ONCE(is_migration_disabled(p));
|
|
||||||
#endif
|
|
||||||
- if (task_cpu(p) == new_cpu)
|
|
||||||
- return;
|
|
||||||
+
|
|
||||||
trace_sched_migrate_task(p, new_cpu);
|
|
||||||
- rseq_migrate(p);
|
|
||||||
- perf_event_task_migrate(p);
|
|
||||||
+
|
|
||||||
+ if (task_cpu(p) != new_cpu) {
|
|
||||||
+ rseq_migrate(p);
|
|
||||||
+ perf_event_task_migrate(p);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
__set_task_cpu(p, new_cpu);
|
|
||||||
}
|
|
||||||
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
|
||||||
index f3bac14124c3..5678c247c0ab 100644
|
|
||||||
--- a/kernel/sched/alt_core.c
|
|
||||||
+++ b/kernel/sched/alt_core.c
|
|
||||||
@@ -810,8 +810,8 @@ unsigned long get_wchan(struct task_struct *p)
|
|
||||||
* Context: rq->lock
|
|
||||||
*/
|
|
||||||
#define __SCHED_DEQUEUE_TASK(p, rq, flags) \
|
|
||||||
- psi_dequeue(p, flags & DEQUEUE_SLEEP); \
|
|
||||||
sched_info_dequeue(rq, p); \
|
|
||||||
+ psi_dequeue(p, flags & DEQUEUE_SLEEP); \
|
|
||||||
\
|
|
||||||
list_del(&p->sq_node); \
|
|
||||||
if (list_empty(&rq->queue.heads[p->sq_idx])) \
|
|
||||||
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
|
||||||
index f3bac14124c3..349a2c92d534 100644
|
|
||||||
--- a/kernel/sched/alt_core.c
|
|
||||||
+++ b/kernel/sched/alt_core.c
|
|
||||||
@@ -4404,8 +4404,8 @@ static inline void schedule_debug(struct task_struct *prev, bool preempt)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Compile time debug macro
|
|
||||||
- * #define ALT_SCHED_DEBUG
|
|
||||||
*/
|
|
||||||
+#define ALT_SCHED_DEBUG
|
|
||||||
|
|
||||||
#ifdef ALT_SCHED_DEBUG
|
|
||||||
void alt_sched_debug(void)
|
|
||||||
|
@@ -522,38 +522,3 @@ index 1fd3cbca20a2..c7bf189d50de 100644
|
|||||||
--
|
--
|
||||||
2.25.1
|
2.25.1
|
||||||
|
|
||||||
From fb23dad87a0bfb6fdfde3dc1d18104da631d050a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sjoerd Simons <sjoerd@collabora.com>
|
|
||||||
Date: Sat, 8 Oct 2022 21:57:51 +0200
|
|
||||||
Subject: [PATCH] soundwire: intel: Initialize clock stop timeout
|
|
||||||
|
|
||||||
The bus->clk_stop_timeout member is only initialized to a non-zero value
|
|
||||||
during the codec driver probe. This can lead to corner cases where this
|
|
||||||
value remains pegged at zero when the bus suspends, which results in an
|
|
||||||
endless loop in sdw_bus_wait_for_clk_prep_deprep().
|
|
||||||
|
|
||||||
Corner cases include configurations with no codecs described in the
|
|
||||||
firmware, or delays in probing codec drivers.
|
|
||||||
|
|
||||||
Initializing the default timeout to the smallest non-zero value avoid this
|
|
||||||
problem and allows for the existing logic to be preserved: the
|
|
||||||
bus->clk_stop_timeout is set as the maximum required by all codecs
|
|
||||||
connected on the bus.
|
|
||||||
|
|
||||||
Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
|
|
||||||
---
|
|
||||||
drivers/soundwire/intel.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
|
|
||||||
index af6c1a93372d90..002bc26b525e87 100644
|
|
||||||
--- a/drivers/soundwire/intel.c
|
|
||||||
+++ b/drivers/soundwire/intel.c
|
|
||||||
@@ -1307,6 +1307,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev,
|
|
||||||
cdns->msg_count = 0;
|
|
||||||
|
|
||||||
bus->link_id = auxdev->id;
|
|
||||||
+ bus->clk_stop_timeout = 1;
|
|
||||||
|
|
||||||
sdw_cdns_probe(cdns);
|
|
||||||
|
|
||||||
|
@@ -426,3 +426,99 @@ index 4bf4ea6cbb5eee..4850dafbaa05fb 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* ---- Socket functions ---- */
|
/* ---- Socket functions ---- */
|
||||||
|
From 50e6a66675f6c9835d4f1d4f8c947d1699ce8e24 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
|
||||||
|
Date: Fri, 7 Oct 2022 09:51:13 +0200
|
||||||
|
Subject: [PATCH 4/5] drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Setting this flag on a scheduler fence prevents pipelining of jobs
|
||||||
|
depending on this fence. In other words we always insert a full CPU
|
||||||
|
round trip before dependen jobs are pushed to the pipeline.
|
||||||
|
|
||||||
|
Signed-off-by: Christian König <christian.koenig@amd.com>
|
||||||
|
---
|
||||||
|
drivers/gpu/drm/scheduler/sched_entity.c | 3 ++-
|
||||||
|
include/drm/gpu_scheduler.h | 9 +++++++++
|
||||||
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
|
||||||
|
index 6b25b2f4f5a3..6137537aaea4 100644
|
||||||
|
--- a/drivers/gpu/drm/scheduler/sched_entity.c
|
||||||
|
+++ b/drivers/gpu/drm/scheduler/sched_entity.c
|
||||||
|
@@ -385,7 +385,8 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity)
|
||||||
|
}
|
||||||
|
|
||||||
|
s_fence = to_drm_sched_fence(fence);
|
||||||
|
- if (s_fence && s_fence->sched == sched) {
|
||||||
|
+ if (s_fence && s_fence->sched == sched &&
|
||||||
|
+ !test_bit(DRM_SCHED_FENCE_DONT_PIPELINE, &fence->flags)) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fence is from the same scheduler, only need to wait for
|
||||||
|
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
|
||||||
|
index addb135eeea6..289a33e80639 100644
|
||||||
|
--- a/include/drm/gpu_scheduler.h
|
||||||
|
+++ b/include/drm/gpu_scheduler.h
|
||||||
|
@@ -32,6 +32,15 @@
|
||||||
|
|
||||||
|
#define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * DRM_SCHED_FENCE_DONT_PIPELINE - Prefent dependency pipelining
|
||||||
|
+ *
|
||||||
|
+ * Setting this flag on a scheduler fence prevents pipelining of jobs depending
|
||||||
|
+ * on this fence. In other words we always insert a full CPU round trip before
|
||||||
|
+ * dependen jobs are pushed to the hw queue.
|
||||||
|
+ */
|
||||||
|
+#define DRM_SCHED_FENCE_DONT_PIPELINE DMA_FENCE_FLAG_USER_BITS
|
||||||
|
+
|
||||||
|
struct drm_gem_object;
|
||||||
|
|
||||||
|
struct drm_gpu_scheduler;
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
From e15e1601fba660124acd7ad41b6f61d46a1c4835 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
|
||||||
|
Date: Fri, 7 Oct 2022 10:59:58 +0200
|
||||||
|
Subject: [PATCH 5/5] drm/amdgpu: use DRM_SCHED_FENCE_DONT_PIPELINE for VM
|
||||||
|
updates
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Make sure that we always have a CPU round trip to let the submission
|
||||||
|
code correctly decide if a TLB flush is necessary or not.
|
||||||
|
|
||||||
|
Signed-off-by: Christian König <christian.koenig@amd.com>
|
||||||
|
---
|
||||||
|
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 9 ++++++++-
|
||||||
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
|
||||||
|
index 1fd3cbca20a2..c7bf189d50de 100644
|
||||||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
|
||||||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
|
||||||
|
@@ -115,8 +115,15 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p,
|
||||||
|
amdgpu_bo_fence(p->vm->root.bo, f, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (fence && !p->immediate)
|
||||||
|
+ if (fence && !p->immediate) {
|
||||||
|
+ /*
|
||||||
|
+ * Most hw generations now have a separate queue for page table
|
||||||
|
+ * updates, but when the queue is shared with userspace we need
|
||||||
|
+ * the extra CPU round trip to correctly flush the TLB.
|
||||||
|
+ */
|
||||||
|
+ set_bit(DRM_SCHED_FENCE_DONT_PIPELINE, &f->flags);
|
||||||
|
swap(*fence, f);
|
||||||
|
+ }
|
||||||
|
dma_fence_put(f);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user