Skip to content

[Deepin-Kernel-SIG] [linux 6.18-y] [BORE] linux6.18.22-bore-6.6.3 #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 2 commits into from
Apr 17, 2026
Merged

[Deepin-Kernel-SIG] [linux 6.18-y] [BORE] linux6.18.22-bore-6.6.3 #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b59015
Revert "FROMEXT: sched: linux6.18.18-bore-6.6.2"
opsiff Apr 16, 2026
9f1b95a
FROMEXT: linux6.18.22-bore-6.6.3
firelzrd Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/linux/sched/bore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define SCHED_BORE_AUTHOR "Masahito Suzuki"
#define SCHED_BORE_PROGNAME "BORE CPU Scheduler modification"

#define SCHED_BORE_VERSION "6.6.2"
#define SCHED_BORE_VERSION "6.6.3"

extern u8 __read_mostly sched_bore;
DECLARE_STATIC_KEY_TRUE(sched_bore_key);
Expand Down
18 changes: 12 additions & 6 deletions kernel/sched/bore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,9 @@ static inline bool task_is_bore_eligible(struct task_struct *p)

static inline u32 count_children_upto2(struct task_struct *p) {
struct list_head *head = &p->children;
struct list_head *next = head->next;
return (next != head) + (next->next != head);
struct list_head *first = READ_ONCE(head->next);
struct list_head *second = READ_ONCE(first->next);
return (first != head) + (second != head);
}

static inline bool burst_cache_expired(struct bore_bc *bc, u64 now) {
Expand Down Expand Up @@ -224,9 +225,13 @@ static u32 inherit_from_ancestor_hub(struct task_struct *parent,
if (scan_count++ >= BURST_CACHE_SCAN_LIMIT) break;

struct task_struct *descendant = direct_child;
while (count_children_upto2(descendant) == 1)
descendant = list_first_entry(&descendant->children,
struct task_struct, sibling);
while (count_children_upto2(descendant) == 1) {
struct task_struct *next_descendant =
list_first_or_null_rcu(&descendant->children,
struct task_struct, sibling);
if (!next_descendant) break;
descendant = next_descendant;
}

if (!task_is_bore_eligible(descendant)) continue;
count++;
Expand All @@ -247,10 +252,11 @@ static u32 inherit_from_thread_group(struct task_struct *p, u64 now) {

if (burst_cache_expired(bc, now)) {
struct task_struct *sibling;
u32 count = 0, total = 0;
u32 count = 0, total = 0, scan_count = 0;

for_each_thread(leader, sibling) {
if (count >= BURST_CACHE_SAMPLE_LIMIT) break;
if (scan_count++ >= BURST_CACHE_SCAN_LIMIT) break;

if (!task_is_bore_eligible(sibling)) continue;
count++;
Expand Down
16 changes: 16 additions & 0 deletions kernel/sched/fair.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3880,11 +3880,17 @@ void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
bool curr = cfs_rq->curr == se;
bool rel_vprot = false;
u64 vprot;
#ifdef CONFIG_SCHED_BORE
s64 vlag_unscaled = 0;
#endif /* !CONFIG_SCHED_BORE */
Comment on lines +3883 to +3885
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The #endif comment says "!CONFIG_SCHED_BORE" but the corresponding conditional is "#ifdef CONFIG_SCHED_BORE". Please update the trailing comment to match the actual condition to avoid confusion during future maintenance (and keep it consistent with kernel style expectations).

Copilot uses AI. Check for mistakes.

if (se->on_rq) {
/* commit outstanding execution time */
update_curr(cfs_rq);
update_entity_lag(cfs_rq, se);
#ifdef CONFIG_SCHED_BORE
vlag_unscaled = se->vlag;
#endif /* !CONFIG_SCHED_BORE */
Comment on lines +3891 to +3893
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trailing #endif comment here also uses "!CONFIG_SCHED_BORE" while closing an "#ifdef CONFIG_SCHED_BORE" block. Please fix the comment to avoid misleading readers.

Copilot uses AI. Check for mistakes.
se->deadline -= se->vruntime;
se->rel_deadline = 1;
if (curr && protect_slice(se)) {
Expand Down Expand Up @@ -3920,6 +3926,16 @@ void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,

enqueue_load_avg(cfs_rq, se);
if (se->on_rq) {
#ifdef CONFIG_SCHED_BORE
if (curr) {
se->vruntime += vlag_unscaled - se->vlag;
if (se->rel_deadline) {
se->deadline += se->vruntime;
se->rel_deadline = 0;
}
}
else
#endif /* !CONFIG_SCHED_BORE */
place_entity(cfs_rq, se, 0);
Comment on lines +3929 to 3939
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue here: the trailing #endif comment says "!CONFIG_SCHED_BORE" even though the block is guarded by "#ifdef CONFIG_SCHED_BORE". Please correct the comment to match the conditional for clarity.

Copilot uses AI. Check for mistakes.
if (rel_vprot)
se->vprot = se->vruntime + vprot;
Expand Down
Loading