bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: shell: Prevent deadlock with net arp command

Browse Source 
In case one of the networking shell backends is enabled, net arp command
could potentially trigger a deadlock, as it locks the ARP mutex before
TCP connection mutex, while TCP stack could do this in reverse order
(for instance when sending ACK or retransmission).

Mitigate this, by forcing a separate TX thread in such case, so that ARP
mutex is no longer accessed with TCP mutex locked.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2023-12-14 10:14:09 +01:00 committed by Fabio Baltieri
parent 37e1a116ef
commit 0c095898fb
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
subsys/net/ip/Kconfig
View File

@ -184,13 +184,23 @@ config NET_SHELL_DYN_CMD_COMPLETION
length) by default. Other dynamic completion commands in
net-shell require also some smaller amount of memory.
config NET_SHELL_REQUIRE_TX_THREAD
bool
depends on NET_SHELL && (SHELL_BACKEND_TELNET || SHELL_BACKEND_MQTT)
default y if NET_ARP
help
Hidden symbol indicating that network shell requires separate TX
thread due to possible deadlocks during shell/net stack operations.
config NET_TC_TX_COUNT
int "How many Tx traffic classes to have for each network device"
default 1 if USERSPACE || USB_DEVICE_NETWORK
default 1 if USERSPACE || USB_DEVICE_NETWORK || \
NET_SHELL_REQUIRE_TX_THREAD
default 0
range 1 NET_TC_NUM_PRIORITIES if NET_TC_NUM_PRIORITIES<=8 && USERSPACE
range 1 NET_TC_NUM_PRIORITIES if NET_TC_NUM_PRIORITIES<=8 && \
(USERSPACE || NET_SHELL_REQUIRE_TX_THREAD)
range 0 NET_TC_NUM_PRIORITIES if NET_TC_NUM_PRIORITIES<=8
range 1 8 if USERSPACE
range 1 8 if USERSPACE || NET_SHELL_REQUIRE_TX_THREAD
range 0 8
help
Define how many Tx traffic classes (queues) the system should have