-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
24 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
From 968fcd8fa0ce6eb74f5994913a82859b14ad0fad Mon Sep 17 00:00:00 2001 | ||
From 93fb7f081f5f864bc5cd8db2be59575675c4e65c Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Tue, 14 Jun 2022 17:02:22 +0200 | ||
Date: Tue, 14 Jun 2022 17:45:50 +0200 | ||
Subject: [PATCH] cachy | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
|
@@ -11,6 +11,7 @@ Signed-off-by: Peter Jung <[email protected]> | |
arch/Kconfig | 10 +++++ | ||
arch/x86/include/asm/cpufeatures.h | 2 +- | ||
arch/x86/include/asm/mwait.h | 1 + | ||
arch/x86/kernel/cpu/amd.c | 3 +- | ||
arch/x86/kernel/process.c | 39 ++++++++++++----- | ||
drivers/cpufreq/Kconfig | 2 +- | ||
drivers/cpufreq/cpufreq_ondemand.c | 6 +-- | ||
|
@@ -34,7 +35,7 @@ Signed-off-by: Peter Jung <[email protected]> | |
mm/vmscan.c | 24 ++++++++--- | ||
scripts/Makefile.lib | 4 ++ | ||
scripts/Makefile.modfinal | 4 ++ | ||
29 files changed, 286 insertions(+), 53 deletions(-) | ||
30 files changed, 288 insertions(+), 54 deletions(-) | ||
|
||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt | ||
index 3f1cc5e317ed..d491c096f0a9 100644 | ||
|
@@ -182,6 +183,20 @@ index 29dd27b5a339..3a8fdf881313 100644 | |
|
||
#define CPUID_MWAIT_LEAF 5 | ||
#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 | ||
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c | ||
index 0c0b09796ced..ff2075f26ef4 100644 | ||
--- a/arch/x86/kernel/cpu/amd.c | ||
+++ b/arch/x86/kernel/cpu/amd.c | ||
@@ -1152,7 +1152,8 @@ u32 amd_get_highest_perf(void) | ||
struct cpuinfo_x86 *c = &boot_cpu_data; | ||
|
||
if (c->x86 == 0x17 && ((c->x86_model >= 0x30 && c->x86_model < 0x40) || | ||
- (c->x86_model >= 0x70 && c->x86_model < 0x80))) | ||
+ (c->x86_model >= 0x70 && c->x86_model < 0x80) || | ||
+ (c->x86_model >= 0xa0 && c->x86_model < 0xb0))) | ||
return 166; | ||
|
||
if (c->x86 == 0x19 && ((c->x86_model >= 0x20 && c->x86_model < 0x30) || | ||
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c | ||
index b370767f5b19..e26c63615931 100644 | ||
--- a/arch/x86/kernel/process.c | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 89caf3b071a929cfeefcc0ad9592a3335f943dd1 Mon Sep 17 00:00:00 2001 | ||
From 2b1abcfe601d06d8fd124fd12ef2968c16e5baeb Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Tue, 14 Jun 2022 17:10:04 +0200 | ||
Subject: [PATCH] fixes fixes | ||
Date: Tue, 14 Jun 2022 17:54:59 +0200 | ||
Subject: [PATCH] fixes | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
--- | ||
|
@@ -35,12 +35,12 @@ Signed-off-by: Peter Jung <[email protected]> | |
include/uapi/linux/vt.h | 15 ++++++- | ||
kernel/cpu.c | 1 + | ||
kernel/kcsan/kcsan_test.c | 5 ++- | ||
kernel/sched/sched.h | 21 +++++---- | ||
kernel/sched/sched.h | 6 ++- | ||
kernel/trace/trace.c | 14 ++---- | ||
kernel/workqueue.c | 2 +- | ||
mm/swap.c | 2 +- | ||
net/sched/Kconfig | 4 ++ | ||
35 files changed, 172 insertions(+), 88 deletions(-) | ||
35 files changed, 164 insertions(+), 81 deletions(-) | ||
|
||
diff --git a/Makefile b/Makefile | ||
index d8b942f4174f..ebdd981c0d9c 100644 | ||
|
@@ -772,7 +772,7 @@ index a36fca063a73..767dfacd6ed3 100644 | |
|
||
if (num_online_cpus() < min_required_cpus) { | ||
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h | ||
index 0d2b6b758f32..870d3d730920 100644 | ||
index 0d2b6b758f32..08fdb9ccd14d 100644 | ||
--- a/kernel/sched/sched.h | ||
+++ b/kernel/sched/sched.h | ||
@@ -1686,6 +1686,11 @@ queue_balance_callback(struct rq *rq, | ||
|
@@ -795,39 +795,6 @@ index 0d2b6b758f32..870d3d730920 100644 | |
|
||
#ifdef CONFIG_SMP | ||
static_assert(WF_EXEC == SD_BALANCE_EXEC); | ||
@@ -2182,6 +2186,8 @@ static inline void set_next_task(struct rq *rq, struct task_struct *next) | ||
* | ||
* include/asm-generic/vmlinux.lds.h | ||
* | ||
+ * *CAREFUL* they are laid out in *REVERSE* order!!! | ||
+ * | ||
* Also enforce alignment on the instance, not the type, to guarantee layout. | ||
*/ | ||
#define DEFINE_SCHED_CLASS(name) \ | ||
@@ -2190,17 +2196,16 @@ const struct sched_class name##_sched_class \ | ||
__section("__" #name "_sched_class") | ||
|
||
/* Defined in include/asm-generic/vmlinux.lds.h */ | ||
-extern struct sched_class __begin_sched_classes[]; | ||
-extern struct sched_class __end_sched_classes[]; | ||
- | ||
-#define sched_class_highest (__end_sched_classes - 1) | ||
-#define sched_class_lowest (__begin_sched_classes - 1) | ||
+extern struct sched_class __sched_class_highest[]; | ||
+extern struct sched_class __sched_class_lowest[]; | ||
|
||
#define for_class_range(class, _from, _to) \ | ||
- for (class = (_from); class != (_to); class--) | ||
+ for (class = (_from); class < (_to); class++) | ||
|
||
#define for_each_class(class) \ | ||
- for_class_range(class, sched_class_highest, sched_class_lowest) | ||
+ for_class_range(class, __sched_class_highest, __sched_class_lowest) | ||
+ | ||
+#define sched_class_above(_a, _b) ((_a) < (_b)) | ||
|
||
extern const struct sched_class stop_sched_class; | ||
extern const struct sched_class dl_sched_class; | ||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c | ||
index 114c31bdf8f9..4b0354a89cb2 100644 | ||
--- a/kernel/trace/trace.c | ||
|