Skip to content
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

v6.7.6-scx2 #15

Merged
merged 2 commits into from
Feb 26, 2024
Merged

v6.7.6-scx2 #15

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
1396c09
scx: Fix spurious ops verification failure due to missing jiffies con…
htejun Feb 26, 2024
73acd11
v6.7.6-scx2
Byte-Lab Feb 26, 2024
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
VERSION = 6
PATCHLEVEL = 7
SUBLEVEL = 6
EXTRAVERSION = -scx1
EXTRAVERSION = -scx2
NAME = Hurr durr I'ma ninja sloth

# *DOCUMENTATION*
Expand Down
3 changes: 2 additions & 1 deletion kernel/sched/ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4057,7 +4057,8 @@ static int bpf_scx_init_member(const struct btf_type *t,
return -EINVAL;
return 1;
case offsetof(struct sched_ext_ops, timeout_ms):
if (*(u32 *)(udata + moff) > SCX_WATCHDOG_MAX_TIMEOUT)
if (msecs_to_jiffies(*(u32 *)(udata + moff)) >
SCX_WATCHDOG_MAX_TIMEOUT)
return -E2BIG;
ops->timeout_ms = *(u32 *)(udata + moff);
return 1;
Expand Down