-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cherrypick][v1.1-branch] Cherry picking lwip related fixes (#32370)
* inet: ScopedLwIPLock for better safety and added locks at necessary places (#28655) * inet: scoped lwip locks for better safety and add at few more places * Do not static assert if LWIP_TCPIP_CORE_LOCKING is disabled * Add scope for locks * move out the error variable definition to the top * [ESP32] Enable LWIP_TCPIP_CORE_LOCKING by default and added static assert for the same (#28798) * [ESP32] Enable LWIP_TCPIP_CORE_LOCKING by default and acquire lwip locks when initializing route_hook * inet: static assert if LWIP_TCPIP_CORE_LOCKING is disabled Static assert is disabled for ASR and bouffalolab platforms * typo * UDPEndPointImplLwIP: Support LWIP_TCPIP_CORE_LOCKING=0 (#29057) Wrap calls to LwIP APIs in `tcpip_api_call()`, as required. When `LWIP_TCPIP_CORE_LOCKING` is enabled, this internally becomes `LOCK_TCPIP_CORE/UNLOCK_TCPIP_CORE` and when it isn't, it posts a message to the TCPIP task to run the function. Added CHIP stack locking to the UDP receive function. --------- Co-authored-by: Deomid Ryabkov <rojer@rojer.me>
- Loading branch information
Showing
7 changed files
with
217 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* | ||
* Copyright (c) 2023 Project CHIP Authors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include <inet/EndPointStateLwIP.h> | ||
|
||
#include <lwip/sys.h> | ||
#include <lwip/tcpip.h> | ||
|
||
#include <platform/LockTracker.h> | ||
|
||
namespace chip { | ||
namespace Inet { | ||
|
||
err_t EndPointStateLwIP::RunOnTCPIPRet(std::function<err_t()> fn) | ||
{ | ||
assertChipStackLockedByCurrentThread(); | ||
#if LWIP_TCPIP_CORE_LOCKING | ||
err_t err; | ||
LOCK_TCPIP_CORE(); | ||
err = fn(); | ||
UNLOCK_TCPIP_CORE(); | ||
return err; | ||
#else | ||
// Post a message to the TCPIP task and wait for it to run. | ||
static sys_sem_t sTCPIPSem; | ||
static bool sTCPIPSemInited = false; | ||
if (!sTCPIPSemInited) | ||
{ | ||
err_t err = sys_sem_new(&sTCPIPSem, 0); | ||
if (err != ERR_OK) | ||
{ | ||
return err; | ||
} | ||
sTCPIPSemInited = true; | ||
} | ||
|
||
// tcpip_callback takes a C function pointer, so we can't pass a capturing lambda to it. | ||
// Just store the state the function we pass to it needs in statics. | ||
// This should be safe, since that function will execute before we return and there is no | ||
// re-entry into this method. | ||
static std::function<err_t()> sTCPIPFunction; | ||
static err_t sTCPIPFunctionResult; | ||
VerifyOrDie(sTCPIPFunction == nullptr); | ||
|
||
sTCPIPFunction = fn; | ||
const err_t err = tcpip_callback( | ||
[](void * aCtx) { | ||
sTCPIPFunctionResult = sTCPIPFunction(); | ||
sys_sem_signal(&sTCPIPSem); | ||
}, | ||
nullptr); | ||
if (err != ERR_OK) | ||
{ | ||
return err; | ||
} | ||
sys_arch_sem_wait(&sTCPIPSem, 0); | ||
sTCPIPFunction = nullptr; | ||
return sTCPIPFunctionResult; | ||
#endif | ||
} | ||
|
||
void EndPointStateLwIP::RunOnTCPIP(std::function<void()> fn) | ||
{ | ||
VerifyOrDie(RunOnTCPIPRet([&fn]() { | ||
fn(); | ||
return ERR_OK; | ||
}) == ERR_OK); | ||
} | ||
|
||
} // namespace Inet | ||
} // namespace chip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.