Date: Thu, 4 Feb 2016 11:39:54 +0000 From: "rrs (Randall Stewart)" <phabric-noreply@FreeBSD.org> To: transport@freebsd.org Subject: [Differential] [Request, 19 lines] D5189: TCP stacks loading issue Message-ID: <differential-rev-PHID-DREV-vccnwlydoer2taoqbrmz-req@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
--b1_b881844935197bbeb03190bd4573426b Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit rrs created this revision. rrs added a reviewer: hiren. rrs added a subscriber: transport. REVISION SUMMARY The fast path.c code had the wrong module dependency (which is fixed in this revision too) but it points out a weakness in the initialization, i.e. one must have the register function either validate that initialization and error, or just do the initialization at that point. I choose the later since it does no harm. TEST PLAN load the old module without changing its order and make sure we don't crash :-) REVISION DETAIL https://reviews.freebsd.org/D5189 AFFECTED FILES netinet/tcp_stacks/fastpath.c netinet/tcp_subr.c CHANGE DETAILS diff --git a/netinet/tcp_subr.c b/netinet/tcp_subr.c --- a/netinet/tcp_subr.c +++ b/netinet/tcp_subr.c @@ -263,9 +263,20 @@ 0 }; +int t_functions_inited = 0; struct tcp_funchead t_functions; static struct tcp_function_block *tcp_func_set_ptr = &tcp_def_funcblk; +static void +init_tcp_functions() +{ + if (t_functions_inited == 0) { + TAILQ_INIT(&t_functions); + rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0); + t_functions_inited = 1; + } +} + static struct tcp_function_block * find_tcp_functions_locked(struct tcp_function_set *fs) { @@ -503,6 +514,9 @@ struct tcp_function *n; struct tcp_function_set fs; + if (t_functions_inited == 0) { + init_tcp_functions(); + } if ((blk->tfb_tcp_output == NULL) || (blk->tfb_tcp_do_segment == NULL) || (blk->tfb_tcp_ctloutput == NULL) || @@ -681,8 +695,7 @@ tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; tcp_tcbhashsize = hashsize; /* Setup the tcp function block list */ - TAILQ_INIT(&t_functions); - rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0); + init_tcp_functions(); register_tcp_functions(&tcp_def_funcblk, M_WAITOK); if (tcp_soreceive_stream) { diff --git a/netinet/tcp_stacks/fastpath.c b/netinet/tcp_stacks/fastpath.c --- a/netinet/tcp_stacks/fastpath.c +++ b/netinet/tcp_stacks/fastpath.c @@ -2453,4 +2453,4 @@ }; MODULE_VERSION(kern_tcpfastpaths, 1); -DECLARE_MODULE(kern_tcpfastpaths, new_tcp_fastpaths, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(kern_tcpfastpaths, new_tcp_fastpaths, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: rrs, hiren Cc: transport --b1_b881844935197bbeb03190bd4573426b Content-Type: text/x-patch; charset=utf-8; name="D5189.13003.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5189.13003.patch" ZGlmZiAtLWdpdCBhL25ldGluZXQvdGNwX3N1YnIuYyBiL25ldGluZXQvdGNwX3N1YnIuYwotLS0g YS9uZXRpbmV0L3RjcF9zdWJyLmMKKysrIGIvbmV0aW5ldC90Y3Bfc3Vici5jCkBAIC0yNjMsOSAr MjYzLDIwIEBACiAJMAogfTsKIAoraW50IHRfZnVuY3Rpb25zX2luaXRlZCA9IDA7CiBzdHJ1Y3Qg dGNwX2Z1bmNoZWFkIHRfZnVuY3Rpb25zOwogc3RhdGljIHN0cnVjdCB0Y3BfZnVuY3Rpb25fYmxv Y2sgKnRjcF9mdW5jX3NldF9wdHIgPSAmdGNwX2RlZl9mdW5jYmxrOwogCitzdGF0aWMgdm9pZAor aW5pdF90Y3BfZnVuY3Rpb25zKCkKK3sKKwlpZiAodF9mdW5jdGlvbnNfaW5pdGVkID09IDApIHsK KwkJVEFJTFFfSU5JVCgmdF9mdW5jdGlvbnMpOworCQlyd19pbml0X2ZsYWdzKCZ0Y3BfZnVuY3Rp b25fbG9jaywgInRjcF9mdW5jX2xvY2siICwgMCk7CisJCXRfZnVuY3Rpb25zX2luaXRlZCA9IDE7 CisJfQorfQorCiBzdGF0aWMgc3RydWN0IHRjcF9mdW5jdGlvbl9ibG9jayAqCiBmaW5kX3RjcF9m dW5jdGlvbnNfbG9ja2VkKHN0cnVjdCB0Y3BfZnVuY3Rpb25fc2V0ICpmcykKIHsKQEAgLTUwMyw2 ICs1MTQsOSBAQAogCXN0cnVjdCB0Y3BfZnVuY3Rpb24gKm47CiAJc3RydWN0IHRjcF9mdW5jdGlv bl9zZXQgZnM7CiAKKwlpZiAodF9mdW5jdGlvbnNfaW5pdGVkID09IDApIHsKKwkJaW5pdF90Y3Bf ZnVuY3Rpb25zKCk7CisJfQogCWlmICgoYmxrLT50ZmJfdGNwX291dHB1dCA9PSBOVUxMKSB8fAog CSAgICAoYmxrLT50ZmJfdGNwX2RvX3NlZ21lbnQgPT0gTlVMTCkgfHwKIAkgICAgKGJsay0+dGZi X3RjcF9jdGxvdXRwdXQgPT0gTlVMTCkgfHwKQEAgLTY4MSw4ICs2OTUsNyBAQAogCXRjcF9maW53 YWl0Ml90aW1lb3V0ID0gVENQVFZfRklOV0FJVDJfVElNRU9VVDsKIAl0Y3BfdGNiaGFzaHNpemUg PSBoYXNoc2l6ZTsKIAkvKiBTZXR1cCB0aGUgdGNwIGZ1bmN0aW9uIGJsb2NrIGxpc3QgKi8KLQlU QUlMUV9JTklUKCZ0X2Z1bmN0aW9ucyk7Ci0JcndfaW5pdF9mbGFncygmdGNwX2Z1bmN0aW9uX2xv Y2ssICJ0Y3BfZnVuY19sb2NrIiAsIDApOworCWluaXRfdGNwX2Z1bmN0aW9ucygpOwogCXJlZ2lz dGVyX3RjcF9mdW5jdGlvbnMoJnRjcF9kZWZfZnVuY2JsaywgTV9XQUlUT0spOwogCiAJaWYgKHRj cF9zb3JlY2VpdmVfc3RyZWFtKSB7CmRpZmYgLS1naXQgYS9uZXRpbmV0L3RjcF9zdGFja3MvZmFz dHBhdGguYyBiL25ldGluZXQvdGNwX3N0YWNrcy9mYXN0cGF0aC5jCi0tLSBhL25ldGluZXQvdGNw X3N0YWNrcy9mYXN0cGF0aC5jCisrKyBiL25ldGluZXQvdGNwX3N0YWNrcy9mYXN0cGF0aC5jCkBA IC0yNDUzLDQgKzI0NTMsNCBAQAogfTsKIAogTU9EVUxFX1ZFUlNJT04oa2Vybl90Y3BmYXN0cGF0 aHMsIDEpOwotREVDTEFSRV9NT0RVTEUoa2Vybl90Y3BmYXN0cGF0aHMsIG5ld190Y3BfZmFzdHBh dGhzLCBTSV9TVUJfUFNFVURPLCBTSV9PUkRFUl9BTlkpOworREVDTEFSRV9NT0RVTEUoa2Vybl90 Y3BmYXN0cGF0aHMsIG5ld190Y3BfZmFzdHBhdGhzLCBTSV9TVUJfUFJPVE9fRE9NQUlOLCBTSV9P UkRFUl9BTlkpOwoK --b1_b881844935197bbeb03190bd4573426b--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?differential-rev-PHID-DREV-vccnwlydoer2taoqbrmz-req>