forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/kernel/sched/sched.h
....@@ -351,7 +351,7 @@
351351 extern bool __checkparam_dl(const struct sched_attr *attr);
352352 extern bool dl_param_changed(struct task_struct *p, const struct sched_attr *attr);
353353 extern int  dl_cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial);
354
-extern int  dl_cpu_busy(int cpu, struct task_struct *p);
354
+extern int  dl_bw_check_overflow(int cpu);
355355 
356356 #ifdef CONFIG_CGROUP_SCHED
357357 
....@@ -2459,6 +2459,23 @@
24592459 #ifdef CONFIG_UCLAMP_TASK
24602460 unsigned long uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id);
24612461 
2462
+static inline unsigned long uclamp_rq_get(struct rq *rq,
2463
+					  enum uclamp_id clamp_id)
2464
+{
2465
+	return READ_ONCE(rq->uclamp[clamp_id].value);
2466
+}
2467
+
2468
+static inline void uclamp_rq_set(struct rq *rq, enum uclamp_id clamp_id,
2469
+				 unsigned int value)
2470
+{
2471
+	WRITE_ONCE(rq->uclamp[clamp_id].value, value);
2472
+}
2473
+
2474
+static inline bool uclamp_rq_is_idle(struct rq *rq)
2475
+{
2476
+	return rq->uclamp_flags & UCLAMP_FLAG_IDLE;
2477
+}
2478
+
24622479 /**
24632480  * uclamp_rq_util_with - clamp @util with @rq and @p effective uclamp values.
24642481  * @rq:		The rq to clamp against. Must not be NULL.
....@@ -2494,12 +2511,12 @@
24942511 		 * Ignore last runnable task's max clamp, as this task will
24952512 		 * reset it. Similarly, no need to read the rq's min clamp.
24962513 		 */
2497
-		if (rq->uclamp_flags & UCLAMP_FLAG_IDLE)
2514
+		if (uclamp_rq_is_idle(rq))
24982515 			goto out;
24992516 	}
25002517 
2501
-	min_util = max_t(unsigned long, min_util, READ_ONCE(rq->uclamp[UCLAMP_MIN].value));
2502
-	max_util = max_t(unsigned long, max_util, READ_ONCE(rq->uclamp[UCLAMP_MAX].value));
2518
+	min_util = max_t(unsigned long, min_util, uclamp_rq_get(rq, UCLAMP_MIN));
2519
+	max_util = max_t(unsigned long, max_util, uclamp_rq_get(rq, UCLAMP_MAX));
25032520 out:
25042521 	/*
25052522 	 * Since CPU's {min,max}_util clamps are MAX aggregated considering
....@@ -2530,6 +2547,15 @@
25302547 	return static_branch_likely(&sched_uclamp_used);
25312548 }
25322549 #else /* CONFIG_UCLAMP_TASK */
2550
+static inline unsigned long uclamp_eff_value(struct task_struct *p,
2551
+					     enum uclamp_id clamp_id)
2552
+{
2553
+	if (clamp_id == UCLAMP_MIN)
2554
+		return 0;
2555
+
2556
+	return SCHED_CAPACITY_SCALE;
2557
+}
2558
+
25332559 static inline
25342560 unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long util,
25352561 				  struct task_struct *p)
....@@ -2546,6 +2572,25 @@
25462572 {
25472573 	return false;
25482574 }
2575
+
2576
+static inline unsigned long uclamp_rq_get(struct rq *rq,
2577
+					  enum uclamp_id clamp_id)
2578
+{
2579
+	if (clamp_id == UCLAMP_MIN)
2580
+		return 0;
2581
+
2582
+	return SCHED_CAPACITY_SCALE;
2583
+}
2584
+
2585
+static inline void uclamp_rq_set(struct rq *rq, enum uclamp_id clamp_id,
2586
+				 unsigned int value)
2587
+{
2588
+}
2589
+
2590
+static inline bool uclamp_rq_is_idle(struct rq *rq)
2591
+{
2592
+	return false;
2593
+}
25492594 #endif /* CONFIG_UCLAMP_TASK */
25502595 
25512596 #ifdef CONFIG_UCLAMP_TASK_GROUP