[tip: sched/fifo] sched,locktorture: Convert to sched_set_fifo()

[tip-bot2 for Peter Zijlstra]

The following commit has been merged into the sched/fifo branch of tip:

Commit-ID:     93db9129fa4beb78e2227554d237e8db04ca514c
Gitweb:        
https://git.kernel.org/tip/93db9129fa4beb78e2227554d237e8db04ca514c
Author:        Peter Zijlstra <pet...@infradead.org>
AuthorDate:    Tue, 21 Apr 2020 12:09:13 +02:00
Committer:     Peter Zijlstra <pet...@infradead.org>
CommitterDate: Mon, 15 Jun 2020 14:10:24 +02:00

sched,locktorture: Convert to sched_set_fifo()

Because SCHED_FIFO is a broken scheduler model (see previous patches)
take away the priority field, the kernel can't possibly make an
informed decision.

Effectively changes prio from 99 to 50.

Cc: paul...@kernel.org
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Reviewed-by: Ingo Molnar <mi...@kernel.org>
Reviewed-by: Paul E. McKenney <paul...@kernel.org>
---
 kernel/locking/locktorture.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 5efbfc6..fca41a7 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -436,8 +436,6 @@ static int torture_rtmutex_lock(void) 
__acquires(torture_rtmutex)
 
 static void torture_rtmutex_boost(struct torture_random_state *trsp)
 {
-       int policy;
-       struct sched_param param;
        const unsigned int factor = 50000; /* yes, quite arbitrary */
 
        if (!rt_task(current)) {
@@ -448,8 +446,7 @@ static void torture_rtmutex_boost(struct 
torture_random_state *trsp)
                 */
                if (trsp && !(torture_random(trsp) %
                              (cxt.nrealwriters_stress * factor))) {
-                       policy = SCHED_FIFO;
-                       param.sched_priority = MAX_RT_PRIO - 1;
+                       sched_set_fifo(current);
                } else /* common case, do nothing */
                        return;
        } else {
@@ -462,13 +459,10 @@ static void torture_rtmutex_boost(struct 
torture_random_state *trsp)
                 */
                if (!trsp || !(torture_random(trsp) %
                               (cxt.nrealwriters_stress * factor * 2))) {
-                       policy = SCHED_NORMAL;
-                       param.sched_priority = 0;
+                       sched_set_normal(current, 0);
                } else /* common case, do nothing */
                        return;
        }
-
-       sched_setscheduler_nocheck(current, policy, &param);
 }
 
 static void torture_rtmutex_delay(struct torture_random_state *trsp)