[324/622] lnet: correct discovery LNetEQFree()

Commit Message

James Simmons Feb. 27, 2020, 9:13 p.m. UTC

From: Amir Shehata <[e-mail]>

The EQ needs to be freed after all the queues are cleaned to avoid
having non-processed events on the event queue on free. This will
prevent the memory from being freed.

WC-bug-id: https://jira.whamcloud.com/browse/LU-12254
Lustre-commit: a0879b5985b4 ("LU-12254 lnet: correct discovery LNetEQFree()")
Signed-off-by: Amir Shehata <[e-mail]>
Reviewed-on: https://review.whamcloud.com/34796
Reviewed-by: Olaf Weber <[e-mail]>
Reviewed-by: Sebastien Buisson <[e-mail]>
Reviewed-by: Chris Horn <[e-mail]>
Signed-off-by: James Simmons <[e-mail]>
---
 net/lnet/lnet/peer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/net/lnet/lnet/peer.c b/net/lnet/lnet/peer.c
index 7b11f28..8af9db2 100644
--- a/net/lnet/lnet/peer.c
+++ b/net/lnet/lnet/peer.c
@@ -3142,8 +3142,6 @@  static int lnet_peer_discovery(void *arg)
 	 * size of the thundering herd if there are multiple threads
 	 * waiting on discovery of a single peer.
 	 */
-	LNetEQFree(the_lnet.ln_dc_eqh);
-	LNetInvalidateEQHandle(&the_lnet.ln_dc_eqh);
 
 	/* Queue cleanup 1: stop all pending pings and pushes. */
 	lnet_net_lock(LNET_LOCK_EX);
@@ -3171,6 +3169,9 @@  static int lnet_peer_discovery(void *arg)
 	}
 	lnet_net_unlock(LNET_LOCK_EX);
 
+	LNetEQFree(the_lnet.ln_dc_eqh);
+	LNetInvalidateEQHandle(&the_lnet.ln_dc_eqh);
+
 	the_lnet.ln_dc_state = LNET_DC_STATE_SHUTDOWN;
 	wake_up(&the_lnet.ln_dc_waitq);