2023-01-17 05:59:51

by Yue Hu

Subject: [PATCH] rcu/rcutorture: Eliminate variable n_rcu_torture_boost_rterror

From: Yue Hu <[email protected]>

After commit 8b700983de82 ("sched: Remove sched_set_*() return value"),
this variable is not used anymore. So eliminate it entirely.

Signed-off-by: Yue Hu <[email protected]>
---
kernel/rcu/rcutorture.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 634df26a2c27..327c8fbb7e00 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -179,7 +179,6 @@ static atomic_t n_rcu_torture_mbchk_tries;
static atomic_t n_rcu_torture_error;
static long n_rcu_torture_barrier_error;
static long n_rcu_torture_boost_ktrerror;
-static long n_rcu_torture_boost_rterror;
static long n_rcu_torture_boost_failure;
static long n_rcu_torture_boosts;
static atomic_long_t n_rcu_torture_timers;
@@ -2194,12 +2193,11 @@ rcu_torture_stats_print(void)
atomic_read(&n_rcu_torture_alloc),
atomic_read(&n_rcu_torture_alloc_fail),
atomic_read(&n_rcu_torture_free));
- pr_cont("rtmbe: %d rtmbkf: %d/%d rtbe: %ld rtbke: %ld rtbre: %ld ",
+ pr_cont("rtmbe: %d rtmbkf: %d/%d rtbe: %ld rtbke: %ld ",
atomic_read(&n_rcu_torture_mberror),
atomic_read(&n_rcu_torture_mbchk_fail), atomic_read(&n_rcu_torture_mbchk_tries),
n_rcu_torture_barrier_error,
- n_rcu_torture_boost_ktrerror,
- n_rcu_torture_boost_rterror);
+ n_rcu_torture_boost_ktrerror);
pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
n_rcu_torture_boost_failure,
n_rcu_torture_boosts,
@@ -2217,15 +2215,13 @@ rcu_torture_stats_print(void)
if (atomic_read(&n_rcu_torture_mberror) ||
atomic_read(&n_rcu_torture_mbchk_fail) ||
n_rcu_torture_barrier_error || n_rcu_torture_boost_ktrerror ||
- n_rcu_torture_boost_rterror || n_rcu_torture_boost_failure ||
- i > 1) {
+ n_rcu_torture_boost_failure || i > 1) {
pr_cont("%s", "!!! ");
atomic_inc(&n_rcu_torture_error);
WARN_ON_ONCE(atomic_read(&n_rcu_torture_mberror));
WARN_ON_ONCE(atomic_read(&n_rcu_torture_mbchk_fail));
WARN_ON_ONCE(n_rcu_torture_barrier_error); // rcu_barrier()
WARN_ON_ONCE(n_rcu_torture_boost_ktrerror); // no boost kthread
- WARN_ON_ONCE(n_rcu_torture_boost_rterror); // can't set RT prio
WARN_ON_ONCE(n_rcu_torture_boost_failure); // boost failed (TIMER_SOFTIRQ RT prio?)
WARN_ON_ONCE(i > 1); // Too-short grace period
}
@@ -3540,7 +3536,6 @@ rcu_torture_init(void)
atomic_set(&n_rcu_torture_error, 0);
n_rcu_torture_barrier_error = 0;
n_rcu_torture_boost_ktrerror = 0;
- n_rcu_torture_boost_rterror = 0;
n_rcu_torture_boost_failure = 0;
n_rcu_torture_boosts = 0;
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
--
2.17.1

2023-01-17 15:34:53

by Paul E. McKenney

Subject: Re: [PATCH] rcu/rcutorture: Eliminate variable n_rcu_torture_boost_rterror

On Tue, Jan 17, 2023 at 01:53:10PM +0800, Yue Hu wrote:
> From: Yue Hu <[email protected]>
>
> After commit 8b700983de82 ("sched: Remove sched_set_*() return value"),
> this variable is not used anymore. So eliminate it entirely.
>
> Signed-off-by: Yue Hu <[email protected]>

Good eyes! Applied, thank you!

Thanx, Paul

> ---
> kernel/rcu/rcutorture.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
> index 634df26a2c27..327c8fbb7e00 100644
> --- a/kernel/rcu/rcutorture.c
> +++ b/kernel/rcu/rcutorture.c
> @@ -179,7 +179,6 @@ static atomic_t n_rcu_torture_mbchk_tries;
> static atomic_t n_rcu_torture_error;
> static long n_rcu_torture_barrier_error;
> static long n_rcu_torture_boost_ktrerror;
> -static long n_rcu_torture_boost_rterror;
> static long n_rcu_torture_boost_failure;
> static long n_rcu_torture_boosts;
> static atomic_long_t n_rcu_torture_timers;
> @@ -2194,12 +2193,11 @@ rcu_torture_stats_print(void)
> atomic_read(&n_rcu_torture_alloc),
> atomic_read(&n_rcu_torture_alloc_fail),
> atomic_read(&n_rcu_torture_free));
> - pr_cont("rtmbe: %d rtmbkf: %d/%d rtbe: %ld rtbke: %ld rtbre: %ld ",
> + pr_cont("rtmbe: %d rtmbkf: %d/%d rtbe: %ld rtbke: %ld ",
> atomic_read(&n_rcu_torture_mberror),
> atomic_read(&n_rcu_torture_mbchk_fail), atomic_read(&n_rcu_torture_mbchk_tries),
> n_rcu_torture_barrier_error,
> - n_rcu_torture_boost_ktrerror,
> - n_rcu_torture_boost_rterror);
> + n_rcu_torture_boost_ktrerror);
> pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
> n_rcu_torture_boost_failure,
> n_rcu_torture_boosts,
> @@ -2217,15 +2215,13 @@ rcu_torture_stats_print(void)
> if (atomic_read(&n_rcu_torture_mberror) ||
> atomic_read(&n_rcu_torture_mbchk_fail) ||
> n_rcu_torture_barrier_error || n_rcu_torture_boost_ktrerror ||
> - n_rcu_torture_boost_rterror || n_rcu_torture_boost_failure ||
> - i > 1) {
> + n_rcu_torture_boost_failure || i > 1) {
> pr_cont("%s", "!!! ");
> atomic_inc(&n_rcu_torture_error);
> WARN_ON_ONCE(atomic_read(&n_rcu_torture_mberror));
> WARN_ON_ONCE(atomic_read(&n_rcu_torture_mbchk_fail));
> WARN_ON_ONCE(n_rcu_torture_barrier_error); // rcu_barrier()
> WARN_ON_ONCE(n_rcu_torture_boost_ktrerror); // no boost kthread
> - WARN_ON_ONCE(n_rcu_torture_boost_rterror); // can't set RT prio
> WARN_ON_ONCE(n_rcu_torture_boost_failure); // boost failed (TIMER_SOFTIRQ RT prio?)
> WARN_ON_ONCE(i > 1); // Too-short grace period
> }
> @@ -3540,7 +3536,6 @@ rcu_torture_init(void)
> atomic_set(&n_rcu_torture_error, 0);
> n_rcu_torture_barrier_error = 0;
> n_rcu_torture_boost_ktrerror = 0;
> - n_rcu_torture_boost_rterror = 0;
> n_rcu_torture_boost_failure = 0;
> n_rcu_torture_boosts = 0;
> for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
> --
> 2.17.1
>