net: Add tags to network iterable ROM sections

Add __iterable_section_rom to network struct types and remove ld/cmake entries. Signed-off-by: Pieter De Gendt <[email protected]>
zephyrproject-rtos · Dec 16, 2024 · 5e78385 · 5e78385
1 parent ae4087f
commit 5e78385
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 65 deletions.
diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake
@@ -91,15 +91,6 @@ zephyr_linker_section_configure(
   KEEP SORT NAME
 )
 
-if(CONFIG_NET_SOCKETS)
-  zephyr_iterable_section(NAME net_socket_register KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
-
-if(CONFIG_NET_L2_PPP)
-  zephyr_iterable_section(NAME ppp_protocol_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
 zephyr_iterable_section(NAME bt_l2cap_fixed_chan KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 
 if(CONFIG_BT_CLASSIC)
@@ -161,10 +152,6 @@ if(CONFIG_EMUL)
   zephyr_iterable_section(NAME emul KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
 
-if(CONFIG_DNS_SD)
-  zephyr_iterable_section(NAME dns_sd_rec KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
 if(CONFIG_PCIE)
   zephyr_iterable_section(NAME irq_alloc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()
@@ -214,18 +201,6 @@ if (CONFIG_MULTI_LEVEL_INTERRUPTS)
   zephyr_iterable_section(NAME intc_table KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
 endif()
 
-if (CONFIG_HTTP_SERVER)
-  zephyr_iterable_section(NAME http_service_desc KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
-if (CONFIG_COAP_SERVER)
-  zephyr_iterable_section(NAME coap_service KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
-if (CONFIG_NET_MGMT)
-  zephyr_iterable_section(NAME net_mgmt_event_static_handler KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
-endif()
-
 if(CONFIG_INPUT)
   zephyr_iterable_section(NAME input_callback KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
 endif()

diff --git a/include/zephyr/linker/common-rom.ld b/include/zephyr/linker/common-rom.ld
@@ -6,8 +6,6 @@
 
 #include <zephyr/linker/common-rom/common-rom-init.ld>
 
-#include <zephyr/linker/common-rom/common-rom-net.ld>
-
 #include <zephyr/linker/common-rom/common-rom-bt.ld>
 
 #include <zephyr/linker/common-rom/common-rom-logging.ld>

diff --git a/include/zephyr/linker/common-rom/common-rom-net.ld b/include/zephyr/linker/common-rom/common-rom-net.ld
diff --git a/include/zephyr/net/coap_service.h b/include/zephyr/net/coap_service.h
@@ -48,7 +48,7 @@ struct coap_service_data {
 	struct coap_pending pending[CONFIG_COAP_SERVICE_PENDING_MESSAGES];
 };
 
-struct coap_service {
+__iterable_section_rom struct coap_service {
 	const char *name;
 	const char *host;
 	uint16_t *port;

diff --git a/include/zephyr/net/dns_sd.h b/include/zephyr/net/dns_sd.h
@@ -212,7 +212,7 @@ extern "C" {
  *
  * @see <a href="https://tools.ietf.org/html/rfc6763">RFC 6763</a>
  */
-struct dns_sd_rec {
+__iterable_section_rom struct dns_sd_rec {
 	/** "<Instance>" - e.g. "My HTTP Server" */
 	const char *instance;
 	/** Top half of the "<Service>" such as "_http" */

diff --git a/include/zephyr/net/http/service.h b/include/zephyr/net/http/service.h
@@ -64,7 +64,7 @@ struct http_resource_desc {
 
 /** @cond INTERNAL_HIDDEN */
 
-struct http_service_desc {
+__iterable_section_rom struct http_service_desc {
 	const char *host;
 	uint16_t *port;
 	void *detail;

diff --git a/include/zephyr/net/net_mgmt.h b/include/zephyr/net/net_mgmt.h
@@ -204,7 +204,7 @@ typedef void (*net_mgmt_event_static_handler_t)(uint32_t mgmt_event,
 /** @cond INTERNAL_HIDDEN */
 
 /* Structure for event handler registered at compile time */
-struct net_mgmt_event_static_handler {
+__iterable_section_rom struct net_mgmt_event_static_handler {
 	uint32_t event_mask;
 	net_mgmt_event_static_handler_t handler;
 	void *user_data;

diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
@@ -1132,7 +1132,7 @@ struct in6_pktinfo {
 /**
  * @brief Registration information for a given BSD socket family.
  */
-struct net_socket_register {
+__iterable_section_rom struct net_socket_register {
 	int family;
 	bool is_offloaded;
 	bool (*is_supported)(int family, int type, int proto);

diff --git a/include/zephyr/net/socket_service.h b/include/zephyr/net/socket_service.h
@@ -67,7 +67,7 @@ struct net_socket_service_event {
  * User should create needed sockets and then setup the poll struct and
  * then register the sockets to be monitored at runtime.
  */
-struct net_socket_service_desc {
+__iterable_section_rom struct net_socket_service_desc {
 #if CONFIG_NET_SOCKETS_LOG_LEVEL >= LOG_LEVEL_DBG
 	/**
 	 * Owner name. This can be used in debugging to see who has

diff --git a/include/zephyr/toolchain/common.h b/include/zephyr/toolchain/common.h
@@ -180,6 +180,9 @@
 /* Indicates this is a network socket object */
 #define __net_socket __zpp(struct("__net_socket"))
 
+/* Indicates a struct iterable section should be added in ROM */
+#define __iterable_section_rom __zpp(struct("__iterable_section_rom"))
+
 #ifndef BUILD_ASSERT
 /* Compile-time assertion that makes the build to fail.
  * Common implementation swallows the message.

diff --git a/subsys/net/l2/ppp/ppp_internal.h b/subsys/net/l2/ppp/ppp_internal.h
@@ -36,7 +36,7 @@ struct ppp_packet {
 #define PPP_BUF_ALLOC_TIMEOUT	K_MSEC(100)
 
 /** Protocol handler information. */
-struct ppp_protocol_handler {
+__iterable_section_rom struct ppp_protocol_handler {
 	/** Protocol init function */
 	void (*init)(struct ppp_context *ctx);