diff options
| author |   Liangxing Wang <liangxing.wang@arm.com> | 2022-05-13 04:24:19 +0000 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2022-06-10 18:11:58 +0000 |
| commit | 2211277f3af5a6f50fedb3c6ccf65d4e96b1192a (patch) | |
| tree | ee7c34f7ea5f952c7f1bdf97246f91ac5b44b078 | |
| parent | 0d5f1a6c5449092ef4503e57e1e68d0032bc67ef (diff) | |
vcl: fix iperf3 server crash issue when it runs over vpp host stack.
Issue:
Let iperf3 server run via ldp and vcl on top of vpp's host stack. If
iperf3 client connects this iperf3 server with tcp MSS setting option,
iperf3 server will always crash.
Root cause:
When MSS option is specified by iperf3 client, iperf3 server will
recreate the listening socket firstly, then call setsockopt() to set MSS
immediately. Iperf3 code can be referred here:
https://github.com/esnet/iperf/blob/58332f8154e2140e40a6e0ea060a418138291718/src/iperf_tcp.c#L186.
However, in vcl layer vpp_evt_q of this recreated session is not
allocated yet. So iperf3 server crashes with vpp_evt_q null pointer access.
Fix:
Add session vpp_evt_q null pointer check in vcl_session_transport_attr().
Add a vcl test case for this MSS option scenario.
Type: fix
Signed-off-by: Liangxing Wang <liangxing.wang@arm.com>
Change-Id: I2863bd0cffbe6e60108ab333f97c00530c006ba7
| -rw-r--r-- | src/vcl/vppcom.c | 9 | ||||
| -rw-r--r-- | test/test_vcl.py | 11 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 7fffc3bcbe2..3a9a7fdc1a9 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -289,10 +289,17 @@ vcl_session_transport_attr (vcl_worker_t *wrk, vcl_session_t *s, u8 is_get, f64 timeout; ASSERT (!wrk->session_attr_op); + mq = s->vpp_evt_q; + if (PREDICT_FALSE (!mq)) + { + /* FIXME: attribute should be stored and sent once session is + * bound/connected to vpp */ + return 0; + } + wrk->session_attr_op = 1; wrk->session_attr_op_rv = -1; - mq = s->vpp_evt_q; app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_TRANSPORT_ATTR); mp = (session_transport_attr_msg_t *) app_evt->evt->data; memset (mp, 0, sizeof (*mp)); diff --git a/test/test_vcl.py b/test/test_vcl.py index bf139fe0537..8c0a49da063 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -193,6 +193,7 @@ class VCLTestCase(VppTestCase): i.unconfig_ip4() i.set_table_ip4(0) i.admin_down() + i.remove_vpp_config() def thru_host_stack_ipv6_setup(self): self.vapi.session_enable_disable(is_enable=1) @@ -932,6 +933,16 @@ class LDPThruHostStackIperf(VCLTestCase): iperf3, self.server_iperf3_args, iperf3, self.client_iperf3_args ) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + def test_ldp_thru_host_stack_iperf3_mss(self): + """run LDP thru host stack iperf3 test with mss option""" + + self.timeout = self.client_iperf3_timeout + self.client_iperf3_args.append("-M 1000") + self.thru_host_stack_test( + iperf3, self.server_iperf3_args, iperf3, self.client_iperf3_args + ) + class LDPThruHostStackIperfUdp(VCLTestCase): """LDP Thru Host Stack Iperf UDP""" |