Fixed ppp_lwip_disconnect hangs when connection failure. #7160

jarvte · 2018-06-07T10:04:03Z

Description

fixed ppp_lwip_disconnect hangs when connection failure.
improved nsapi_ppp_connect error handling
fixing issue ppp_lwip_disconnect hangs on acquiring ppp_close_sem semaphore when cellular connection fails with NSAPI_ERROR_CONNECTION_LOST #6979

@AriParkkila @kjbracey-arm please review.

Internal ref to defect: IOTCELL-1028

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

jarvte · 2018-06-07T11:26:19Z

@0xc0170 travis failure not related to this fix, probably ci/pr-head neither.

kjbracey · 2018-06-07T13:26:01Z

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

-    my_stream = NULL;
+        /* close call made, now let's catch the response in the status callback */
+        sys_arch_sem_wait(&ppp_close_sem, 0);
+        ppp_active = false;


Probably should actually set ppp_active to false even if ppp_close returns an error. It's probably down if that happens.

true, fixed

cmonr · 2018-06-07T18:27:48Z

@jarvte Thanks for that comment. Restarted that Travis job...

AriParkkila · 2018-06-08T07:57:27Z

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

+    if (ppp_active) {
+        err_t ret = ppp_close(my_ppp_pcb, 0);
+        if (ret != ERR_OK) {
+            ppp_active = false;


All paths set ppp_active = false;, could be done once?

ppp_active can't be called before sys_arch_sem_wait but did some modifications.

AriParkkila · 2018-06-08T08:10:39Z

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

@@ -373,6 +372,9 @@ nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_event_t,
        retcode = lwip._add_ppp_interface(stream, true, stack, &my_interface);
        if (retcode != NSAPI_ERROR_OK) {
            my_interface = NULL;
+            my_stream->set_blocking(true);
+            my_stream = NULL;
+            connection_status_cb = NULL;


AT_CellularNetwork::open_data_channel should release file handle before calling nsapi_ppp_connect(), and also reinitialise file handle if nsapi_ppp_connect() returns failure.

By "release" do you mean unset its sigio callback? Yes, probably wise.

no need to do it here, only after my_interface->bringup which will set sigio. Added unset of sigio there. Good point!

AriParkkila · 2018-06-08T08:15:59Z

features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp

+    my_stream->set_blocking(true);
+    my_stream = NULL;
+
+    return retcode;


AT_CellularNetwork::disconnect should probably take ownership also in case of if (err != NSAPI_ERROR_OK)

true, fixed to AT_Cellularnetwork::disconnect()

- set ppp_active false if close fails in ppp disconnect. - unset sigio in ppp disconnect - take ownership of filehandle in CellularNetwork::disconnect even in case of failure

0xc0170 · 2018-06-10T17:43:34Z

/morph build

mbed-ci · 2018-06-10T21:27:03Z

Build : SUCCESS

Build number : 2308
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7160/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

mbed-ci · 2018-06-10T22:52:18Z

Exporter Build : SUCCESS

Build number : 1930
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7160/

mbed-ci · 2018-06-11T07:01:12Z

Test : SUCCESS

Build number : 2085
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7160/2085

0xc0170 · 2018-06-11T08:37:56Z

/morph export-build
/morph mbed2-build

mbed-ci · 2018-06-11T10:32:08Z

Exporter Build : SUCCESS

Build number : 1932
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7160/

jarvte · 2018-06-11T12:06:51Z

@0xc0170 please merge

Fixed ppp disconnect hangs when connection failure.

dab4215

jarvte mentioned this pull request Jun 7, 2018

ppp_lwip_disconnect hangs on acquiring ppp_close_sem semaphore when cellular connection fails with NSAPI_ERROR_CONNECTION_LOST #6979

Closed

0xc0170 requested review from kjbracey and AriParkkila June 7, 2018 10:29

0xc0170 added the needs: review label Jun 7, 2018

kjbracey reviewed Jun 7, 2018

View reviewed changes

AriParkkila suggested changes Jun 8, 2018

View reviewed changes

jarvte force-pushed the ppp_lwip_disconnect_hangs branch from a9bec43 to db5f38b Compare June 8, 2018 09:28

Review fix:

b35dc6a

- set ppp_active false if close fails in ppp disconnect. - unset sigio in ppp disconnect - take ownership of filehandle in CellularNetwork::disconnect even in case of failure

jarvte force-pushed the ppp_lwip_disconnect_hangs branch from db5f38b to b35dc6a Compare June 8, 2018 09:30

AriParkkila approved these changes Jun 8, 2018

View reviewed changes

kjbracey approved these changes Jun 11, 2018

View reviewed changes

kjbracey added needs: CI and removed needs: review labels Jun 11, 2018

0xc0170 added ready for merge and removed needs: CI labels Jun 11, 2018

cmonr added the release-version: 5.9.1 label Jun 11, 2018

cmonr merged commit de99c0f into ARMmbed:master Jun 11, 2018

0xc0170 removed the ready for merge label Jun 11, 2018

jarvte deleted the ppp_lwip_disconnect_hangs branch June 20, 2018 06:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed ppp_lwip_disconnect hangs when connection failure. #7160

Fixed ppp_lwip_disconnect hangs when connection failure. #7160

jarvte commented Jun 7, 2018

jarvte commented Jun 7, 2018

kjbracey Jun 7, 2018

jarvte Jun 8, 2018

cmonr commented Jun 7, 2018

AriParkkila Jun 8, 2018

jarvte Jun 8, 2018

AriParkkila Jun 8, 2018

kjbracey Jun 8, 2018

jarvte Jun 8, 2018

AriParkkila Jun 8, 2018

jarvte Jun 8, 2018

0xc0170 commented Jun 10, 2018

mbed-ci commented Jun 10, 2018

mbed-ci commented Jun 10, 2018

mbed-ci commented Jun 11, 2018

0xc0170 commented Jun 11, 2018

mbed-ci commented Jun 11, 2018

jarvte commented Jun 11, 2018

Fixed ppp_lwip_disconnect hangs when connection failure. #7160

Fixed ppp_lwip_disconnect hangs when connection failure. #7160

Conversation

jarvte commented Jun 7, 2018

Description

Pull request type

jarvte commented Jun 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cmonr commented Jun 7, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xc0170 commented Jun 10, 2018

mbed-ci commented Jun 10, 2018

Triggering tests

mbed-ci commented Jun 10, 2018

mbed-ci commented Jun 11, 2018

0xc0170 commented Jun 11, 2018

mbed-ci commented Jun 11, 2018

jarvte commented Jun 11, 2018