Merge branch 'bufix/Backport_some_wifi_lwip_bugs_for_5.0_0821' into 'release/v5.0'

Bufix/backport some wifi lwip bugs for 5.0 0821 See merge request espressif/esp-idf!20732
2022-10-28 16:33:50 +08:00 · 2022-10-28 16:33:50 +08:00 · 2635a18df2
commit 2635a18df2
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@ -1828,7 +1828,7 @@ pm_on_coex_schm_process_restart = 0x40001ee4;
 hal_mac_set_rxq_policy = 0x40001ee8;
 hal_sniffer_enable = 0x40001eec;
 hal_sniffer_disable = 0x40001ef0;
-hal_sniffer_rx_set_promis = 0x40001ef4;
+/*hal_sniffer_rx_set_promis = 0x40001ef4;*/
 hal_sniffer_rx_clr_statistics = 0x40001ef8;
 hal_sniffer_set_promis_misc_pkt = 0x40001efc;
 tsf_hal_set_tsf_enable = 0x40001f00;
--- a/components/esp_system/include/esp_task.h
+++ b/components/esp_system/include/esp_task.h
@ -1,16 +1,8 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// 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.
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */

 /* Notes:
 * 1. Put all task priority and stack size definition in this file
@ -47,6 +39,9 @@
 #define BT_TASK_EXTRA_STACK_SIZE      TASK_EXTRA_STACK_SIZE
 #define ESP_TASK_BT_CONTROLLER_STACK  (3584 + TASK_EXTRA_STACK_SIZE)

+/* Ping Task */
+#define ESP_TASK_PING_STACK             (2048 + TASK_EXTRA_STACK_SIZE)
+

 /* idf task */
 #define ESP_TASK_TIMER_PRIO           (ESP_TASK_PRIO_MAX - 3)
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@ -1 +1 @@
-Subproject commit d5c07b38d015f52416fde092b1295d1a74595b68
+Subproject commit 6842e78865e048f43ab360adbde283dc3351db6e
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@ -481,7 +481,13 @@ menu "LWIP"
            int "Maximum segment lifetime (MSL)"
            default 60000
            help
-                Set maximum segment lifetime in in milliseconds.
+                Set maximum segment lifetime in milliseconds.
+
+        config LWIP_TCP_FIN_WAIT_TIMEOUT
+            int "Maximum FIN segment lifetime"
+            default 20000
+            help
+                Set maximum segment lifetime in milliseconds.

        config LWIP_TCP_SND_BUF_DEFAULT
            int "Default send buffer size"
--- a/components/lwip/include/apps/ping/ping_sock.h
+++ b/components/lwip/include/apps/ping/ping_sock.h
@ -80,7 +80,7 @@ typedef struct {
        .tos = 0,                        \
        .ttl = IP_DEFAULT_TTL,           \
        .target_addr = *(IP_ANY_TYPE),   \
-        .task_stack_size = 2048,         \
+        .task_stack_size = ESP_TASK_PING_STACK,         \
        .task_prio = 2,                  \
        .interface = 0,\
    }
--- a/components/lwip/lwip
+++ b/components/lwip/lwip
@ -1 +1 @@
-Subproject commit 316cfc17ce24f2d5d65c9f28251ec43a59a74cb1
+Subproject commit 9bad641bc7378d2eb1ba84834baafaf119135206
--- a/components/lwip/port/esp32/include/lwipopts.h
+++ b/components/lwip/port/esp32/include/lwipopts.h
@ -578,6 +578,11 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 */
 #define TCP_MSL                         CONFIG_LWIP_TCP_MSL

+/**
+ * TCP_FIN_WAIT_TIMEOUT: The maximum FIN segment lifetime in milliseconds
+ */
+#define TCP_FIN_WAIT_TIMEOUT            CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT
+
 /**
 * LWIP_WND_SCALE and TCP_RCV_SCALE:
 * Set LWIP_WND_SCALE to 1 to enable window scaling.
--- a/docs/en/api-guides/lwip.rst
+++ b/docs/en/api-guides/lwip.rst
@ -448,6 +448,7 @@ Most lwIP RAM usage is on-demand, as RAM is allocated from the heap as needed. T

 - Reducing :ref:`CONFIG_LWIP_MAX_SOCKETS` reduces the maximum number of sockets in the system. This will also cause TCP sockets in the ``WAIT_CLOSE`` state to be closed and recycled more rapidly (if needed to open a new socket), further reducing peak RAM usage.
 - Reducing :ref:`CONFIG_LWIP_TCPIP_RECVMBOX_SIZE`, :ref:`CONFIG_LWIP_TCP_RECVMBOX_SIZE` and :ref:`CONFIG_LWIP_UDP_RECVMBOX_SIZE` reduce memory usage at the expense of throughput, depending on usage.
+- Reducing :ref:`CONFIG_LWIP_TCP_MSL`, :ref:`CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT` reduces the maximum segment lifetime in the system. This will also cause TCP sockets in the ``TIME_WAIT``, ``FIN_WAIT_2`` state to be closed and recycled more rapidly 
 - Disable  :ref:`CONFIG_LWIP_IPV6` can save about 39 KB for firmware size and 2KB RAM when system power up and 7KB RAM when TCPIP stack running. If there is no requirement for supporting IPV6 then it can be disabled to save flash and RAM footprint.

 .. only:: SOC_WIFI_SUPPORTED
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@ -638,7 +638,6 @@ components/esp_system/include/esp_int_wdt.h
 components/esp_system/include/esp_private/dbg_stubs.h
 components/esp_system/include/esp_private/panic_internal.h
 components/esp_system/include/esp_private/system_internal.h
-components/esp_system/include/esp_task.h
 components/esp_system/port/arch/riscv/expression_with_stack.c
 components/esp_system/port/arch/xtensa/expression_with_stack.c
 components/esp_system/port/public_compat/brownout.h
@ -1981,7 +1980,6 @@ tools/ldgen/output_commands.py
 tools/ldgen/samples/template.ld
 tools/ldgen/sdkconfig.py
 tools/ldgen/test/data/linker_script.ld
-tools/mocks/esp_system/include/esp_task.h
 tools/templates/sample_component/include/main.h
 tools/templates/sample_component/main.c
 tools/test_apps/build_system/embed_test/main/test_main.c
--- a/tools/mocks/esp_system/include/esp_task.h
+++ b/tools/mocks/esp_system/include/esp_task.h
@ -1,16 +1,8 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// 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.
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */

 /* Notes:
 * 1. Put all task priority and stack size definition in this file
@ -48,6 +40,9 @@
 #define BT_TASK_EXTRA_STACK_SIZE      TASK_EXTRA_STACK_SIZE
 #define ESP_TASK_BT_CONTROLLER_STACK  (3584 + TASK_EXTRA_STACK_SIZE)

+/* Ping Task */
+#define ESP_TASK_PING_STACK             (2048 + TASK_EXTRA_STACK_SIZE)
+

 /* idf task */
 #define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)