Merge pull request #147 from sched-ext/htejun

scx: Fix spurious ops verification failure due to missing jiffies conversion
sched-ext · Feb 26, 2024 · a9e80ff · a9e80ff
2 parents 74cfdbf + 90b8f6e
commit a9e80ff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
@@ -4067,7 +4067,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;