Skip to content

Commit de81335

Browse files
authored
Merge branch 'main' into p2dq-wakee-optimize
2 parents eccd0f8 + dc24e77 commit de81335

File tree

8 files changed

+794
-34
lines changed

8 files changed

+794
-34
lines changed

kernel-versions.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"sched_ext/for-next": {
33
"repo": "https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git",
44
"branch": "for-next",
5-
"commitHash": "9c0a5e83ebe7448eb2dbf3109e1ad7f18622d3a3",
6-
"lastModified": 1764648094,
7-
"narHash": "sha256-RNx6MT4ZGh4xpOOlVOfEVpc+SMnhcLSBdjBVNtPvVxI=",
8-
"kernelVersion": "6.18.0-rc2"
5+
"commitHash": "12b5cd99a05f7cbc2ceb88b3b9601d404ef2236a",
6+
"lastModified": 1765252770,
7+
"narHash": "sha256-OeDjxUPjqY4zncis107O39euxDmhE1xX9rllFv2hj+A=",
8+
"kernelVersion": "6.18.0"
99
},
1010
"bpf/bpf-next": {
1111
"repo": "https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git",
1212
"branch": "master",
13-
"commitHash": "5d9fb42f05e5bea386e6648d5699c2beaabe1c6a",
14-
"lastModified": 1764993043,
15-
"narHash": "sha256-OBEpMoHDJ0ZgBjDNGKDxMNM7YhqgjV8ZzxHFq1s2NGg=",
13+
"commitHash": "759377dab35e404fc4f013e3f853d6e9450b4633",
14+
"lastModified": 1765426010,
15+
"narHash": "sha256-Cr8wRVjJW+PKju3LWCwlFKhyhhYRg9O2hvAx04kL5N0=",
1616
"kernelVersion": "6.18.0"
1717
},
1818
"stable/6_12": {

scheds/rust/scx_p2dq/src/bpf/intf.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ enum stat_idx {
8989
P2DQ_STAT_EXEC_BALANCE,
9090
P2DQ_STAT_FORK_SAME_LLC,
9191
P2DQ_STAT_EXEC_SAME_LLC,
92+
P2DQ_STAT_THERMAL_KICK,
93+
P2DQ_STAT_THERMAL_AVOID,
94+
P2DQ_STAT_EAS_LITTLE_SELECT,
95+
P2DQ_STAT_EAS_BIG_SELECT,
96+
P2DQ_STAT_EAS_FALLBACK,
9297
P2DQ_NR_STATS,
9398
};
9499

0 commit comments

Comments
 (0)