Skip to contentSkip to conversation

rcu: init and destroy rcu_synchronize when necessary

PATCH Applied Wei Yang 2 participants 3 messages Apr 15, 2020 – Apr 16, 2020 RCU

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH 1/1 rcu: init and destroy rcu_synchronize when necessary

We would skip the rcu_synchronize if it is a duplicate call back function.

This is not necessary to init and destroy for them.

---
 kernel/rcu/update.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
kernel/rcu/update.c +7 -5
index 6c4b862f57d6..91e44b527aad 100644
@@ -353,13 +353,14 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 			might_sleep();
 			continue;
 		}
-		init_rcu_head_on_stack(&rs_array[i].head);
-		init_completion(&rs_array[i].completion);
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
+			init_rcu_head_on_stack(&rs_array[i].head);
+			init_completion(&rs_array[i].completion);
 			(crcu_array[i])(&rs_array[i].head, wakeme_after_rcu);
+		}
 	}
 
 	/* Wait for all callbacks to be invoked. */
@@ -370,9 +371,10 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
 			wait_for_completion(&rs_array[i].completion);
-		destroy_rcu_head_on_stack(&rs_array[i].head);
+			destroy_rcu_head_on_stack(&rs_array[i].head);
+		}
 	}
 }
 EXPORT_SYMBOL_GPL(__wait_rcu_gp);
Signature · 1 line
2.23.0
maintainer Applied
#1 lore raw
Quoted 5 lines · Wei Yang

We would skip the rcu_synchronize if it is a duplicate call back function.

This is not necessary to init and destroy for them.

Applied, thank you!

I edited the commit log a bit. Could you please check below to make sure that I didn't mess anything up?

Thanx, Paul

------------------------------------------------------------------------

commit d9eaddf545fe8e3e2725e2fa0bf87b59b5667c14

Author: Wei Yang <[email protected]>
Date:   Wed Apr 15 22:26:55 2020 +0000

rcu: Initialize and destroy rcu_synchronize only when necessary

The __wait_rcu_gp() function unconditionally initializes and cleans up each element of rs_array[], whether used or not. This is slightly wasteful and rather confusing, so this commit skips both initialization and cleanup for duplicate callback functions.

kernel/rcu/update.c +7 -5
index 3ce63a9..351c322 100644
@@ -391,13 +391,14 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 			might_sleep();
 			continue;
 		}
-		init_rcu_head_on_stack(&rs_array[i].head);
-		init_completion(&rs_array[i].completion);
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
+			init_rcu_head_on_stack(&rs_array[i].head);
+			init_completion(&rs_array[i].completion);
 			(crcu_array[i])(&rs_array[i].head, wakeme_after_rcu);
+		}
 	}
 
 	/* Wait for all callbacks to be invoked. */
@@ -408,9 +409,10 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
 			wait_for_completion(&rs_array[i].completion);
-		destroy_rcu_head_on_stack(&rs_array[i].head);
+			destroy_rcu_head_on_stack(&rs_array[i].head);
+		}
 	}
 }
 EXPORT_SYMBOL_GPL(__wait_rcu_gp);
author
#2 lore raw
Quoted 12 lines · Paul E. McKenney
Quoted 5 lines · Wei Yang

We would skip the rcu_synchronize if it is a duplicate call back function.

This is not necessary to init and destroy for them.

Applied, thank you!

I edited the commit log a bit. Could you please check below to make sure that I didn't mess anything up?

Yep, the changelog looks good to me :-)

Glad you like it.

Quoted 53 lines

Thanx, Paul

------------------------------------------------------------------------

commit d9eaddf545fe8e3e2725e2fa0bf87b59b5667c14

Author: Wei Yang <[email protected]>
Date:   Wed Apr 15 22:26:55 2020 +0000

rcu: Initialize and destroy rcu_synchronize only when necessary

The __wait_rcu_gp() function unconditionally initializes and cleans up each element of rs_array[], whether used or not. This is slightly wasteful and rather confusing, so this commit skips both initialization and cleanup for duplicate callback functions.

kernel/rcu/update.c +7 -5
index 3ce63a9..351c322 100644
@@ -391,13 +391,14 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 			might_sleep();
 			continue;
 		}
-		init_rcu_head_on_stack(&rs_array[i].head);
-		init_completion(&rs_array[i].completion);
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
+			init_rcu_head_on_stack(&rs_array[i].head);
+			init_completion(&rs_array[i].completion);
 			(crcu_array[i])(&rs_array[i].head, wakeme_after_rcu);
+		}
 	}
 
 	/* Wait for all callbacks to be invoked. */
@@ -408,9 +409,10 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,
 		for (j = 0; j < i; j++)
 			if (crcu_array[j] == crcu_array[i])
 				break;
-		if (j == i)
+		if (j == i) {
 			wait_for_completion(&rs_array[i].completion);
-		destroy_rcu_head_on_stack(&rs_array[i].head);
+			destroy_rcu_head_on_stack(&rs_array[i].head);
+		}
 	}
 }
 EXPORT_SYMBOL_GPL(__wait_rcu_gp);
Signature · 2 lines
Wei Yang
Help you, Help me