tests/lwip_sock: Take lock before calling etharp by yarrick · Pull Request #17145 · RIOT-OS/RIOT

yarrick · 2021-11-05T17:48:05Z

Contribution description

Lock lwIP before adding static entry to etharp (fixing assert)

Testing procedure

BOARD=native LWIP_IPV6=0 LWIP_IPV4=1 make -C tests/lwip_sock_ip/ clean flash test -j

BOARD=native LWIP_IPV6=0 LWIP_IPV4=1 make -C tests/lwip_sock_udp/ clean flash test -j

Issues/PRs references

Fixes #17144

Fixes RIOT-OS#17144

tests/lwip_sock_ip/Makefile

tests/lwip_sock_tcp/Makefile

tests/lwip_sock_udp/Makefile

miri64 · 2021-11-06T12:37:42Z

(as explanation why I want to keep the tests as is: Dual stack support is not the same #if branch in some cases as either IPv6 or IPv4 are, so until #14669 is resolved, I prefer to keep the tests in our main use case).

miri64 · 2021-11-06T12:51:42Z

I ran all the lwip_sock tests in all possible configurations

for test in tests/lwip_sock_{ip,tcp,udp}/; do
   for ipv6 in 0 1; do
       for ipv4 in 0 1; do
           if [ $((ipv4 + ipv6)) -eq 0 ]; then
               continue
           fi
           LWIP_IPV4=${ipv4} LWIP_IPV6=${ipv6} make -C ${test} flash -j test || break
        done
    done
done

They succeeded. I also tested tests/lwip on native by sending around some data, in both dual-stack IPv4 mode:

Details

Terminal 1 (DHCPv4 server)

sudo dist/tools/tapsetup/tapsetup
sudo dnsmasq --no-daemon --log-queries --dhcp-range=10.1.194.2,10.1.194.128,1h -i tapbr0

Terminal 2 (tap0)

$ QUIETER=1 LWIP_IPV4=1 LWIP_IPV6=1 make -C tests/lwip --no-print-directory -j flash term
Building application "tests_lwip" for "native" with MCU "native".

/usr/bin/ld: /home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/cpu/tramp.o: warning: relocation against `_native_saved_eip' in read-only section `.text'
/usr/bin/ld: warning: creating DT_TEXTREL in a PIE
   text	   data	    bss	    dec	    hex	filename
 287450	   1312	 101900	 390662	  5f606	/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf tap0 
RIOT native interrupts/signals initialized.
LED_RED_OFF
LED_GREEN_ON
RIOT native board initialized.
RIOT native hardware initialization complete.

main(): This is RIOT! (Version: 2022.01-devel-392-g91be3-HEAD)
RIOT lwip test application
> tcp connect 10.1.194.45:1337
tcp connect 10.1.194.45:1337
> tcp send abcdef1234567890
tcp send abcdef1234567890
Success: send 8 byte over TCP to server
> udp send 10.1.194.45:1337 1234567890abcdef0987654321
udp send 10.1.194.45:1337 1234567890abcdef0987654321
Success: send 13 byte over UDP to 10.1.194.45:1337
> ip send 10.1.194.45 255 601234714567321
ip send 10.1.194.45 255 601234714567321
Success: send 8 byte over IPv4 to 10.1.194.45 (next header: 255)
> ^C
native: exiting

$ QUIETER=1 LWIP_IPV4=1 LWIP_IPV6=0 make -C tests/lwip --no-print-directory -j flash term
Building application "tests_lwip" for "native" with MCU "native".

/usr/bin/ld: /home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/cpu/tramp.o: warning: relocation against `_native_saved_eip' in read-only section `.text'
/usr/bin/ld: warning: creating DT_TEXTREL in a PIE
   text	   data	    bss	    dec	    hex	filename
 231035	   1228	 100396	 332659	  51373	/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf tap0 
RIOT native interrupts/signals initialized.
LED_RED_OFF
LED_GREEN_ON
RIOT native board initialized.
RIOT native hardware initialization complete.

main(): This is RIOT! (Version: 2022.01-devel-392-g91be3-HEAD)
RIOT lwip test application
> tcp connect 10.1.194.45:1337                 
tcp connect 10.1.194.45:1337
> tcp send 0987654321fedcba
tcp send 0987654321fedcba
Success: send 8 byte over TCP to server
> tcp disconnect
tcp disconnect
> udp send 10.1.194.45:1337 0987654321123456790abcdef
udp send 10.1.194.45:1337 0987654321123456790abcdef
Success: send 13 byte over UDP to 10.1.194.45:1337
> ip send 10.1.194.45 255 abcdef0987654321
ip send 10.1.194.45 255 abcdef0987654321
Success: send 8 byte over IPv4 to 10.1.194.45 (next header: 255)
> ^C
native: exiting

Terminal 3 (tap1)

$ PORT=tap1 make -C tests/lwip term
make: Entering directory '/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip'
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf tap1 
RIOT native interrupts/signals initialized.
LED_RED_OFF
LED_GREEN_ON
RIOT native board initialized.
RIOT native hardware initialization complete.

main(): This is RIOT! (Version: 2022.01-devel-392-g91be3-HEAD)
RIOT lwip test application
> ifconfig
ifconfig
Iface ET0 HWaddr: da:27:1d:a8:64:24 Link: up State: up
        Link type: wired
        inet addr: 10.1.194.45 mask: 255.255.255.0 gw: 10.1.194.1
        inet6 addr: fe80:0:0:0:d827:1dff:fea8:6424 scope: link
> tcp server start 1337
tcp server start 1337
Success: started TCP server on port 1337
> udp server start 1337
udp server start 1337
Success: started UDP server on port 1337
> ip server start 255
ip server start 255
Success: started IP server on protocol 255
> TCP client [a01:c24d::]:49153 connected
Received TCP data from client [a01:c24d::]:49153
00000000  AB  CD  EF  12  34  56  78  90
Received UDP data from [a01:c24d::]:49153
00000000  12  34  56  78  90  AB  CD  EF  09  87  65  43  21
Received IP data from [10.1.194.77]:
00000000  60  12  34  71  45  67  32  10
^C
native: exiting

$ PORT=tap1 make -C tests/lwip term
make: Entering directory '/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip'
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/lwip/bin/native/tests_lwip.elf tap1 
RIOT native interrupts/signals initialized.
LED_RED_OFF
LED_GREEN_ON
RIOT native board initialized.
RIOT native hardware initialization complete.

main(): This is RIOT! (Version: 2022.01-devel-392-g91be3-HEAD)
RIOT lwip test application
> ifconfig
ifconfig
Iface ET0 HWaddr: da:27:1d:a8:64:24 Link: up State: up
        Link type: wired
        inet addr: 10.1.194.45 mask: 255.255.255.0 gw: 10.1.194.1
> tcp server start 1337
tcp server start 1337
Success: started TCP server on port 1337
> udp server start 1337
udp server start 1337
Success: started UDP server on port 1337
> ip server start 255
ip server start 255
Success: started IP server on protocol 255
> TCP client [10.1.194.77]:49153 connected
Received TCP data from client [10.1.194.77]:49153
00000000  09  87  65  43  21  FE  DC  BA
TCP connection to [10.1.194.77]:49153 reset
Received UDP data from [10.1.194.77]:49153
00000000  09  87  65  43  21  12  34  56  79  0A  BC  DE  F0
Received IP data from [10.1.194.77]:
00000000  AB  CD  EF  09  87  65  43  21
^C
native: exiting

They both work!

fjmolinas · 2021-11-08T07:49:54Z

Thanks for the quick reaction @yarrick!

tests/lwip_sock: Take lock before calling etharp

91be3ad

Fixes RIOT-OS#17144

yarrick requested a review from miri64 as a code owner November 5, 2021 17:48

github-actions bot added the Area: tests Area: tests and testing framework label Nov 5, 2021

yarrick requested a review from fjmolinas November 5, 2021 17:49

yarrick added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Nov 5, 2021

yarrick force-pushed the core_lock branch from 6d3af8d to 7398b22 Compare November 6, 2021 10:36

miri64 requested changes Nov 6, 2021

View reviewed changes

tests/lwip_sock_ip/Makefile Outdated Show resolved Hide resolved

tests/lwip_sock_tcp/Makefile Outdated Show resolved Hide resolved

tests/lwip_sock_udp/Makefile Outdated Show resolved Hide resolved

yarrick force-pushed the core_lock branch from 7398b22 to 91be3ad Compare November 6, 2021 11:25

yarrick added the Area: network Area: Networking label Nov 6, 2021

miri64 approved these changes Nov 6, 2021

View reviewed changes

miri64 merged commit 3677a93 into RIOT-OS:master Nov 6, 2021

miri64 mentioned this pull request Nov 6, 2021

pkg/lwip: use ztimer_msec instead of xtimer #17115

Merged

yarrick deleted the core_lock branch November 6, 2021 17:06

fjmolinas added this to the Release 2022.01 milestone Nov 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests/lwip_sock: Take lock before calling etharp#17145

tests/lwip_sock: Take lock before calling etharp#17145
miri64 merged 1 commit intoRIOT-OS:masterfrom
yarrick:core_lock

yarrick commented Nov 5, 2021 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miri64 commented Nov 6, 2021

Uh oh!

miri64 commented Nov 6, 2021 •

edited

Loading

Terminal 1 (DHCPv4 server)

Terminal 2 (tap0)

Terminal 3 (tap1)

Uh oh!

fjmolinas commented Nov 8, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

yarrick commented Nov 5, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution description

Testing procedure

Issues/PRs references

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miri64 commented Nov 6, 2021

Uh oh!

miri64 commented Nov 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Terminal 1 (DHCPv4 server)

Terminal 2 (tap0)

Terminal 3 (tap1)

Uh oh!

fjmolinas commented Nov 8, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

yarrick commented Nov 5, 2021 •

edited

Loading

miri64 commented Nov 6, 2021 •

edited

Loading