Adding QOS in response to LinkADRReq and fixing class C bugs #8183

hasnainvirk · 2018-09-19T13:04:16Z

Description

Adds QOS mechanism for unconfirmed messages as per 1.0.2 spec in response to LinkADRReq mac command. In addition to that it fixes various bugs potentially hindering class C operation.

Pull request type

[X] Fix
[] Refactor
[ ] Target update
[] Functionality change
[ ] Breaking change

hasnainvirk · 2018-09-19T13:04:51Z

@kivaisan @AnttiKauppila @kjbracey-arm Please review.

hasnainvirk · 2018-09-19T13:05:49Z

Tests added here
https://github.com/ARMmbed/mbed-lora-tests-simulator-private/pull/6 [Simulator test]
https://github.com/ARMmbed/mbed-lora-tests-private/pull/59 [Functional HW test]

kivaisan

LGTM. Just few cosmetics.

kivaisan · 2018-09-20T05:36:34Z

features/lorawan/LoRaWANStack.cpp

    if (_device_current_state == DEVICE_STATE_JOINING) {
        _device_current_state = DEVICE_STATE_AWAITING_JOIN_ACCEPT;
    }

    if (_device_current_state == DEVICE_STATE_SENDING) {
        if (_loramac.get_mcps_confirmation()->req_type == MCPS_CONFIRMED) {
-            _ctrl_flags |= TX_ONGOING_FLAG;
-            _ctrl_flags &= ~TX_DONE_FLAG;
+            //_ctrl_flags &= ~TX_DONE_FLAG;


Remove dead code

kivaisan · 2018-09-20T05:36:49Z

features/lorawan/LoRaWANStack.cpp

-            // application when RX2 windows is elapsed, i.e., in process_reception_timeout()
-            _ctrl_flags &= ~TX_ONGOING_FLAG;
+        } else {
+            //_ctrl_flags |= TX_DONE_FLAG;


Dead code here too

hasnainvirk · 2018-09-20T08:16:05Z

Dead code removed, rebased.

hasnainvirk · 2018-09-20T12:53:06Z

@kivaisan @AnttiKauppila @kjbracey-arm Please review again. Added a few commits for stability improvement and rebased after few PRs went in.

kivaisan · 2018-09-20T12:58:52Z

features/lorawan/lorastack/mac/LoRaMac.cpp

@@ -889,6 +889,8 @@ void LoRaMac::on_backoff_timer_expiry(void)

 void LoRaMac::open_rx1_window(void)
 {
+    tr_debug("Opening RX1 Window");


No. Opening RX windows is quite time critical so let's not print until the window has been opened.

kivaisan · 2018-09-20T12:59:01Z

features/lorawan/lorastack/mac/LoRaMac.cpp

 }

 void LoRaMac::open_rx2_window()
 {
+    tr_debug("Opening RX2 Window, Frequency = %lu", _params.rx_window2_config.frequency);


The same issue here.

LinkADRReq parameters and certain parameters used camel case which is not the recommended style.

Before going after an automatic uplink, we should check if there was an automatic uplink already ongoing, i.e., the ack for the previous automatic uplink cycle has not been received. If there is we shouldn't queue the new automatic uplink and wait for the previous Ack cycle to complete.

LinkADRReq mac command can be used by the network server to set a certain level of QOS using NbTrans field which is applicable to Unconfirmed traffic only for 1.0.2 spec. This commit introduces mechanisms to facilitate this QOS. It means to repeat an outgoing unconfirmed message NbTrans times without changing its frame counter. For class C, we have retired the ack_expiry_timer_for_class_c and have replaced it with another timer which mimics the RX2 closure as in Class A but doesn't actually close RX2 window. It's just a mechanism by which the state machine is informed that the you can proceed forward, we have not received anything in RX2 window either. This is needed as RX2 doesn't timeout in class C (i.e., the radio remains in continuous mode). In addition to that we need to close any pending timers for Receive windows after the MIC has passed and the Duplicate counter check has also been passed.

After transmission we should change the state before invoking opening of slots as we may start receiving in the rx slots and the state would suddenly change from SENDING to RECEIVING without going through the ACK_WAIT state (in case of CONFIRMED messages). Tests show that after this slight adjustment, our number of ack retries have significantly reduced.

The idea behind the method post_process_no_reception() is to post process any outgoing TX but we shouldn't do that if a CONFIRMED message is outgoing and there are still some retries left.

Previously, we weren't filling in RX1 frequecny in rx_window1_config structure. However, everything worked as in LoRaPHY::rx_config() API there was a check which filled in correct RX1 frequency. Now we are filling in RX1 freq. properly while we are computing parameters for RX1 window.

A couple of the coverity analysis findings are being treated here. For the rest there will be a separate PR.

hasnainvirk · 2018-09-21T12:57:33Z

@kivaisan @kjbracey-arm @AnttiKauppila @0xc0170 Please review again. Tests updated as well in their respective PRs. Some corner cases are covered and improvements in stability.

AnttiKauppila · 2018-10-04T07:33:28Z

@0xc0170 Canthis be built?

NirSonnenschein · 2018-10-07T19:01:50Z

/morph build

mbed-ci · 2018-10-07T20:32:50Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-10-07T21:52:14Z

Exporter Build : SUCCESS

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

mbed-ci · 2018-10-08T01:44:35Z

Test : SUCCESS

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

0xc0170 · 2018-10-10T19:09:07Z

/morph mbed2-build

This reverts commit 5c675d3, reversing changes made to 2b04a02.

Revert "Merge pull request #8183 from hasnainvirk/QOS_impl"

This reverts commit 5c675d3, reversing changes made to 2b04a02.

hasnainvirk force-pushed the QOS_impl branch from ab24d37 to 2b2bef3 Compare September 19, 2018 13:16

AnttiKauppila approved these changes Sep 19, 2018

View reviewed changes

0xc0170 added the needs: review label Sep 19, 2018

kivaisan approved these changes Sep 20, 2018

View reviewed changes

hasnainvirk force-pushed the QOS_impl branch from 2b2bef3 to 6e2bf48 Compare September 20, 2018 08:15

0xc0170 approved these changes Sep 20, 2018

View reviewed changes

0xc0170 added needs: CI and removed needs: review labels Sep 20, 2018

hasnainvirk force-pushed the QOS_impl branch from 6e2bf48 to 64768fd Compare September 20, 2018 12:49

kivaisan suggested changes Sep 20, 2018

View reviewed changes

cmonr added needs: work and removed needs: CI labels Sep 20, 2018

Hasnain Virk added 7 commits September 21, 2018 15:55

Style correction

76814d4

LinkADRReq parameters and certain parameters used camel case which is not the recommended style.

TX post-process for CONFIRMED UL in no-reception case

19e87ce

The idea behind the method post_process_no_reception() is to post process any outgoing TX but we shouldn't do that if a CONFIRMED message is outgoing and there are still some retries left.

Fixing coverity findings

bc976c6

A couple of the coverity analysis findings are being treated here. For the rest there will be a separate PR.

hasnainvirk force-pushed the QOS_impl branch from 64768fd to bc976c6 Compare September 21, 2018 12:55

kivaisan approved these changes Sep 24, 2018

View reviewed changes

0xc0170 added needs: CI and removed needs: work labels Sep 24, 2018

hasnainvirk mentioned this pull request Oct 1, 2018

LoRaWAN: Incorrect Handling of Repeated Calls of 'send' and 'cancel_sending' #8285

Closed

hasnainvirk mentioned this pull request Oct 8, 2018

Making cancel_sending() API robust #8299

Merged

NirSonnenschein added ready for merge and removed needs: CI labels Oct 11, 2018

cmonr added the release-version: 5.10.2 label Oct 11, 2018

cmonr merged commit 5c675d3 into ARMmbed:master Oct 11, 2018

cmonr removed the ready for merge label Oct 11, 2018

cmonr pushed a commit to cmonr/mbed-os that referenced this pull request Oct 11, 2018

Revert "Merge pull request ARMmbed#8183 from hasnainvirk/QOS_impl"

dd8e9bb

This reverts commit 5c675d3, reversing changes made to 2b04a02.

cmonr mentioned this pull request Oct 11, 2018

Revert "Merge pull request #8183 from hasnainvirk/QOS_impl" #8393

Merged

adbridge added a commit that referenced this pull request Oct 12, 2018

Merge pull request #8393 from cmonr/unittest-fix

5e4b872

Revert "Merge pull request #8183 from hasnainvirk/QOS_impl"

adbridge pushed a commit that referenced this pull request Oct 19, 2018

Revert "Merge pull request #8183 from hasnainvirk/QOS_impl"

762cf03

This reverts commit 5c675d3, reversing changes made to 2b04a02.

Adding QOS in response to LinkADRReq and fixing class C bugs #8183

Adding QOS in response to LinkADRReq and fixing class C bugs #8183

Uh oh!

Conversation

hasnainvirk commented Sep 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull request type

Uh oh!

hasnainvirk commented Sep 19, 2018

Uh oh!

hasnainvirk commented Sep 19, 2018

Uh oh!

kivaisan left a comment

Choose a reason for hiding this comment

Uh oh!

kivaisan Sep 20, 2018

Choose a reason for hiding this comment

Uh oh!

kivaisan Sep 20, 2018

Choose a reason for hiding this comment

Uh oh!

hasnainvirk commented Sep 20, 2018

Uh oh!

hasnainvirk commented Sep 20, 2018

Uh oh!

kivaisan Sep 20, 2018

Choose a reason for hiding this comment

Uh oh!

kivaisan Sep 20, 2018

Choose a reason for hiding this comment

Uh oh!

hasnainvirk commented Sep 21, 2018

Uh oh!

AnttiKauppila commented Oct 4, 2018

Uh oh!

NirSonnenschein commented Oct 7, 2018

Uh oh!

mbed-ci commented Oct 7, 2018

Build : SUCCESS

Triggering tests

Uh oh!

mbed-ci commented Oct 7, 2018

Exporter Build : SUCCESS

Uh oh!

mbed-ci commented Oct 8, 2018

Test : SUCCESS

Uh oh!

0xc0170 commented Oct 10, 2018

Uh oh!

Uh oh!

hasnainvirk commented Sep 19, 2018 •

edited

Loading