From d711bea6fe013a9a8043c04bcd5bdb42227d06f1 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 18 Apr 2019 02:30:58 +0200 Subject: [PATCH] eal: promote some experimental functions as stable The function rte_eal_cleanup() was introduced more than one year ago, in DPDK 18.02. It is no longer experimental, allowing pdump, proc-info and hotplug_mp apps to not need any experimental API. The function rte_ctrl_thread_create() was introduced one year ago in DPDK 18.05. It is no longer experimental, allowing KNI PMD and TEP example to not need any experimental API. The functions rte_socket_count() and rte_socket_id_by_idx() were introduced one year ago in DPDK 18.05. They are no longer experimental. The function rte_dev_is_probed() was introduced half a year ago in DPDK 18.11. It is no longer experimental. Signed-off-by: Thomas Monjalon Acked-by: Hemant Agrawal Acked-by: Kevin Traynor --- app/pdump/Makefile | 1 - app/pdump/meson.build | 1 - app/proc-info/Makefile | 1 - app/proc-info/meson.build | 1 - drivers/net/kni/Makefile | 1 - drivers/net/kni/meson.build | 1 - examples/multi_process/hotplug_mp/Makefile | 1 - examples/tep_termination/Makefile | 2 -- examples/tep_termination/meson.build | 1 - lib/librte_eal/common/eal_common_dev.c | 2 +- lib/librte_eal/common/eal_common_lcore.c | 4 ++-- lib/librte_eal/common/eal_common_thread.c | 2 +- lib/librte_eal/common/include/rte_dev.h | 4 ---- lib/librte_eal/common/include/rte_eal.h | 5 +---- lib/librte_eal/common/include/rte_lcore.h | 6 +++--- lib/librte_eal/linux/eal/eal.c | 2 +- lib/librte_eal/rte_eal_version.map | 10 +++++----- 17 files changed, 14 insertions(+), 31 deletions(-) diff --git a/app/pdump/Makefile b/app/pdump/Makefile index bd3c208195..e6b9eea91b 100644 --- a/app/pdump/Makefile +++ b/app/pdump/Makefile @@ -7,7 +7,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y) APP = dpdk-pdump -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) # all source are stored in SRCS-y diff --git a/app/pdump/meson.build b/app/pdump/meson.build index 116c27f02c..7bb908e047 100644 --- a/app/pdump/meson.build +++ b/app/pdump/meson.build @@ -2,5 +2,4 @@ # Copyright(c) 2018 Intel Corporation sources = files('main.c') -allow_experimental_apis = true deps += ['ethdev', 'kvargs', 'pdump'] diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile index 9e87f524dd..214f3f54a1 100644 --- a/app/proc-info/Makefile +++ b/app/proc-info/Makefile @@ -5,7 +5,6 @@ include $(RTE_SDK)/mk/rte.vars.mk APP = dpdk-procinfo -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) # all source are stored in SRCS-y diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build index 866b390d69..f050c4a9b4 100644 --- a/app/proc-info/meson.build +++ b/app/proc-info/meson.build @@ -2,5 +2,4 @@ # Copyright(c) 2018 Intel Corporation sources = files('main.c') -allow_experimental_apis = true deps += ['ethdev', 'metrics', 'security'] diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile index 562e8d2daa..01eaef0564 100644 --- a/drivers/net/kni/Makefile +++ b/drivers/net/kni/Makefile @@ -10,7 +10,6 @@ LIB = librte_pmd_kni.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lpthread LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build index 0f784c6d53..e3b2d83b56 100644 --- a/drivers/net/kni/meson.build +++ b/drivers/net/kni/meson.build @@ -3,6 +3,5 @@ # this driver can be built if-and-only-if KNI library is buildable build = dpdk_conf.has('RTE_LIBRTE_KNI') -allow_experimental_apis = true sources = files('rte_eth_kni.c') deps += 'kni' diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index 1fd7aa085c..3ff74d52a8 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -18,6 +18,5 @@ SRCS-y := main.c commands.c CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 222679bc97..f4b85e49b9 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -25,7 +25,6 @@ CFLAGS += -O3 $(shell pkg-config --cflags libdpdk) LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk) LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk) -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -Wno-deprecated-declarations build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -58,7 +57,6 @@ $(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -Wno-deprecated-declarations diff --git a/examples/tep_termination/meson.build b/examples/tep_termination/meson.build index 1dc341e3ad..f65d689802 100644 --- a/examples/tep_termination/meson.build +++ b/examples/tep_termination/meson.build @@ -10,7 +10,6 @@ if not is_linux build = false endif deps += ['hash', 'vhost'] -allow_experimental_apis = true cflags += '-Wno-deprecated-declarations' sources = files( 'main.c', 'vxlan.c', 'vxlan_setup.c' diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 0ec42d8289..824b8f9267 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -76,7 +76,7 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name) return strcmp(dev->name, name); } -int __rte_experimental +int rte_dev_is_probed(const struct rte_device *dev) { /* The field driver should be set only when the probe is successful. */ diff --git a/lib/librte_eal/common/eal_common_lcore.c b/lib/librte_eal/common/eal_common_lcore.c index 1cbac42286..8c2744fabc 100644 --- a/lib/librte_eal/common/eal_common_lcore.c +++ b/lib/librte_eal/common/eal_common_lcore.c @@ -114,14 +114,14 @@ rte_eal_cpu_init(void) return 0; } -unsigned int __rte_experimental +unsigned int rte_socket_count(void) { const struct rte_config *config = rte_eal_get_configuration(); return config->numa_node_count; } -int __rte_experimental +int rte_socket_id_by_idx(unsigned int idx) { const struct rte_config *config = rte_eal_get_configuration(); diff --git a/lib/librte_eal/common/eal_common_thread.c b/lib/librte_eal/common/eal_common_thread.c index 14f206c048..c91aba8f95 100644 --- a/lib/librte_eal/common/eal_common_thread.c +++ b/lib/librte_eal/common/eal_common_thread.c @@ -164,7 +164,7 @@ static void *rte_thread_init(void *arg) return start_routine(routine_arg); } -__rte_experimental int +int rte_ctrl_thread_create(pthread_t *thread, const char *name, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 0d5e25b500..56dd52ad9e 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -111,9 +111,6 @@ struct rte_device { }; /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * Query status of a device. * * @param dev @@ -121,7 +118,6 @@ struct rte_device { * @return * (int)true if already probed successfully, 0 otherwise. */ -__rte_experimental int rte_dev_is_probed(const struct rte_device *dev); /** diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 833433229b..f9288666eb 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -174,9 +174,6 @@ int rte_eal_iopl_init(void); int rte_eal_init(int argc, char **argv); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * Clean up the Environment Abstraction Layer (EAL) * * This function must be called to release any internal resources that EAL has @@ -187,7 +184,7 @@ int rte_eal_init(int argc, char **argv); * @return 0 Successfully released all internal EAL resources * @return -EFAULT There was an error in releasing all resources. */ -int __rte_experimental rte_eal_cleanup(void); +int rte_eal_cleanup(void); /** * Check if a primary process is currently alive diff --git a/lib/librte_eal/common/include/rte_lcore.h b/lib/librte_eal/common/include/rte_lcore.h index dea17f5000..be757a32e0 100644 --- a/lib/librte_eal/common/include/rte_lcore.h +++ b/lib/librte_eal/common/include/rte_lcore.h @@ -149,7 +149,7 @@ unsigned rte_socket_id(void); * @return * the number of physical sockets as recognized by EAL */ -unsigned int __rte_experimental +unsigned int rte_socket_count(void); /** @@ -166,7 +166,7 @@ rte_socket_count(void); * - physical socket id as recognized by EAL * - -1 on error, with errno set to EINVAL */ -int __rte_experimental +int rte_socket_id_by_idx(unsigned int idx); /** @@ -306,7 +306,7 @@ int rte_thread_setname(pthread_t id, const char *name); * On success, returns 0; on error, it returns a negative value * corresponding to the error number. */ -__rte_experimental int +int rte_ctrl_thread_create(pthread_t *thread, const char *name, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg); diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index f7ae62d7b1..1613996190 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -1253,7 +1253,7 @@ mark_freeable(const struct rte_memseg_list *msl, const struct rte_memseg *ms, return 0; } -int __rte_experimental +int rte_eal_cleanup(void) { /* if we're in a primary process, we need to mark hugepages as freeable diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 18d02017cc..245493461c 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -271,6 +271,8 @@ DPDK_18.11 { DPDK_19.05 { global: + rte_ctrl_thread_create; + rte_dev_is_probed; rte_devargs_add; rte_devargs_dump; rte_devargs_insert; @@ -279,6 +281,9 @@ DPDK_19.05 { rte_devargs_parsef; rte_devargs_remove; rte_devargs_type_count; + rte_eal_cleanup; + rte_socket_count; + rte_socket_id_by_idx; } DPDK_18.11; @@ -289,7 +294,6 @@ EXPERIMENTAL { rte_class_find_by_name; rte_class_register; rte_class_unregister; - rte_ctrl_thread_create; rte_delay_us_sleep; rte_dev_dma_map; rte_dev_dma_unmap; @@ -300,10 +304,8 @@ EXPERIMENTAL { rte_dev_event_monitor_stop; rte_dev_hotplug_handle_disable; rte_dev_hotplug_handle_enable; - rte_dev_is_probed; rte_dev_iterator_init; rte_dev_iterator_next; - rte_eal_cleanup; rte_extmem_attach; rte_extmem_detach; rte_extmem_register; @@ -376,6 +378,4 @@ EXPERIMENTAL { rte_service_lcore_attr_get; rte_service_lcore_attr_reset_all; rte_service_may_be_active; - rte_socket_count; - rte_socket_id_by_idx; }; -- 2.20.1