Skip to content

esp32: Drain PPP input before destroying the netif #2471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielmancini wants to merge 1 commit into
base: release-0.7
Choose a base branch
from
Open

esp32: Drain PPP input before destroying the netif #2471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/platforms/esp32/components/avm_builtins/network_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>
#include <freertos/task.h>
#include <lwip/tcpip.h>
#define HAVE_PPP 1
#endif
#pragma GCC diagnostic pop
Expand Down Expand Up @@ -1791,6 +1792,11 @@ static bool start_ppp(Context *ctx, term pid, term ref, struct ClientData *data,
return false;
}

static void ppp_rx_drained(void *arg)
{
xSemaphoreGive((SemaphoreHandle_t) arg);
}

// Frees what start_ppp set up, once the session is dead (or never started): lwIP keeps timers
// on a session until its dead phase, and the netif and its PPP control block must outlive them.
static void free_ppp(struct PPPGlue *glue)
Expand All @@ -1803,6 +1809,15 @@ static void free_ppp(struct PPPGlue *glue)
ESP_LOGI(TAG, "PPP closed: %u bytes in, %u bytes out", (unsigned) glue->rx_bytes, (unsigned) glue->tx_bytes);
glue->stop = true;
xSemaphoreTake(glue->stopped, portMAX_DELAY);
// The RX task has stopped, but input it queued for the TCP/IP task still points at the
// netif. With core locking, esp_netif_destroy runs at once instead of behind that input,
// so a callback through the mailbox, which is FIFO, waits it out. Not
// esp_netif_tcpip_exec or tcpip_callback_wait: under core locking both run inline.
if (tcpip_callback(ppp_rx_drained, glue->stopped) != ERR_OK) {
ESP_LOGE(TAG, "Failed to drain PPP input, left allocated");
return;
}
xSemaphoreTake(glue->stopped, portMAX_DELAY);
}
if (glue->stopped != NULL) {
vSemaphoreDelete(glue->stopped);
Expand All @@ -1828,7 +1843,7 @@ static void ppp_teardown_task(void *args)
struct PPPGlue *glue = args;
if (xSemaphoreTake(glue->died, pdMS_TO_TICKS(PPP_TEARDOWN_MS)) == pdTRUE) {
free_ppp(glue);
ESP_LOGI(TAG, "PPP closed late, freed");
ESP_LOGI(TAG, "PPP late close teardown finished");
} else {
ESP_LOGE(TAG, "PPP did not close in %d ms, left allocated", PPP_TEARDOWN_MS);
}
Expand Down
Loading