git-lng-odp

git-lng-odp@lists.linaro.org

1203 discussions

[COMMIT] branch master updated. v1.19.0.1_tigermoth-71-g3c449bd7

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 3c449bd75224b543de394bf6444c09cfbc6e104f (commit) via c3c447c96ab63092461dee2bac607f59a21bf8de (commit) from c7bf6a71fe08f3ba8228eced708c9d05496a825a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c449bd75224b543de394bf6444c09cfbc6e104f Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 4 17:03:44 2018 +0300 linux-gen: queue_lf: use lock free 128 bit atomics Use 128 bit atomics from arch/aarch64 directory. On ARMv8, GCC built-in atomics does not utilize 128 bit atomic instructions but uses locks instead. All other targets use GGC built-ins (when lock free). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 1c3c6bc4..e4902a3f 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -24,14 +24,55 @@ typedef unsigned __int128 u128_t; +static inline void atomic_zero_u128(u128_t *atomic) +{ + __atomic_store_n(atomic, 0, __ATOMIC_RELAXED); +} + +#if defined(__aarch64__) +/* ARMv8 has atomic load-acq/store-rel instructions for a pair of + * 64bit of data. GCC atomic built-in for 128bits does not utilize these + * instructions but uses locks instead. Override GCC built-in for ARMv8. + */ +#include <odp_cpu.h> + +static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __lockfree_compare_exchange_16((__int128 *)atomic, + (__int128 *)&old_val, + new_val, + 0, + __ATOMIC_RELEASE, + __ATOMIC_RELAXED); +} + +static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, + u128_t new_val) +{ + return __lockfree_compare_exchange_16((__int128 *)atomic, + (__int128 *)&old_val, + new_val, + 0, + __ATOMIC_ACQUIRE, + __ATOMIC_RELAXED); +} + static inline u128_t atomic_load_u128(u128_t *atomic) { - return __atomic_load_n(atomic, __ATOMIC_RELAXED); + return __lockfree_load_16((__int128 *)atomic, __ATOMIC_RELAXED); } -static inline void atomic_zero_u128(u128_t *atomic) +static inline int atomic_is_lockfree_u128(void) { - __atomic_store_n(atomic, 0, __ATOMIC_RELAXED); + return 1; +} + +#else + +static inline u128_t atomic_load_u128(u128_t *atomic) +{ + return __atomic_load_n(atomic, __ATOMIC_RELAXED); } static inline int atomic_cas_rel_u128(u128_t *atomic, u128_t old_val, @@ -57,6 +98,8 @@ static inline int atomic_is_lockfree_u128(void) return __atomic_is_lock_free(16, NULL); } +#endif + #else /* These definitions enable build in non 128 bit compatible systems. commit c3c447c96ab63092461dee2bac607f59a21bf8de Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon Jun 4 14:18:12 2018 +0300 linux-gen: queue_lf: wrap is_lock_free function Wrap GCC built-in __atomic_is_lock_free function so that it can be overridden on ARMv8. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index b3cfbdbe..1c3c6bc4 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -52,6 +52,11 @@ static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, __ATOMIC_RELAXED); } +static inline int atomic_is_lockfree_u128(void) +{ + return __atomic_is_lock_free(16, NULL); +} + #else /* These definitions enable build in non 128 bit compatible systems. @@ -86,6 +91,11 @@ static inline int atomic_cas_acq_u128(u128_t *atomic, u128_t old_val, return atomic_cas_rel_u128(atomic, old_val, new_val); } +static inline int atomic_is_lockfree_u128(void) +{ + return 0; +} + #endif /* Node in lock-free ring */ @@ -263,12 +273,10 @@ uint32_t queue_lf_init_global(uint32_t *queue_lf_size, queue_lf_func_t *lf_func) { odp_shm_t shm; - bool lockfree = 0; + int lockfree; /* 16 byte lockfree CAS operation is needed. */ -#ifdef __SIZEOF_INT128__ - lockfree = __atomic_is_lock_free(16, NULL); -#endif + lockfree = atomic_is_lockfree_u128(); ODP_DBG("\nLock-free queue init\n"); ODP_DBG(" u128 lock-free: %i\n\n", lockfree); ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_queue_lf.c | 65 +++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 7 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-69-gc7bf6a71

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via c7bf6a71fe08f3ba8228eced708c9d05496a825a (commit) via a832529f5430e0f60fee792a95a35ce7b2bed25d (commit) via 277cbcf414448fb7fd3fa8171a7cb8ffdcb6262b (commit) via 953246794f041282cb1a59ccf47f9bde6c369069 (commit) from 780d15ced4188a38984c656a9fca58fdd5226735 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c7bf6a71fe08f3ba8228eced708c9d05496a825a Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Tue Jun 5 09:11:44 2018 +0300 linux-gen: pktio: remove odp_packet_socket.h from unrelated files Cleanup pktio code by not including odp_packet_socket.h in unrelated files. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 69a3072d..cec2d2d6 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -30,10 +30,11 @@ extern "C" { #include <odp_config_internal.h> #include <odp/api/hints.h> +#include <string.h> #include <net/if.h> +#include <linux/if_ether.h> #define PKTIO_MAX_QUEUES 64 -#include <odp_packet_socket.h> #define PKTIO_NAME_LEN 256 diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4a91c08a..7759f83e 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -19,7 +19,6 @@ #include <odp/api/spinlock.h> #include <odp/api/ticketlock.h> #include <odp/api/shared_memory.h> -#include <odp_packet_socket.h> #include <odp_config_internal.h> #include <odp_queue_if.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 5b2f8854..6333847d 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -19,7 +19,6 @@ #include <odp_ethtool_stats.h> #include <odp_ethtool_rss.h> #include <odp_socket_common.h> -#include <odp_packet_socket.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> #include <protocols/eth.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 20fb5f45..dc87db2b 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -43,7 +43,6 @@ #include <odp_api.h> #include <odp/api/plat/packet_inlines.h> -#include <odp_packet_socket.h> #include <odp_socket_common.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> commit a832529f5430e0f60fee792a95a35ce7b2bed25d Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jun 4 16:40:06 2018 +0300 linux-gen: pktio: move common code out of socket pktio files Cleanup socket pktio code by moving common functionality to a separate file. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ed9ff591..07c88f85 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -112,6 +112,7 @@ noinst_HEADERS = \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ include/odp_packet_socket.h \ + include/odp_socket_common.h \ include/odp_ethtool_stats.h \ include/odp_ethtool_rss.h \ include/odp_pcapng.h \ @@ -201,6 +202,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_weak.c \ pktio/dpdk.c \ pktio/dpdk_parse.c \ + pktio/socket_common.c \ pktio/ethtool_stats.c \ pktio/ethtool_rss.c \ pktio/io_ops.c \ diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index dd9d53aa..6f9443a3 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -57,41 +57,4 @@ struct ring { ODP_STATIC_ASSERT(offsetof(struct ring, mm_space) <= ODP_CACHE_LINE_SIZE, "ERR_STRUCT_RING"); -static inline void -ethaddr_copy(unsigned char mac_dst[], unsigned char mac_src[]) -{ - memcpy(mac_dst, mac_src, ETH_ALEN); -} - -static inline int -ethaddrs_equal(unsigned char mac_a[], unsigned char mac_b[]) -{ - return !memcmp(mac_a, mac_b, ETH_ALEN); -} - -/** - * Read the MAC address from a packet socket - */ -int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]); - -/** - * Read the MTU from a packet socket - */ -uint32_t mtu_get_fd(int fd, const char *name); - -/** - * Enable/Disable promisc mode for a packet socket - */ -int promisc_mode_set_fd(int fd, const char *name, int enable); - -/** - * Return promisc mode of a packet socket - */ -int promisc_mode_get_fd(int fd, const char *name); - -/** - * Return link status of a packet socket (up/down) - */ -int link_status_fd(int fd, const char *name); - #endif diff --git a/platform/linux-generic/include/odp_socket_common.h b/platform/linux-generic/include/odp_socket_common.h new file mode 100644 index 00000000..4c6b3e63 --- /dev/null +++ b/platform/linux-generic/include/odp_socket_common.h @@ -0,0 +1,57 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_SOCKET_COMMON_H_ +#define ODP_SOCKET_COMMON_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <string.h> +#include <linux/if_ether.h> + +static inline void +ethaddr_copy(unsigned char mac_dst[], unsigned char mac_src[]) +{ + memcpy(mac_dst, mac_src, ETH_ALEN); +} + +static inline int +ethaddrs_equal(unsigned char mac_a[], unsigned char mac_b[]) +{ + return !memcmp(mac_a, mac_b, ETH_ALEN); +} + +/** + * Read the MAC address from a packet socket + */ +int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]); + +/** + * Read the MTU from a packet socket + */ +uint32_t mtu_get_fd(int fd, const char *name); + +/** + * Enable/Disable promisc mode for a packet socket + */ +int promisc_mode_set_fd(int fd, const char *name, int enable); + +/** + * Return promisc mode of a packet socket + */ +int promisc_mode_get_fd(int fd, const char *name); + +/** + * Return link status of a packet socket (up/down) + */ +int link_status_fd(int fd, const char *name); + +#ifdef __cplusplus +} +#endif +#endif /* ODP_SOCKET_COMMON_H_ */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 34847f9c..4e320aa0 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -24,6 +24,7 @@ #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <odp_socket_common.h> #include <odp_packet_dpdk.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 66868486..5b2f8854 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -18,6 +18,7 @@ #include <odp_packet_io_internal.h> #include <odp_ethtool_stats.h> #include <odp_ethtool_rss.h> +#include <odp_socket_common.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 18ab74dd..9422d85b 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -36,6 +36,7 @@ #include <odp_api.h> #include <odp_packet_socket.h> +#include <odp_socket_common.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_ethtool_stats.h> @@ -117,125 +118,6 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) #define ETHBUF_ALIGN(buf_ptr) ((uint8_t *)ODP_ALIGN_ROUNDUP_PTR((buf_ptr), \ sizeof(uint32_t)) + ETHBUF_OFFSET) -/** - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]) -{ - struct ifreq ethreq; - int ret; - - memset(&ethreq, 0, sizeof(ethreq)); - snprintf(ethreq.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFHWADDR, &ethreq); - if (ret != 0) { - __odp_errno = errno; - ODP_ERR("ioctl(SIOCGIFHWADDR): %s: \"%s\".\n", strerror(errno), - ethreq.ifr_name); - return -1; - } - - memcpy(mac_dst, (unsigned char *)ethreq.ifr_ifru.ifru_hwaddr.sa_data, - ETH_ALEN); - return 0; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -uint32_t mtu_get_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFMTU, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFMTU): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return 0; - } - return ifr.ifr_mtu + _ODP_ETHHDR_LEN; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int promisc_mode_set_fd(int fd, const char *name, int enable) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - if (enable) - ifr.ifr_flags |= IFF_PROMISC; - else - ifr.ifr_flags &= ~(IFF_PROMISC); - - ret = ioctl(fd, SIOCSIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCSIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - return 0; -} - -/* - * ODP_PACKET_SOCKET_MMSG: - * ODP_PACKET_SOCKET_MMAP: - * ODP_PACKET_NETMAP: - */ -int promisc_mode_get_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - return !!(ifr.ifr_flags & IFF_PROMISC); -} - -int link_status_fd(int fd, const char *name) -{ - struct ifreq ifr; - int ret; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - ret = ioctl(fd, SIOCGIFFLAGS, &ifr); - if (ret < 0) { - __odp_errno = errno; - ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), - ifr.ifr_name); - return -1; - } - - return !!(ifr.ifr_flags & IFF_RUNNING); -} - /* * ODP_PACKET_SOCKET_MMSG: */ diff --git a/platform/linux-generic/pktio/socket_common.c b/platform/linux-generic/pktio/socket_common.c new file mode 100644 index 00000000..edb4bcf3 --- /dev/null +++ b/platform/linux-generic/pktio/socket_common.c @@ -0,0 +1,143 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include "config.h" + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <linux/if_packet.h> +#include <errno.h> +#include <odp_debug_internal.h> +#include <odp_errno_define.h> +#include <odp_socket_common.h> +#include <protocols/eth.h> + +/** + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int mac_addr_get_fd(int fd, const char *name, unsigned char mac_dst[]) +{ + struct ifreq ethreq; + int ret; + + memset(&ethreq, 0, sizeof(ethreq)); + snprintf(ethreq.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFHWADDR, &ethreq); + if (ret != 0) { + __odp_errno = errno; + ODP_ERR("ioctl(SIOCGIFHWADDR): %s: \"%s\".\n", strerror(errno), + ethreq.ifr_name); + return -1; + } + + memcpy(mac_dst, (unsigned char *)ethreq.ifr_ifru.ifru_hwaddr.sa_data, + ETH_ALEN); + return 0; +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +uint32_t mtu_get_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFMTU, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFMTU): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return 0; + } + return ifr.ifr_mtu + _ODP_ETHHDR_LEN; +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int promisc_mode_set_fd(int fd, const char *name, int enable) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + if (enable) + ifr.ifr_flags |= IFF_PROMISC; + else + ifr.ifr_flags &= ~(IFF_PROMISC); + + ret = ioctl(fd, SIOCSIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCSIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + return 0; +} + +/* + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + * ODP_PACKET_NETMAP: + */ +int promisc_mode_get_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + return !!(ifr.ifr_flags & IFF_PROMISC); +} + +int link_status_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + __odp_errno = errno; + ODP_DBG("ioctl(SIOCGIFFLAGS): %s: \"%s\".\n", strerror(errno), + ifr.ifr_name); + return -1; + } + + return !!(ifr.ifr_flags & IFF_RUNNING); +} diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index bb8adb56..aedcceae 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -28,6 +28,7 @@ #include <odp_api.h> #include <odp/api/plat/packet_inlines.h> #include <odp_packet_socket.h> +#include <odp_socket_common.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_ethtool_stats.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 12a1945d..20fb5f45 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -44,6 +44,7 @@ #include <odp_api.h> #include <odp/api/plat/packet_inlines.h> #include <odp_packet_socket.h> +#include <odp_socket_common.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> commit 277cbcf414448fb7fd3fa8171a7cb8ffdcb6262b Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jun 4 15:21:16 2018 +0300 linux-gen: pktio: move ethtool rss function to a new file Cleanup socket pktio code by moving independent rss functionality to a separate file. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c76114e0..ed9ff591 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -113,6 +113,7 @@ noinst_HEADERS = \ include/odp_packet_io_ring_internal.h \ include/odp_packet_socket.h \ include/odp_ethtool_stats.h \ + include/odp_ethtool_rss.h \ include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ @@ -201,6 +202,7 @@ __LIB__libodp_linux_la_SOURCES = \ pktio/dpdk.c \ pktio/dpdk_parse.c \ pktio/ethtool_stats.c \ + pktio/ethtool_rss.c \ pktio/io_ops.c \ pktio/ipc.c \ pktio/loop.c \ diff --git a/platform/linux-generic/include/odp_ethtool_rss.h b/platform/linux-generic/include/odp_ethtool_rss.h new file mode 100644 index 00000000..e942e3fd --- /dev/null +++ b/platform/linux-generic/include/odp_ethtool_rss.h @@ -0,0 +1,65 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ETHTOOL_RSS_H_ +#define ODP_ETHTOOL_RSS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/packet_io.h> + +/** + * Get enabled RSS hash protocols of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto[out] Hash protocols + * + * @returns Number enabled hash protocols + */ +int rss_conf_get_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto); + +/** + * Get supported RSS hash protocols of a packet socket + * + * Can be both read and modified. + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto[out] Hash protocols + * + * @returns Number of supported hash protocols + */ +int rss_conf_get_supported_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto); + +/** + * Set RSS hash protocols of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param hash_proto Hash protocols + * + * @retval 0 on success + * @retval <0 on failure + */ +int rss_conf_set_fd(int fd, const char *name, + const odp_pktin_hash_proto_t *proto); + +/** + * Print enabled RSS hash protocols + * + * @param hash_proto Hash protocols + */ +void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); + +#ifdef __cplusplus +} +#endif +#endif /* ODP_ETHTOOL_RSS_H_ */ diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 46561052..dd9d53aa 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -94,50 +94,4 @@ int promisc_mode_get_fd(int fd, const char *name); */ int link_status_fd(int fd, const char *name); -/** - * Get enabled RSS hash protocols of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto[out] Hash protocols - * - * @returns Number enabled hash protocols - */ -int rss_conf_get_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto); - -/** - * Get supported RSS hash protocols of a packet socket - * - * Can be both read and modified. - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto[out] Hash protocols - * - * @returns Number of supported hash protocols - */ -int rss_conf_get_supported_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto); - -/** - * Set RSS hash protocols of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param hash_proto Hash protocols - * - * @retval 0 on success - * @retval <0 on failure - */ -int rss_conf_set_fd(int fd, const char *name, - const odp_pktin_hash_proto_t *proto); - -/** - * Print enabled RSS hash protocols - * - * @param hash_proto Hash protocols - */ -void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); - #endif diff --git a/platform/linux-generic/pktio/ethtool_rss.c b/platform/linux-generic/pktio/ethtool_rss.c new file mode 100644 index 00000000..e1ba33aa --- /dev/null +++ b/platform/linux-generic/pktio/ethtool_rss.c @@ -0,0 +1,257 @@ +/* Copyright (c) 2015-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <sys/ioctl.h> +#include <linux/ethtool.h> +#include <linux/sockios.h> +#include <net/if.h> +#include <odp_ethtool_rss.h> +#include <odp_debug_internal.h> + +/** + * Get enabled hash options of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param flow_type Packet flow type + * @param options[out] Enabled hash options + * + * @retval 0 on success + * @retval <0 on failure + */ +static inline int get_rss_hash_options(int fd, const char *name, + uint32_t flow_type, uint64_t *options) +{ + struct ifreq ifr; + struct ethtool_rxnfc rsscmd; + + memset(&ifr, 0, sizeof(ifr)); + memset(&rsscmd, 0, sizeof(rsscmd)); + *options = 0; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + + rsscmd.cmd = ETHTOOL_GRXFH; + rsscmd.flow_type = flow_type; + + ifr.ifr_data = (caddr_t)&rsscmd; + + if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) + return -1; + + *options = rsscmd.data; + return 0; +} + +int rss_conf_get_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + int rss_enabled = 0; + + memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); + + get_rss_hash_options(fd, name, IPV4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { + hash_proto->proto.ipv4 = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, TCP_V4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv4_tcp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, UDP_V4_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv4_udp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, IPV6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { + hash_proto->proto.ipv6 = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, TCP_V6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv6_tcp = 1; + rss_enabled++; + } + get_rss_hash_options(fd, name, UDP_V6_FLOW, &options); + if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && + (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { + hash_proto->proto.ipv6_udp = 1; + rss_enabled++; + } + return rss_enabled; +} + +/** + * Set hash options of a packet socket + * + * @param fd Socket file descriptor + * @param name Interface name + * @param flow_type Packet flow type + * @param options Hash options + * + * @retval 0 on success + * @retval <0 on failure + */ +static inline int set_rss_hash(int fd, const char *name, + uint32_t flow_type, uint64_t options) +{ + struct ifreq ifr; + struct ethtool_rxnfc rsscmd; + + memset(&rsscmd, 0, sizeof(rsscmd)); + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + + rsscmd.cmd = ETHTOOL_SRXFH; + rsscmd.flow_type = flow_type; + rsscmd.data = options; + + ifr.ifr_data = (caddr_t)&rsscmd; + + if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) + return -1; + + return 0; +} + +int rss_conf_set_fd(int fd, const char *name, + const odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + odp_pktin_hash_proto_t cur_hash; + + /* Compare to currently set hash protocols */ + rss_conf_get_fd(fd, name, &cur_hash); + + if (hash_proto->proto.ipv4_udp && !cur_hash.proto.ipv4_udp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, UDP_V4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv4_tcp && !cur_hash.proto.ipv4_tcp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, TCP_V4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6_udp && !cur_hash.proto.ipv6_udp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, UDP_V6_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6_tcp && !cur_hash.proto.ipv6_tcp) { + options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (set_rss_hash(fd, name, TCP_V6_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv4 && !cur_hash.proto.ipv4) { + options = RXH_IP_SRC | RXH_IP_DST; + if (set_rss_hash(fd, name, IPV4_FLOW, options)) + return -1; + } + if (hash_proto->proto.ipv6 && !cur_hash.proto.ipv6) { + options = RXH_IP_SRC | RXH_IP_DST; + if (set_rss_hash(fd, name, IPV6_FLOW, options)) + return -1; + } + return 0; +} + +int rss_conf_get_supported_fd(int fd, const char *name, + odp_pktin_hash_proto_t *hash_proto) +{ + uint64_t options; + int rss_supported = 0; + + memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); + + if (!get_rss_hash_options(fd, name, IPV4_FLOW, &options)) { + if (!set_rss_hash(fd, name, IPV4_FLOW, options)) { + hash_proto->proto.ipv4 = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, TCP_V4_FLOW, &options)) { + if (!set_rss_hash(fd, name, TCP_V4_FLOW, options)) { + hash_proto->proto.ipv4_tcp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, UDP_V4_FLOW, &options)) { + if (!set_rss_hash(fd, name, UDP_V4_FLOW, options)) { + hash_proto->proto.ipv4_udp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, IPV6_FLOW, &options)) { + if (!set_rss_hash(fd, name, IPV6_FLOW, options)) { + hash_proto->proto.ipv6 = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, TCP_V6_FLOW, &options)) { + if (!set_rss_hash(fd, name, TCP_V6_FLOW, options)) { + hash_proto->proto.ipv6_tcp = 1; + rss_supported++; + } + } + if (!get_rss_hash_options(fd, name, UDP_V6_FLOW, &options)) { + if (!set_rss_hash(fd, name, UDP_V6_FLOW, options)) { + hash_proto->proto.ipv6_udp = 1; + rss_supported++; + } + } + return rss_supported; +} + +void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto) +{ int max_len = 512; + char str[max_len]; + int len = 0; + int n = max_len - 1; + + len += snprintf(&str[len], n - len, " rss conf\n"); + + if (hash_proto->proto.ipv4) + len += snprintf(&str[len], n - len, + " IPV4\n"); + if (hash_proto->proto.ipv4_tcp) + len += snprintf(&str[len], n - len, + " IPV4 TCP\n"); + if (hash_proto->proto.ipv4_udp) + len += snprintf(&str[len], n - len, + " IPV4 UDP\n"); + if (hash_proto->proto.ipv6) + len += snprintf(&str[len], n - len, + " IPV6\n"); + if (hash_proto->proto.ipv6_tcp) + len += snprintf(&str[len], n - len, + " IPV6 TCP\n"); + if (hash_proto->proto.ipv6_udp) + len += snprintf(&str[len], n - len, + " IPV6 UDP\n"); + str[len] = '\0'; + + ODP_PRINT("%s\n", str); +} + diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 1d8f6988..66868486 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -17,6 +17,7 @@ #include <odp_packet_io_internal.h> #include <odp_ethtool_stats.h> +#include <odp_ethtool_rss.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index dc68a95f..18ab74dd 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -236,239 +236,6 @@ int link_status_fd(int fd, const char *name) return !!(ifr.ifr_flags & IFF_RUNNING); } -/** - * Get enabled hash options of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param flow_type Packet flow type - * @param options[out] Enabled hash options - * - * @retval 0 on success - * @retval <0 on failure - */ -static inline int get_rss_hash_options(int fd, const char *name, - uint32_t flow_type, uint64_t *options) -{ - struct ifreq ifr; - struct ethtool_rxnfc rsscmd; - - memset(&ifr, 0, sizeof(ifr)); - memset(&rsscmd, 0, sizeof(rsscmd)); - *options = 0; - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - - rsscmd.cmd = ETHTOOL_GRXFH; - rsscmd.flow_type = flow_type; - - ifr.ifr_data = (caddr_t)&rsscmd; - - if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) - return -1; - - *options = rsscmd.data; - return 0; -} - -int rss_conf_get_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - int rss_enabled = 0; - - memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); - - get_rss_hash_options(fd, name, IPV4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { - hash_proto->proto.ipv4 = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, TCP_V4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv4_tcp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, UDP_V4_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv4_udp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, IPV6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST)) { - hash_proto->proto.ipv6 = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, TCP_V6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv6_tcp = 1; - rss_enabled++; - } - get_rss_hash_options(fd, name, UDP_V6_FLOW, &options); - if ((options & RXH_IP_SRC) && (options & RXH_IP_DST) && - (options & RXH_L4_B_0_1) && (options & RXH_L4_B_2_3)) { - hash_proto->proto.ipv6_udp = 1; - rss_enabled++; - } - return rss_enabled; -} - -/** - * Set hash options of a packet socket - * - * @param fd Socket file descriptor - * @param name Interface name - * @param flow_type Packet flow type - * @param options Hash options - * - * @retval 0 on success - * @retval <0 on failure - */ -static inline int set_rss_hash(int fd, const char *name, - uint32_t flow_type, uint64_t options) -{ - struct ifreq ifr; - struct ethtool_rxnfc rsscmd; - - memset(&rsscmd, 0, sizeof(rsscmd)); - - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); - - rsscmd.cmd = ETHTOOL_SRXFH; - rsscmd.flow_type = flow_type; - rsscmd.data = options; - - ifr.ifr_data = (caddr_t)&rsscmd; - - if (ioctl(fd, SIOCETHTOOL, &ifr) < 0) - return -1; - - return 0; -} - -int rss_conf_set_fd(int fd, const char *name, - const odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - odp_pktin_hash_proto_t cur_hash; - - /* Compare to currently set hash protocols */ - rss_conf_get_fd(fd, name, &cur_hash); - - if (hash_proto->proto.ipv4_udp && !cur_hash.proto.ipv4_udp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, UDP_V4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv4_tcp && !cur_hash.proto.ipv4_tcp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, TCP_V4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6_udp && !cur_hash.proto.ipv6_udp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, UDP_V6_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6_tcp && !cur_hash.proto.ipv6_tcp) { - options = RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3; - if (set_rss_hash(fd, name, TCP_V6_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv4 && !cur_hash.proto.ipv4) { - options = RXH_IP_SRC | RXH_IP_DST; - if (set_rss_hash(fd, name, IPV4_FLOW, options)) - return -1; - } - if (hash_proto->proto.ipv6 && !cur_hash.proto.ipv6) { - options = RXH_IP_SRC | RXH_IP_DST; - if (set_rss_hash(fd, name, IPV6_FLOW, options)) - return -1; - } - return 0; -} - -int rss_conf_get_supported_fd(int fd, const char *name, - odp_pktin_hash_proto_t *hash_proto) -{ - uint64_t options; - int rss_supported = 0; - - memset(hash_proto, 0, sizeof(odp_pktin_hash_proto_t)); - - if (!get_rss_hash_options(fd, name, IPV4_FLOW, &options)) { - if (!set_rss_hash(fd, name, IPV4_FLOW, options)) { - hash_proto->proto.ipv4 = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, TCP_V4_FLOW, &options)) { - if (!set_rss_hash(fd, name, TCP_V4_FLOW, options)) { - hash_proto->proto.ipv4_tcp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, UDP_V4_FLOW, &options)) { - if (!set_rss_hash(fd, name, UDP_V4_FLOW, options)) { - hash_proto->proto.ipv4_udp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, IPV6_FLOW, &options)) { - if (!set_rss_hash(fd, name, IPV6_FLOW, options)) { - hash_proto->proto.ipv6 = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, TCP_V6_FLOW, &options)) { - if (!set_rss_hash(fd, name, TCP_V6_FLOW, options)) { - hash_proto->proto.ipv6_tcp = 1; - rss_supported++; - } - } - if (!get_rss_hash_options(fd, name, UDP_V6_FLOW, &options)) { - if (!set_rss_hash(fd, name, UDP_V6_FLOW, options)) { - hash_proto->proto.ipv6_udp = 1; - rss_supported++; - } - } - return rss_supported; -} - -void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto) -{ int max_len = 512; - char str[max_len]; - int len = 0; - int n = max_len - 1; - - len += snprintf(&str[len], n - len, " rss conf\n"); - - if (hash_proto->proto.ipv4) - len += snprintf(&str[len], n - len, - " IPV4\n"); - if (hash_proto->proto.ipv4_tcp) - len += snprintf(&str[len], n - len, - " IPV4 TCP\n"); - if (hash_proto->proto.ipv4_udp) - len += snprintf(&str[len], n - len, - " IPV4 UDP\n"); - if (hash_proto->proto.ipv6) - len += snprintf(&str[len], n - len, - " IPV6\n"); - if (hash_proto->proto.ipv6_tcp) - len += snprintf(&str[len], n - len, - " IPV6 TCP\n"); - if (hash_proto->proto.ipv6_udp) - len += snprintf(&str[len], n - len, - " IPV6 UDP\n"); - str[len] = '\0'; - - ODP_PRINT("%s\n", str); -} - /* * ODP_PACKET_SOCKET_MMSG: */ commit 953246794f041282cb1a59ccf47f9bde6c369069 Author: Bogdan Pricope <bogdan.pricope(a)linaro.org> Date: Mon Jun 4 11:30:15 2018 +0300 linux-gen: pktio: move ethtool stats function to a new file Cleanup the code by moving independent functionalities to separate files. Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8670450f..c76114e0 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -112,6 +112,7 @@ noinst_HEADERS = \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ include/odp_packet_socket.h \ + include/odp_ethtool_stats.h \ include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ @@ -199,7 +200,7 @@ __LIB__libodp_linux_la_SOURCES = \ odp_weak.c \ pktio/dpdk.c \ pktio/dpdk_parse.c \ - pktio/ethtool.c \ + pktio/ethtool_stats.c \ pktio/io_ops.c \ pktio/ipc.c \ pktio/loop.c \ diff --git a/platform/linux-generic/include/odp_ethtool_stats.h b/platform/linux-generic/include/odp_ethtool_stats.h new file mode 100644 index 00000000..04d4698e --- /dev/null +++ b/platform/linux-generic/include/odp_ethtool_stats.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ETHTOOL_H_ +#define ODP_ETHTOOL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <string.h> +#include <odp/api/packet_io_stats.h> + +/** + * Get ethtool statistics of a packet socket + */ +int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats); + +#ifdef __cplusplus +} +#endif +#endif /* ODP_ETHTOOL_H_ */ diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index f77248f0..46561052 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -140,9 +140,4 @@ int rss_conf_set_fd(int fd, const char *name, */ void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto); -/** - * Get ethtool statistics of a packet socket - */ -int ethtool_stats_get_fd(int fd, const char *name, odp_pktio_stats_t *stats); - #endif diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool_stats.c similarity index 99% rename from platform/linux-generic/pktio/ethtool.c rename to platform/linux-generic/pktio/ethtool_stats.c index 784e8c3c..fc04fd31 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool_stats.c @@ -17,7 +17,7 @@ #include <net/if.h> #include <odp_api.h> -#include <odp_packet_socket.h> +#include <odp_ethtool_stats.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index a8498aa1..1d8f6988 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -16,6 +16,7 @@ #include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> +#include <odp_ethtool_stats.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index c7a1c3ab..218196b4 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -8,6 +8,7 @@ #include "config.h" #include <odp_packet_io_internal.h> +#include <odp_ethtool_stats.h> #include <odp_classification_internal.h> #include <errno.h> diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 93613e54..dc68a95f 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -38,6 +38,7 @@ #include <odp_packet_socket.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> +#include <odp_ethtool_stats.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 8ec2198b..bb8adb56 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -30,6 +30,7 @@ #include <odp_packet_socket.h> #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> +#include <odp_ethtool_stats.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> #include <odp_classification_datamodel.h> ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 7 +- platform/linux-generic/include/odp_ethtool_rss.h | 65 ++++ platform/linux-generic/include/odp_ethtool_stats.h | 25 ++ .../linux-generic/include/odp_packet_io_internal.h | 3 +- platform/linux-generic/include/odp_packet_socket.h | 88 ----- platform/linux-generic/include/odp_socket_common.h | 57 ++++ platform/linux-generic/odp_packet_io.c | 1 - platform/linux-generic/pktio/dpdk.c | 1 + platform/linux-generic/pktio/ethtool_rss.c | 257 +++++++++++++++ .../pktio/{ethtool.c => ethtool_stats.c} | 2 +- platform/linux-generic/pktio/netmap.c | 4 +- platform/linux-generic/pktio/pktio_common.c | 1 + platform/linux-generic/pktio/socket.c | 354 +-------------------- platform/linux-generic/pktio/socket_common.c | 143 +++++++++ platform/linux-generic/pktio/socket_mmap.c | 2 + platform/linux-generic/pktio/tap.c | 2 +- 16 files changed, 566 insertions(+), 446 deletions(-) create mode 100644 platform/linux-generic/include/odp_ethtool_rss.h create mode 100644 platform/linux-generic/include/odp_ethtool_stats.h create mode 100644 platform/linux-generic/include/odp_socket_common.h create mode 100644 platform/linux-generic/pktio/ethtool_rss.c rename platform/linux-generic/pktio/{ethtool.c => ethtool_stats.c} (99%) create mode 100644 platform/linux-generic/pktio/socket_common.c hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-65-g780d15ce

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 780d15ced4188a38984c656a9fca58fdd5226735 (commit) from afef45861d081c0722fff71992d45854923c0d0f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 780d15ced4188a38984c656a9fca58fdd5226735 Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Mon Jun 4 21:35:43 2018 +0200 example/l2fw_simple: increase wait time When using huge pages, the wrapper script that's used to run this test will send a SIGINT signal too early to the signal, causing it to be ignored by the application. This in turn cause the application to never exit its main loop, which depends on handling this signal to set the variable that terminates the loop. Increasing the delay between starting the application and sending the SIGINT signal fixes this issue. This fixes https://bugs.linaro.org/show_bug.cgi?id=3879 Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/example/l2fwd_simple/l2fwd_simple_run.sh b/example/l2fwd_simple/l2fwd_simple_run.sh index 10f4e6dc..18acb357 100755 --- a/example/l2fwd_simple/l2fwd_simple_run.sh +++ b/example/l2fwd_simple/l2fwd_simple_run.sh @@ -12,7 +12,7 @@ echo "using PCAP_IN = ${PCAP_IN}" ./odp_l2fwd_simple${EXEEXT} pcap:in=${PCAP_IN} pcap:out=pcapout.pcap \ 02:00:00:00:00:01 02:00:00:00:00:02 & -sleep 1 +sleep 2 kill -s SIGINT $! wait $! STATUS=$? @@ -32,7 +32,7 @@ rm -f pcapout.pcap ./odp_l2fwd_simple${EXEEXT} null:0 null:1 \ 02:00:00:00:00:01 02:00:00:00:00:02 & -sleep 1 +sleep 2 kill -s SIGINT $! wait $! STATUS=$? ----------------------------------------------------------------------- Summary of changes: example/l2fwd_simple/l2fwd_simple_run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-64-gafef4586

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via afef45861d081c0722fff71992d45854923c0d0f (commit) from 75a996cfa0f3e2fa8530ea41ea3857eb86ab4b84 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit afef45861d081c0722fff71992d45854923c0d0f Author: Josep Puigdemont <josep.puigdemont(a)linaro.org> Date: Fri Jun 1 14:20:00 2018 +0200 linux-gen: ishmphy: use MAP_POPULATE in mmap Populating pages on mapping will avoid them being zeroed-out at run-time. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3867 Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Reviewed-and-tested-by: Matias Elo <matias.elo(a)nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c index cc547a1c..e770b7bc 100644 --- a/platform/linux-generic/odp_ishmphy.c +++ b/platform/linux-generic/odp_ishmphy.c @@ -96,7 +96,7 @@ void *_odp_ishmphy_map(int fd, void *start, uint64_t size, int flags) { void *mapped_addr_tmp, *mapped_addr; - int mmap_flags = 0; + int mmap_flags = MAP_POPULATE; if (flags & _ODP_ISHM_SINGLE_VA) { if (!start) { ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_ishmphy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-63-g75a996cf

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 75a996cfa0f3e2fa8530ea41ea3857eb86ab4b84 (commit) via 482da37abf31dc87fbe9bb28258122fa178cec45 (commit) from 07201e1277cfeb885c7ee2a666575ec9dc8c8d7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75a996cfa0f3e2fa8530ea41ea3857eb86ab4b84 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 1 09:17:34 2018 +0300 test: queue_perf: added new plain queue performance test Simple test to measure plain queue performance in various modes. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/performance/.gitignore b/test/performance/.gitignore index 4c4ab6ed..febe86ed 100644 --- a/test/performance/.gitignore +++ b/test/performance/.gitignore @@ -7,6 +7,7 @@ odp_ipsec odp_l2fwd odp_pktio_ordered odp_pktio_perf +odp_queue_perf odp_sched_latency odp_sched_pktio odp_scheduling diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 811cc1c0..5b45f40e 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -5,7 +5,8 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = odp_bench_packet \ odp_crypto \ odp_ipsec \ - odp_pktio_perf + odp_pktio_perf \ + odp_queue_perf COMPILE_ONLY = odp_l2fwd \ odp_pktio_ordered \ @@ -38,6 +39,7 @@ odp_sched_latency_SOURCES = odp_sched_latency.c odp_sched_pktio_SOURCES = odp_sched_pktio.c odp_scheduling_SOURCES = odp_scheduling.c odp_pktio_perf_SOURCES = odp_pktio_perf.c +odp_queue_perf_SOURCES = odp_queue_perf.c # l2fwd test depends on generator example EXTRA_odp_l2fwd_DEPENDENCIES = example-generator diff --git a/test/performance/odp_queue_perf.c b/test/performance/odp_queue_perf.c new file mode 100644 index 00000000..521b7271 --- /dev/null +++ b/test/performance/odp_queue_perf.c @@ -0,0 +1,365 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <string.h> +#include <stdint.h> +#include <inttypes.h> +#include <stdlib.h> +#include <getopt.h> + +#include <odp_api.h> + +typedef struct test_options_t { + uint32_t num_queue; + uint32_t num_event; + uint32_t num_round; + odp_nonblocking_t nonblock; + +} test_options_t; + +static void print_usage(void) +{ + printf("\n" + "Plain queue performance test\n" + "\n" + "Usage: odp_queue_perf [options]\n" + "\n" + " -q, --num_queue Number of queues\n" + " -e, --num_event Number of events per queue\n" + " -r, --num_round Number of rounds\n" + " -l, --lockfree Lockfree queues\n" + " -w, --waitfree Waitfree queues\n" + " -h, --help This help\n" + "\n"); +} + +static int parse_options(int argc, char *argv[], test_options_t *test_options) +{ + int opt; + int long_index; + int ret = 0; + + static const struct option longopts[] = { + {"num_queue", required_argument, NULL, 'q'}, + {"num_event", required_argument, NULL, 'e'}, + {"num_round", required_argument, NULL, 'r'}, + {"lockfree", no_argument, NULL, 'l'}, + {"waitfree", no_argument, NULL, 'w'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + + static const char *shortopts = "+q:e:r:lwh"; + + test_options->num_queue = 1; + test_options->num_event = 1; + test_options->num_round = 1000; + test_options->nonblock = ODP_BLOCKING; + + while (1) { + opt = getopt_long(argc, argv, shortopts, longopts, &long_index); + + if (opt == -1) + break; + + switch (opt) { + case 'q': + test_options->num_queue = atoi(optarg); + break; + case 'e': + test_options->num_event = atoi(optarg); + break; + case 'r': + test_options->num_round = atoi(optarg); + break; + case 'l': + test_options->nonblock = ODP_NONBLOCKING_LF; + break; + case 'w': + test_options->nonblock = ODP_NONBLOCKING_WF; + break; + case 'h': + /* fall through */ + default: + print_usage(); + ret = -1; + break; + } + } + + return ret; +} + +static int test_queue(test_options_t *test_options) +{ + odp_pool_capability_t pool_capa; + odp_queue_capability_t queue_capa; + odp_pool_param_t pool_param; + odp_queue_param_t queue_param; + odp_pool_t pool; + odp_event_t ev; + uint32_t i, j, rounds; + uint64_t c1, c2, diff, ops, nsec; + odp_time_t t1, t2; + uint64_t num_retry = 0; + odp_nonblocking_t nonblock = test_options->nonblock; + uint32_t num_queue = test_options->num_queue; + uint32_t num_event = test_options->num_event; + uint32_t num_round = test_options->num_round; + uint32_t tot_event = num_queue * num_event; + odp_queue_t queue[num_queue]; + odp_event_t event[tot_event]; + + printf("\nTesting %s queues\n", + nonblock == ODP_BLOCKING ? "NORMAL" : + (nonblock == ODP_NONBLOCKING_LF ? "LOCKFREE" : + (nonblock == ODP_NONBLOCKING_WF ? "WAITFREE" : "???"))); + printf(" num rounds %u\n", num_round); + printf(" num queues %u\n", num_queue); + printf(" num events per queue %u\n\n", num_event); + + for (i = 0; i < num_queue; i++) + queue[i] = ODP_QUEUE_INVALID; + + for (i = 0; i < tot_event; i++) + event[i] = ODP_EVENT_INVALID; + + if (odp_queue_capability(&queue_capa)) { + printf("Error: Queue capa failed.\n"); + return -1; + } + + if (odp_pool_capability(&pool_capa)) { + printf("Error: Pool capa failed.\n"); + return -1; + } + + if (nonblock == ODP_BLOCKING) { + if (num_queue > queue_capa.plain.max_num) { + printf("Max queues supported %u\n", + queue_capa.plain.max_num); + return -1; + } + + if (num_event > queue_capa.plain.max_size) { + printf("Max queue size supported %u\n", + queue_capa.plain.max_size); + return -1; + } + } else if (nonblock == ODP_NONBLOCKING_LF) { + if (queue_capa.plain.lockfree.max_num == 0) { + printf("Lockfree queues not supported\n"); + return 0; + } + + if (num_queue > queue_capa.plain.lockfree.max_num) { + printf("Max lockfree queues supported %u\n", + queue_capa.plain.lockfree.max_num); + return -1; + } + + if (num_event > queue_capa.plain.lockfree.max_size) { + printf("Max lockfree queue size supported %u\n", + queue_capa.plain.lockfree.max_size); + return -1; + } + } else if (nonblock == ODP_NONBLOCKING_WF) { + if (queue_capa.plain.waitfree.max_num == 0) { + printf("Waitfree queues not supported\n"); + return 0; + } + + if (num_queue > queue_capa.plain.waitfree.max_num) { + printf("Max waitfree queues supported %u\n", + queue_capa.plain.waitfree.max_num); + return -1; + } + + if (num_event > queue_capa.plain.waitfree.max_size) { + printf("Max waitfree queue size supported %u\n", + queue_capa.plain.waitfree.max_size); + return -1; + } + } else { + printf("Error: Bad queue blocking type\n"); + return -1; + } + + if (tot_event > pool_capa.buf.max_num) { + printf("Max events supported %u\n", pool_capa.buf.max_num); + return -1; + } + + odp_pool_param_init(&pool_param); + pool_param.type = ODP_POOL_BUFFER; + pool_param.buf.num = tot_event; + + pool = odp_pool_create("queue perf pool", &pool_param); + + if (pool == ODP_POOL_INVALID) { + printf("Error: Pool create failed.\n"); + return -1; + } + + odp_queue_param_init(&queue_param); + queue_param.type = ODP_QUEUE_TYPE_PLAIN; + queue_param.nonblocking = nonblock; + queue_param.size = num_event; + + for (i = 0; i < num_queue; i++) { + queue[i] = odp_queue_create(NULL, &queue_param); + + if (queue[i] == ODP_QUEUE_INVALID) { + printf("Error: Queue create failed %u.\n", i); + goto error; + } + } + + for (i = 0; i < tot_event; i++) { + event[i] = odp_buffer_to_event(odp_buffer_alloc(pool)); + + if (event[i] == ODP_EVENT_INVALID) { + printf("Error: Event alloc failed %u.\n", i); + goto error; + } + } + + for (i = 0; i < num_queue; i++) { + for (j = 0; j < num_event; j++) { + uint32_t id = i * num_event + j; + + if (odp_queue_enq(queue[i], event[id])) { + printf("Error: Queue enq failed %u/%u\n", i, j); + goto error; + } + + event[id] = ODP_EVENT_INVALID; + } + } + + t1 = odp_time_local(); + c1 = odp_cpu_cycles(); + + for (rounds = 0; rounds < num_round; rounds++) { + int retry = 0; + + for (i = 0; i < num_queue; i++) { + ev = odp_queue_deq(queue[i]); + + if (ev == ODP_EVENT_INVALID) { + if (retry < 5) { + retry++; + num_retry++; + continue; + } + + printf("Error: Queue deq failed %u\n", i); + goto error; + } + + retry = 0; + + if (odp_queue_enq(queue[i], ev)) { + printf("Error: Queue enq failed %u\n", i); + goto error; + } + } + } + + c2 = odp_cpu_cycles(); + t2 = odp_time_local(); + + nsec = odp_time_diff_ns(t2, t1); + diff = odp_cpu_cycles_diff(c2, c1); + ops = num_round * num_queue; + + printf("RESULT:\n"); + printf(" num deq + enq operations: %" PRIu64 "\n", ops); + printf(" duration (nsec): %" PRIu64 "\n", nsec); + printf(" num cycles: %" PRIu64 "\n", diff); + printf(" cycles per deq + enq: %.3f\n", (double)diff / ops); + printf(" num retries: %" PRIu64 "\n\n", num_retry); + +error: + + for (i = 0; i < num_queue; i++) { + for (j = 0; j < num_event; j++) { + ev = odp_queue_deq(queue[i]); + + if (ev != ODP_EVENT_INVALID) + odp_event_free(ev); + } + } + + for (i = 0; i < tot_event; i++) { + if (event[i] != ODP_EVENT_INVALID) + odp_event_free(event[i]); + } + + for (i = 0; i < num_queue; i++) { + if (queue[i] == ODP_QUEUE_INVALID) + break; + + if (odp_queue_destroy(queue[i])) { + printf("Error: Queue destroy failed %u.\n", i); + break; + } + } + + if (odp_pool_destroy(pool)) { + printf("Error: Pool destroy failed.\n"); + return -1; + } + + return 0; +} + +int main(int argc, char **argv) +{ + odp_instance_t instance; + odp_init_t init; + test_options_t test_options; + + if (parse_options(argc, argv, &test_options)) + return -1; + + /* List features not to be used */ + odp_init_param_init(&init); + init.not_used.feat.cls = 1; + init.not_used.feat.crypto = 1; + init.not_used.feat.ipsec = 1; + init.not_used.feat.schedule = 1; + init.not_used.feat.timer = 1; + init.not_used.feat.tm = 1; + + /* Init ODP before calling anything else */ + if (odp_init_global(&instance, &init, NULL)) { + printf("Error: Global init failed.\n"); + return -1; + } + + /* Init this thread */ + if (odp_init_local(instance, ODP_THREAD_WORKER)) { + printf("Error: Local init failed.\n"); + return -1; + } + + if (test_queue(&test_options)) + printf("Error: Queue test failed.\n"); + + if (odp_term_local()) { + printf("Error: term local failed.\n"); + return -1; + } + + if (odp_term_global(instance)) { + printf("Error: term global failed.\n"); + return -1; + } + + return 0; +} commit 482da37abf31dc87fbe9bb28258122fa178cec45 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri Jun 1 10:36:17 2018 +0300 validation: queue_lf: log print when test skipped Test passes if capability indicates that lockfree queues are not implemented. Print the skipped status into log. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c index b854c46b..d09586a8 100644 --- a/test/validation/api/queue/queue.c +++ b/test/validation/api/queue/queue.c @@ -238,8 +238,10 @@ static void queue_test_lockfree(void) CU_ASSERT_FATAL(odp_queue_capability(&capa) == 0); - if (capa.plain.lockfree.max_num == 0) + if (capa.plain.lockfree.max_num == 0) { + printf(" NO LOCKFREE QUEUES. Test skipped.\n"); return; + } max_burst = capa.plain.lockfree.max_size; @@ -604,8 +606,10 @@ static void multithread_test(odp_nonblocking_t nonblocking) max_size = capa.plain.max_size; if (nonblocking == ODP_NONBLOCKING_LF) { - if (capa.plain.lockfree.max_num == 0) + if (capa.plain.lockfree.max_num == 0) { + printf(" NO LOCKFREE QUEUES. Test skipped.\n"); return; + } max_size = capa.plain.lockfree.max_size; } ----------------------------------------------------------------------- Summary of changes: test/performance/.gitignore | 1 + test/performance/Makefile.am | 4 +- test/performance/odp_queue_perf.c | 365 ++++++++++++++++++++++++++++++++++++++ test/validation/api/queue/queue.c | 8 +- 4 files changed, 375 insertions(+), 3 deletions(-) create mode 100644 test/performance/odp_queue_perf.c hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-61-g07201e12

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 07201e1277cfeb885c7ee2a666575ec9dc8c8d7c (commit) via 617d56864581c2c26dd03158aa5b60c7f845da4c (commit) via ff8eea5c2a9f5283a46376d3bb1bbedd8dd034a4 (commit) via 7cc7193c74553b5f46db482b6d8c7af599d0464a (commit) via 27de124db6343381c25335e611853b487880e9fc (commit) via a3e0a9ddf57e165e682700263f1e0a6e65037c04 (commit) via 9dd6633189cf15ca554cc4ae21996f7db91c6901 (commit) via bcb01a637648278bbbefcd6cdc3014a98de8ed4f (commit) via 8460c9c1b5afab84f4279e6e04cfb1e012965c14 (commit) via 09406916470553a85f30fc14889127443cc4a09b (commit) via ffc3f2bd0059664273425eb0c34411ac5cd88c3e (commit) from 6582ff6158b7e8380536f83da9b0fc25659e3c36 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 07201e1277cfeb885c7ee2a666575ec9dc8c8d7c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu May 31 00:52:45 2018 +0300 linux-gen: pktio: drop now-unused union definition Union, that previously contained different private data items, now has only generic private data array. Drop surrounding union to make code simpler. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index f42e8f0c..69a3072d 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -65,9 +65,7 @@ struct pktio_entry { uint8_t cls_enabled; /**< classifier enabled */ uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ - union { - unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; - }; + unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; enum { /* Not allocated */ PKTIO_STATE_FREE = 0, commit 617d56864581c2c26dd03158aa5b60c7f845da4c Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make null use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c6f1bafd..8670450f 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -111,7 +111,6 @@ noinst_HEADERS = \ include/odp_packet_io_internal.h \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ - include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index b2948e1d..f42e8f0c 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -34,7 +34,6 @@ extern "C" { #define PKTIO_MAX_QUEUES 64 #include <odp_packet_socket.h> -#include <odp_packet_null.h> #define PKTIO_NAME_LEN 256 @@ -67,7 +66,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_null_t pkt_null; /**< using null for IO */ unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; }; enum { diff --git a/platform/linux-generic/include/odp_packet_null.h b/platform/linux-generic/include/odp_packet_null.h deleted file mode 100644 index bd9036f1..00000000 --- a/platform/linux-generic/include/odp_packet_null.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright (c) 2018-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PACKET_NULL_H_ -#define ODP_PACKET_NULL_H_ - -#include <odp/api/pool.h> - -typedef struct { - int promisc; /**< whether promiscuous mode is on */ -} pkt_null_t; - -#endif diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c index 49500cab..2f1757b6 100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@ -8,7 +8,18 @@ #include <odp_api.h> #include <odp_packet_io_internal.h> -#include <odp_packet_null.h> + +typedef struct { + int promisc; /**< whether promiscuous mode is on */ +} pkt_null_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_null_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_null_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_null_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} static int null_close(pktio_entry_t *pktio_entry ODP_UNUSED) { @@ -21,7 +32,7 @@ static int null_open(odp_pktio_t id ODP_UNUSED, { if (strncmp(devname, "null:", 5) != 0) return -1; - pktio_entry->s.pkt_null.promisc = 0; + pkt_priv(pktio_entry)->promisc = 0; return 0; } @@ -103,13 +114,13 @@ static int null_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, static int null_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_entry->s.pkt_null.promisc = !!enable; + pkt_priv(pktio_entry)->promisc = !!enable; return 0; } static int null_promisc_mode_get(pktio_entry_t *pktio_entry) { - return pktio_entry->s.pkt_null.promisc; + return pkt_priv(pktio_entry)->promisc; } static int null_capability(pktio_entry_t *pktio_entry ODP_UNUSED, commit ff8eea5c2a9f5283a46376d3bb1bbedd8dd034a4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make ipc use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 702b34f9..b2948e1d 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -50,44 +50,6 @@ extern "C" { /* Forward declaration */ struct pktio_if_ops; -typedef struct { - /* TX */ - struct { - _ring_t *send; /**< ODP ring for IPC msg packets - indexes transmitted to shared - memory */ - _ring_t *free; /**< ODP ring for IPC msg packets - indexes already processed by remote - process */ - } tx; - /* RX */ - struct { - _ring_t *recv; /**< ODP ring for IPC msg packets - indexes received from shared - memory (from remote process) */ - _ring_t *free; /**< odp ring for ipc msg packets - indexes already processed by - current process */ - _ring_t *cache; /**< local cache to keep packet order right */ - } rx; /* slave */ - void *pool_base; /**< Remote pool base addr */ - void *pool_mdata_base; /**< Remote pool mdata base addr */ - uint64_t pkt_size; /**< Packet size in remote pool */ - odp_pool_t pool; /**< Pool of main process */ - enum { - PKTIO_TYPE_IPC_MASTER = 0, /**< Master is the process which - creates shm */ - PKTIO_TYPE_IPC_SLAVE /**< Slave is the process which - connects to shm */ - } type; /**< define if it's master or slave process */ - odp_atomic_u32_t ready; /**< 1 - pktio is ready and can recv/send - packet, 0 - not yet ready */ - void *pinfo; - odp_shm_t pinfo_shm; - odp_shm_t remote_pool_shm; /**< shm of remote pool get with - _ipc_map_remote_pool() */ -} _ipc_pktio_t; - #if defined(ODP_NETMAP) #define PKTIO_PRIVATE_SIZE 74752 #elif defined(ODP_PKTIO_DPDK) @@ -105,7 +67,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - _ipc_pktio_t ipc; /**< IPC pktio data */ pkt_null_t pkt_null; /**< using null for IO */ unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; }; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index d1e30ab8..3b54962f 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -25,6 +25,52 @@ ODP_DBG(fmt, ##__VA_ARGS__);\ } while (0) +typedef struct { + /* TX */ + struct { + _ring_t *send; /**< ODP ring for IPC msg packets + indexes transmitted to shared + memory */ + _ring_t *free; /**< ODP ring for IPC msg packets + indexes already processed by remote + process */ + } tx; + /* RX */ + struct { + _ring_t *recv; /**< ODP ring for IPC msg packets + indexes received from shared + memory (from remote process) */ + _ring_t *free; /**< odp ring for ipc msg packets + indexes already processed by + current process */ + _ring_t *cache; /**< local cache to keep packet order right */ + } rx; /* slave */ + void *pool_base; /**< Remote pool base addr */ + void *pool_mdata_base; /**< Remote pool mdata base addr */ + uint64_t pkt_size; /**< Packet size in remote pool */ + odp_pool_t pool; /**< Pool of main process */ + enum { + PKTIO_TYPE_IPC_MASTER = 0, /**< Master is the process which + creates shm */ + PKTIO_TYPE_IPC_SLAVE /**< Slave is the process which + connects to shm */ + } type; /**< define if it's master or slave process */ + odp_atomic_u32_t ready; /**< 1 - pktio is ready and can recv/send + packet, 0 - not yet ready */ + void *pinfo; + odp_shm_t pinfo_shm; + odp_shm_t remote_pool_shm; /**< shm of remote pool get with + _ipc_map_remote_pool() */ +} pkt_ipc_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_ipc_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_ipc_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_ipc_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + /* MAC address for the "ipc" interface */ static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; @@ -46,7 +92,7 @@ static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl) static int _ipc_master_start(pktio_entry_t *pktio_entry) { - struct pktio_info *pinfo = pktio_entry->s.ipc.pinfo; + struct pktio_info *pinfo = pkt_priv(pktio_entry)->pinfo; odp_shm_t shm; if (pinfo->slave.init_done == 0) @@ -60,11 +106,11 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) return -1; } - pktio_entry->s.ipc.remote_pool_shm = shm; - pktio_entry->s.ipc.pool_base = odp_shm_addr(shm); - pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm); + pkt_priv(pktio_entry)->remote_pool_shm = shm; + pkt_priv(pktio_entry)->pool_base = odp_shm_addr(shm); + pkt_priv(pktio_entry)->pool_mdata_base = (char *)odp_shm_addr(shm); - odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1); + odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 1); IPC_ODP_DBG("%s started.\n", pktio_entry->s.name); return 0; @@ -91,62 +137,62 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, * to be processed packets ring. */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pktio_entry->s.ipc.tx.send = _ring_create(ipc_shm_name, + pkt_priv(pktio_entry)->tx.send = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->s.ipc.tx.send) { + if (!pkt_priv(pktio_entry)->tx.send) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); return -1; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.tx.send), - _ring_free_count(pktio_entry->s.ipc.tx.send)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send), + _ring_free_count(pkt_priv(pktio_entry)->tx.send)); /* generate name in shm like ipc_pktio_p for * already processed packets */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pktio_entry->s.ipc.tx.free = _ring_create(ipc_shm_name, + pkt_priv(pktio_entry)->tx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->s.ipc.tx.free) { + if (!pkt_priv(pktio_entry)->tx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.tx.free), - _ring_free_count(pktio_entry->s.ipc.tx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free), + _ring_free_count(pkt_priv(pktio_entry)->tx.free)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pktio_entry->s.ipc.rx.recv = _ring_create(ipc_shm_name, + pkt_priv(pktio_entry)->rx.recv = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->s.ipc.rx.recv) { + if (!pkt_priv(pktio_entry)->rx.recv) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_m_cons; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.rx.recv), - _ring_free_count(pktio_entry->s.ipc.rx.recv)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv), + _ring_free_count(pkt_priv(pktio_entry)->rx.recv)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pktio_entry->s.ipc.rx.free = _ring_create(ipc_shm_name, + pkt_priv(pktio_entry)->rx.free = _ring_create(ipc_shm_name, PKTIO_IPC_ENTRIES, _RING_SHM_PROC | _RING_NO_LIST); - if (!pktio_entry->s.ipc.rx.free) { + if (!pkt_priv(pktio_entry)->rx.free) { ODP_ERR("pid %d unable to create ipc ring %s name\n", getpid(), ipc_shm_name); goto free_s_prod; } ODP_DBG("Created IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.rx.free), - _ring_free_count(pktio_entry->s.ipc.rx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free), + _ring_free_count(pkt_priv(pktio_entry)->rx.free)); /* Set up pool name for remote info */ - pinfo = pktio_entry->s.ipc.pinfo; + pinfo = pkt_priv(pktio_entry)->pinfo; pool_name = _ipc_odp_buffer_pool_shm_name(pool_hdl); if (strlen(pool_name) > ODP_POOL_NAME_LEN) { ODP_ERR("pid %d ipc pool name %s is too big %d\n", @@ -159,7 +205,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, pinfo->slave.pid = 0; pinfo->slave.init_done = 0; - pktio_entry->s.ipc.pool = pool_hdl; + pkt_priv(pktio_entry)->pool = pool_hdl; ODP_DBG("Pre init... DONE.\n"); pinfo->master.init_done = 1; @@ -228,7 +274,7 @@ static int _ipc_init_slave(const char *dev, if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_slave_r"))) ODP_ABORT("too big ipc name\n"); - pktio_entry->s.ipc.pool = pool; + pkt_priv(pktio_entry)->pool = pool; return 0; } @@ -249,61 +295,61 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) sprintf(dev, "ipc:%s", tail); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev); - pktio_entry->s.ipc.rx.recv = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->s.ipc.rx.recv) { + pkt_priv(pktio_entry)->rx.recv = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_priv(pktio_entry)->rx.recv) { ODP_DBG("pid %d unable to find ipc ring %s name\n", getpid(), dev); sleep(1); return -1; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.rx.recv), - _ring_free_count(pktio_entry->s.ipc.rx.recv)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.recv), + _ring_free_count(pkt_priv(pktio_entry)->rx.recv)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev); - pktio_entry->s.ipc.rx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->s.ipc.rx.free) { + pkt_priv(pktio_entry)->rx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_priv(pktio_entry)->rx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.rx.free), - _ring_free_count(pktio_entry->s.ipc.rx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->rx.free), + _ring_free_count(pkt_priv(pktio_entry)->rx.free)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev); - pktio_entry->s.ipc.tx.send = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->s.ipc.tx.send) { + pkt_priv(pktio_entry)->tx.send = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_priv(pktio_entry)->tx.send) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_m_cons; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.tx.send), - _ring_free_count(pktio_entry->s.ipc.tx.send)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.send), + _ring_free_count(pkt_priv(pktio_entry)->tx.send)); snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev); - pktio_entry->s.ipc.tx.free = _ipc_shm_map(ipc_shm_name, pid); - if (!pktio_entry->s.ipc.tx.free) { + pkt_priv(pktio_entry)->tx.free = _ipc_shm_map(ipc_shm_name, pid); + if (!pkt_priv(pktio_entry)->tx.free) { ODP_ERR("pid %d unable to find ipc ring %s name\n", getpid(), dev); goto free_s_prod; } ODP_DBG("Connected IPC ring: %s, count %d, free %d\n", - ipc_shm_name, _ring_count(pktio_entry->s.ipc.tx.free), - _ring_free_count(pktio_entry->s.ipc.tx.free)); + ipc_shm_name, _ring_count(pkt_priv(pktio_entry)->tx.free), + _ring_free_count(pkt_priv(pktio_entry)->tx.free)); /* Get info about remote pool */ - pinfo = pktio_entry->s.ipc.pinfo; + pinfo = pkt_priv(pktio_entry)->pinfo; shm = _ipc_map_remote_pool(pinfo->master.pool_name, pid); - pktio_entry->s.ipc.remote_pool_shm = shm; - pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm); - pktio_entry->s.ipc.pkt_size = pinfo->master.block_size; + pkt_priv(pktio_entry)->remote_pool_shm = shm; + pkt_priv(pktio_entry)->pool_mdata_base = (char *)odp_shm_addr(shm); + pkt_priv(pktio_entry)->pkt_size = pinfo->master.block_size; - _ipc_export_pool(pinfo, pktio_entry->s.ipc.pool); + _ipc_export_pool(pinfo, pkt_priv(pktio_entry)->pool); - odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1); + odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 1); pinfo->slave.init_done = 1; ODP_DBG("%s started.\n", pktio_entry->s.name); @@ -342,17 +388,17 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, if (strncmp(dev, "ipc", 3)) return -1; - odp_atomic_init_u32(&pktio_entry->s.ipc.ready, 0); + odp_atomic_init_u32(&pkt_priv(pktio_entry)->ready, 0); - pktio_entry->s.ipc.rx.cache = _ring_create("ipc_rx_cache", + pkt_priv(pktio_entry)->rx.cache = _ring_create("ipc_rx_cache", PKTIO_IPC_ENTRIES, _RING_NO_LIST); - if (!pktio_entry->s.ipc.rx.cache) + if (!pkt_priv(pktio_entry)->rx.cache) return -1; /* Shared info about remote pktio */ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) { - pktio_entry->s.ipc.type = PKTIO_TYPE_IPC_SLAVE; + pkt_priv(pktio_entry)->type = PKTIO_TYPE_IPC_SLAVE; snprintf(name, sizeof(name), "ipc:%s_info", tail); IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid); @@ -368,12 +414,12 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, _ring_destroy("ipc_rx_cache"); return -1; } - pktio_entry->s.ipc.pinfo = pinfo; - pktio_entry->s.ipc.pinfo_shm = shm; + pkt_priv(pktio_entry)->pinfo = pinfo; + pkt_priv(pktio_entry)->pinfo_shm = shm; ODP_DBG("process %d is slave\n", getpid()); ret = _ipc_init_slave(name, pktio_entry, pool); } else { - pktio_entry->s.ipc.type = PKTIO_TYPE_IPC_MASTER; + pkt_priv(pktio_entry)->type = PKTIO_TYPE_IPC_MASTER; snprintf(name, sizeof(name), "%s_info", dev); shm = odp_shm_reserve(name, sizeof(struct pktio_info), ODP_CACHE_LINE_SIZE, @@ -387,8 +433,8 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED, pinfo = odp_shm_addr(shm); pinfo->master.init_done = 0; pinfo->master.pool_name[0] = 0; - pktio_entry->s.ipc.pinfo = pinfo; - pktio_entry->s.ipc.pinfo_shm = shm; + pkt_priv(pktio_entry)->pinfo = pinfo; + pkt_priv(pktio_entry)->pinfo_shm = shm; ODP_DBG("process %d is master\n", getpid()); ret = _ipc_init_master(pktio_entry, dev, pool); } @@ -408,7 +454,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) if (!r) return; - pool = pool_entry_from_hdl(pktio_entry->s.ipc.pool); + pool = pool_entry_from_hdl(pkt_priv(pktio_entry)->pool); addr = odp_shm_addr(pool->shm); rbuf_p = (void *)&offsets; @@ -442,16 +488,16 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, uint32_t ready; int pkts_ring; - ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready); + ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); if (odp_unlikely(!ready)) { IPC_ODP_DBG("start pktio is missing before usage?\n"); return 0; } - _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free); /* rx from cache */ - r = pktio_entry->s.ipc.rx.cache; + r = pkt_priv(pktio_entry)->rx.cache; pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -459,7 +505,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* rx from other app */ if (pkts == 0) { ipcbufs_p = (void *)&offsets[0]; - r = pktio_entry->s.ipc.rx.recv; + r = pkt_priv(pktio_entry)->rx.recv; pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len); if (odp_unlikely(pkts < 0)) ODP_ABORT("internal error dequeue\n"); @@ -477,10 +523,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, uint64_t data_pool_off; void *rmt_data_ptr; - phdr = (void *)((uint8_t *)pktio_entry->s.ipc.pool_mdata_base + + phdr = (void *)((uint8_t *)pkt_priv(pktio_entry)-> + pool_mdata_base + offsets[i]); - pool = pktio_entry->s.ipc.pool; + pool = pkt_priv(pktio_entry)->pool; if (odp_unlikely(pool == ODP_POOL_INVALID)) ODP_ABORT("invalid pool"); @@ -505,10 +552,11 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(!pkt_data)) ODP_ABORT("unable to map pkt_data ipc_slave %d\n", (PKTIO_TYPE_IPC_SLAVE == - pktio_entry->s.ipc.type)); + pkt_priv(pktio_entry)->type)); /* Copy packet data from shared pool to local pool. */ - rmt_data_ptr = (uint8_t *)pktio_entry->s.ipc.pool_mdata_base + + rmt_data_ptr = (uint8_t *)pkt_priv(pktio_entry)-> + pool_mdata_base + data_pool_off; memcpy(pkt_data, rmt_data_ptr, phdr->frame_len); @@ -528,7 +576,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, /* put back to rx ring dequed but not processed packets*/ if (pkts != i) { ipcbufs_p = (void *)&offsets[i]; - r_p = pktio_entry->s.ipc.rx.cache; + r_p = pkt_priv(pktio_entry)->rx.cache; pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts - i); if (pkts_ring != (pkts - i)) @@ -543,7 +591,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkts = i; /* Now tell other process that we no longer need that buffers.*/ - r_p = pktio_entry->s.ipc.rx.free; + r_p = pkt_priv(pktio_entry)->rx.free; repeat: @@ -591,7 +639,8 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, void **rbuf_p; int ret; int i; - uint32_t ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready); + uint32_t ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); + pool_t *ipc_pool = pool_entry_from_hdl(pkt_priv(pktio_entry)->pool); odp_packet_t pkt_table_mapped[num]; /**< Ready to send packet has to be * in memory mapped pool. */ uintptr_t offsets[num]; @@ -599,14 +648,13 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, if (odp_unlikely(!ready)) return 0; - _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free); + _ipc_free_ring_packets(pktio_entry, pkt_priv(pktio_entry)->tx.free); /* Copy packets to shm shared pool if they are in different * pool, or if they are references (we can't share across IPC). */ for (i = 0; i < num; i++) { odp_packet_t pkt = pkt_table[i]; - pool_t *ipc_pool = pool_entry_from_hdl(pktio_entry->s.ipc.pool); odp_packet_hdr_t *pkt_hdr; pool_t *pool; @@ -617,7 +665,8 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, odp_packet_has_ref(pkt)) { odp_packet_t newpkt; - newpkt = odp_packet_copy(pkt, pktio_entry->s.ipc.pool); + newpkt = odp_packet_copy(pkt, + pkt_priv(pktio_entry)->pool); if (newpkt == ODP_PACKET_INVALID) ODP_ABORT("Unable to copy packet\n"); @@ -650,17 +699,17 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, pkt_hdr, pkt_hdr->buf_hdr.ipc_data_offset, offsets[i], odp_shm_addr(pool->shm), odp_shm_addr(pool_entry_from_hdl( - pktio_entry->s.ipc.pool)->shm)); + pkt_priv(pktio_entry)->pool)->shm)); } /* Put packets to ring to be processed by other process. */ rbuf_p = (void *)&offsets[0]; - r = pktio_entry->s.ipc.tx.send; + r = pkt_priv(pktio_entry)->tx.send; ret = _ring_mp_enqueue_burst(r, rbuf_p, num); if (odp_unlikely(ret < 0)) { ODP_ERR("pid %d odp_ring_mp_enqueue_bulk fail, ipc_slave %d, ret %d\n", getpid(), - (PKTIO_TYPE_IPC_SLAVE == pktio_entry->s.ipc.type), + (PKTIO_TYPE_IPC_SLAVE == pkt_priv(pktio_entry)->type), ret); ODP_ERR("odp_ring_full: %d, odp_ring_count %d, _ring_free_count %d\n", _ring_full(r), _ring_count(r), @@ -700,14 +749,14 @@ static int ipc_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, static int ipc_start(pktio_entry_t *pktio_entry) { - uint32_t ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready); + uint32_t ready = odp_atomic_load_u32(&pkt_priv(pktio_entry)->ready); if (ready) { ODP_ABORT("%s Already started\n", pktio_entry->s.name); return -1; } - if (pktio_entry->s.ipc.type == PKTIO_TYPE_IPC_MASTER) + if (pkt_priv(pktio_entry)->type == PKTIO_TYPE_IPC_MASTER) return _ipc_master_start(pktio_entry); else return _ipc_slave_start(pktio_entry); @@ -717,20 +766,22 @@ static int ipc_stop(pktio_entry_t *pktio_entry) { unsigned tx_send = 0, tx_free = 0; - odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 0); + odp_atomic_store_u32(&pkt_priv(pktio_entry)->ready, 0); - if (pktio_entry->s.ipc.tx.send) - _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.send); + if (pkt_priv(pktio_entry)->tx.send) + _ipc_free_ring_packets(pktio_entry, + pkt_priv(pktio_entry)->tx.send); /* other process can transfer packets from one ring to * other, use delay here to free that packets. */ sleep(1); - if (pktio_entry->s.ipc.tx.free) - _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free); - - if (pktio_entry->s.ipc.tx.send) - tx_send = _ring_count(pktio_entry->s.ipc.tx.send); - if (pktio_entry->s.ipc.tx.free) - tx_free = _ring_count(pktio_entry->s.ipc.tx.free); + if (pkt_priv(pktio_entry)->tx.free) + _ipc_free_ring_packets(pktio_entry, + pkt_priv(pktio_entry)->tx.free); + + if (pkt_priv(pktio_entry)->tx.send) + tx_send = _ring_count(pkt_priv(pktio_entry)->tx.send); + if (pkt_priv(pktio_entry)->tx.free) + tx_free = _ring_count(pkt_priv(pktio_entry)->tx.free); if (tx_send | tx_free) { ODP_DBG("IPC rings: tx send %d tx free %d\n", tx_send, tx_free); @@ -749,7 +800,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) ipc_stop(pktio_entry); - odp_shm_free(pktio_entry->s.ipc.remote_pool_shm); + odp_shm_free(pkt_priv(pktio_entry)->remote_pool_shm); if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) snprintf(name, sizeof(name), "ipc:%s", tail); @@ -757,7 +808,7 @@ static int ipc_close(pktio_entry_t *pktio_entry) snprintf(name, sizeof(name), "%s", dev); /* unlink this pktio info for both master and slave */ - odp_shm_free(pktio_entry->s.ipc.pinfo_shm); + odp_shm_free(pkt_priv(pktio_entry)->pinfo_shm); /* destroy rings */ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", name); commit 7cc7193c74553b5f46db482b6d8c7af599d0464a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make tap use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ae87d222..c6f1bafd 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -113,7 +113,6 @@ noinst_HEADERS = \ include/odp_packet_io_ring_internal.h \ include/odp_packet_null.h \ include/odp_packet_socket.h \ - include/odp_packet_tap.h \ include/odp_pcapng.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 216d7185..702b34f9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -34,7 +34,6 @@ extern "C" { #define PKTIO_MAX_QUEUES 64 #include <odp_packet_socket.h> -#include <odp_packet_tap.h> #include <odp_packet_null.h> #define PKTIO_NAME_LEN 256 @@ -106,7 +105,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_tap_t pkt_tap; /**< using TAP for IO */ _ipc_pktio_t ipc; /**< IPC pktio data */ pkt_null_t pkt_null; /**< using null for IO */ unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; diff --git a/platform/linux-generic/include/odp_packet_tap.h b/platform/linux-generic/include/odp_packet_tap.h deleted file mode 100644 index a90bfbce..00000000 --- a/platform/linux-generic/include/odp_packet_tap.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2015, Ilya Maximets <i.maximets(a)samsung.com> - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PACKET_TAP_H_ -#define ODP_PACKET_TAP_H_ - -#include <odp/api/pool.h> - -typedef struct { - int fd; /**< file descriptor for tap interface*/ - int skfd; /**< socket descriptor */ - uint32_t mtu; /**< cached mtu */ - unsigned char if_mac[ETH_ALEN]; /**< MAC address of pktio side (not a - MAC address of kernel interface)*/ - odp_pool_t pool; /**< pool to alloc packets from */ -} pkt_tap_t; - -#endif diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index a3587f10..12a1945d 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -51,6 +51,23 @@ #define BUF_SIZE 65536 +typedef struct { + int fd; /**< file descriptor for tap interface*/ + int skfd; /**< socket descriptor */ + uint32_t mtu; /**< cached mtu */ + unsigned char if_mac[ETH_ALEN]; /**< MAC address of pktio side (not a + MAC address of kernel interface)*/ + odp_pool_t pool; /**< pool to alloc packets from */ +} pkt_tap_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_tap_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_tap_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_tap_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + static int gen_random_mac(unsigned char *mac) { mac[0] = 0x7a; /* not multicast and local assignment bit is set */ @@ -91,7 +108,7 @@ static int tap_pktio_open(odp_pktio_t id ODP_UNUSED, int fd, skfd, flags; uint32_t mtu; struct ifreq ifr; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); if (strncmp(devname, "tap:", 4) != 0) return -1; @@ -175,7 +192,7 @@ tap_err: static int tap_pktio_start(pktio_entry_t *pktio_entry) { struct ifreq ifr; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); odp_memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", @@ -206,7 +223,7 @@ sock_err: static int tap_pktio_stop(pktio_entry_t *pktio_entry) { struct ifreq ifr; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); odp_memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", @@ -237,7 +254,7 @@ sock_err: static int tap_pktio_close(pktio_entry_t *pktio_entry) { int ret = 0; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); if (tap->fd != -1 && close(tap->fd) != 0) { __odp_errno = errno; @@ -264,13 +281,13 @@ static odp_packet_t pack_odp_pkt(pktio_entry_t *pktio_entry, const void *data, if (pktio_cls_enabled(pktio_entry)) { if (cls_classify_packet(pktio_entry, data, len, len, - &pktio_entry->s.pkt_tap.pool, + &pkt_priv(pktio_entry)->pool, &parsed_hdr, true)) { return ODP_PACKET_INVALID; } } - num = packet_alloc_multi(pktio_entry->s.pkt_tap.pool, len, &pkt, 1); + num = packet_alloc_multi(pkt_priv(pktio_entry)->pool, len, &pkt, 1); if (num != 1) return ODP_PACKET_INVALID; @@ -302,7 +319,7 @@ static int tap_pktio_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ssize_t retval; int i; uint8_t buf[BUF_SIZE]; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); odp_time_t ts_val; odp_time_t *ts = NULL; @@ -342,7 +359,7 @@ static int tap_pktio_send_lockless(pktio_entry_t *pktio_entry, int i, n; uint32_t pkt_len; uint8_t buf[BUF_SIZE]; - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); for (i = 0; i < num; i++) { pkt_len = odp_packet_len(pkts[i]); @@ -405,10 +422,10 @@ static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) { uint32_t ret; - ret = mtu_get_fd(pktio_entry->s.pkt_tap.skfd, + ret = mtu_get_fd(pkt_priv(pktio_entry)->skfd, pktio_entry->s.name + 4); if (ret > 0) - pktio_entry->s.pkt_tap.mtu = ret; + pkt_priv(pktio_entry)->mtu = ret; return ret; } @@ -416,25 +433,25 @@ static uint32_t tap_mtu_get(pktio_entry_t *pktio_entry) static int tap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->s.pkt_tap.skfd, + return promisc_mode_set_fd(pkt_priv(pktio_entry)->skfd, pktio_entry->s.name + 4, enable); } static int tap_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->s.pkt_tap.skfd, + return promisc_mode_get_fd(pkt_priv(pktio_entry)->skfd, pktio_entry->s.name + 4); } static int tap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->s.pkt_tap.if_mac, ETH_ALEN); + memcpy(mac_addr, pkt_priv(pktio_entry)->if_mac, ETH_ALEN); return ETH_ALEN; } static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) { - pkt_tap_t *tap = &pktio_entry->s.pkt_tap; + pkt_tap_t *tap = pkt_priv(pktio_entry); memcpy(tap->if_mac, mac_addr, ETH_ALEN); @@ -444,7 +461,7 @@ static int tap_mac_addr_set(pktio_entry_t *pktio_entry, const void *mac_addr) static int tap_link_status(pktio_entry_t *pktio_entry) { - return link_status_fd(pktio_entry->s.pkt_tap.skfd, + return link_status_fd(pkt_priv(pktio_entry)->skfd, pktio_entry->s.name + 4); } commit 27de124db6343381c25335e611853b487880e9fc Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make pcap use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index a4b2fed7..216d7185 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -51,21 +51,6 @@ extern "C" { /* Forward declaration */ struct pktio_if_ops; -#ifdef HAVE_PCAP -typedef struct { - char *fname_rx; /**< name of pcap file for rx */ - char *fname_tx; /**< name of pcap file for tx */ - void *rx; /**< rx pcap handle */ - void *tx; /**< tx pcap handle */ - void *tx_dump; /**< tx pcap dumper handle */ - odp_pool_t pool; /**< rx pool */ - unsigned char *buf; /**< per-pktio temp buffer */ - int loops; /**< number of times to loop rx pcap */ - int loop_cnt; /**< number of loops completed */ - odp_bool_t promisc; /**< promiscuous mode state */ -} pkt_pcap_t; -#endif - typedef struct { /* TX */ struct { @@ -121,9 +106,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { -#ifdef HAVE_PCAP - pkt_pcap_t pkt_pcap; /**< Using pcap for IO */ -#endif pkt_tap_t pkt_tap; /**< using TAP for IO */ _ipc_pktio_t ipc; /**< IPC pktio data */ pkt_null_t pkt_null; /**< using null for IO */ diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index f1662930..c6a817fc 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -49,6 +49,27 @@ #include <pcap/pcap.h> #include <pcap/bpf.h> +typedef struct { + char *fname_rx; /**< name of pcap file for rx */ + char *fname_tx; /**< name of pcap file for tx */ + void *rx; /**< rx pcap handle */ + void *tx; /**< tx pcap handle */ + void *tx_dump; /**< tx pcap dumper handle */ + odp_pool_t pool; /**< rx pool */ + unsigned char *buf; /**< per-pktio temp buffer */ + int loops; /**< number of times to loop rx pcap */ + int loop_cnt; /**< number of loops completed */ + odp_bool_t promisc; /**< promiscuous mode state */ +} pkt_pcap_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_pcap_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_pcap_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_pcap_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + #define PKTIO_PCAP_MTU (64 * 1024) static const char pcap_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x04}; @@ -139,7 +160,7 @@ static int _pcapif_init_tx(pkt_pcap_t *pcap) static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *devname, odp_pool_t pool) { - pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + pkt_pcap_t *pcap = pkt_priv(pktio_entry); int ret; memset(pcap, 0, sizeof(pkt_pcap_t)); @@ -166,7 +187,7 @@ static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, static int pcapif_close(pktio_entry_t *pktio_entry) { - pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + pkt_pcap_t *pcap = pkt_priv(pktio_entry); if (pcap->tx_dump) pcap_dump_close(pcap->tx_dump); @@ -213,7 +234,7 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt; odp_packet_hdr_t *pkt_hdr; uint32_t pkt_len; - pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + pkt_pcap_t *pcap = pkt_priv(pktio_entry); odp_time_t ts_val; odp_time_t *ts = NULL; @@ -297,7 +318,7 @@ static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt) static int pcapif_send_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkts[], int num) { - pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + pkt_pcap_t *pcap = pkt_priv(pktio_entry); int i; odp_ticketlock_lock(&pktio_entry->s.txl); @@ -365,7 +386,7 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, { char filter_exp[64] = {0}; struct bpf_program bpf; - pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + pkt_pcap_t *pcap = pkt_priv(pktio_entry); if (!pcap->rx) { pcap->promisc = enable; @@ -405,7 +426,7 @@ static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, static int pcapif_promisc_mode_get(pktio_entry_t *pktio_entry) { - return pktio_entry->s.pkt_pcap.promisc; + return pkt_priv(pktio_entry)->promisc; } static int pcapif_stats_reset(pktio_entry_t *pktio_entry) commit a3e0a9ddf57e165e682700263f1e0a6e65037c04 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make dpdk use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 020c2b97..d457cfa3 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -8,70 +8,10 @@ #define ODP_PACKET_DPDK_H #include <odp/api/packet_io.h> -#include <odp/api/pool.h> -#include <odp/api/ticketlock.h> -#include <net/if.h> - -#ifdef ODP_PKTIO_DPDK -#include <rte_config.h> -#include <rte_mbuf.h> - -#define DPDK_MEMORY_MB 512 -#define DPDK_NB_MBUF 16384 -#define DPDK_MBUF_BUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE -#define DPDK_MEMPOOL_CACHE_SIZE 64 - -ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) && - (DPDK_MEMPOOL_CACHE_SIZE <= RTE_MEMPOOL_CACHE_MAX_SIZE) && - (DPDK_MEMPOOL_CACHE_SIZE <= DPDK_MBUF_BUF_SIZE * 10 / 15) - , "DPDK mempool cache size failure"); -#endif - -/* Minimum RX burst size */ -#define DPDK_MIN_RX_BURST 4 - -/** DPDK runtime configuration options */ -typedef struct { - int num_rx_desc; - int num_tx_desc; - int rx_drop_en; -} dpdk_opt_t; +struct rte_mbuf; /** Cache for storing packets */ -struct pkt_cache_t { - /** array for storing extra RX packets */ - struct rte_mbuf *pkt[DPDK_MIN_RX_BURST]; - unsigned idx; /**< head of cache */ - unsigned count; /**< packets in cache */ -}; - -typedef union ODP_ALIGNED_CACHE { - struct pkt_cache_t s; - uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pkt_cache_t))]; -} pkt_cache_t; - -/** Packet IO using DPDK interface */ -typedef struct ODP_ALIGNED_CACHE { - odp_pool_t pool; /**< pool to alloc packets from */ - struct rte_mempool *pkt_pool; /**< DPDK packet pool */ - uint32_t data_room; /**< maximum packet length */ - unsigned min_rx_burst; /**< minimum RX burst size */ - odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ - uint16_t mtu; /**< maximum transmission unit */ - uint16_t port_id; /**< DPDK port identifier */ - /** Use system call to get/set vdev promisc mode */ - uint8_t vdev_sysc_promisc; - uint8_t lockless_rx; /**< no locking for rx */ - uint8_t lockless_tx; /**< no locking for tx */ - /** RX queue locks */ - odp_ticketlock_t ODP_ALIGNED_CACHE rx_lock[PKTIO_MAX_QUEUES]; - odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */ - /** cache for storing extra RX packets */ - pkt_cache_t rx_cache[PKTIO_MAX_QUEUES]; - dpdk_opt_t opt; -} pkt_dpdk_t; - /** Packet parser using DPDK interface */ int dpdk_packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr, diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 600fdd36..a4b2fed7 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -36,7 +36,6 @@ extern "C" { #include <odp_packet_socket.h> #include <odp_packet_tap.h> #include <odp_packet_null.h> -#include <odp_packet_dpdk.h> #define PKTIO_NAME_LEN 256 @@ -107,6 +106,8 @@ typedef struct { #if defined(ODP_NETMAP) #define PKTIO_PRIVATE_SIZE 74752 +#elif defined(ODP_PKTIO_DPDK) +#define PKTIO_PRIVATE_SIZE 5632 #else #define PKTIO_PRIVATE_SIZE 384 #endif @@ -120,7 +121,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_dpdk_t pkt_dpdk; /**< using DPDK for IO */ #ifdef HAVE_PCAP pkt_pcap_t pkt_pcap; /**< Using pcap for IO */ #endif diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 8d93b873..34847f9c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -33,6 +33,7 @@ #include <protocols/udp.h> #include <rte_config.h> +#include <rte_mbuf.h> #include <rte_malloc.h> #if __GNUC__ >= 7 #pragma GCC diagnostic push @@ -74,6 +75,67 @@ ODP_STATIC_ASSERT(PKT_EXTRA_LEN >= sizeof(struct rte_mbuf), #define IXGBE_DRV_NAME "net_ixgbe" #define I40E_DRV_NAME "net_i40e" +#define DPDK_MEMORY_MB 512 +#define DPDK_NB_MBUF 16384 +#define DPDK_MBUF_BUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE +#define DPDK_MEMPOOL_CACHE_SIZE 64 + +ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) && + (DPDK_MEMPOOL_CACHE_SIZE <= RTE_MEMPOOL_CACHE_MAX_SIZE) && + (DPDK_MEMPOOL_CACHE_SIZE <= DPDK_MBUF_BUF_SIZE * 10 / 15) + , "DPDK mempool cache size failure"); + +/* Minimum RX burst size */ +#define DPDK_MIN_RX_BURST 4 + +/** DPDK runtime configuration options */ +typedef struct { + int num_rx_desc; + int num_tx_desc; + int rx_drop_en; +} dpdk_opt_t; + +struct pkt_cache_t { + /** array for storing extra RX packets */ + struct rte_mbuf *pkt[DPDK_MIN_RX_BURST]; + unsigned int idx; /**< head of cache */ + unsigned int count; /**< packets in cache */ +}; + +typedef union ODP_ALIGNED_CACHE { + struct pkt_cache_t s; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pkt_cache_t))]; +} pkt_cache_t; + +/** Packet IO using DPDK interface */ +typedef struct ODP_ALIGNED_CACHE { + odp_pool_t pool; /**< pool to alloc packets from */ + struct rte_mempool *pkt_pool; /**< DPDK packet pool */ + uint32_t data_room; /**< maximum packet length */ + unsigned int min_rx_burst; /**< minimum RX burst size */ + odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ + uint16_t mtu; /**< maximum transmission unit */ + uint16_t port_id; /**< DPDK port identifier */ + /** Use system call to get/set vdev promisc mode */ + uint8_t vdev_sysc_promisc; + uint8_t lockless_rx; /**< no locking for rx */ + uint8_t lockless_tx; /**< no locking for tx */ + /** RX queue locks */ + odp_ticketlock_t ODP_ALIGNED_CACHE rx_lock[PKTIO_MAX_QUEUES]; + odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */ + /** cache for storing extra RX packets */ + pkt_cache_t rx_cache[PKTIO_MAX_QUEUES]; + dpdk_opt_t opt; +} pkt_dpdk_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_dpdk_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_dpdk_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_dpdk_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ /* Has dpdk_pktio_init() been called */ @@ -121,7 +183,7 @@ static int lookup_opt(const char *opt_name, const char *drv_name, int *val) static int init_options(pktio_entry_t *pktio_entry, const struct rte_eth_dev_info *dev_info) { - dpdk_opt_t *opt = &pktio_entry->s.pkt_dpdk.opt; + dpdk_opt_t *opt = &pkt_priv(pktio_entry)->opt; if (!lookup_opt("num_rx_desc", dev_info->driver_name, &opt->num_rx_desc)) @@ -149,7 +211,7 @@ static int init_options(pktio_entry_t *pktio_entry, opt->rx_drop_en = !!opt->rx_drop_en; ODP_PRINT("DPDK interface (%s): %" PRIu16 "\n", dev_info->driver_name, - pktio_entry->s.pkt_dpdk.port_id); + pkt_priv(pktio_entry)->port_id); ODP_PRINT(" num_rx_desc: %d\n", opt->num_rx_desc); ODP_PRINT(" num_tx_desc: %d\n", opt->num_tx_desc); ODP_PRINT(" rx_drop_en: %d\n", opt->rx_drop_en); @@ -434,13 +496,13 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, int i, j; int nb_pkts = 0; int alloc_len, num; - odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; + odp_pool_t pool = pkt_priv(pktio_entry)->pool; odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; /* Allocate maximum sized packets */ - alloc_len = pktio_entry->s.pkt_dpdk.data_room; + alloc_len = pkt_priv(pktio_entry)->data_room; num = packet_alloc_multi(pool, alloc_len, pkt_table, mbuf_num); if (num != mbuf_num) { @@ -637,7 +699,7 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry, struct rte_mbuf *mbuf_table[], const odp_packet_t pkt_table[], uint16_t num) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); int i, j; char *data; uint16_t pkt_len; @@ -693,7 +755,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry, void *data; int i; int nb_pkts = 0; - odp_pool_t pool = pktio_entry->s.pkt_dpdk.pool; + odp_pool_t pool = pkt_priv(pktio_entry)->pool; odp_pktin_config_opt_t pktin_cfg = pktio_entry->s.config.pktin; odp_proto_layer_t parse_layer = pktio_entry->s.config.parser.layer; odp_pktio_t input = pktio_entry->s.handle; @@ -768,7 +830,7 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry, const odp_packet_t pkt_table[], uint16_t num, uint16_t *copy_count) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout; odp_pktout_config_opt_t *pktout_capa = &pktio_entry->s.capa.config.pktout; @@ -864,7 +926,7 @@ static uint32_t dpdk_vdev_mtu_get(uint16_t port_id) static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); uint32_t mtu = 0; if (rte_eth_dev_get_mtu(pkt_dpdk->port_id, (uint16_t *)&mtu)) @@ -885,7 +947,7 @@ static uint32_t dpdk_mtu_get(pktio_entry_t *pktio_entry) static uint32_t dpdk_frame_maxlen(pktio_entry_t *pktio_entry) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); return pkt_dpdk->mtu; } @@ -964,7 +1026,7 @@ static void rss_conf_to_hash_proto(struct rte_eth_rss_conf *rss_conf, static int dpdk_setup_port(pktio_entry_t *pktio_entry) { int ret; - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); struct rte_eth_rss_conf rss_conf; uint16_t hw_ip_checksum = 0; @@ -1012,7 +1074,7 @@ static int dpdk_setup_port(pktio_entry_t *pktio_entry) static int dpdk_close(pktio_entry_t *pktio_entry) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); unsigned idx; unsigned i, j; @@ -1207,9 +1269,9 @@ static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, lockless = 0; if (p->hash_enable && p->num_queues > 1) - pktio_entry->s.pkt_dpdk.hash = p->hash_proto; + pkt_priv(pktio_entry)->hash = p->hash_proto; - pktio_entry->s.pkt_dpdk.lockless_rx = lockless; + pkt_priv(pktio_entry)->lockless_rx = lockless; return 0; } @@ -1217,7 +1279,7 @@ static int dpdk_input_queues_config(pktio_entry_t *pktio_entry, static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); uint8_t lockless; if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE) @@ -1233,7 +1295,7 @@ static int dpdk_output_queues_config(pktio_entry_t *pktio_entry, static void dpdk_init_capability(pktio_entry_t *pktio_entry, struct rte_eth_dev_info *dev_info) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); odp_pktio_capability_t *capa = &pktio_entry->s.capa; int ptype_cnt; int ptype_l3_ipv4 = 0; @@ -1324,7 +1386,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED, const char *netdev, odp_pool_t pool) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); struct rte_eth_dev_info dev_info; struct rte_mempool *pkt_pool; char pool_name[RTE_MEMPOOL_NAMESIZE]; @@ -1442,7 +1504,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) { struct rte_eth_dev_info dev_info; struct rte_eth_rxconf *rxconf; - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); uint16_t port_id = pkt_dpdk->port_id; int ret; unsigned i; @@ -1536,7 +1598,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) static int dpdk_stop(pktio_entry_t *pktio_entry) { - rte_eth_dev_stop(pktio_entry->s.pkt_dpdk.port_id); + rte_eth_dev_stop(pkt_priv(pktio_entry)->port_id); return 0; } @@ -1544,7 +1606,7 @@ static int dpdk_stop(pktio_entry_t *pktio_entry) static int dpdk_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); pkt_cache_t *rx_cache = &pkt_dpdk->rx_cache[index]; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -1576,7 +1638,7 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, } else if ((unsigned)num < pkt_dpdk->min_rx_burst) { struct rte_mbuf *new_mbufs[pkt_dpdk->min_rx_burst]; - nb_rx = rte_eth_rx_burst(pktio_entry->s.pkt_dpdk.port_id, index, + nb_rx = rte_eth_rx_burst(pkt_priv(pktio_entry)->port_id, index, new_mbufs, pkt_dpdk->min_rx_burst); rx_cache->s.idx = 0; for (i = 0; i < nb_rx; i++) { @@ -1591,7 +1653,7 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index, nb_rx = RTE_MIN(num, nb_rx); } else { - nb_rx = rte_eth_rx_burst(pktio_entry->s.pkt_dpdk.port_id, index, + nb_rx = rte_eth_rx_burst(pkt_priv(pktio_entry)->port_id, index, rx_mbufs, num); } @@ -1619,7 +1681,7 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int num) { struct rte_mbuf *tx_mbufs[num]; - pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; + pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry); uint16_t copy_count = 0; int tx_pkts; int i; @@ -1682,16 +1744,16 @@ static int dpdk_send(pktio_entry_t *pktio_entry, int index, static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - rte_eth_macaddr_get(pktio_entry->s.pkt_dpdk.port_id, + rte_eth_macaddr_get(pkt_priv(pktio_entry)->port_id, (struct ether_addr *)mac_addr); return ETH_ALEN; } static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pkt_priv(pktio_entry)->port_id; - if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) + if (pkt_priv(pktio_entry)->vdev_sysc_promisc) return dpdk_vdev_promisc_mode_set(port_id, enable); if (enable) @@ -1704,9 +1766,9 @@ static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) { - uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pkt_priv(pktio_entry)->port_id; - if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) + if (pkt_priv(pktio_entry)->vdev_sysc_promisc) return dpdk_vdev_promisc_mode_get(port_id); else return rte_eth_promiscuous_get(port_id); @@ -1725,7 +1787,7 @@ static int dpdk_link_status(pktio_entry_t *pktio_entry) memset(&link, 0, sizeof(struct rte_eth_link)); - rte_eth_link_get_nowait(pktio_entry->s.pkt_dpdk.port_id, &link); + rte_eth_link_get_nowait(pkt_priv(pktio_entry)->port_id, &link); return link.link_status; } @@ -1747,7 +1809,7 @@ static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) int ret; struct rte_eth_stats rte_stats; - ret = rte_eth_stats_get(pktio_entry->s.pkt_dpdk.port_id, &rte_stats); + ret = rte_eth_stats_get(pkt_priv(pktio_entry)->port_id, &rte_stats); if (ret == 0) { stats_convert(&rte_stats, stats); @@ -1758,7 +1820,7 @@ static int dpdk_stats(pktio_entry_t *pktio_entry, odp_pktio_stats_t *stats) static int dpdk_stats_reset(pktio_entry_t *pktio_entry) { - rte_eth_stats_reset(pktio_entry->s.pkt_dpdk.port_id); + rte_eth_stats_reset(pkt_priv(pktio_entry)->port_id); return 0; } commit 9dd6633189cf15ca554cc4ae21996f7db91c6901 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make netmap use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8709e713..ae87d222 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -111,7 +111,6 @@ noinst_HEADERS = \ include/odp_packet_io_internal.h \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ - include/odp_packet_netmap.h \ include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 946f4578..600fdd36 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -34,7 +34,6 @@ extern "C" { #define PKTIO_MAX_QUEUES 64 #include <odp_packet_socket.h> -#include <odp_packet_netmap.h> #include <odp_packet_tap.h> #include <odp_packet_null.h> #include <odp_packet_dpdk.h> @@ -106,7 +105,11 @@ typedef struct { _ipc_map_remote_pool() */ } _ipc_pktio_t; +#if defined(ODP_NETMAP) +#define PKTIO_PRIVATE_SIZE 74752 +#else #define PKTIO_PRIVATE_SIZE 384 +#endif struct pktio_entry { const struct pktio_if_ops *ops; /**< Implementation specific methods */ @@ -117,7 +120,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_netmap_t pkt_nm; /**< using netmap API for IO */ pkt_dpdk_t pkt_dpdk; /**< using DPDK for IO */ #ifdef HAVE_PCAP pkt_pcap_t pkt_pcap; /**< Using pcap for IO */ diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h deleted file mode 100644 index bd3efdcf..00000000 --- a/platform/linux-generic/include/odp_packet_netmap.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PACKET_NETMAP_H -#define ODP_PACKET_NETMAP_H - -#include <odp/api/align.h> -#include <odp/api/debug.h> -#include <odp/api/packet_io.h> -#include <odp/api/pool.h> -#include <odp/api/ticketlock.h> -#include <odp_align_internal.h> - -#include <linux/if_ether.h> -#include <net/if.h> - -#define NM_MAX_DESC 64 - -/** netmap runtime configuration options */ -typedef struct { - int nr_rx_slots; - int nr_tx_slots; -} netmap_opt_t; - -/** Ring for mapping pktin/pktout queues to netmap descriptors */ -struct netmap_ring_t { - unsigned first; /**< Index of first netmap descriptor */ - unsigned last; /**< Index of last netmap descriptor */ - unsigned num; /**< Number of netmap descriptors */ - /** Netmap metadata for the device */ - struct nm_desc *desc[NM_MAX_DESC]; - unsigned cur; /**< Index of current netmap descriptor */ - odp_ticketlock_t lock; /**< Queue lock */ -}; - -typedef union ODP_ALIGNED_CACHE { - struct netmap_ring_t s; - uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct netmap_ring_t))]; -} netmap_ring_t; - -/** Netmap ring slot */ -typedef struct { - char *buf; /**< Slot buffer pointer */ - uint16_t len; /**< Slot length */ -} netmap_slot_t; - -/** Packet socket using netmap mmaped rings for both Rx and Tx */ -typedef struct { - odp_pool_t pool; /**< pool to alloc packets from */ - uint32_t if_flags; /**< interface flags */ - uint32_t mtu; /**< maximum transmission unit */ - int sockfd; /**< control socket */ - unsigned char if_mac[ETH_ALEN]; /**< eth mac address */ - char nm_name[IF_NAMESIZE + 7]; /**< netmap:<ifname> */ - char if_name[IF_NAMESIZE]; /**< interface name used in ioctl */ - odp_bool_t is_virtual; /**< nm virtual port (VALE/pipe) */ - uint32_t num_rx_rings; /**< number of nm rx rings */ - uint32_t num_tx_rings; /**< number of nm tx rings */ - unsigned num_rx_desc_rings; /**< number of rx descriptor rings */ - unsigned num_tx_desc_rings; /**< number of tx descriptor rings */ - odp_bool_t lockless_rx; /**< no locking for rx */ - odp_bool_t lockless_tx; /**< no locking for tx */ - /** mapping of pktin queues to netmap rx descriptors */ - netmap_ring_t rx_desc_ring[PKTIO_MAX_QUEUES]; - /** mapping of pktout queues to netmap tx descriptors */ - netmap_ring_t tx_desc_ring[PKTIO_MAX_QUEUES]; - netmap_opt_t opt; /**< options */ -} pkt_netmap_t; - -#endif diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 86a40229..a8498aa1 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -16,7 +16,6 @@ #include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> -#include <odp_packet_netmap.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> #include <odp_errno_define.h> @@ -48,6 +47,67 @@ #define NM_WAIT_TIMEOUT 10 /* netmap_wait_for_link() timeout in seconds */ #define NM_INJECT_RETRIES 10 +#define NM_MAX_DESC 64 + +/** netmap runtime configuration options */ +typedef struct { + int nr_rx_slots; + int nr_tx_slots; +} netmap_opt_t; + +/** Ring for mapping pktin/pktout queues to netmap descriptors */ +struct netmap_ring_t { + unsigned int first; /**< Index of first netmap descriptor */ + unsigned int last; /**< Index of last netmap descriptor */ + unsigned int num; /**< Number of netmap descriptors */ + /** Netmap metadata for the device */ + struct nm_desc *desc[NM_MAX_DESC]; + unsigned int cur; /**< Index of current netmap descriptor */ + odp_ticketlock_t lock; /**< Queue lock */ +}; + +typedef union ODP_ALIGNED_CACHE { + struct netmap_ring_t s; + uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct netmap_ring_t))]; +} netmap_ring_t; + +/** Netmap ring slot */ +typedef struct { + char *buf; /**< Slot buffer pointer */ + uint16_t len; /**< Slot length */ +} netmap_slot_t; + +/** Packet socket using netmap mmaped rings for both Rx and Tx */ +typedef struct { + odp_pool_t pool; /**< pool to alloc packets from */ + uint32_t if_flags; /**< interface flags */ + uint32_t mtu; /**< maximum transmission unit */ + int sockfd; /**< control socket */ + unsigned char if_mac[ETH_ALEN]; /**< eth mac address */ + char nm_name[IF_NAMESIZE + 7]; /**< netmap:<ifname> */ + char if_name[IF_NAMESIZE]; /**< interface name used in ioctl */ + odp_bool_t is_virtual; /**< nm virtual port (VALE/pipe) */ + uint32_t num_rx_rings; /**< number of nm rx rings */ + uint32_t num_tx_rings; /**< number of nm tx rings */ + unsigned int num_rx_desc_rings; /**< number of rx descriptor rings */ + unsigned int num_tx_desc_rings; /**< number of tx descriptor rings */ + odp_bool_t lockless_rx; /**< no locking for rx */ + odp_bool_t lockless_tx; /**< no locking for tx */ + /** mapping of pktin queues to netmap rx descriptors */ + netmap_ring_t rx_desc_ring[PKTIO_MAX_QUEUES]; + /** mapping of pktout queues to netmap tx descriptors */ + netmap_ring_t tx_desc_ring[PKTIO_MAX_QUEUES]; + netmap_opt_t opt; /**< options */ +} pkt_netmap_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_netmap_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_netmap_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_netmap_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int netmap_stats_reset(pktio_entry_t *pktio_entry); @@ -66,7 +126,7 @@ static int lookup_opt(const char *opt_name, const char *drv_name, int *val) static int init_options(pktio_entry_t *pktio_entry) { - netmap_opt_t *opt = &pktio_entry->s.pkt_nm.opt; + netmap_opt_t *opt = &pkt_priv(pktio_entry)->opt; if (!lookup_opt("nr_rx_slots", "virt", &opt->nr_rx_slots)) @@ -87,7 +147,7 @@ static int init_options(pktio_entry_t *pktio_entry) } ODP_PRINT("netmap interface: %s\n", - pktio_entry->s.pkt_nm.if_name); + pkt_priv(pktio_entry)->if_name); ODP_PRINT(" num_rx_desc: %d\n", opt->nr_rx_slots); ODP_PRINT(" num_tx_desc: %d\n", opt->nr_tx_slots); @@ -97,7 +157,7 @@ static int init_options(pktio_entry_t *pktio_entry) static int netmap_do_ioctl(pktio_entry_t *pktio_entry, unsigned long cmd, int subcmd) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); struct ethtool_value eval; struct ifreq ifr; int err; @@ -105,7 +165,7 @@ static int netmap_do_ioctl(pktio_entry_t *pktio_entry, unsigned long cmd, memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", - pktio_entry->s.pkt_nm.if_name); + pkt_priv(pktio_entry)->if_name); switch (cmd) { case SIOCSIFFLAGS: @@ -184,7 +244,7 @@ static inline void map_netmap_rings(netmap_ring_t *rings, static int netmap_input_queues_config(pktio_entry_t *pktio_entry, const odp_pktin_queue_param_t *p) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); odp_pktin_mode_t mode = pktio_entry->s.param.in_mode; unsigned num_queues = p->num_queues; odp_bool_t lockless; @@ -197,8 +257,8 @@ static int netmap_input_queues_config(pktio_entry_t *pktio_entry, lockless = (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE); if (p->hash_enable && num_queues > 1) { - if (rss_conf_set_fd(pktio_entry->s.pkt_nm.sockfd, - pktio_entry->s.pkt_nm.if_name, + if (rss_conf_set_fd(pkt_priv(pktio_entry)->sockfd, + pkt_priv(pktio_entry)->if_name, &p->hash_proto)) { ODP_ERR("Failed to configure input hash\n"); return -1; @@ -213,7 +273,7 @@ static int netmap_input_queues_config(pktio_entry_t *pktio_entry, static int netmap_output_queues_config(pktio_entry_t *pktio_entry, const odp_pktout_queue_param_t *p) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); pkt_nm->lockless_tx = (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE); @@ -230,7 +290,7 @@ static int netmap_output_queues_config(pktio_entry_t *pktio_entry, static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) { int i, j; - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); for (i = 0; i < PKTIO_MAX_QUEUES; i++) { for (j = 0; j < NM_MAX_DESC; j++) { @@ -253,7 +313,7 @@ static inline void netmap_close_descriptors(pktio_entry_t *pktio_entry) static int netmap_close(pktio_entry_t *pktio_entry) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); netmap_close_descriptors(pktio_entry); @@ -267,11 +327,11 @@ static int netmap_close(pktio_entry_t *pktio_entry) static int netmap_link_status(pktio_entry_t *pktio_entry) { - if (pktio_entry->s.pkt_nm.is_virtual) + if (pkt_priv(pktio_entry)->is_virtual) return 1; - return link_status_fd(pktio_entry->s.pkt_nm.sockfd, - pktio_entry->s.pkt_nm.if_name); + return link_status_fd(pkt_priv(pktio_entry)->sockfd, + pkt_priv(pktio_entry)->if_name); } /** @@ -298,12 +358,12 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) * until the opposing end's interface comes back up again. In * this case without the additional sleep pktio validation * tests fail. */ - if (!pktio_entry->s.pkt_nm.is_virtual) + if (!pkt_priv(pktio_entry)->is_virtual) sleep(1); if (ret == 1) return 1; } - ODP_DBG("%s link is down\n", pktio_entry->s.pkt_nm.if_name); + ODP_DBG("%s link is down\n", pkt_priv(pktio_entry)->if_name); return 0; } @@ -314,7 +374,7 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry) */ static void netmap_init_capability(pktio_entry_t *pktio_entry) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); odp_pktio_capability_t *capa = &pktio_entry->s.capa; memset(capa, 0, sizeof(odp_pktio_capability_t)); @@ -381,7 +441,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, const char *prefix; uint32_t mtu; uint32_t buf_size; - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); struct nm_desc *desc; struct netmap_ring *ring; odp_pktin_hash_proto_t hash_proto; @@ -470,7 +530,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, /* Use either interface MTU or netmap buffer size as MTU, whichever is * smaller. */ - mtu = mtu_get_fd(pktio_entry->s.pkt_nm.sockfd, pkt_nm->if_name); + mtu = mtu_get_fd(pkt_priv(pktio_entry)->sockfd, pkt_nm->if_name); if (mtu == 0) { ODP_ERR("Unable to read interface MTU\n"); goto error; @@ -494,7 +554,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, goto error; /* netmap uses only ethtool to get statistics counters */ - err = ethtool_stats_get_fd(pktio_entry->s.pkt_nm.sockfd, + err = ethtool_stats_get_fd(pkt_priv(pktio_entry)->sockfd, pkt_nm->if_name, &cur_stats); if (err) { ODP_ERR("netmap pktio %s does not support statistics counters\n", @@ -515,7 +575,7 @@ error: static int netmap_start(pktio_entry_t *pktio_entry) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); netmap_ring_t *desc_ring; struct nm_desc *desc_ptr; unsigned i; @@ -580,11 +640,11 @@ static int netmap_start(pktio_entry_t *pktio_entry) base_desc.self = &base_desc; base_desc.mem = NULL; - if (pktio_entry->s.pkt_nm.is_virtual) { + if (pkt_priv(pktio_entry)->is_virtual) { base_desc.req.nr_rx_slots = - pktio_entry->s.pkt_nm.opt.nr_rx_slots; + pkt_priv(pktio_entry)->opt.nr_rx_slots; base_desc.req.nr_tx_slots = - pktio_entry->s.pkt_nm.opt.nr_tx_slots; + pkt_priv(pktio_entry)->opt.nr_tx_slots; } base_desc.req.nr_ringid = 0; if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC || @@ -599,7 +659,7 @@ static int netmap_start(pktio_entry_t *pktio_entry) /* Only the first rx descriptor does mmap */ desc_ring = pkt_nm->rx_desc_ring; flags = NM_OPEN_IFNAME | NETMAP_NO_TX_POLL; - if (pktio_entry->s.pkt_nm.is_virtual) + if (pkt_priv(pktio_entry)->is_virtual) flags |= NM_OPEN_RING_CFG; desc_ring[0].s.desc[0] = nm_open(pkt_nm->nm_name, NULL, flags, &base_desc); @@ -609,7 +669,7 @@ static int netmap_start(pktio_entry_t *pktio_entry) } /* Open rest of the rx descriptors (one per netmap ring) */ flags = NM_OPEN_IFNAME | NETMAP_NO_TX_POLL | NM_OPEN_NO_MMAP; - if (pktio_entry->s.pkt_nm.is_virtual) + if (pkt_priv(pktio_entry)->is_virtual) flags |= NM_OPEN_RING_CFG; for (i = 0; i < pktio_entry->s.num_in_queue; i++) { for (j = desc_ring[i].s.first; j <= desc_ring[i].s.last; j++) { @@ -632,7 +692,7 @@ static int netmap_start(pktio_entry_t *pktio_entry) /* Open tx descriptors */ desc_ring = pkt_nm->tx_desc_ring; flags = NM_OPEN_IFNAME | NM_OPEN_NO_MMAP; - if (pktio_entry->s.pkt_nm.is_virtual) + if (pkt_priv(pktio_entry)->is_virtual) flags |= NM_OPEN_RING_CFG; if ((base_desc.req.nr_flags & NR_REG_MASK) == NR_REG_ALL_NIC) { @@ -684,7 +744,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, odp_time_t *ts) { odp_packet_t pkt; - odp_pool_t pool = pktio_entry->s.pkt_nm.pool; + odp_pool_t pool = pkt_priv(pktio_entry)->pool; odp_packet_hdr_t *pkt_hdr; odp_packet_hdr_t parsed_hdr; int i; @@ -692,7 +752,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, int alloc_len; /* Allocate maximum sized packets */ - alloc_len = pktio_entry->s.pkt_nm.mtu; + alloc_len = pkt_priv(pktio_entry)->mtu; num = packet_alloc_multi(pool, alloc_len, pkt_tbl, slot_num); @@ -750,7 +810,7 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, netmap_slot_t slot_tbl[num]; char *buf; uint32_t slot_id; - uint32_t mtu = pktio_entry->s.pkt_nm.mtu; + uint32_t mtu = pkt_priv(pktio_entry)->mtu; int i; int ring_id = desc->cur_rx_ring; int num_rx = 0; @@ -795,7 +855,7 @@ static inline int netmap_recv_desc(pktio_entry_t *pktio_entry, static int netmap_fd_set(pktio_entry_t *pktio_entry, int index, fd_set *readfds) { struct nm_desc *desc; - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); unsigned first_desc_id = pkt_nm->rx_desc_ring[index].s.first; unsigned last_desc_id = pkt_nm->rx_desc_ring[index].s.last; unsigned desc_id; @@ -834,7 +894,7 @@ static int netmap_recv(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[], int num) { struct nm_desc *desc; - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); unsigned first_desc_id = pkt_nm->rx_desc_ring[index].s.first; unsigned last_desc_id = pkt_nm->rx_desc_ring[index].s.last; unsigned desc_id; @@ -957,7 +1017,7 @@ static int netmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], static int netmap_send(pktio_entry_t *pktio_entry, int index, const odp_packet_t pkt_table[], int num) { - pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm; + pkt_netmap_t *pkt_nm = pkt_priv(pktio_entry); struct pollfd polld; struct nm_desc *desc; struct netmap_ring *ring; @@ -1032,34 +1092,34 @@ static int netmap_send(pktio_entry_t *pktio_entry, int index, static int netmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->s.pkt_nm.if_mac, ETH_ALEN); + memcpy(mac_addr, pkt_priv(pktio_entry)->if_mac, ETH_ALEN); return ETH_ALEN; } static uint32_t netmap_mtu_get(pktio_entry_t *pktio_entry) { - return pktio_entry->s.pkt_nm.mtu; + return pkt_priv(pktio_entry)->mtu; } static int netmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - if (pktio_entry->s.pkt_nm.is_virtual) { + if (pkt_priv(pktio_entry)->is_virtual) { __odp_errno = ENOTSUP; return -1; } - return promisc_mode_set_fd(pktio_entry->s.pkt_nm.sockfd, - pktio_entry->s.pkt_nm.if_name, enable); + return promisc_mode_set_fd(pkt_priv(pktio_entry)->sockfd, + pkt_priv(pktio_entry)->if_name, enable); } static int netmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - if (pktio_entry->s.pkt_nm.is_virtual) + if (pkt_priv(pktio_entry)->is_virtual) return 0; - return promisc_mode_get_fd(pktio_entry->s.pkt_nm.sockfd, - pktio_entry->s.pkt_nm.if_name); + return promisc_mode_get_fd(pkt_priv(pktio_entry)->sockfd, + pkt_priv(pktio_entry)->if_name); } static int netmap_capability(pktio_entry_t *pktio_entry, @@ -1079,7 +1139,7 @@ static int netmap_stats(pktio_entry_t *pktio_entry, return sock_stats_fd(pktio_entry, stats, - pktio_entry->s.pkt_nm.sockfd); + pkt_priv(pktio_entry)->sockfd); } static int netmap_stats_reset(pktio_entry_t *pktio_entry) @@ -1091,15 +1151,15 @@ static int netmap_stats_reset(pktio_entry_t *pktio_entry) } return sock_stats_reset_fd(pktio_entry, - pktio_entry->s.pkt_nm.sockfd); + pkt_priv(pktio_entry)->sockfd); } static void netmap_print(pktio_entry_t *pktio_entry) { odp_pktin_hash_proto_t hash_proto; - if (rss_conf_get_fd(pktio_entry->s.pkt_nm.sockfd, - pktio_entry->s.pkt_nm.if_name, &hash_proto)) + if (rss_conf_get_fd(pkt_priv(pktio_entry)->sockfd, + pkt_priv(pktio_entry)->if_name, &hash_proto)) rss_conf_print(&hash_proto); } commit bcb01a637648278bbbefcd6cdc3014a98de8ed4f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make socket_mmap use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 3dbeb2be..946f4578 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -117,8 +117,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_sock_mmap_t pkt_sock_mmap; /**< using socket mmap - * API for IO */ pkt_netmap_t pkt_nm; /**< using netmap API for IO */ pkt_dpdk_t pkt_dpdk; /**< using DPDK for IO */ #ifdef HAVE_PCAP diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index 7774db80..f77248f0 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -57,24 +57,6 @@ struct ring { ODP_STATIC_ASSERT(offsetof(struct ring, mm_space) <= ODP_CACHE_LINE_SIZE, "ERR_STRUCT_RING"); -/** Packet socket using mmap rings for both Rx and Tx */ -typedef struct { - /** Packet mmap ring for Rx */ - struct ring ODP_ALIGNED_CACHE rx_ring; - /** Packet mmap ring for Tx */ - struct ring ODP_ALIGNED_CACHE tx_ring; - - int ODP_ALIGNED_CACHE sockfd; - odp_pool_t pool; - int mtu; /**< maximum transmission unit */ - size_t frame_offset; /**< frame start offset from start of pkt buf */ - uint8_t *mmap_base; - unsigned mmap_len; - unsigned char if_mac[ETH_ALEN]; - struct sockaddr_ll ll; - int fanout; -} pkt_sock_mmap_t; - static inline void ethaddr_copy(unsigned char mac_dst[], unsigned char mac_src[]) { diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index eff22a7b..8ec2198b 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -49,6 +49,32 @@ /* Maximum number of packets to store in each RX/TX block */ #define MAX_PKTS_PER_BLOCK 512 +/** Packet socket using mmap rings for both Rx and Tx */ +typedef struct { + /** Packet mmap ring for Rx */ + struct ring ODP_ALIGNED_CACHE rx_ring; + /** Packet mmap ring for Tx */ + struct ring ODP_ALIGNED_CACHE tx_ring; + + int ODP_ALIGNED_CACHE sockfd; + odp_pool_t pool; + int mtu; /**< maximum transmission unit */ + size_t frame_offset; /**< frame start offset from start of pkt buf */ + uint8_t *mmap_base; + unsigned int mmap_len; + unsigned char if_mac[ETH_ALEN]; + struct sockaddr_ll ll; + int fanout; +} pkt_sock_mmap_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_sock_mmap_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_sock_mmap_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_sock_mmap_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int set_pkt_sock_fanout_mmap(pkt_sock_mmap_t *const pkt_sock, @@ -534,7 +560,7 @@ static int mmap_bind_sock(pkt_sock_mmap_t *pkt_sock, const char *netdev) static int sock_mmap_close(pktio_entry_t *entry) { - pkt_sock_mmap_t *const pkt_sock = &entry->s.pkt_sock_mmap; + pkt_sock_mmap_t *const pkt_sock = pkt_priv(entry); int ret; ret = mmap_unmap_sock(pkt_sock); @@ -563,7 +589,7 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, if (disable_pktio) return -1; - pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; + pkt_sock_mmap_t *const pkt_sock = pkt_priv(pktio_entry); int fanout = 1; /* Init pktio entry */ @@ -622,7 +648,7 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, goto error; } - ret = ethtool_stats_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + ret = ethtool_stats_get_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name, &cur_stats); if (ret != 0) { @@ -639,7 +665,7 @@ static int sock_mmap_open(odp_pktio_t id ODP_UNUSED, } ret = sock_stats_reset_fd(pktio_entry, - pktio_entry->s.pkt_sock_mmap.sockfd); + pkt_priv(pktio_entry)->sockfd); if (ret != 0) goto error; @@ -653,7 +679,7 @@ error: static int sock_mmap_fd_set(pktio_entry_t *pktio_entry, int index ODP_UNUSED, fd_set *readfds) { - pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; + pkt_sock_mmap_t *const pkt_sock = pkt_priv(pktio_entry); int fd; odp_ticketlock_lock(&pktio_entry->s.rxl); @@ -667,7 +693,7 @@ static int sock_mmap_fd_set(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int sock_mmap_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int num) { - pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; + pkt_sock_mmap_t *const pkt_sock = pkt_priv(pktio_entry); int ret; odp_ticketlock_lock(&pktio_entry->s.rxl); @@ -767,7 +793,7 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int num) { int ret; - pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap; + pkt_sock_mmap_t *const pkt_sock = pkt_priv(pktio_entry); odp_ticketlock_lock(&pktio_entry->s.txl); ret = pkt_mmap_v2_tx(pkt_sock->tx_ring.sock, &pkt_sock->tx_ring, @@ -779,32 +805,32 @@ static int sock_mmap_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static uint32_t sock_mmap_mtu_get(pktio_entry_t *pktio_entry) { - return mtu_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + return mtu_get_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name); } static int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->s.pkt_sock_mmap.if_mac, ETH_ALEN); + memcpy(mac_addr, pkt_priv(pktio_entry)->if_mac, ETH_ALEN); return ETH_ALEN; } static int sock_mmap_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + return promisc_mode_set_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name, enable); } static int sock_mmap_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + return promisc_mode_get_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name); } static int sock_mmap_link_status(pktio_entry_t *pktio_entry) { - return link_status_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + return link_status_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name); } @@ -833,7 +859,7 @@ static int sock_mmap_stats(pktio_entry_t *pktio_entry, return sock_stats_fd(pktio_entry, stats, - pktio_entry->s.pkt_sock_mmap.sockfd); + pkt_priv(pktio_entry)->sockfd); } static int sock_mmap_stats_reset(pktio_entry_t *pktio_entry) @@ -845,7 +871,7 @@ static int sock_mmap_stats_reset(pktio_entry_t *pktio_entry) } return sock_stats_reset_fd(pktio_entry, - pktio_entry->s.pkt_sock_mmap.sockfd); + pkt_priv(pktio_entry)->sockfd); } static int sock_mmap_init_global(void) commit 8460c9c1b5afab84f4279e6e04cfb1e012965c14 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make socket use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 9d8de4c6..3dbeb2be 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -117,7 +117,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_sock_t pkt_sock; /**< using socket API for IO */ pkt_sock_mmap_t pkt_sock_mmap; /**< using socket mmap * API for IO */ pkt_netmap_t pkt_nm; /**< using netmap API for IO */ diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index f5612222..7774db80 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -37,13 +37,6 @@ #define PACKET_FANOUT_HASH 0 #endif /* PACKET_FANOUT */ -typedef struct { - int sockfd; /**< socket descriptor */ - odp_pool_t pool; /**< pool to alloc packets from */ - uint32_t mtu; /**< maximum transmission unit */ - unsigned char if_mac[ETH_ALEN]; /**< IF eth mac addr */ -} pkt_sock_t; - /** packet mmap ring */ struct ring { struct iovec *rd; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 5be240ec..93613e54 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -52,6 +52,21 @@ #define MAX_SEGS CONFIG_PACKET_MAX_SEGS #define PACKET_JUMBO_LEN (9 * 1024) +typedef struct { + int sockfd; /**< socket descriptor */ + odp_pool_t pool; /**< pool to alloc packets from */ + uint32_t mtu; /**< maximum transmission unit */ + unsigned char if_mac[ETH_ALEN]; /**< IF eth mac addr */ +} pkt_sock_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_sock_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_sock_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_sock_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + static int disable_pktio; /** !0 this pktio disabled, 0 enabled */ static int sock_stats_reset(pktio_entry_t *pktio_entry); @@ -458,7 +473,8 @@ void rss_conf_print(const odp_pktin_hash_proto_t *hash_proto) */ static int sock_close(pktio_entry_t *pktio_entry) { - pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; + pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); + if (pkt_sock->sockfd != -1 && close(pkt_sock->sockfd) != 0) { __odp_errno = errno; ODP_ERR("close(sockfd): %s\n", strerror(errno)); @@ -480,7 +496,7 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, struct ifreq ethreq; struct sockaddr_ll sa_ll; char shm_name[ODP_SHM_NAME_LEN]; - pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; + pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); odp_pktio_stats_t cur_stats; /* Init pktio entry */ @@ -533,7 +549,7 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, const char *netdev, goto error; } - err = ethtool_stats_get_fd(pktio_entry->s.pkt_sock.sockfd, + err = ethtool_stats_get_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name, &cur_stats); if (err != 0) { @@ -604,7 +620,7 @@ static uint32_t _rx_pkt_to_iovec(odp_packet_t pkt, static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_packet_t pkt_table[], int num) { - pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; + pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); odp_pool_t pool = pkt_sock->pool; odp_time_t ts_val; odp_time_t *ts = NULL; @@ -704,7 +720,7 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, static int sock_fd_set(pktio_entry_t *pktio_entry, int index ODP_UNUSED, fd_set *readfds) { - pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; + pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); const int sockfd = pkt_sock->sockfd; FD_SET(sockfd, readfds); @@ -807,7 +823,7 @@ static uint32_t _tx_pkt_to_iovec(odp_packet_t pkt, static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_table[], int num) { - pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock; + pkt_sock_t *pkt_sock = pkt_priv(pktio_entry); struct mmsghdr msgvec[num]; struct iovec iovecs[num][MAX_SEGS]; int ret; @@ -853,7 +869,7 @@ static int sock_mmsg_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, */ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) { - return pktio_entry->s.pkt_sock.mtu; + return pkt_priv(pktio_entry)->mtu; } /* @@ -862,7 +878,7 @@ static uint32_t sock_mtu_get(pktio_entry_t *pktio_entry) static int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) { - memcpy(mac_addr, pktio_entry->s.pkt_sock.if_mac, ETH_ALEN); + memcpy(mac_addr, pkt_priv(pktio_entry)->if_mac, ETH_ALEN); return ETH_ALEN; } @@ -872,7 +888,7 @@ static int sock_mac_addr_get(pktio_entry_t *pktio_entry, static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - return promisc_mode_set_fd(pktio_entry->s.pkt_sock.sockfd, + return promisc_mode_set_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name, enable); } @@ -881,13 +897,13 @@ static int sock_promisc_mode_set(pktio_entry_t *pktio_entry, */ static int sock_promisc_mode_get(pktio_entry_t *pktio_entry) { - return promisc_mode_get_fd(pktio_entry->s.pkt_sock.sockfd, + return promisc_mode_get_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name); } static int sock_link_status(pktio_entry_t *pktio_entry) { - return link_status_fd(pktio_entry->s.pkt_sock.sockfd, + return link_status_fd(pkt_priv(pktio_entry)->sockfd, pktio_entry->s.name); } @@ -916,7 +932,7 @@ static int sock_stats(pktio_entry_t *pktio_entry, return sock_stats_fd(pktio_entry, stats, - pktio_entry->s.pkt_sock.sockfd); + pkt_priv(pktio_entry)->sockfd); } static int sock_stats_reset(pktio_entry_t *pktio_entry) @@ -928,7 +944,7 @@ static int sock_stats_reset(pktio_entry_t *pktio_entry) } return sock_stats_reset_fd(pktio_entry, - pktio_entry->s.pkt_sock.sockfd); + pkt_priv(pktio_entry)->sockfd); } static int sock_init_global(void) commit 09406916470553a85f30fc14889127443cc4a09b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:14:36 2018 +0300 linux-gen: pktio: make loop use generic private data field Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index dfcb1bcf..9d8de4c6 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -53,12 +53,6 @@ extern "C" { /* Forward declaration */ struct pktio_if_ops; -typedef struct { - odp_queue_t loopq; /**< loopback queue for "loop" device */ - odp_bool_t promisc; /**< promiscuous mode state */ - uint8_t idx; /**< index of "loop" device */ -} pkt_loop_t; - #ifdef HAVE_PCAP typedef struct { char *fname_rx; /**< name of pcap file for rx */ @@ -123,7 +117,6 @@ struct pktio_entry { uint8_t chksum_insert_ena; /**< pktout checksum offload enabled */ odp_pktio_t handle; /**< pktio handle */ union { - pkt_loop_t pkt_loop; /**< Using loopback for IO */ pkt_sock_t pkt_sock; /**< using socket API for IO */ pkt_sock_mmap_t pkt_sock_mmap; /**< using socket mmap * API for IO */ diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 0bd1835c..faaef3ab 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -30,6 +30,20 @@ #define MAX_LOOP 16 #define LOOP_MTU (64 * 1024) +typedef struct { + odp_queue_t loopq; /**< loopback queue for "loop" device */ + odp_bool_t promisc; /**< promiscuous mode state */ + uint8_t idx; /**< index of "loop" device */ +} pkt_loop_t; + +ODP_STATIC_ASSERT(PKTIO_PRIVATE_SIZE >= sizeof(pkt_loop_t), + "PKTIO_PRIVATE_SIZE too small"); + +static inline pkt_loop_t *pkt_priv(pktio_entry_t *pktio_entry) +{ + return (pkt_loop_t *)(uintptr_t)(pktio_entry->s.pkt_priv); +} + /* MAC address for the "loop" interface */ static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; @@ -56,11 +70,11 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, snprintf(loopq_name, sizeof(loopq_name), "%" PRIu64 "-pktio_loopq", odp_pktio_to_u64(id)); - pktio_entry->s.pkt_loop.loopq = + pkt_priv(pktio_entry)->loopq = odp_queue_create(loopq_name, NULL); - pktio_entry->s.pkt_loop.idx = idx; + pkt_priv(pktio_entry)->idx = idx; - if (pktio_entry->s.pkt_loop.loopq == ODP_QUEUE_INVALID) + if (pkt_priv(pktio_entry)->loopq == ODP_QUEUE_INVALID) return -1; loopback_stats_reset(pktio_entry); @@ -71,7 +85,7 @@ static int loopback_open(odp_pktio_t id, pktio_entry_t *pktio_entry, static int loopback_close(pktio_entry_t *pktio_entry) { - return odp_queue_destroy(pktio_entry->s.pkt_loop.loopq); + return odp_queue_destroy(pkt_priv(pktio_entry)->loopq); } static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, @@ -92,7 +106,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.rxl); - queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); + queue = queue_fn->from_ext(pkt_priv(pktio_entry)->loopq); nbr = queue_fn->deq_multi(queue, hdr_tbl, num); if (pktio_entry->s.config.pktin.bit.ts_all || @@ -310,7 +324,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, odp_ticketlock_lock(&pktio_entry->s.txl); - queue = queue_fn->from_ext(pktio_entry->s.pkt_loop.loopq); + queue = queue_fn->from_ext(pkt_priv(pktio_entry)->loopq); ret = queue_fn->enq_multi(queue, hdr_tbl, nb_tx); if (ret > 0) { @@ -335,7 +349,7 @@ static int loopback_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, void *mac_addr) { memcpy(mac_addr, pktio_loop_mac, ETH_ALEN); - ((uint8_t *)mac_addr)[ETH_ALEN - 1] += pktio_entry->s.pkt_loop.idx; + ((uint8_t *)mac_addr)[ETH_ALEN - 1] += pkt_priv(pktio_entry)->idx; return ETH_ALEN; } @@ -387,13 +401,13 @@ static int loopback_capability(pktio_entry_t *pktio_entry ODP_UNUSED, static int loopback_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - pktio_entry->s.pkt_loop.promisc = enable; + pkt_priv(pktio_entry)->promisc = enable; return 0; } static int loopback_promisc_mode_get(pktio_entry_t *pktio_entry) { - return pktio_entry->s.pkt_loop.promisc ? 1 : 0; + return pkt_priv(pktio_entry)->promisc ? 1 : 0; } static int loopback_stats(pktio_entry_t *pktio_entry, commit ffc3f2bd0059664273425eb0c34411ac5cd88c3e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed May 30 19:13:50 2018 +0300 linux-gen: pktio: add abstract pktio private data storage In order to encapsulate PktIO private data, add common private data storage to pktio_entry_t. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 880237a5..dfcb1bcf 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -112,6 +112,8 @@ typedef struct { _ipc_map_remote_pool() */ } _ipc_pktio_t; +#define PKTIO_PRIVATE_SIZE 384 + struct pktio_entry { const struct pktio_if_ops *ops; /**< Implementation specific methods */ /* These two locks together lock the whole pktio device */ @@ -133,6 +135,7 @@ struct pktio_entry { pkt_tap_t pkt_tap; /**< using TAP for IO */ _ipc_pktio_t ipc; /**< IPC pktio data */ pkt_null_t pkt_null; /**< using null for IO */ + unsigned char ODP_ALIGNED_CACHE pkt_priv[PKTIO_PRIVATE_SIZE]; }; enum { /* Not allocated */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 - platform/linux-generic/include/odp_packet_dpdk.h | 62 +----- .../linux-generic/include/odp_packet_io_internal.h | 82 +------- platform/linux-generic/include/odp_packet_netmap.h | 73 ------- platform/linux-generic/include/odp_packet_null.h | 16 -- platform/linux-generic/include/odp_packet_socket.h | 25 --- platform/linux-generic/include/odp_packet_tap.h | 21 -- platform/linux-generic/pktio/dpdk.c | 122 ++++++++--- platform/linux-generic/pktio/ipc.c | 225 +++++++++++++-------- platform/linux-generic/pktio/loop.c | 32 ++- platform/linux-generic/pktio/netmap.c | 150 +++++++++----- platform/linux-generic/pktio/null.c | 19 +- platform/linux-generic/pktio/pcap.c | 33 ++- platform/linux-generic/pktio/socket.c | 42 ++-- platform/linux-generic/pktio/socket_mmap.c | 54 +++-- platform/linux-generic/pktio/tap.c | 47 +++-- 16 files changed, 509 insertions(+), 497 deletions(-) delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h delete mode 100644 platform/linux-generic/include/odp_packet_null.h delete mode 100644 platform/linux-generic/include/odp_packet_tap.h hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-50-g6582ff61

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6582ff6158b7e8380536f83da9b0fc25659e3c36 (commit) via fe280bface8fd28a8d0baa3ca95a71f221187fe8 (commit) via bd5112acbb750723958463cf0328ebb15855f7ab (commit) from 06b3650b581bf05ea2f015a02635382fb7c38fda (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6582ff6158b7e8380536f83da9b0fc25659e3c36 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Thu May 31 19:01:26 2018 +0300 test: remove bash wrapper around tm validation test Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index c92d123c..92ae85f8 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -58,7 +58,7 @@ TESTS = \ thread/thread_main$(EXEEXT) \ time/time_main$(EXEEXT) \ timer/timer_main$(EXEEXT) \ - traffic_mngr/traffic_mngr.sh \ + traffic_mngr/traffic_mngr_main$(EXEEXT) \ shmem/shmem_main$(EXEEXT) \ system/system_main$(EXEEXT) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index a9b8550d..53a00f5e 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr.c LDADD += -lm - -dist_check_SCRIPTS = traffic_mngr.sh -test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh deleted file mode 100755 index c8f8d95a..00000000 --- a/test/validation/api/traffic_mngr/traffic_mngr.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2017-2018, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -# directories where traffic_mngr_main binary can be found: -# -in the validation dir when running make check (intree or out of tree) -# -in the script directory, when running after 'make install', or -# -in the validation when running standalone (./traffic_mngr) intree. -# -in the current directory. -# running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/traffic_mngr:$PATH -PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH -PATH=$(dirname $0):$PATH -PATH=`pwd`:$PATH - -traffic_mngr_main_path=$(which traffic_mngr_main${EXEEXT}) -if [ -x "$traffic_mngr_main_path" ] ; then - echo "running with traffic_mngr_main: $traffic_mngr_run_path" -else - echo "cannot find traffic_mngr_main: please set you PATH for it." - exit 1 -fi - -# exit codes expected by automake for skipped tests -TEST_SKIPPED=77 - -traffic_mngr_main${EXEEXT} -ret=$? - -if [ "${CI}" = "true" ] && [ $ret -eq 255 ]; then - echo "SKIP: skip due to not isolated environment" - exit ${TEST_SKIPPED} -fi - -exit $ret commit fe280bface8fd28a8d0baa3ca95a71f221187fe8 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Wed May 30 00:04:04 2018 +0300 test: tm: allow some tests to be skipped under CI that is temporary patch until we fix CUNIT to be able to skip tests. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index e16c3400..4d78c31c 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -3896,6 +3896,14 @@ static void traffic_mngr_test_byte_wred(void) static void traffic_mngr_test_pkt_wred(void) { int rc; + const char *env = getenv("CI"); + int allow_skip_result = 0; + + if (env && !strcmp(env, "true")) { + allow_skip_result = 1; + LOG_DBG("\nWARNING: test result can be used for code coverage only.\n" + "CI=true env variable is set!\n"); + } if (!tm_capabilities.tm_queue_wred_supported) { LOG_DBG("\ntest_pkt_wred was not run because tm_capabilities " @@ -3903,9 +3911,11 @@ static void traffic_mngr_test_pkt_wred(void) return; } - CU_ASSERT(test_pkt_wred("pkt_wred_40G", "pkt_bw_40G", - "pkt_thresh_40G", "node_1_3_2", 1, - ODP_PACKET_GREEN, TM_PERCENT(30), false) == 0); + rc = test_pkt_wred("pkt_wred_40G", "pkt_bw_40G", + "pkt_thresh_40G", "node_1_3_2", 1, + ODP_PACKET_GREEN, TM_PERCENT(30), false); + if (rc != 0 && !allow_skip_result) + CU_FAIL("40G test failed\n"); if (!tm_capabilities.tm_queue_dual_slope_supported) { LOG_DBG("since tm_capabilities indicates no dual slope " @@ -3916,14 +3926,21 @@ static void traffic_mngr_test_pkt_wred(void) rc = test_pkt_wred("pkt_wred_30G", "pkt_bw_30G", "pkt_thresh_30G", "node_1_3_2", 1, ODP_PACKET_GREEN, TM_PERCENT(30), true); - CU_ASSERT(rc == 0); + if (rc != 0 && !allow_skip_result) + CU_FAIL("30G test failed\n"); + + rc = test_pkt_wred("pkt_wred_50Y", "pkt_bw_50Y", + "pkt_thresh_50Y", "node_1_3_2", 2, + ODP_PACKET_YELLOW, TM_PERCENT(50), true); + if (rc != 0 && !allow_skip_result) + CU_FAIL("50Y test failed\n"); + - CU_ASSERT(test_pkt_wred("pkt_wred_50Y", "pkt_bw_50Y", - "pkt_thresh_50Y", "node_1_3_2", 2, - ODP_PACKET_YELLOW, TM_PERCENT(50), true) == 0); - CU_ASSERT(test_pkt_wred("pkt_wred_70R", "pkt_bw_70R", - "pkt_thresh_70R", "node_1_3_2", 3, - ODP_PACKET_RED, TM_PERCENT(70), true) == 0); + rc = test_pkt_wred("pkt_wred_70R", "pkt_bw_70R", + "pkt_thresh_70R", "node_1_3_2", 3, + ODP_PACKET_RED, TM_PERCENT(70), true); + if (rc != 0 && !allow_skip_result) + CU_FAIL("70Y test failed\n"); } static void traffic_mngr_test_query(void) commit bd5112acbb750723958463cf0328ebb15855f7ab Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue May 29 23:39:18 2018 +0300 linux-gen: test: tm: respect return codes Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index bf12a836..abd9cffc 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -626,8 +626,8 @@ static void tm_sched_config_set(tm_shaper_obj_t *shaper_obj, } /* Any locking required and validity checks must be done by the caller! */ -static void tm_threshold_config_set(tm_wred_node_t *wred_node, - odp_tm_threshold_t thresholds_profile) +static int tm_threshold_config_set(tm_wred_node_t *wred_node, + odp_tm_threshold_t thresholds_profile) { tm_queue_thresholds_t *threshold_params; @@ -637,15 +637,18 @@ static void tm_threshold_config_set(tm_wred_node_t *wred_node, } if (thresholds_profile == ODP_TM_INVALID) - return; + return 0; threshold_params = tm_get_profile_params(thresholds_profile, TM_THRESHOLD_PROFILE); - if (threshold_params == NULL) - return; + if (threshold_params == NULL) { + ODP_DBG("threshold_params is NULL\n"); + return -1; + } threshold_params->ref_cnt++; wred_node->threshold_params = threshold_params; + return 0; } /* Any locking required and validity checks must be done by the caller! */ @@ -4091,15 +4094,17 @@ int odp_tm_queue_threshold_config(odp_tm_queue_t tm_queue, odp_tm_threshold_t thresholds_profile) { tm_queue_obj_t *tm_queue_obj; + int ret; tm_queue_obj = GET_TM_QUEUE_OBJ(tm_queue); if (!tm_queue_obj) return -1; odp_ticketlock_lock(&tm_profile_lock); - tm_threshold_config_set(tm_queue_obj->tm_wred_node, thresholds_profile); + ret = tm_threshold_config_set(tm_queue_obj->tm_wred_node, + thresholds_profile); odp_ticketlock_unlock(&tm_profile_lock); - return 0; + return ret; } int odp_tm_queue_wred_config(odp_tm_queue_t tm_queue, diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index 700b14fd..e16c3400 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -2891,16 +2891,21 @@ static int set_queue_thresholds(odp_tm_queue_t tm_queue, odp_tm_threshold_params_t *threshold_params) { odp_tm_threshold_t threshold_profile; + int ret; /* First see if a threshold profile already exists with this name, in * which case we use that profile, else create a new one. */ threshold_profile = odp_tm_thresholds_lookup(threshold_name); if (threshold_profile != ODP_TM_INVALID) { - odp_tm_thresholds_params_update(threshold_profile, - threshold_params); + ret = odp_tm_thresholds_params_update(threshold_profile, + threshold_params); + if (ret) + return ret; } else { threshold_profile = odp_tm_threshold_create(threshold_name, threshold_params); + if (threshold_profile == ODP_TM_INVALID) + return -1; threshold_profiles[num_threshold_profiles] = threshold_profile; num_threshold_profiles++; } @@ -3138,6 +3143,7 @@ static int test_pkt_wred(const char *wred_name, odp_tm_queue_t tm_queue; pkt_info_t pkt_info; uint32_t num_fill_pkts, num_test_pkts, pkts_sent; + int ret; /* Pick the tm_queue and set the tm_queue's wred profile to drop the * given percentage of traffic, then send 100 pkts and see how many @@ -3154,8 +3160,10 @@ static int test_pkt_wred(const char *wred_name, odp_tm_threshold_params_init(&threshold_params); threshold_params.max_pkts = 1000; threshold_params.enable_max_pkts = true; - if (set_queue_thresholds(tm_queue, threshold_name, - &threshold_params) != 0) { + + ret = set_queue_thresholds(tm_queue, threshold_name, + &threshold_params); + if (ret) { LOG_ERR("set_queue_thresholds failed\n"); return -1; } @@ -3185,8 +3193,12 @@ static int test_pkt_wred(const char *wred_name, /* Disable the shaper, so as to get the pkts out quicker. */ set_shaper(node_name, shaper_name, 0, 0); - num_rcv_pkts = receive_pkts(odp_tm_systems[0], rcv_pktin, - num_fill_pkts + pkts_sent, 64 * 1000); + ret = receive_pkts(odp_tm_systems[0], rcv_pktin, + num_fill_pkts + pkts_sent, 64 * 1000); + if (ret < 0) + return -1; + + num_rcv_pkts = ret; /* Search the EXPECTED_PKT_RCVD table to find a matching entry */ wred_pkt_cnts = search_expected_pkt_rcv_tbl(TM_PERCENT(99.9), @@ -3197,12 +3209,15 @@ static int test_pkt_wred(const char *wred_name, flush_leftover_pkts(odp_tm_systems[0], rcv_pktin); CU_ASSERT(odp_tm_is_idle(odp_tm_systems[0])); - if ((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)) - return 0; + if ((pkts_sent < wred_pkt_cnts->min_cnt) || + (pkts_sent > wred_pkt_cnts->max_cnt)) { + LOG_ERR("min_cnt %d <= pkts_sent %d <= max_cnt %d\n", + wred_pkt_cnts->min_cnt, + pkts_sent, + wred_pkt_cnts->max_cnt); + return -1; + } - CU_ASSERT((wred_pkt_cnts->min_cnt <= pkts_sent) && - (pkts_sent <= wred_pkt_cnts->max_cnt)); return 0; } ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/odp_traffic_mngr.c | 19 +++--- test/validation/api/Makefile.am | 2 +- test/validation/api/traffic_mngr/Makefile.am | 5 -- test/validation/api/traffic_mngr/traffic_mngr.c | 74 +++++++++++++++++------- test/validation/api/traffic_mngr/traffic_mngr.sh | 39 ------------- 5 files changed, 66 insertions(+), 73 deletions(-) delete mode 100755 test/validation/api/traffic_mngr/traffic_mngr.sh hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-47-g06b3650b

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 06b3650b581bf05ea2f015a02635382fb7c38fda (commit) via 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 (commit) via c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 (commit) from 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 06b3650b581bf05ea2f015a02635382fb7c38fda Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Wed May 30 12:34:12 2018 +0300 linux-gen: time: use inlined functions internally Always use inlined time functions internally. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5113eba2..4a91c08a 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -27,6 +27,7 @@ #include <odp_debug_internal.h> #include <odp_packet_io_ipc_internal.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_pcapng.h> #include <string.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 7311d13a..c81e417c 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -15,6 +15,7 @@ #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/spinlock.h> #include <odp/api/hints.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 155be5a2..826747ee 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -18,6 +18,7 @@ #include <odp/api/plat/thread_inlines.h> #include <odp/api/thrmask.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 0f80452d..ac0b35fd 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -11,6 +11,7 @@ #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/schedule.h> #include <odp/api/shared_memory.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 79ba35b7..bf12a836 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -28,6 +28,8 @@ #include <odp_traffic_mngr_internal.h> #include <odp/api/plat/packet_inlines.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_macros_internal.h> #include <odp_init_internal.h> #include <odp_errno_define.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 803c514f..8d93b873 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -19,6 +19,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 6cabf0ea..86a40229 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -12,6 +12,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> +#include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp_packet_io_internal.h> #include <odp_packet_netmap.h> commit 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 17:16:40 2018 +0300 linux-gen: time: inline diff, sum and cmp Inline small functions commonly used in time calculations. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp/api/plat/time_inlines.h b/platform/linux-generic/include/odp/api/plat/time_inlines.h index 1075a395..527490e3 100644 --- a/platform/linux-generic/include/odp/api/plat/time_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/time_inlines.h @@ -9,6 +9,7 @@ #include <stdint.h> #include <odp/api/align.h> +#include <odp/api/hints.h> #include <odp/api/abi/cpu_time.h> @@ -48,6 +49,10 @@ static inline odp_time_t _odp_time_cur(void) #define _ODP_INLINE static inline #define odp_time_local __odp_time_local #define odp_time_global __odp_time_global + #define odp_time_cmp __odp_time_cmp + #define odp_time_diff __odp_time_diff + #define odp_time_sum __odp_time_sum + #else #define _ODP_INLINE #endif @@ -62,6 +67,35 @@ _ODP_INLINE odp_time_t odp_time_global(void) return _odp_time_cur(); } +_ODP_INLINE int odp_time_cmp(odp_time_t t2, odp_time_t t1) +{ + if (odp_likely(t2.u64 > t1.u64)) + return 1; + + if (t2.u64 < t1.u64) + return -1; + + return 0; +} + +_ODP_INLINE odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) +{ + odp_time_t time; + + time.u64 = t2.u64 - t1.u64; + + return time; +} + +_ODP_INLINE odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) +{ + odp_time_t time; + + time.u64 = t1.u64 + t2.u64; + + return time; +} + /** @endcond */ #endif diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 065ad956..97886d6a 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -152,26 +152,6 @@ static inline uint64_t time_res(void) return time_spec_res(); } -static inline int time_cmp(odp_time_t t2, odp_time_t t1) -{ - if (odp_likely(t2.u64 > t1.u64)) - return 1; - - if (t2.u64 < t1.u64) - return -1; - - return 0; -} - -static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2) -{ - odp_time_t time; - - time.u64 = t1.u64 + t2.u64; - - return time; -} - static inline uint64_t time_to_ns(odp_time_t time) { if (_odp_time_glob.use_hw) @@ -194,16 +174,7 @@ static inline void time_wait_until(odp_time_t time) do { cur = _odp_time_cur(); - } while (time_cmp(time, cur) > 0); -} - -odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) -{ - odp_time_t time; - - time.u64 = t2.u64 - t1.u64; - - return time; + } while (odp_time_cmp(time, cur) > 0); } uint64_t odp_time_diff_ns(odp_time_t t2, odp_time_t t1) @@ -230,16 +201,6 @@ odp_time_t odp_time_global_from_ns(uint64_t ns) return time_from_ns(ns); } -int odp_time_cmp(odp_time_t t2, odp_time_t t1) -{ - return time_cmp(t2, t1); -} - -odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) -{ - return time_sum(t1, t2); -} - uint64_t odp_time_local_res(void) { return time_res(); @@ -254,7 +215,7 @@ void odp_time_wait_ns(uint64_t ns) { odp_time_t cur = _odp_time_cur(); odp_time_t wait = time_from_ns(ns); - odp_time_t end_time = time_sum(cur, wait); + odp_time_t end_time = odp_time_sum(cur, wait); time_wait_until(end_time); } commit c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 13:52:27 2018 +0300 linux-gen: time: inline arch cpu time on x86 Inline cpu HW time counter read function on x86. Time global data structure is visible to applications, but Posix types (timespec) or header files are not. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 30ba0476..8709e713 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -42,7 +42,8 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ include/odp/api/plat/thread_inlines.h \ - include/odp/api/plat/ticketlock_inlines.h + include/odp/api/plat/ticketlock_inlines.h \ + include/odp/api/plat/time_inlines.h odpapiabiarchinclude_HEADERS += \ include-abi/odp/api/abi/align.h \ @@ -82,7 +83,6 @@ odpapiabiarchinclude_HEADERS += \ endif noinst_HEADERS = \ - arch/odp_arch_time_internal.h \ include/odp_align_internal.h \ include/odp_atomic_internal.h \ include/odp_bitmap_internal.h \ @@ -227,14 +227,16 @@ __LIB__libodp_linux_la_SOURCES += \ odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ - odp_ticketlock_api.c + odp_ticketlock_api.c \ + odp_time_api.c endif if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h endif @@ -247,7 +249,8 @@ if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h endif @@ -260,7 +263,8 @@ if ARCH_IS_DEFAULT __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h endif @@ -271,7 +275,8 @@ if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h endif @@ -282,7 +287,8 @@ if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h \ + arch/default/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h endif @@ -294,7 +300,9 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c -odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h +odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h \ + arch/x86/odp/api/abi/cpu_rdtsc.h \ + arch/x86/odp/api/abi/cpu_time.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h endif diff --git a/platform/linux-generic/arch/aarch64/odp_global_time.c b/platform/linux-generic/arch/aarch64/odp_global_time.c index fac2088c..91e5c7a6 100644 --- a/platform/linux-generic/arch/aarch64/odp_global_time.c +++ b/platform/linux-generic/arch/aarch64/odp_global_time.c @@ -11,27 +11,11 @@ #include <time.h> #include <odp_debug_internal.h> -#include <odp_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> -int cpu_has_global_time(void) -{ - uint64_t hz = cpu_global_time_freq(); - - /* - * The system counter portion of the architected timer must - * provide a uniform view of system time to all processing - * elements in the system. This should hold true even for - * heterogeneous SoCs. - * - * Determine whether the system has 'global time' by checking - * whether a read of the architected timer frequency sys reg - * returns a sane value. Sane is considered to be within - * 1MHz and 6GHz (1us and .1667ns period). - */ - return hz >= 1000000 && hz <= 6000000000; -} +#include <odp/visibility_begin.h> -uint64_t cpu_global_time(void) +uint64_t _odp_cpu_global_time(void) { uint64_t cntvct; @@ -47,7 +31,27 @@ uint64_t cpu_global_time(void) return cntvct; } -uint64_t cpu_global_time_freq(void) +#include <odp/visibility_end.h> + +int _odp_cpu_has_global_time(void) +{ + uint64_t hz = _odp_cpu_global_time_freq(); + + /* + * The system counter portion of the architected timer must + * provide a uniform view of system time to all processing + * elements in the system. This should hold true even for + * heterogeneous SoCs. + * + * Determine whether the system has 'global time' by checking + * whether a read of the architected timer frequency sys reg + * returns a sane value. Sane is considered to be within + * 1MHz and 6GHz (1us and .1667ns period). + */ + return hz >= 1000000 && hz <= 6000000000; +} + +uint64_t _odp_cpu_global_time_freq(void) { uint64_t cntfrq; diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h b/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h new file mode 100644 index 00000000..09138e70 --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu_time.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_TIME_H_ +#define ODP_ARCH_CPU_TIME_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +int _odp_cpu_has_global_time(void); +uint64_t _odp_cpu_global_time(void); +uint64_t _odp_cpu_global_time_freq(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/default/odp_global_time.c b/platform/linux-generic/arch/default/odp_global_time.c index faa0ec3f..facffea7 100644 --- a/platform/linux-generic/arch/default/odp_global_time.c +++ b/platform/linux-generic/arch/default/odp_global_time.c @@ -4,19 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> -int cpu_has_global_time(void) +#include <odp/visibility_begin.h> + +uint64_t _odp_cpu_global_time(void) { return 0; } -uint64_t cpu_global_time(void) +#include <odp/visibility_end.h> + +int _odp_cpu_has_global_time(void) { return 0; } -uint64_t cpu_global_time_freq(void) +uint64_t _odp_cpu_global_time_freq(void) { return 0; } diff --git a/platform/linux-generic/arch/odp_arch_time_internal.h b/platform/linux-generic/arch/odp_arch_time_internal.h deleted file mode 100644 index c3b90ac5..00000000 --- a/platform/linux-generic/arch/odp_arch_time_internal.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_ARCH_TIME_INTERNAL_H_ -#define ODP_ARCH_TIME_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <stdint.h> - -int cpu_has_global_time(void); -uint64_t cpu_global_time(void); -uint64_t cpu_global_time_freq(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index f5a744fd..935af2cb 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -41,7 +41,7 @@ #include "cpu_flags.h" #include <odp_debug_internal.h> -#include <odp_arch_time_internal.h> +#include <odp/api/abi/cpu_time.h> #include <stdio.h> #include <stdint.h> @@ -361,7 +361,7 @@ void cpu_flags_print_all(void) ODP_PRINT("%s", str); } -int cpu_has_global_time(void) +int _odp_cpu_has_global_time(void) { if (cpu_get_flag_enabled(RTE_CPUFLAG_INVTSC) > 0) return 1; diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h index 63be3da6..1eb8a956 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h @@ -8,6 +8,7 @@ #define ODP_ARCH_CPU_INLINES_H_ #include <stdint.h> +#include <odp/api/abi/cpu_rdtsc.h> _ODP_INLINE void odp_cpu_pause(void) { @@ -20,19 +21,7 @@ _ODP_INLINE void odp_cpu_pause(void) _ODP_INLINE uint64_t odp_cpu_cycles(void) { - union { - uint64_t tsc_64; - struct { - uint32_t lo_32; - uint32_t hi_32; - }; - } tsc; - - __asm__ __volatile__ ("rdtsc" : - "=a" (tsc.lo_32), - "=d" (tsc.hi_32) : : "memory"); - - return tsc.tsc_64; + return _odp_cpu_rdtsc(); } _ODP_INLINE uint64_t odp_cpu_cycles_max(void) diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h new file mode 100644 index 00000000..ccc5f0f3 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_RDTSC_H_ +#define ODP_ARCH_CPU_RDTSC_H_ + +#include <stdint.h> + +static inline uint64_t _odp_cpu_rdtsc(void) +{ + union { + uint64_t tsc_64; + struct { + uint32_t lo_32; + uint32_t hi_32; + }; + } tsc; + + __asm__ __volatile__ ("rdtsc" : + "=a" (tsc.lo_32), + "=d" (tsc.hi_32) : : "memory"); + + return tsc.tsc_64; +} + +#endif diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h new file mode 100644 index 00000000..05ff0db9 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_TIME_H_ +#define ODP_ARCH_CPU_TIME_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> +#include <odp/api/abi/cpu_rdtsc.h> + +static inline uint64_t _odp_cpu_global_time(void) +{ + return _odp_cpu_rdtsc(); +} + +int _odp_cpu_has_global_time(void); +uint64_t _odp_cpu_global_time_freq(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index da22d45a..e46a7586 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -10,24 +10,15 @@ #include <time.h> -#include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> -#include <odp_arch_time_internal.h> - -/* Inlined API functions */ -#include <odp/api/plat/cpu_inlines.h> - -uint64_t cpu_global_time(void) -{ - return odp_cpu_cycles(); -} +#include <odp/api/abi/cpu_time.h> #define SEC_IN_NS 1000000000ULL /* Measure TSC frequency. Frequency information registers are defined for x86, * but those are often not enumerated. */ -uint64_t cpu_global_time_freq(void) +uint64_t _odp_cpu_global_time_freq(void) { struct timespec sleep, ts1, ts2; uint64_t t1, t2, ts_nsec, cycles, hz; @@ -49,7 +40,7 @@ uint64_t cpu_global_time_freq(void) return 0; } - t1 = cpu_global_time(); + t1 = _odp_cpu_global_time(); if (nanosleep(&sleep, NULL) < 0) { ODP_DBG("nanosleep failed\n"); @@ -61,7 +52,7 @@ uint64_t cpu_global_time_freq(void) return 0; } - t2 = cpu_global_time(); + t2 = _odp_cpu_global_time(); ts_nsec = (ts2.tv_sec - ts1.tv_sec) * SEC_IN_NS; ts_nsec += ts2.tv_nsec - ts1.tv_nsec; diff --git a/platform/linux-generic/include-abi/odp/api/abi/time.h b/platform/linux-generic/include-abi/odp/api/abi/time.h index a86a526d..e80e57b1 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/time.h +++ b/platform/linux-generic/include-abi/odp/api/abi/time.h @@ -5,3 +5,6 @@ */ #include <odp/api/abi-default/time.h> + +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/time_inlines.h> diff --git a/platform/linux-generic/include/odp/api/plat/time_inlines.h b/platform/linux-generic/include/odp/api/plat/time_inlines.h new file mode 100644 index 00000000..1075a395 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/time_inlines.h @@ -0,0 +1,67 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_TIME_INLINES_H_ +#define ODP_PLAT_TIME_INLINES_H_ + +#include <stdint.h> +#include <odp/api/align.h> + +#include <odp/api/abi/cpu_time.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#define _ODP_TIMESPEC_SIZE 16 + +typedef struct _odp_time_global_t { + /* Storage space for struct timespec. Posix headers are not included + * here to avoid application exposure. */ + uint8_t ODP_ALIGNED(_ODP_TIMESPEC_SIZE) timespec[_ODP_TIMESPEC_SIZE]; + + int use_hw; + uint64_t hw_start; + uint64_t hw_freq_hz; + +} _odp_time_global_t; + +extern _odp_time_global_t _odp_time_glob; + +odp_time_t _odp_timespec_cur(void); + +static inline odp_time_t _odp_time_cur(void) +{ + if (_odp_time_glob.use_hw) { + odp_time_t time; + + time.count = _odp_cpu_global_time() - _odp_time_glob.hw_start; + return time; + } + + return _odp_timespec_cur(); +} + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_time_local __odp_time_local + #define odp_time_global __odp_time_global +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE odp_time_t odp_time_local(void) +{ + return _odp_time_cur(); +} + +_ODP_INLINE odp_time_t odp_time_global(void) +{ + return _odp_time_cur(); +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 96308edc..065ad956 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -9,22 +9,21 @@ #include <odp_posix_extensions.h> #include <time.h> +#include <string.h> +#include <inttypes.h> + #include <odp/api/time.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> #include <odp_init_internal.h> -#include <odp_arch_time_internal.h> -#include <string.h> -#include <inttypes.h> +#include <odp/api/plat/time_inlines.h> + +ODP_STATIC_ASSERT(_ODP_TIMESPEC_SIZE >= (sizeof(struct timespec)), + "_ODP_TIMESPEC_SIZE too small"); -typedef struct time_global_t { - struct timespec spec_start; - int use_hw; - uint64_t hw_start; - uint64_t hw_freq_hz; -} time_global_t; +#include <odp/visibility_begin.h> -static time_global_t global; +_odp_time_global_t _odp_time_glob; /* * Posix timespec based functions @@ -49,21 +48,26 @@ static inline uint64_t time_spec_diff_nsec(struct timespec *t2, return nsec; } -static inline odp_time_t time_spec_cur(void) +odp_time_t _odp_timespec_cur(void) { int ret; odp_time_t time; struct timespec sys_time; + struct timespec *start_time; + + start_time = (struct timespec *)(uintptr_t)&_odp_time_glob.timespec; ret = clock_gettime(CLOCK_MONOTONIC_RAW, &sys_time); if (odp_unlikely(ret != 0)) ODP_ABORT("clock_gettime failed\n"); - time.nsec = time_spec_diff_nsec(&sys_time, &global.spec_start); + time.nsec = time_spec_diff_nsec(&sys_time, start_time); return time; } +#include <odp/visibility_end.h> + static inline uint64_t time_spec_res(void) { int ret; @@ -94,24 +98,15 @@ static inline odp_time_t time_spec_from_ns(uint64_t ns) * HW time counter based functions */ -static inline odp_time_t time_hw_cur(void) -{ - odp_time_t time; - - time.count = cpu_global_time() - global.hw_start; - - return time; -} - static inline uint64_t time_hw_res(void) { - return global.hw_freq_hz; + return _odp_time_glob.hw_freq_hz; } static inline uint64_t time_hw_to_ns(odp_time_t time) { uint64_t nsec; - uint64_t freq_hz = global.hw_freq_hz; + uint64_t freq_hz = _odp_time_glob.hw_freq_hz; uint64_t count = time.count; uint64_t sec = 0; @@ -129,7 +124,7 @@ static inline odp_time_t time_hw_from_ns(uint64_t ns) { odp_time_t time; uint64_t count; - uint64_t freq_hz = global.hw_freq_hz; + uint64_t freq_hz = _odp_time_glob.hw_freq_hz; uint64_t sec = 0; if (ns >= ODP_TIME_SEC_IN_NS) { @@ -149,17 +144,9 @@ static inline odp_time_t time_hw_from_ns(uint64_t ns) * Common functions */ -static inline odp_time_t time_cur(void) -{ - if (global.use_hw) - return time_hw_cur(); - - return time_spec_cur(); -} - static inline uint64_t time_res(void) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_res(); return time_spec_res(); @@ -187,7 +174,7 @@ static inline odp_time_t time_sum(odp_time_t t1, odp_time_t t2) static inline uint64_t time_to_ns(odp_time_t time) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_to_ns(time); return time_spec_to_ns(time); @@ -195,7 +182,7 @@ static inline uint64_t time_to_ns(odp_time_t time) static inline odp_time_t time_from_ns(uint64_t ns) { - if (global.use_hw) + if (_odp_time_glob.use_hw) return time_hw_from_ns(ns); return time_spec_from_ns(ns); @@ -206,20 +193,10 @@ static inline void time_wait_until(odp_time_t time) odp_time_t cur; do { - cur = time_cur(); + cur = _odp_time_cur(); } while (time_cmp(time, cur) > 0); } -odp_time_t odp_time_local(void) -{ - return time_cur(); -} - -odp_time_t odp_time_global(void) -{ - return time_cur(); -} - odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) { odp_time_t time; @@ -275,7 +252,7 @@ uint64_t odp_time_global_res(void) void odp_time_wait_ns(uint64_t ns) { - odp_time_t cur = time_cur(); + odp_time_t cur = _odp_time_cur(); odp_time_t wait = time_from_ns(ns); odp_time_t end_time = time_sum(cur, wait); @@ -289,28 +266,31 @@ void odp_time_wait_until(odp_time_t time) int odp_time_init_global(void) { + struct timespec *timespec; int ret = 0; + _odp_time_global_t *global = &_odp_time_glob; - memset(&global, 0, sizeof(time_global_t)); + memset(global, 0, sizeof(_odp_time_global_t)); - if (cpu_has_global_time()) { - global.use_hw = 1; - global.hw_freq_hz = cpu_global_time_freq(); + if (_odp_cpu_has_global_time()) { + global->use_hw = 1; + global->hw_freq_hz = _odp_cpu_global_time_freq(); - if (global.hw_freq_hz == 0) + if (global->hw_freq_hz == 0) return -1; printf("HW time counter freq: %" PRIu64 " hz\n\n", - global.hw_freq_hz); + global->hw_freq_hz); - global.hw_start = cpu_global_time(); + global->hw_start = _odp_cpu_global_time(); return 0; } - global.spec_start.tv_sec = 0; - global.spec_start.tv_nsec = 0; + timespec = (struct timespec *)(uintptr_t)global->timespec; + timespec->tv_sec = 0; + timespec->tv_nsec = 0; - ret = clock_gettime(CLOCK_MONOTONIC_RAW, &global.spec_start); + ret = clock_gettime(CLOCK_MONOTONIC_RAW, timespec); return ret; } diff --git a/platform/linux-generic/odp_time_api.c b/platform/linux-generic/odp_time_api.c new file mode 100644 index 00000000..cd547b23 --- /dev/null +++ b/platform/linux-generic/odp_time_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/time.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/time_inlines.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index f46aa6e8..5fef5af2 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -53,8 +53,8 @@ #include <odp/api/std_types.h> #include <odp/api/sync.h> #include <odp/api/time.h> +#include <odp/api/plat/time_inlines.h> #include <odp/api/timer.h> -#include <odp_arch_time_internal.h> #include <odp_timer_internal.h> /* Inlined API functions */ ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 26 ++-- .../linux-generic/arch/aarch64/odp_global_time.c | 44 ++++--- .../arch/default/odp/api/abi/cpu_time.h | 24 ++++ .../linux-generic/arch/default/odp_global_time.c | 12 +- .../linux-generic/arch/odp_arch_time_internal.h | 24 ---- platform/linux-generic/arch/x86/cpu_flags.c | 4 +- .../arch/x86/odp/api/abi/cpu_inlines.h | 15 +-- .../linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h | 29 +++++ .../linux-generic/arch/x86/odp/api/abi/cpu_time.h | 29 +++++ platform/linux-generic/arch/x86/odp_global_time.c | 17 +-- .../linux-generic/include-abi/odp/api/abi/time.h | 3 + .../include/odp/api/plat/time_inlines.h | 101 +++++++++++++++ platform/linux-generic/odp_packet_io.c | 1 + platform/linux-generic/odp_schedule_basic.c | 1 + platform/linux-generic/odp_schedule_scalable.c | 1 + platform/linux-generic/odp_schedule_sp.c | 1 + platform/linux-generic/odp_time.c | 137 ++++++--------------- .../{odp_cpu_api.c => odp_time_api.c} | 4 +- platform/linux-generic/odp_timer.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 2 + platform/linux-generic/pktio/dpdk.c | 2 + platform/linux-generic/pktio/netmap.c | 2 + 22 files changed, 295 insertions(+), 186 deletions(-) create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_time.h delete mode 100644 platform/linux-generic/arch/odp_arch_time_internal.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_rdtsc.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h create mode 100644 platform/linux-generic/include/odp/api/plat/time_inlines.h copy platform/linux-generic/{odp_cpu_api.c => odp_time_api.c} (76%) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-44-g2a9d3323

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (commit) via a2fb09b3a4178398a5528eeab2c119cc9a107629 (commit) via b5982d00b9e2ff6fbcb86d8602ca249236c1f06c (commit) via 78b552f62a65c6a873ed021d5579675b4fd84e3a (commit) via 68f26e2a86eb206dcdda9324b20afa208067e6c2 (commit) from 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 10:17:34 2018 +0300 linux-gen: queue: inline queue context Use common qentry offset structure to inline queue context function for both basic and scalable queue implementation. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e995479a..30ba0476 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -36,6 +36,8 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/packet_inlines.h \ include/odp/api/plat/pktio_inlines.h \ include/odp/api/plat/pool_inline_types.h \ + include/odp/api/plat/queue_inlines.h \ + include/odp/api/plat/queue_inline_types.h \ include/odp/api/plat/std_clib_inlines.h \ include/odp/api/plat/strong_types.h \ include/odp/api/plat/sync_inlines.h \ @@ -221,6 +223,7 @@ __LIB__libodp_linux_la_SOURCES += \ odp_packet_api.c \ odp_packet_flags_api.c \ odp_pktio_api.c \ + odp_queue_api.c \ odp_std_clib_api.c \ odp_sync_api.c \ odp_thread_api.c \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/queue.h b/platform/linux-generic/include-abi/odp/api/abi/queue.h index 41b44221..6ec92260 100644 --- a/platform/linux-generic/include-abi/odp/api/abi/queue.h +++ b/platform/linux-generic/include-abi/odp/api/abi/queue.h @@ -30,6 +30,9 @@ typedef ODP_HANDLE_T(odp_queue_t); #define ODP_QUEUE_NAME_LEN 32 +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/queue_inlines.h> + /** * @} */ diff --git a/platform/linux-generic/include/odp/api/plat/queue_inline_types.h b/platform/linux-generic/include/odp/api/plat/queue_inline_types.h new file mode 100644 index 00000000..3a8df7a4 --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/queue_inline_types.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_QUEUE_INLINE_TYPES_H_ +#define ODP_PLAT_QUEUE_INLINE_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +/* Queue entry field accessor */ +#define _odp_qentry_field(qentry, cast, field) \ + (*(cast *)(uintptr_t)((uint8_t *)qentry + \ + _odp_queue_inline_offset.field)) + +/* Queue entry field offsets for inline functions */ +typedef struct _odp_queue_inline_offset_t { + uint16_t context; + +} _odp_queue_inline_offset_t; + +/** @endcond */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/queue_inlines.h b/platform/linux-generic/include/odp/api/plat/queue_inlines.h new file mode 100644 index 00000000..f802c96e --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/queue_inlines.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_QUEUE_INLINES_H_ +#define ODP_PLAT_QUEUE_INLINES_H_ + +#include <odp/api/plat/queue_inline_types.h> + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_queue_context __odp_queue_context +#else + #define _ODP_INLINE +#endif + +_ODP_INLINE void *odp_queue_context(odp_queue_t handle) +{ + void *context; + void *qentry = (void *)handle; + + context = _odp_qentry_field(qentry, void *, context); + + return context; +} + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index b9f4f03d..2eaf8771 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -27,7 +27,6 @@ typedef struct { int (*queue_capability)(odp_queue_capability_t *capa); int (*queue_context_set)(odp_queue_t queue, void *context, uint32_t len); - void *(*queue_context)(odp_queue_t queue); int (*queue_enq)(odp_queue_t queue, odp_event_t ev); int (*queue_enq_multi)(odp_queue_t queue, const odp_event_t events[], int num); diff --git a/platform/linux-generic/odp_queue_api.c b/platform/linux-generic/odp_queue_api.c new file mode 100644 index 00000000..34311857 --- /dev/null +++ b/platform/linux-generic/odp_queue_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/queue.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/queue_inlines.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index aa3fb42e..f7715bc5 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -26,6 +26,7 @@ #include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> #include <odp_libconfig_internal.h> +#include <odp/api/plat/queue_inline_types.h> #define NUM_INTERNAL_QUEUES 64 @@ -44,6 +45,7 @@ static int queue_init(queue_entry_t *queue, const char *name, const odp_queue_param_t *param); queue_global_t *queue_glb; +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; static inline queue_entry_t *qentry_from_handle(odp_queue_t handle) { @@ -129,6 +131,12 @@ static int queue_init_global(void) ODP_DBG("Starts...\n"); + /* Fill in queue entry field offsets for inline functions */ + memset(&_odp_queue_inline_offset, 0, + sizeof(_odp_queue_inline_offset_t)); + _odp_queue_inline_offset.context = offsetof(queue_entry_t, + s.param.context); + shm = odp_shm_reserve("_odp_queue_gbl", sizeof(queue_global_t), sizeof(queue_entry_t), 0); @@ -430,11 +438,6 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) -{ - return qentry_from_handle(handle)->s.param.context; -} - static odp_queue_t queue_lookup(const char *name) { uint32_t i; @@ -861,7 +864,6 @@ queue_api_t queue_basic_api = { .queue_lookup = queue_lookup, .queue_capability = queue_capability, .queue_context_set = queue_context_set, - .queue_context = queue_context, .queue_enq = queue_enq, .queue_enq_multi = queue_enq_multi, .queue_deq = queue_deq, diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 912251b7..f3984542 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -13,6 +13,15 @@ #include <stdlib.h> #include <string.h> +#include <odp/api/align.h> +#include <odp/api/plat/queue_inline_types.h> + +#include <odp/visibility_begin.h> + +_odp_queue_inline_offset_t ODP_ALIGNED_CACHE _odp_queue_inline_offset; + +#include <odp/visibility_end.h> + extern const queue_api_t queue_scalable_api; extern const queue_fn_t queue_scalable_fn; @@ -47,11 +56,6 @@ int odp_queue_context_set(odp_queue_t queue, void *context, uint32_t len) return queue_api->queue_context_set(queue, context, len); } -void *odp_queue_context(odp_queue_t queue) -{ - return queue_api->queue_context(queue); -} - int odp_queue_enq(odp_queue_t queue, odp_event_t ev) { return queue_api->queue_enq(queue, ev); diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 38880e7f..13e93bc1 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -26,6 +26,7 @@ #include <odp_schedule_if.h> #include <odp_ishm_internal.h> #include <odp_ishmpool_internal.h> +#include <odp/api/plat/queue_inline_types.h> #include <string.h> #include <inttypes.h> @@ -44,6 +45,7 @@ #define LOCK_INIT(a) odp_ticketlock_init(a) extern __thread sched_scalable_thread_state_t *sched_ts; +extern _odp_queue_inline_offset_t _odp_queue_inline_offset; typedef struct queue_table_t { queue_entry_t queue[ODP_CONFIG_QUEUES]; @@ -195,6 +197,12 @@ static int queue_init_global(void) ODP_DBG("Queue init ... "); + /* Fill in queue entry field offsets for inline functions */ + memset(&_odp_queue_inline_offset, 0, + sizeof(_odp_queue_inline_offset_t)); + _odp_queue_inline_offset.context = offsetof(queue_entry_t, + s.param.context); + /* Attach to the pool if it exists */ queue_shm_pool = _odp_ishm_pool_lookup("queue_shm_pool"); if (queue_shm_pool == NULL) { @@ -465,11 +473,6 @@ static int queue_context_set(odp_queue_t handle, void *context, return 0; } -static void *queue_context(odp_queue_t handle) -{ - return qentry_from_ext(handle)->s.param.context; -} - static odp_queue_t queue_lookup(const char *name) { uint32_t i; @@ -964,7 +967,6 @@ queue_api_t queue_scalable_api = { .queue_lookup = queue_lookup, .queue_capability = queue_capability, .queue_context_set = queue_context_set, - .queue_context = queue_context, .queue_enq = queue_enq, .queue_enq_multi = queue_enq_multi, .queue_deq = queue_deq, commit a2fb09b3a4178398a5528eeab2c119cc9a107629 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Tue May 29 10:43:50 2018 +0300 linux-gen: queue scalable: change queue handle to pointer Use queue entry pointer as queue handle. This allow easy inline of queue_context, etc functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index 37147aa9..71aaa3ba 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -77,7 +77,7 @@ static inline void *shm_pool_alloc_align(_odp_ishm_pool_t *pool, uint32_t size) static inline uint32_t queue_to_id(odp_queue_t handle) { - return _odp_typeval(handle) - 1; + return qentry_from_ext(handle)->s.index; } static inline queue_entry_t *qentry_from_int(void *handle) diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 1cc318e3..38880e7f 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -52,11 +52,6 @@ typedef struct queue_table_t { static queue_table_t *queue_tbl; static _odp_ishm_pool_t *queue_shm_pool; -static inline odp_queue_t queue_from_id(uint32_t queue_id) -{ - return _odp_cast_scalar(odp_queue_t, queue_id + 1); -} - static void *queue_from_ext(odp_queue_t handle); static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr); static odp_buffer_hdr_t *_queue_deq(void *handle); @@ -72,7 +67,7 @@ static queue_entry_t *get_qentry(uint32_t queue_id) queue_entry_t *qentry_from_ext(odp_queue_t handle) { - return get_qentry(queue_to_id(handle)); + return (queue_entry_t *)(uintptr_t)handle; } static int _odp_queue_disable_enq(sched_elem_t *q) @@ -246,7 +241,7 @@ static int queue_init_global(void) queue = get_qentry(i); LOCK_INIT(&queue->s.lock); queue->s.index = i; - queue->s.handle = queue_from_id(i); + queue->s.handle = (odp_queue_t)queue; } ODP_DBG("done\n"); @@ -323,27 +318,27 @@ static int queue_capability(odp_queue_capability_t *capa) static odp_queue_type_t queue_type(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.type; + return qentry_from_ext(handle)->s.type; } static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.sync; + return qentry_from_ext(handle)->s.param.sched.sync; } static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.prio; + return qentry_from_ext(handle)->s.param.sched.prio; } static odp_schedule_group_t queue_sched_group(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.sched.group; + return qentry_from_ext(handle)->s.param.sched.group; } static uint32_t queue_lock_count(odp_queue_t handle) { - queue_entry_t *queue = qentry_from_int(queue_from_ext(handle)); + queue_entry_t *queue = qentry_from_ext(handle); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? queue->s.param.sched.lock_count : 0; @@ -392,7 +387,7 @@ static int queue_destroy(odp_queue_t handle) if (handle == ODP_QUEUE_INVALID) return -1; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); LOCK(&queue->s.lock); if (queue->s.status != QUEUE_STATUS_READY) { UNLOCK(&queue->s.lock); @@ -465,14 +460,14 @@ static int queue_context_set(odp_queue_t handle, void *context, uint32_t len ODP_UNUSED) { odp_mb_full(); - qentry_from_int(queue_from_ext(handle))->s.param.context = context; + qentry_from_ext(handle)->s.param.context = context; odp_mb_full(); return 0; } static void *queue_context(odp_queue_t handle) { - return qentry_from_int(queue_from_ext(handle))->s.param.context; + return qentry_from_ext(handle)->s.param.context; } static odp_queue_t queue_lookup(const char *name) @@ -663,7 +658,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); for (i = 0; i < num; i++) buf_hdr[i] = buf_hdl_to_hdr(odp_buffer_from_event(ev[i])); @@ -676,7 +671,7 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev) odp_buffer_hdr_t *buf_hdr; queue_entry_t *queue; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); buf_hdr = buf_hdl_to_hdr(odp_buffer_from_event(ev)); return queue->s.enqueue(qentry_to_int(queue), buf_hdr); @@ -843,7 +838,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); return queue->s.dequeue_multi(qentry_to_int(queue), (odp_buffer_hdr_t **)ev, num); } @@ -851,7 +846,7 @@ static odp_event_t queue_deq(odp_queue_t handle) { queue_entry_t *queue; - queue = qentry_from_int(queue_from_ext(handle)); + queue = qentry_from_ext(handle); return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); } @@ -954,15 +949,12 @@ static void queue_set_enq_deq_func(void *handle, static void *queue_from_ext(odp_queue_t handle) { - uint32_t queue_id; - - queue_id = queue_to_id(handle); - return qentry_to_int(get_qentry(queue_id)); + return (void *)handle; } static odp_queue_t queue_to_ext(void *handle) { - return qentry_from_int(handle)->s.handle; + return (odp_queue_t)handle; } /* API functions */ commit b5982d00b9e2ff6fbcb86d8602ca249236c1f06c Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 16:06:36 2018 +0300 linux-gen: queue: change queue handle to pointer Use queue entry pointer as queue handle. This allow easy inline of queue_context, etc functions. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 1808fb73..6cc6ed28 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -74,19 +74,21 @@ typedef struct queue_global_t { extern queue_global_t *queue_glb; -static inline void *queue_index_to_qint(uint32_t queue_id) +static inline uint32_t queue_to_index(odp_queue_t handle) { - return &queue_glb->queue[queue_id]; + queue_entry_t *qentry = (queue_entry_t *)(uintptr_t)handle; + + return qentry->s.index; } -static inline uint32_t queue_to_index(odp_queue_t handle) +static inline queue_entry_t *qentry_from_index(uint32_t queue_id) { - return _odp_typeval(handle) - 1; + return &queue_glb->queue[queue_id]; } static inline odp_queue_t queue_from_index(uint32_t queue_id) { - return _odp_cast_scalar(odp_queue_t, queue_id + 1); + return (odp_queue_t)qentry_from_index(queue_id); } #ifdef __cplusplus diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 4af819c3..aa3fb42e 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -45,16 +45,9 @@ static int queue_init(queue_entry_t *queue, const char *name, queue_global_t *queue_glb; -static inline queue_entry_t *get_qentry(uint32_t queue_id) +static inline queue_entry_t *qentry_from_handle(odp_queue_t handle) { - return &queue_glb->queue[queue_id]; -} - -static inline queue_entry_t *handle_to_qentry(odp_queue_t handle) -{ - uint32_t queue_id = queue_to_index(handle); - - return get_qentry(queue_id); + return (queue_entry_t *)(uintptr_t)handle; } static int queue_capa(odp_queue_capability_t *capa, int sched) @@ -149,10 +142,10 @@ static int queue_init_global(void) for (i = 0; i < ODP_CONFIG_QUEUES; i++) { /* init locks */ - queue_entry_t *queue = get_qentry(i); + queue_entry_t *queue = qentry_from_index(i); LOCK_INIT(queue); queue->s.index = i; - queue->s.handle = queue_from_index(i); + queue->s.handle = (odp_queue_t)queue; } if (read_config_file(queue_glb)) { @@ -208,7 +201,7 @@ static int queue_term_global(void) int i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_glb->queue[i]; + queue = qentry_from_index(i); LOCK(queue); if (queue->s.status != QUEUE_STATUS_FREE) { ODP_ERR("Not destroyed queue: %s\n", queue->s.name); @@ -239,27 +232,27 @@ static int queue_capability(odp_queue_capability_t *capa) static odp_queue_type_t queue_type(odp_queue_t handle) { - return handle_to_qentry(handle)->s.type; + return qentry_from_handle(handle)->s.type; } static odp_schedule_sync_t queue_sched_type(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.sync; + return qentry_from_handle(handle)->s.param.sched.sync; } static odp_schedule_prio_t queue_sched_prio(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.prio; + return qentry_from_handle(handle)->s.param.sched.prio; } static odp_schedule_group_t queue_sched_group(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.sched.group; + return qentry_from_handle(handle)->s.param.sched.group; } static uint32_t queue_lock_count(odp_queue_t handle) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED ? queue->s.param.sched.lock_count : 0; @@ -295,7 +288,7 @@ static odp_queue_t queue_create(const char *name, } for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue = &queue_glb->queue[i]; + queue = qentry_from_index(i); if (queue->s.status != QUEUE_STATUS_FREE) continue; @@ -357,7 +350,7 @@ static odp_queue_t queue_create(const char *name, void sched_cb_queue_destroy_finalize(uint32_t queue_index) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); LOCK(queue); @@ -370,7 +363,7 @@ void sched_cb_queue_destroy_finalize(uint32_t queue_index) void sched_cb_queue_set_status(uint32_t queue_index, int status) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); LOCK(queue); @@ -382,7 +375,7 @@ void sched_cb_queue_set_status(uint32_t queue_index, int status) static int queue_destroy(odp_queue_t handle) { queue_entry_t *queue; - queue = handle_to_qentry(handle); + queue = qentry_from_handle(handle); if (handle == ODP_QUEUE_INVALID) return -1; @@ -432,14 +425,14 @@ static int queue_context_set(odp_queue_t handle, void *context, uint32_t len ODP_UNUSED) { odp_mb_full(); - handle_to_qentry(handle)->s.param.context = context; + qentry_from_handle(handle)->s.param.context = context; odp_mb_full(); return 0; } static void *queue_context(odp_queue_t handle) { - return handle_to_qentry(handle)->s.param.context; + return qentry_from_handle(handle)->s.param.context; } static odp_queue_t queue_lookup(const char *name) @@ -447,7 +440,7 @@ static odp_queue_t queue_lookup(const char *name) uint32_t i; for (i = 0; i < ODP_CONFIG_QUEUES; i++) { - queue_entry_t *queue = &queue_glb->queue[i]; + queue_entry_t *queue = qentry_from_index(i); if (queue->s.status == QUEUE_STATUS_FREE || queue->s.status == QUEUE_STATUS_DESTROYED) @@ -552,7 +545,7 @@ static int queue_int_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); if (odp_unlikely(num == 0)) return 0; @@ -566,7 +559,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) static int queue_enq(odp_queue_t handle, odp_event_t ev) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return queue->s.enqueue(queue, (odp_buffer_hdr_t *)(uintptr_t)ev); @@ -641,7 +634,7 @@ static odp_buffer_hdr_t *queue_int_deq(void *q_int) static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; @@ -652,7 +645,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) static odp_event_t queue_deq(odp_queue_t handle) { - queue_entry_t *queue = handle_to_qentry(handle); + queue_entry_t *queue = qentry_from_handle(handle); return (odp_event_t)queue->s.dequeue(queue); } @@ -739,7 +732,7 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) return -1; } - queue = get_qentry(queue_id); + queue = qentry_from_index(queue_id); LOCK(queue); status = queue->s.status; @@ -762,14 +755,14 @@ static int queue_info(odp_queue_t handle, odp_queue_info_t *info) int sched_cb_queue_deq_multi(uint32_t queue_index, odp_event_t ev[], int num, int update_status) { - queue_entry_t *qe = get_qentry(queue_index); + queue_entry_t *qe = qentry_from_index(queue_index); return deq_multi(qe, (odp_buffer_hdr_t **)ev, num, update_status); } int sched_cb_queue_empty(uint32_t queue_index) { - queue_entry_t *queue = get_qentry(queue_index); + queue_entry_t *queue = qentry_from_index(queue_index); int ret = 0; LOCK(queue); @@ -851,7 +844,7 @@ static void queue_set_enq_deq_func(void *q_int, static void *queue_from_ext(odp_queue_t handle) { - return handle_to_qentry(handle); + return qentry_from_handle(handle); } static odp_queue_t queue_to_ext(void *q_int) diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 0fced5cf..7311d13a 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -798,7 +798,7 @@ static inline int poll_pktin(uint32_t qi, int stash) return num; } - q_int = queue_index_to_qint(qi); + q_int = qentry_from_index(qi); ret = queue_fn->enq_multi(q_int, b_hdr, num); commit 78b552f62a65c6a873ed021d5579675b4fd84e3a Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 15:10:34 2018 +0300 linux-gen: queue: remove extra conversion functions Remove unnecessary conversion functions between queue entry and void pointer types. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index e227f26c..1808fb73 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -89,16 +89,6 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static inline queue_entry_t *qentry_from_int(void *q_int) -{ - return (queue_entry_t *)q_int; -} - -static inline void *qentry_to_int(queue_entry_t *qentry) -{ - return qentry; -} - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 7c1e1c84..4af819c3 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -495,7 +495,7 @@ static inline int enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], ring_st_t *ring_st; uint32_t buf_idx[num]; - queue = qentry_from_int(q_int); + queue = q_int; ring_st = &queue->s.ring_st; if (sched_fn->ord_enq_multi(q_int, (void **)buf_hdr, num, &ret)) @@ -560,7 +560,7 @@ static int queue_enq_multi(odp_queue_t handle, const odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - return queue->s.enqueue_multi(qentry_to_int(queue), + return queue->s.enqueue_multi(queue, (odp_buffer_hdr_t **)(uintptr_t)ev, num); } @@ -568,7 +568,7 @@ static int queue_enq(odp_queue_t handle, odp_event_t ev) { queue_entry_t *queue = handle_to_qentry(handle); - return queue->s.enqueue(qentry_to_int(queue), + return queue->s.enqueue(queue, (odp_buffer_hdr_t *)(uintptr_t)ev); } @@ -620,14 +620,14 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], static int queue_int_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { - queue_entry_t *queue = qentry_from_int(q_int); + queue_entry_t *queue = q_int; return deq_multi(queue, buf_hdr, num, 0); } static odp_buffer_hdr_t *queue_int_deq(void *q_int) { - queue_entry_t *queue = qentry_from_int(q_int); + queue_entry_t *queue = q_int; odp_buffer_hdr_t *buf_hdr = NULL; int ret; @@ -646,7 +646,7 @@ static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - return queue->s.dequeue_multi(qentry_to_int(queue), + return queue->s.dequeue_multi(queue, (odp_buffer_hdr_t **)ev, num); } @@ -654,7 +654,7 @@ static odp_event_t queue_deq(odp_queue_t handle) { queue_entry_t *queue = handle_to_qentry(handle); - return (odp_event_t)queue->s.dequeue(qentry_to_int(queue)); + return (odp_event_t)queue->s.dequeue(queue); } static int queue_init(queue_entry_t *queue, const char *name, @@ -800,12 +800,14 @@ static uint64_t queue_to_u64(odp_queue_t hdl) static odp_pktout_queue_t queue_get_pktout(void *q_int) { - return qentry_from_int(q_int)->s.pktout; + queue_entry_t *qentry = q_int; + + return qentry->s.pktout; } static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; qentry->s.pktout.pktio = pktio; qentry->s.pktout.index = index; @@ -813,12 +815,14 @@ static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) static odp_pktin_queue_t queue_get_pktin(void *q_int) { - return qentry_from_int(q_int)->s.pktin; + queue_entry_t *qentry = q_int; + + return qentry->s.pktin; } static void queue_set_pktin(void *q_int, odp_pktio_t pktio, int index) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; qentry->s.pktin.pktio = pktio; qentry->s.pktin.index = index; @@ -830,7 +834,7 @@ static void queue_set_enq_deq_func(void *q_int, queue_deq_fn_t deq, queue_deq_multi_fn_t deq_multi) { - queue_entry_t *qentry = qentry_from_int(q_int); + queue_entry_t *qentry = q_int; if (enq) qentry->s.enqueue = enq; @@ -847,12 +851,14 @@ static void queue_set_enq_deq_func(void *q_int, static void *queue_from_ext(odp_queue_t handle) { - return qentry_to_int(handle_to_qentry(handle)); + return handle_to_qentry(handle); } static odp_queue_t queue_to_ext(void *q_int) { - return qentry_from_int(q_int)->s.handle; + queue_entry_t *qentry = q_int; + + return qentry->s.handle; } /* API functions */ diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index 4a8a5492..b3cfbdbe 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -144,7 +144,7 @@ static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) ring_lf_node_t *node; uint64_t counter; - queue = qentry_from_int(q_int); + queue = q_int; queue_lf = queue->s.queue_lf; i_node = 0; @@ -204,7 +204,7 @@ static odp_buffer_hdr_t *queue_lf_deq(void *q_int) ring_lf_node_t *node, *old; uint64_t lowest; - queue = qentry_from_int(q_int); + queue = q_int; queue_lf = queue->s.queue_lf; i_node = 0; diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index 57e958bb..0fced5cf 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -638,8 +638,7 @@ static inline void ordered_stash_release(void) buf_hdr = sched_local.ordered.stash[i].buf_hdr; num = sched_local.ordered.stash[i].num; - num_enq = queue_fn->enq_multi(qentry_to_int(queue_entry), - buf_hdr, num); + num_enq = queue_fn->enq_multi(queue_entry, buf_hdr, num); /* Drop packets that were not enqueued */ if (odp_unlikely(num_enq < num)) { @@ -719,7 +718,7 @@ static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], { int i; uint32_t stash_num = sched_local.ordered.stash_num; - queue_entry_t *dst_queue = qentry_from_int(q_int); + queue_entry_t *dst_queue = q_int; uint32_t src_queue = sched_local.ordered.src_queue; if ((src_queue == NULL_INDEX) || sched_local.ordered.in_order) diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index f0062b59..c1e51bb5 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1142,8 +1142,7 @@ static inline void ordered_stash_release(void) buf_hdr = thread_local.ordered.stash[i].buf_hdr; num = thread_local.ordered.stash[i].num; - num_enq = queue_fn->enq_multi(qentry_to_int(queue_entry), - buf_hdr, num); + num_enq = queue_fn->enq_multi(queue_entry, buf_hdr, num); if (odp_unlikely(num_enq < num)) { if (odp_unlikely(num_enq < 0)) @@ -1208,7 +1207,7 @@ static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], { int i; uint32_t stash_num = thread_local.ordered.stash_num; - queue_entry_t *dst_queue = qentry_from_int(q_int); + queue_entry_t *dst_queue = q_int; uint32_t src_queue = thread_local.ordered.src_queue; if ((src_queue == NULL_INDEX) || thread_local.ordered.in_order) commit 68f26e2a86eb206dcdda9324b20afa208067e6c2 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Mon May 28 14:52:34 2018 +0300 linux-gen: queue: remove abstract internal queue type Implementation internal (queue) references are pointers. Remove additional (abstract) type from queue interface. Other modules use void pointer as (abstract) queue reference. Abstract type added complexity and confusion, as queue handles had three different formats API handle, internal abstract type and queue structure pointer. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 951903dd..cd2db2ec 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -105,7 +105,7 @@ typedef struct { odp_time_t timestamp; /* Classifier destination queue */ - queue_t dst_queue; + void *dst_queue; /* Result for crypto packet op */ odp_crypto_packet_result_t crypto_op_result; diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 8019dfe9..880237a5 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -175,7 +175,7 @@ struct pktio_entry { struct { odp_queue_t queue; - queue_t queue_int; + void *queue_int; odp_pktin_queue_t pktin; } in_queue[PKTIO_MAX_QUEUES]; diff --git a/platform/linux-generic/include/odp_queue_if.h b/platform/linux-generic/include/odp_queue_if.h index ed8d6ca9..b9f4f03d 100644 --- a/platform/linux-generic/include/odp_queue_if.h +++ b/platform/linux-generic/include/odp_queue_if.h @@ -44,29 +44,23 @@ typedef struct { int (*queue_info)(odp_queue_t queue, odp_queue_info_t *info); } queue_api_t; -/* Internal abstract queue handle */ -typedef struct { char dummy; } _queue_t; -typedef _queue_t *queue_t; - -#define QUEUE_NULL ((queue_t)NULL) - typedef int (*queue_init_global_fn_t)(void); typedef int (*queue_term_global_fn_t)(void); typedef int (*queue_init_local_fn_t)(void); typedef int (*queue_term_local_fn_t)(void); -typedef queue_t (*queue_from_ext_fn_t)(odp_queue_t handle); -typedef odp_queue_t (*queue_to_ext_fn_t)(queue_t q_int); -typedef int (*queue_enq_fn_t)(queue_t q_int, odp_buffer_hdr_t *); -typedef int (*queue_enq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); -typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(queue_t q_int); -typedef int (*queue_deq_multi_fn_t)(queue_t q_int, odp_buffer_hdr_t **, int); -typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(queue_t q_int); -typedef void (*queue_set_pktout_fn_t)(queue_t q_int, odp_pktio_t pktio, +typedef void *(*queue_from_ext_fn_t)(odp_queue_t handle); +typedef odp_queue_t (*queue_to_ext_fn_t)(void *q_int); +typedef int (*queue_enq_fn_t)(void *q_int, odp_buffer_hdr_t *); +typedef int (*queue_enq_multi_fn_t)(void *q_int, odp_buffer_hdr_t **, int); +typedef odp_buffer_hdr_t *(*queue_deq_fn_t)(void *q_int); +typedef int (*queue_deq_multi_fn_t)(void *q_int, odp_buffer_hdr_t **, int); +typedef odp_pktout_queue_t (*queue_get_pktout_fn_t)(void *q_int); +typedef void (*queue_set_pktout_fn_t)(void *q_int, odp_pktio_t pktio, int index); -typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(queue_t q_int); -typedef void (*queue_set_pktin_fn_t)(queue_t q_int, odp_pktio_t pktio, +typedef odp_pktin_queue_t (*queue_get_pktin_fn_t)(void *q_int); +typedef void (*queue_set_pktin_fn_t)(void *q_int, odp_pktio_t pktio, int index); -typedef void (*queue_set_enq_deq_fn_t)(queue_t q_int, +typedef void (*queue_set_enq_deq_fn_t)(void *q_int, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h index 98e86fa0..e227f26c 100644 --- a/platform/linux-generic/include/odp_queue_internal.h +++ b/platform/linux-generic/include/odp_queue_internal.h @@ -4,13 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ - -/** - * @file - * - * ODP queue - implementation internal - */ - #ifndef ODP_QUEUE_INTERNAL_H_ #define ODP_QUEUE_INTERNAL_H_ @@ -81,9 +74,9 @@ typedef struct queue_global_t { extern queue_global_t *queue_glb; -static inline queue_t queue_index_to_qint(uint32_t queue_id) +static inline void *queue_index_to_qint(uint32_t queue_id) { - return (queue_t)&queue_glb->queue[queue_id]; + return &queue_glb->queue[queue_id]; } static inline uint32_t queue_to_index(odp_queue_t handle) @@ -96,14 +89,14 @@ static inline odp_queue_t queue_from_index(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static inline queue_entry_t *qentry_from_int(queue_t q_int) +static inline queue_entry_t *qentry_from_int(void *q_int) { - return (queue_entry_t *)(void *)(q_int); + return (queue_entry_t *)q_int; } -static inline queue_t qentry_to_int(queue_entry_t *qentry) +static inline void *qentry_to_int(queue_entry_t *qentry) { - return (queue_t)(qentry); + return qentry; } #ifdef __cplusplus diff --git a/platform/linux-generic/include/odp_queue_scalable_internal.h b/platform/linux-generic/include/odp_queue_scalable_internal.h index b108346d..37147aa9 100644 --- a/platform/linux-generic/include/odp_queue_scalable_internal.h +++ b/platform/linux-generic/include/odp_queue_scalable_internal.h @@ -80,14 +80,14 @@ static inline uint32_t queue_to_id(odp_queue_t handle) return _odp_typeval(handle) - 1; } -static inline queue_entry_t *qentry_from_int(queue_t handle) +static inline queue_entry_t *qentry_from_int(void *handle) { - return (queue_entry_t *)(void *)(handle); + return (queue_entry_t *)handle; } -static inline queue_t qentry_to_int(queue_entry_t *qentry) +static inline void *qentry_to_int(queue_entry_t *qentry) { - return (queue_t)(qentry); + return qentry; } static inline odp_queue_t queue_get_handle(queue_entry_t *queue) diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index 4bd127a4..0d095262 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -32,7 +32,7 @@ typedef int (*schedule_init_queue_fn_t)(uint32_t queue_index, typedef void (*schedule_destroy_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_sched_queue_fn_t)(uint32_t queue_index); typedef int (*schedule_unsched_queue_fn_t)(uint32_t queue_index); -typedef int (*schedule_ord_enq_multi_fn_t)(queue_t q_int, +typedef int (*schedule_ord_enq_multi_fn_t)(void *q_int, void *buf_hdr[], int num, int *ret); typedef int (*schedule_init_global_fn_t)(void); typedef int (*schedule_term_global_fn_t)(void); diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index aab6b911..919831a3 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -282,7 +282,7 @@ struct tm_queue_obj_s { uint8_t tm_idx; uint8_t delayed_cnt; uint8_t blocked_cnt; - queue_t tm_qentry; + void *tm_qentry; }; struct tm_node_obj_s { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 81262a17..5113eba2 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -137,7 +137,7 @@ static void init_in_queues(pktio_entry_t *entry) for (i = 0; i < PKTIO_MAX_QUEUES; i++) { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; entry->s.in_queue[i].pktin = PKTIN_INVALID; } } @@ -327,7 +327,7 @@ static void destroy_in_queues(pktio_entry_t *entry, int num) if (entry->s.in_queue[i].queue != ODP_QUEUE_INVALID) { odp_queue_destroy(entry->s.in_queue[i].queue); entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; } } } @@ -637,7 +637,7 @@ static inline int pktin_recv_buf(pktio_entry_t *entry, int pktin_index, return num_rx; } -static int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int pktout_enqueue(void *q_int, odp_buffer_hdr_t *buf_hdr) { odp_packet_t pkt = packet_from_buf_hdr(buf_hdr); int len = 1; @@ -650,7 +650,7 @@ static int pktout_enqueue(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return (nbr == len ? 0 : -1); } -static int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktout_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { odp_packet_t pkt_tbl[QUEUE_MULTI_MAX]; int nbr; @@ -666,7 +666,7 @@ static int pktout_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } -static odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) +static odp_buffer_hdr_t *pktin_dequeue(void *q_int) { odp_buffer_hdr_t *buf_hdr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -705,7 +705,7 @@ static odp_buffer_hdr_t *pktin_dequeue(queue_t q_int) return buf_hdr; } -static int pktin_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], int num) +static int pktin_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int nbr; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; @@ -765,7 +765,7 @@ int sched_cb_pktin_poll_one(int pktio_index, odp_packet_hdr_t *pkt_hdr; odp_buffer_hdr_t *buf_hdr; odp_packet_t packets[QUEUE_MULTI_MAX]; - queue_t queue; + void *q_int; if (odp_unlikely(entry->s.state != PKTIO_STATE_STARTED)) { if (entry->s.state < PKTIO_STATE_ACTIVE || @@ -785,9 +785,9 @@ int sched_cb_pktin_poll_one(int pktio_index, pkt = packets[i]; pkt_hdr = packet_hdr(pkt); if (odp_unlikely(pkt_hdr->p.input_flags.dst_queue)) { - queue = pkt_hdr->dst_queue; + q_int = pkt_hdr->dst_queue; buf_hdr = packet_to_buf_hdr(pkt); - if (queue_fn->enq_multi(queue, &buf_hdr, 1) < 0) { + if (queue_fn->enq_multi(q_int, &buf_hdr, 1) < 0) { /* Queue full? */ odp_packet_free(pkt); __atomic_fetch_add(&entry->s.stats.in_discards, @@ -836,7 +836,7 @@ int sched_cb_pktin_poll_old(int pktio_index, int num_queue, int index[]) } for (idx = 0; idx < num_queue; idx++) { - queue_t q_int; + void *q_int; int num_enq; num = pktin_recv_buf(entry, index[idx], hdr_tbl, @@ -1371,14 +1371,14 @@ int odp_pktio_stats_reset(odp_pktio_t pktio) return ret; } -static int abort_pktin_enqueue(queue_t q_int ODP_UNUSED, +static int abort_pktin_enqueue(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr ODP_UNUSED) { ODP_ABORT("attempted enqueue to a pktin queue"); return -1; } -static int abort_pktin_enq_multi(queue_t q_int ODP_UNUSED, +static int abort_pktin_enq_multi(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { @@ -1386,13 +1386,13 @@ static int abort_pktin_enq_multi(queue_t q_int ODP_UNUSED, return 0; } -static odp_buffer_hdr_t *abort_pktout_dequeue(queue_t q_int ODP_UNUSED) +static odp_buffer_hdr_t *abort_pktout_dequeue(void *q_int ODP_UNUSED) { ODP_ABORT("attempted dequeue from a pktout queue"); return NULL; } -static int abort_pktout_deq_multi(queue_t q_int ODP_UNUSED, +static int abort_pktout_deq_multi(void *q_int ODP_UNUSED, odp_buffer_hdr_t *buf_hdr[] ODP_UNUSED, int num ODP_UNUSED) { @@ -1410,7 +1410,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, unsigned i; int rc; odp_queue_t queue; - queue_t q_int; + void *q_int; odp_pktin_queue_param_t default_param; if (param == NULL) { @@ -1506,7 +1506,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, } else { entry->s.in_queue[i].queue = ODP_QUEUE_INVALID; - entry->s.in_queue[i].queue_int = QUEUE_NULL; + entry->s.in_queue[i].queue_int = NULL; } entry->s.in_queue[i].pktin.index = i; @@ -1598,7 +1598,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, for (i = 0; i < num_queues; i++) { odp_queue_t queue; odp_queue_param_t queue_param; - queue_t q_int; + void *q_int; char name[ODP_QUEUE_NAME_LEN]; int pktio_id = odp_pktio_index(pktio); diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 572441d0..7c1e1c84 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -485,7 +485,7 @@ static inline void buffer_index_to_buf(odp_buffer_hdr_t *buf_hdr[], } } -static inline int enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static inline int enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { int sched = 0; @@ -532,13 +532,13 @@ static inline int enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], return num_enq; } -static int queue_int_enq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static int queue_int_enq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { return enq_multi(q_int, buf_hdr, num); } -static int queue_int_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int queue_int_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { int ret; @@ -617,7 +617,7 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], return num_deq; } -static int queue_int_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], +static int queue_int_deq_multi(void *q_int, odp_buffer_hdr_t *buf_hdr[], int num) { queue_entry_t *queue = qentry_from_int(q_int); @@ -625,7 +625,7 @@ static int queue_int_deq_multi(queue_t q_int, odp_buffer_hdr_t *buf_hdr[], return deq_multi(queue, buf_hdr, num, 0); } -static odp_buffer_hdr_t *queue_int_deq(queue_t q_int) +static odp_buffer_hdr_t *queue_int_deq(void *q_int) { queue_entry_t *queue = qentry_from_int(q_int); odp_buffer_hdr_t *buf_hdr = NULL; @@ -798,12 +798,12 @@ static uint64_t queue_to_u64(odp_queue_t hdl) return _odp_pri(hdl); } -static odp_pktout_queue_t queue_get_pktout(queue_t q_int) +static odp_pktout_queue_t queue_get_pktout(void *q_int) { return qentry_from_int(q_int)->s.pktout; } -static void queue_set_pktout(queue_t q_int, odp_pktio_t pktio, int index) +static void queue_set_pktout(void *q_int, odp_pktio_t pktio, int index) { queue_entry_t *qentry = qentry_from_int(q_int); @@ -811,12 +811,12 @@ static void queue_set_pktout(queue_t q_int, odp_pktio_t pktio, int index) qentry->s.pktout.index = index; } -static odp_pktin_queue_t queue_get_pktin(queue_t q_int) +static odp_pktin_queue_t queue_get_pktin(void *q_int) { return qentry_from_int(q_int)->s.pktin; } -static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index) +static void queue_set_pktin(void *q_int, odp_pktio_t pktio, int index) { queue_entry_t *qentry = qentry_from_int(q_int); @@ -824,7 +824,7 @@ static void queue_set_pktin(queue_t q_int, odp_pktio_t pktio, int index) qentry->s.pktin.index = index; } -static void queue_set_enq_deq_func(queue_t q_int, +static void queue_set_enq_deq_func(void *q_int, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, @@ -845,12 +845,12 @@ static void queue_set_enq_deq_func(queue_t q_int, qentry->s.dequeue_multi = deq_multi; } -static queue_t queue_from_ext(odp_queue_t handle) +static void *queue_from_ext(odp_queue_t handle) { return qentry_to_int(handle_to_qentry(handle)); } -static odp_queue_t queue_to_ext(queue_t q_int) +static odp_queue_t queue_to_ext(void *q_int) { return qentry_from_int(q_int)->s.handle; } diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c index afe629d1..4a8a5492 100644 --- a/platform/linux-generic/odp_queue_lf.c +++ b/platform/linux-generic/odp_queue_lf.c @@ -133,7 +133,7 @@ static inline int next_idx(int idx) return next; } -static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) +static int queue_lf_enq(void *q_int, odp_buffer_hdr_t *buf_hdr) { queue_entry_t *queue; queue_lf_t *queue_lf; @@ -183,7 +183,7 @@ static int queue_lf_enq(queue_t q_int, odp_buffer_hdr_t *buf_hdr) return -1; } -static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, +static int queue_lf_enq_multi(void *q_int, odp_buffer_hdr_t **buf_hdr, int num) { (void)num; @@ -194,7 +194,7 @@ static int queue_lf_enq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, return 0; } -static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) +static odp_buffer_hdr_t *queue_lf_deq(void *q_int) { queue_entry_t *queue; queue_lf_t *queue_lf; @@ -243,7 +243,7 @@ static odp_buffer_hdr_t *queue_lf_deq(queue_t q_int) return NULL; } -static int queue_lf_deq_multi(queue_t q_int, odp_buffer_hdr_t **buf_hdr, +static int queue_lf_deq_multi(void *q_int, odp_buffer_hdr_t **buf_hdr, int num) { odp_buffer_hdr_t *buf; diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 578e6d22..1cc318e3 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -57,12 +57,12 @@ static inline odp_queue_t queue_from_id(uint32_t queue_id) return _odp_cast_scalar(odp_queue_t, queue_id + 1); } -static queue_t queue_from_ext(odp_queue_t handle); -static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr); -static odp_buffer_hdr_t *_queue_deq(queue_t handle); -static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static void *queue_from_ext(odp_queue_t handle); +static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr); +static odp_buffer_hdr_t *_queue_deq(void *handle); +static int _queue_enq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num); -static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_deq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num); static queue_entry_t *get_qentry(uint32_t queue_id) @@ -612,7 +612,7 @@ int _odp_queue_enq_sp(sched_elem_t *q, return actual; } -static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_enq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num) { int actual; @@ -648,7 +648,7 @@ static int _queue_enq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], return actual; } -static int _queue_enq(queue_t handle, odp_buffer_hdr_t *buf_hdr) +static int _queue_enq(void *handle, odp_buffer_hdr_t *buf_hdr) { return odp_likely( _queue_enq_multi(handle, &buf_hdr, 1) == 1) ? 0 : -1; @@ -811,7 +811,7 @@ inline int _odp_queue_deq_mc(sched_elem_t *q, odp_event_t *evp, int num) return ret; } -static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], +static int _queue_deq_multi(void *handle, odp_buffer_hdr_t *buf_hdr[], int num) { sched_elem_t *q; @@ -822,7 +822,7 @@ static int _queue_deq_multi(queue_t handle, odp_buffer_hdr_t *buf_hdr[], return _odp_queue_deq(q, buf_hdr, num); } -static odp_buffer_hdr_t *_queue_deq(queue_t handle) +static odp_buffer_hdr_t *_queue_deq(void *handle) { sched_elem_t *q; odp_buffer_hdr_t *buf_hdr; @@ -911,29 +911,29 @@ static uint64_t queue_to_u64(odp_queue_t hdl) return _odp_pri(hdl); } -static odp_pktout_queue_t queue_get_pktout(queue_t handle) +static odp_pktout_queue_t queue_get_pktout(void *handle) { return qentry_from_int(handle)->s.pktout; } -static void queue_set_pktout(queue_t handle, odp_pktio_t pktio, int index) +static void queue_set_pktout(void *handle, odp_pktio_t pktio, int index) { qentry_from_int(handle)->s.pktout.pktio = pktio; qentry_from_int(handle)->s.pktout.index = index; } -static odp_pktin_queue_t queue_get_pktin(queue_t handle) +static odp_pktin_queue_t queue_get_pktin(void *handle) { return qentry_from_int(handle)->s.pktin; } -static void queue_set_pktin(queue_t handle, odp_pktio_t pktio, int index) +static void queue_set_pktin(void *handle, odp_pktio_t pktio, int index) { qentry_from_int(handle)->s.pktin.pktio = pktio; qentry_from_int(handle)->s.pktin.index = index; } -static void queue_set_enq_deq_func(queue_t handle, +static void queue_set_enq_deq_func(void *handle, queue_enq_fn_t enq, queue_enq_multi_fn_t enq_multi, queue_deq_fn_t deq, @@ -952,7 +952,7 @@ static void queue_set_enq_deq_func(queue_t handle, qentry_from_int(handle)->s.dequeue_multi = deq_multi; } -static queue_t queue_from_ext(odp_queue_t handle) +static void *queue_from_ext(odp_queue_t handle) { uint32_t queue_id; @@ -960,7 +960,7 @@ static queue_t queue_from_ext(odp_queue_t handle) return qentry_to_int(get_qentry(queue_id)); } -static odp_queue_t queue_to_ext(queue_t handle) +static odp_queue_t queue_to_ext(void *handle) { return qentry_from_int(handle)->s.handle; } diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index ca291d15..57e958bb 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -714,7 +714,7 @@ static inline int copy_from_stash(odp_event_t out_ev[], unsigned int max) return i; } -static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], +static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { int i; @@ -766,7 +766,7 @@ static inline int poll_pktin(uint32_t qi, int stash) odp_buffer_hdr_t *b_hdr[MAX_DEQ]; int pktio_index, pktin_index, num, num_pktin, i; int ret; - queue_t qint; + void *q_int; pktio_index = sched->queue[qi].pktio_index; pktin_index = sched->queue[qi].pktin_index; @@ -799,9 +799,9 @@ static inline int poll_pktin(uint32_t qi, int stash) return num; } - qint = queue_index_to_qint(qi); + q_int = queue_index_to_qint(qi); - ret = queue_fn->enq_multi(qint, b_hdr, num); + ret = queue_fn->enq_multi(q_int, b_hdr, num); /* Drop packets that were not enqueued */ if (odp_unlikely(ret < num)) { diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index b8d7e3b5..f0062b59 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -1203,7 +1203,7 @@ static inline void schedule_release_context(void) schedule_release_atomic(); } -static int schedule_ord_enq_multi(queue_t q_int, void *buf_hdr[], +static int schedule_ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { int i; diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index ff24815c..155be5a2 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -2006,7 +2006,7 @@ static int sched_queue(uint32_t queue_index) return 0; } -static int ord_enq_multi(queue_t handle, void *buf_hdr[], int num, +static int ord_enq_multi(void *handle, void *buf_hdr[], int num, int *ret) { diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 2cef0e82..0f80452d 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -414,7 +414,7 @@ static int sched_queue(uint32_t qi) return 0; } -static int ord_enq_multi(queue_t q_int, void *buf_hdr[], int num, +static int ord_enq_multi(void *q_int, void *buf_hdr[], int num, int *ret) { (void)q_int; diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index eeb1ea96..79ba35b7 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -108,7 +108,7 @@ static odp_bool_t tm_demote_pkt_desc(tm_system_t *tm_system, tm_shaper_obj_t *timer_shaper, pkt_desc_t *demoted_pkt_desc); -static int queue_tm_reenq(queue_t queue, odp_buffer_hdr_t *buf_hdr) +static int queue_tm_reenq(void *queue, odp_buffer_hdr_t *buf_hdr) { odp_tm_queue_t tm_queue = MAKE_ODP_TM_QUEUE((uint8_t *)queue - offsetof(tm_queue_obj_t, @@ -118,7 +118,7 @@ static int queue_tm_reenq(queue_t queue, odp_buffer_hdr_t *buf_hdr) return odp_tm_enq(tm_queue, pkt); } -static int queue_tm_reenq_multi(queue_t queue ODP_UNUSED, +static int queue_tm_reenq_multi(void *queue ODP_UNUSED, odp_buffer_hdr_t *buf[] ODP_UNUSED, int num ODP_UNUSED) { diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 18fecf88..0bd1835c 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -79,7 +79,7 @@ static int loopback_recv(pktio_entry_t *pktio_entry, int index ODP_UNUSED, { int nbr, i; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; - queue_t queue; + void *queue; odp_packet_hdr_t *pkt_hdr; odp_packet_t pkt; odp_time_t ts_val; @@ -260,7 +260,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, const odp_packet_t pkt_tbl[], int num) { odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; - queue_t queue; + void *queue; int i; int ret; int nb_tx = 0; ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/Makefile.am | 3 + .../linux-generic/include-abi/odp/api/abi/queue.h | 3 + .../include/odp/api/plat/queue_inline_types.h | 35 ++++++ .../include/odp/api/plat/queue_inlines.h | 36 ++++++ .../linux-generic/include/odp_packet_internal.h | 2 +- .../linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/include/odp_queue_if.h | 29 ++--- .../linux-generic/include/odp_queue_internal.h | 27 +---- .../include/odp_queue_scalable_internal.h | 10 +- platform/linux-generic/include/odp_schedule_if.h | 2 +- .../include/odp_traffic_mngr_internal.h | 2 +- platform/linux-generic/odp_packet_io.c | 34 +++--- .../{odp_event_api.c => odp_queue_api.c} | 4 +- platform/linux-generic/odp_queue_basic.c | 125 +++++++++++---------- platform/linux-generic/odp_queue_if.c | 14 ++- platform/linux-generic/odp_queue_lf.c | 12 +- platform/linux-generic/odp_queue_scalable.c | 84 +++++++------- platform/linux-generic/odp_schedule_basic.c | 13 +-- platform/linux-generic/odp_schedule_iquery.c | 7 +- platform/linux-generic/odp_schedule_scalable.c | 2 +- platform/linux-generic/odp_schedule_sp.c | 2 +- platform/linux-generic/odp_traffic_mngr.c | 4 +- platform/linux-generic/pktio/loop.c | 4 +- 23 files changed, 254 insertions(+), 202 deletions(-) create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inline_types.h create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inlines.h copy platform/linux-generic/{odp_event_api.c => odp_queue_api.c} (75%) hooks/post-receive --

7 years

[COMMIT] branch master updated. v1.19.0.1_tigermoth-39-g42a8b2f0

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (commit) via f4f4dcee96e534c0badc28258ad09ef50b35ec76 (commit) via d6e4b3df266ee1c847763ba50fa802d9e9e62b5e (commit) via bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 (commit) via 170e93051d25ac491811f1ed66cd5552a0b26ec8 (commit) from 744d466a0fe5530bb6c036664413d799a3aeb871 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Fri May 25 11:25:15 2018 +0300 linux-gen: cpu: inline cpu_cycles_diff Moved the last function from .c file to inline header and removed .c file. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 218138f9..e995479a 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -149,7 +149,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_buffer.c \ odp_chksum.c \ odp_classification.c \ - odp_cpu.c \ odp_cpumask.c \ odp_cpumask_task.c \ odp_crypto.c \ diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h index 29b6ca7a..054801e8 100644 --- a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h @@ -7,6 +7,8 @@ #ifndef ODP_PLAT_CPU_INLINES_H_ #define ODP_PLAT_CPU_INLINES_H_ +#include <odp/api/hints.h> + /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ #ifndef _ODP_NO_INLINE @@ -16,12 +18,21 @@ #define odp_cpu_cycles __odp_cpu_cycles #define odp_cpu_cycles_max __odp_cpu_cycles_max #define odp_cpu_cycles_resolution __odp_cpu_cycles_resolution + #define odp_cpu_cycles_diff __odp_cpu_cycles_diff #else #define _ODP_INLINE #endif #include <odp/api/abi/cpu_inlines.h> +_ODP_INLINE uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1) +{ + if (odp_likely(c2 >= c1)) + return c2 - c1; + + return c2 + (odp_cpu_cycles_max() - c1) + 1; +} + /** @endcond */ #endif diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index 8a01d461..03c0817e 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -12,6 +12,7 @@ extern "C" { #endif #include <odp/api/atomic.h> +#include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp_align_internal.h> #include <odp/api/plat/atomic_inlines.h> diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c deleted file mode 100644 index cfdb1cfd..00000000 --- a/platform/linux-generic/odp_cpu.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2015-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include "config.h" - -#include <odp/api/cpu.h> -#include <odp/api/hints.h> - -uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1) -{ - if (odp_likely(c2 >= c1)) - return c2 - c1; - - return c2 + (odp_cpu_cycles_max() - c1) + 1; -} diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index f68a559d..e01120f1 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -8,6 +8,7 @@ #include <config.h> #include <odp/api/shared_memory.h> +#include <odp/api/cpu.h> #include <odp/api/plat/cpu_inlines.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> commit f4f4dcee96e534c0badc28258ad09ef50b35ec76 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 16:54:46 2018 +0300 linux-gen: cpu: inline cpu cycle functions on x86 Moved cpu cycle and pause functions into arch/x86/odp_arch_cpu_inlines.h. Uncommented pause function in spec file and removed it from ABI file. It's safer for ABI compat mode to not have code included into ABI spec files. Other architectures use the default odp_arch_cpu_inlines.h, which does not change the current implementation. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.inc b/Makefile.inc index c887b2ee..f9c4cae4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -9,6 +9,7 @@ else ODP_INCLUDES += \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ + -I$(top_srcdir)/platform/@with_platform@/arch/default \ -I$(top_srcdir)/platform/@with_platform@/include-abi endif diff --git a/include/odp/api/spec/cpu.h b/include/odp/api/spec/cpu.h index d107f283..f6a7e656 100644 --- a/include/odp/api/spec/cpu.h +++ b/include/odp/api/spec/cpu.h @@ -161,14 +161,13 @@ uint64_t odp_cpu_cycles_max(void); uint64_t odp_cpu_cycles_resolution(void); /** - * @def odp_cpu_pause * Pause CPU execution for a short while * * This call is intended for tight loops which poll a shared resource. A short * pause within the loop may save energy and improve system performance as * CPU polling frequency is reduced. */ -/* void odp_cpu_pause(void); */ +void odp_cpu_pause(void); /** * @} diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h index 523fa99e..d7485c09 100644 --- a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h @@ -13,15 +13,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ -#ifdef __SSE2__ - __asm__ __volatile__ ("pause"); -#else - __asm__ __volatile__ ("rep; nop"); -#endif -} - #ifdef __cplusplus } #endif diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h index d4fcf892..69b82eb0 100644 --- a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h +++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h @@ -13,11 +13,6 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ - __asm__ __volatile__ ("pause"); -} - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 6269e578..218138f9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,12 +20,16 @@ DISTCLEANFILES = include/odp_libconfig_config.h include/odp_libconfig_config.h: $(top_srcdir)/config/odp-$(with_platform).conf $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +odpapiabiarchincludedir = $(archincludedir)/odp/api/abi +odpapiabiarchinclude_HEADERS = + if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ + include/odp/api/plat/cpu_inlines.h \ include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_inline_types.h \ @@ -38,8 +42,7 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/thread_inlines.h \ include/odp/api/plat/ticketlock_inlines.h -odpapiabiarchincludedir = $(archincludedir)/odp/api/abi -odpapiabiarchinclude_HEADERS = \ +odpapiabiarchinclude_HEADERS += \ include-abi/odp/api/abi/align.h \ include-abi/odp/api/abi/atomic.h \ include-abi/odp/api/abi/barrier.h \ @@ -214,6 +217,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ odp_byteorder_api.c \ + odp_cpu_api.c \ odp_event_api.c \ odp_packet_api.c \ odp_packet_flags_api.c \ @@ -228,32 +232,33 @@ if ARCH_IS_ARM __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/arm/odp/api/abi/cpu.h endif noinst_HEADERS += arch/arm/odp_atomic.h \ arch/arm/odp_cpu.h \ arch/arm/odp_cpu_idling.h \ - arch/default/odp_cpu_idling.h \ arch/arm/odp_llsc.h endif if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/aarch64/odp/api/abi/cpu.h endif noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/aarch64/odp_cpu.h \ arch/aarch64/odp_cpu_idling.h \ - arch/default/odp_cpu_idling.h \ arch/aarch64/odp_llsc.h endif if ARCH_IS_DEFAULT __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h endif @@ -264,6 +269,7 @@ if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/mips64/odp/api/abi/cpu.h endif @@ -274,6 +280,7 @@ if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/powerpc/odp/api/abi/cpu.h endif @@ -285,11 +292,12 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/x86/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c +odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu_inlines.h if !ODP_ABI_COMPAT odpapiabiarchinclude_HEADERS += arch/x86/odp/api/abi/cpu.h endif -noinst_HEADERS += arch/x86/cpu_flags.h -noinst_HEADERS += arch/default/odp_cpu.h \ +noinst_HEADERS += arch/x86/cpu_flags.h \ + arch/default/odp_cpu.h \ arch/default/odp_cpu_idling.h endif diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h new file mode 100644 index 00000000..f9c2bae9 --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h @@ -0,0 +1,15 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_INLINES_H_ +#define ODP_ARCH_CPU_INLINES_H_ + +#undef odp_cpu_pause +#undef odp_cpu_cycles +#undef odp_cpu_cycles_max +#undef odp_cpu_cycles_resolution + +#endif diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h index 523fa99e..9224af9a 100644 --- a/platform/linux-generic/arch/x86/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu.h @@ -13,14 +13,8 @@ extern "C" { #define ODP_CACHE_LINE_SIZE 64 -static inline void odp_cpu_pause(void) -{ -#ifdef __SSE2__ - __asm__ __volatile__ ("pause"); -#else - __asm__ __volatile__ ("rep; nop"); -#endif -} +/* Inlined functions for non-ABI compat mode */ +#include <odp/api/plat/cpu_inlines.h> #ifdef __cplusplus } diff --git a/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h new file mode 100644 index 00000000..63be3da6 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ARCH_CPU_INLINES_H_ +#define ODP_ARCH_CPU_INLINES_H_ + +#include <stdint.h> + +_ODP_INLINE void odp_cpu_pause(void) +{ +#ifdef __SSE2__ + __asm__ __volatile__ ("pause"); +#else + __asm__ __volatile__ ("rep; nop"); +#endif +} + +_ODP_INLINE uint64_t odp_cpu_cycles(void) +{ + union { + uint64_t tsc_64; + struct { + uint32_t lo_32; + uint32_t hi_32; + }; + } tsc; + + __asm__ __volatile__ ("rdtsc" : + "=a" (tsc.lo_32), + "=d" (tsc.hi_32) : : "memory"); + + return tsc.tsc_64; +} + +_ODP_INLINE uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +_ODP_INLINE uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +} + +#endif diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c index 4e50b6da..c7d97a76 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -10,33 +10,6 @@ #include <odp_init_internal.h> #include <odp_debug_internal.h> -uint64_t odp_cpu_cycles(void) -{ - union { - uint64_t tsc_64; - struct { - uint32_t lo_32; - uint32_t hi_32; - }; - } tsc; - - __asm__ __volatile__ ("rdtsc" : - "=a" (tsc.lo_32), - "=d" (tsc.hi_32) : : "memory"); - - return tsc.tsc_64; -} - -uint64_t odp_cpu_cycles_max(void) -{ - return UINT64_MAX; -} - -uint64_t odp_cpu_cycles_resolution(void) -{ - return 1; -} - int _odp_cpu_cycles_init_global(void) { if (cpu_flags_has_rdtsc() == 0) { diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c index 70a1a1a7..da22d45a 100644 --- a/platform/linux-generic/arch/x86/odp_global_time.c +++ b/platform/linux-generic/arch/x86/odp_global_time.c @@ -15,6 +15,9 @@ #include <odp_debug_internal.h> #include <odp_arch_time_internal.h> +/* Inlined API functions */ +#include <odp/api/plat/cpu_inlines.h> + uint64_t cpu_global_time(void) { return odp_cpu_cycles(); diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h new file mode 100644 index 00000000..29b6ca7a --- /dev/null +++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_INLINES_H_ +#define ODP_PLAT_CPU_INLINES_H_ + +/** @cond _ODP_HIDE_FROM_DOXYGEN_ */ + +#ifndef _ODP_NO_INLINE + /* Inline functions by default */ + #define _ODP_INLINE static inline + #define odp_cpu_pause __odp_cpu_pause + #define odp_cpu_cycles __odp_cpu_cycles + #define odp_cpu_cycles_max __odp_cpu_cycles_max + #define odp_cpu_cycles_resolution __odp_cpu_cycles_resolution +#else + #define _ODP_INLINE +#endif + +#include <odp/api/abi/cpu_inlines.h> + +/** @endcond */ + +#endif diff --git a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h index e84ed88e..1d944bc1 100644 --- a/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/ticketlock_inlines.h @@ -8,6 +8,7 @@ #define _ODP_PLAT_TICKETLOCK_INLINES_H_ #include <odp/api/atomic.h> +#include <odp/api/cpu.h> /** @cond _ODP_HIDE_FROM_DOXYGEN_ */ @@ -21,6 +22,7 @@ #define odp_ticketlock_is_locked __odp_ticketlock_is_locked /* Inline atomic functions */ #include <odp/api/plat/atomic_inlines.h> + #include <odp/api/plat/cpu_inlines.h> #else #undef _ODP_INLINE #define _ODP_INLINE diff --git a/platform/linux-generic/include/odp_ring_internal.h b/platform/linux-generic/include/odp_ring_internal.h index b47c41e5..8a01d461 100644 --- a/platform/linux-generic/include/odp_ring_internal.h +++ b/platform/linux-generic/include/odp_ring_internal.h @@ -15,6 +15,7 @@ extern "C" { #include <odp/api/hints.h> #include <odp_align_internal.h> #include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> /* Ring empty, not a valid data value. */ #define RING_EMPTY ((uint32_t)-1) diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c index ec35d0ff..132ba370 100644 --- a/platform/linux-generic/odp_barrier.c +++ b/platform/linux-generic/odp_barrier.c @@ -12,6 +12,7 @@ #include <odp/api/atomic.h> #include <odp/api/plat/atomic_inlines.h> #include <odp/api/plat/sync_inlines.h> +#include <odp/api/plat/cpu_inlines.h> void odp_barrier_init(odp_barrier_t *barrier, int count) { diff --git a/platform/linux-generic/odp_cpu_api.c b/platform/linux-generic/odp_cpu_api.c new file mode 100644 index 00000000..2e856ec2 --- /dev/null +++ b/platform/linux-generic/odp_cpu_api.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "config.h" + +#include <odp/api/cpu.h> + +/* Non-inlined functions for ABI compat mode */ +#define _ODP_NO_INLINE +#include <odp/api/plat/cpu_inlines.h> diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 061b45f3..3b1686b8 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/atomic.h> -#include <odp/api/plat/atomic_inlines.h> #include <odp/api/ipsec.h> #include <odp/api/random.h> #include <odp/api/shared_memory.h> @@ -16,6 +15,9 @@ #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> +#include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> + #include <string.h> #define IPSEC_SA_STATE_DISABLE 0x40000000 diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c index 3a1086d2..e027a23b 100644 --- a/platform/linux-generic/odp_rwlock.c +++ b/platform/linux-generic/odp_rwlock.c @@ -8,10 +8,12 @@ #include <stdbool.h> #include <odp/api/atomic.h> -#include <odp/api/plat/atomic_inlines.h> #include <odp/api/rwlock.h> #include <odp/api/cpu.h> +#include <odp/api/plat/atomic_inlines.h> +#include <odp/api/plat/cpu_inlines.h> + void odp_rwlock_init(odp_rwlock_t *rwlock) { odp_atomic_init_u32(&rwlock->cnt, 0); diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 9a0dea47..ff24815c 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -25,6 +25,7 @@ #include <odp_ishmpool_internal.h> #include <odp_align_internal.h> +#include <odp/api/plat/cpu_inlines.h> #include <odp_llqueue.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c index 2b3feaa1..f68a559d 100644 --- a/platform/linux-generic/odp_schedule_scalable_ordered.c +++ b/platform/linux-generic/odp_schedule_scalable_ordered.c @@ -8,6 +8,7 @@ #include <config.h> #include <odp/api/shared_memory.h> +#include <odp/api/plat/cpu_inlines.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> #include <odp_bitset.h> diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c index 2e51aabc..54b7c713 100644 --- a/platform/linux-generic/odp_spinlock.c +++ b/platform/linux-generic/odp_spinlock.c @@ -10,6 +10,8 @@ #include <odp/api/cpu.h> #include <odp_atomic_internal.h> +#include <odp/api/plat/cpu_inlines.h> + void odp_spinlock_init(odp_spinlock_t *spinlock) { _odp_atomic_flag_init(&spinlock->lock, 0); diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index 778c2fac..518d940e 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -80,6 +80,8 @@ #include <odp_packet_io_ring_internal.h> #include <odp_errno_define.h> +#include <odp/api/plat/cpu_inlines.h> + static TAILQ_HEAD(, _ring) odp_ring_list; #define RING_VAL_IS_POWER_2(x) ((((x) - 1) & (x)) == 0) commit d6e4b3df266ee1c847763ba50fa802d9e9e62b5e Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 14:43:38 2018 +0300 linux-gen: cpu: add cpu cycles init global Add global init function to check e.g. if CPU cycle counter instruction is available on x86. Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c index 3e3df087..88e70b2e 100644 --- a/platform/linux-generic/arch/default/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c @@ -13,6 +13,7 @@ #include <odp/api/cpu.h> #include <odp_debug_internal.h> +#include <odp_init_internal.h> #define GIGA 1000000000 @@ -46,3 +47,8 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c index 26b92878..72a0e5b0 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c @@ -9,6 +9,7 @@ #include <odp/api/cpu.h> #include <odp/api/hints.h> #include <odp/api/system_info.h> +#include <odp_init_internal.h> uint64_t odp_cpu_cycles(void) { @@ -31,3 +32,8 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + return 0; +} diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index 0fcaa477..f5a744fd 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -368,3 +368,11 @@ int cpu_has_global_time(void) return 0; } + +int cpu_flags_has_rdtsc(void) +{ + if (cpu_get_flag_enabled(RTE_CPUFLAG_TSC) > 0) + return 1; + + return 0; +} diff --git a/platform/linux-generic/arch/x86/cpu_flags.h b/platform/linux-generic/arch/x86/cpu_flags.h index b0d26888..879c9aad 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.h +++ b/platform/linux-generic/arch/x86/cpu_flags.h @@ -12,6 +12,7 @@ extern "C" { #endif void cpu_flags_print_all(void); +int cpu_flags_has_rdtsc(void); #ifdef __cplusplus } diff --git a/platform/linux-generic/arch/x86/odp_cpu_cycles.c b/platform/linux-generic/arch/x86/odp_cpu_cycles.c index 12af1c17..4e50b6da 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_cycles.c +++ b/platform/linux-generic/arch/x86/odp_cpu_cycles.c @@ -6,6 +6,10 @@ #include <odp/api/cpu.h> +#include "cpu_flags.h" +#include <odp_init_internal.h> +#include <odp_debug_internal.h> + uint64_t odp_cpu_cycles(void) { union { @@ -32,3 +36,13 @@ uint64_t odp_cpu_cycles_resolution(void) { return 1; } + +int _odp_cpu_cycles_init_global(void) +{ + if (cpu_flags_has_rdtsc() == 0) { + ODP_ERR("RDTSC instruction not supported\n"); + return -1; + } + + return 0; +} diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 86438938..3619d777 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -81,6 +81,8 @@ int _odp_ipsec_sad_term_global(void); int _odp_ipsec_events_init_global(void); int _odp_ipsec_events_term_global(void); +int _odp_cpu_cycles_init_global(void); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7de3d689..b2b75f12 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -21,6 +21,7 @@ enum init_stage { NO_INIT = 0, /* No init stages completed */ LIBCONFIG_INIT, CPUMASK_INIT, + CPU_CYCLES_INIT, TIME_INIT, SYSINFO_INIT, ISHM_INIT, @@ -173,6 +174,8 @@ static int term_global(enum init_stage stage) } /* Fall through */ + case CPU_CYCLES_INIT: + /* Fall through */ case CPUMASK_INIT: if (odp_cpumask_term_global()) { ODP_ERR("ODP cpumask term failed.\n"); @@ -224,6 +227,12 @@ int odp_init_global(odp_instance_t *instance, } stage = CPUMASK_INIT; + if (_odp_cpu_cycles_init_global()) { + ODP_ERR("ODP cpu cycle init failed.\n"); + goto init_failed; + } + stage = CPU_CYCLES_INIT; + if (odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; commit bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 11:41:30 2018 +0300 linux-gen: init: split odp_internal.h odp_internal.h contained code for three different purposes. Split file into three different headers, so that it's no more a place for random type/function prototype additions. New files are: * odp_init_internal.h which holds global/local init function prototypes * odp_global_data.h which defines global data structure * odp_sysinfo_internal.h which contains system info internal function prototypes Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index fb212950..6269e578 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -91,7 +91,8 @@ noinst_HEADERS = \ include/odp_errno_define.h \ include/odp_fdserver_internal.h \ include/odp_forward_typedefs_internal.h \ - include/odp_internal.h \ + include/odp_global_data.h \ + include/odp_init_internal.h \ include/odp_ipsec_internal.h \ include/odp_ishm_internal.h \ include/odp_ishmphy_internal.h \ @@ -125,6 +126,7 @@ noinst_HEADERS = \ include/odp_schedule_scalable_ordered.h \ include/odp_shm_internal.h \ include/odp_sorted_list_internal.h \ + include/odp_sysinfo_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c index f1bad96c..49e94029 100644 --- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index fe600c55..339c6749 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <string.h> int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index fd265920..810f3758 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include <string.h> int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index b334a276..d9f3a82d 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -6,7 +6,7 @@ #include "config.h" -#include <odp_internal.h> +#include <odp_sysinfo_internal.h> #include "cpu_flags.h" #include <string.h> diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 58054e9e..2e92dd74 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <odp/api/debug.h> -#include <odp_internal.h> +#include <odp_global_data.h> #ifdef __cplusplus extern "C" { #endif diff --git a/platform/linux-generic/include/odp_global_data.h b/platform/linux-generic/include/odp_global_data.h new file mode 100644 index 00000000..a5c2abd1 --- /dev/null +++ b/platform/linux-generic/include/odp_global_data.h @@ -0,0 +1,68 @@ +/* Copyright (c) 2013-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_GLOBAL_DATA_H_ +#define ODP_GLOBAL_DATA_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/init.h> +#include <odp/api/cpumask.h> +#include <sys/types.h> +#include <pthread.h> +#include <stdint.h> +#include <libconfig.h> + +#define MAX_CPU_NUMBER 128 +#define UID_MAXLEN 30 + +typedef struct { + uint64_t cpu_hz_max[MAX_CPU_NUMBER]; + uint64_t page_size; + int cache_line_size; + int cpu_count; + char cpu_arch_str[128]; + char model_str[MAX_CPU_NUMBER][128]; +} system_info_t; + +typedef struct { + uint64_t default_huge_page_size; + char *default_huge_page_dir; +} hugepage_info_t; + +struct odp_global_data_s { + /* directory for odp mmaped files */ + char *shm_dir; + /* overload default with env */ + int shm_dir_from_env; + uint64_t shm_max_memory; + uint64_t shm_max_size; + pid_t main_pid; + char uid[UID_MAXLEN]; + odp_log_func_t log_fn; + odp_abort_func_t abort_fn; + system_info_t system_info; + hugepage_info_t hugepage_info; + odp_cpumask_t control_cpus; + odp_cpumask_t worker_cpus; + int num_cpus_installed; + config_t libconfig_default; + config_t libconfig_runtime; + int inotify_pcapng_fd; + int inotify_watch_fd; + pthread_t inotify_thread; + int inotify_pcapng_is_running; +}; + +extern struct odp_global_data_s odp_global_data; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_init_internal.h similarity index 57% rename from platform/linux-generic/include/odp_internal.h rename to platform/linux-generic/include/odp_init_internal.h index 9695e77e..86438938 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -4,68 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -/** - * @file - * - * ODP HW system information - */ - -#ifndef ODP_INTERNAL_H_ -#define ODP_INTERNAL_H_ +#ifndef ODP_INIT_INTERNAL_H_ +#define ODP_INIT_INTERNAL_H_ #ifdef __cplusplus extern "C" { #endif #include <odp/api/init.h> -#include <odp/api/cpumask.h> #include <odp/api/thread.h> -#include <odp_errno_define.h> -#include <stdio.h> -#include <sys/types.h> -#include <libconfig.h> -#include <pthread.h> - -#define MAX_CPU_NUMBER 128 -#define UID_MAXLEN 30 - -typedef struct { - uint64_t cpu_hz_max[MAX_CPU_NUMBER]; - uint64_t page_size; - int cache_line_size; - int cpu_count; - char cpu_arch_str[128]; - char model_str[MAX_CPU_NUMBER][128]; -} system_info_t; - -typedef struct { - uint64_t default_huge_page_size; - char *default_huge_page_dir; -} hugepage_info_t; - -struct odp_global_data_s { - char *shm_dir; /*< directory for odp mmaped files */ - int shm_dir_from_env; /*< overload default with env */ - uint64_t shm_max_memory; - uint64_t shm_max_size; - pid_t main_pid; - char uid[UID_MAXLEN]; - odp_log_func_t log_fn; - odp_abort_func_t abort_fn; - system_info_t system_info; - hugepage_info_t hugepage_info; - odp_cpumask_t control_cpus; - odp_cpumask_t worker_cpus; - int num_cpus_installed; - config_t libconfig_default; - config_t libconfig_runtime; - int inotify_pcapng_fd; - int inotify_watch_fd; - pthread_t inotify_thread; - int inotify_pcapng_is_running; -}; - -extern struct odp_global_data_s odp_global_data; int odp_cpumask_init_global(const odp_init_t *params); int odp_cpumask_term_global(void); @@ -134,12 +81,6 @@ int _odp_ipsec_sad_term_global(void); int _odp_ipsec_events_init_global(void); int _odp_ipsec_events_term_global(void); -int cpuinfo_parser(FILE *file, system_info_t *sysinfo); -uint64_t odp_cpufreq_id(const char *filename, int id); -uint64_t odp_cpu_hz_current(int id); -uint64_t odp_cpu_arch_hz_current(int id); -void sys_info_print_arch(void); - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 2af9bb34..01410dab 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -8,7 +8,6 @@ #include <odp_packet_io_internal.h> #include <odp/api/packet.h> #include <odp_packet_internal.h> -#include <odp_internal.h> #include <odp/api/shared_memory.h> #include <string.h> diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index 17d4f7ea..7e1984f6 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -11,7 +11,6 @@ #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_align_internal.h> #include <odp_bitset.h> #include <odp_ishmpool_internal.h> diff --git a/platform/linux-generic/include/odp_sysinfo_internal.h b/platform/linux-generic/include/odp_sysinfo_internal.h new file mode 100644 index 00000000..d34087e2 --- /dev/null +++ b/platform/linux-generic/include/odp_sysinfo_internal.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2013-2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_SYSINFO_INTERNAL_H_ +#define ODP_SYSINFO_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp_global_data.h> + +int cpuinfo_parser(FILE *file, system_info_t *sysinfo); +uint64_t odp_cpufreq_id(const char *filename, int id); +uint64_t odp_cpu_hz_current(int id); +uint64_t odp_cpu_arch_hz_current(int id); +void sys_info_print_arch(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h index e4a7dc29..aab6b911 100644 --- a/platform/linux-generic/include/odp_traffic_mngr_internal.h +++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h @@ -26,7 +26,6 @@ extern "C" { #include <odp_timer_wheel_internal.h> #include <odp_pkt_queue_internal.h> #include <odp_sorted_list_internal.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp_buffer_internal.h> #include <odp_queue_if.h> diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 8b25cf4c..6e493bcd 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -10,7 +10,7 @@ #include <odp/api/align.h> #include <odp/api/queue.h> #include <odp/api/debug.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> #include <odp/api/packet_io.h> diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index 71f7d071..1b384d4e 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -14,6 +14,8 @@ #include <odp/api/cpumask.h> #include <odp/api/init.h> #include <odp_debug_internal.h> +#include <odp_global_data.h> +#include <odp_init_internal.h> #include <stdlib.h> #include <string.h> diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 967b0bfd..8473bf5a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -8,7 +8,7 @@ #include <odp_posix_extensions.h> #include <odp/api/crypto.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp/api/spinlock.h> #include <odp/api/sync.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c index d3b76654..071ca606 100644 --- a/platform/linux-generic/odp_errno.c +++ b/platform/linux-generic/odp_errno.c @@ -7,7 +7,6 @@ #include "config.h" #include <odp/api/errno.h> -#include <odp_internal.h> #include <string.h> #include <stdio.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index 4b6fd088..0c9cc50e 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -39,7 +39,8 @@ */ #include <odp_posix_extensions.h> -#include <odp_internal.h> +#include <odp_global_data.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_fdserver_internal.h> #include <sys/prctl.h> diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 60908f09..7de3d689 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -6,23 +6,16 @@ #include "config.h" +#include <odp_posix_extensions.h> + #include <odp/api/init.h> #include <odp_debug_internal.h> -#include <odp/api/debug.h> -#include <unistd.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_schedule_if.h> #include <odp_libconfig_internal.h> #include <string.h> #include <stdio.h> -#include <linux/limits.h> -#include <dirent.h> #include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <sys/types.h> -#include <pwd.h> enum init_stage { NO_INIT = 0, /* No init stages completed */ diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index a72dee33..71258fe9 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -13,6 +13,7 @@ #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_packet_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 247e9f8b..e3977649 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -9,6 +9,7 @@ #include <odp/api/ipsec.h> #include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_buffer_internal.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index eea4ceb2..061b45f3 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -12,6 +12,7 @@ #include <odp/api/random.h> #include <odp/api/shared_memory.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp_ipsec_internal.h> diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index cf4ec9cf..fc2f948c 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -49,11 +49,13 @@ */ #include <odp_posix_extensions.h> #include <odp_config_internal.h> -#include <odp_internal.h> +#include <odp_global_data.h> #include <odp/api/spinlock.h> #include <odp/api/align.h> #include <odp/api/system_info.h> #include <odp/api/debug.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c index 6207ce75..cc547a1c 100644 --- a/platform/linux-generic/odp_ishmphy.c +++ b/platform/linux-generic/odp_ishmphy.c @@ -12,7 +12,6 @@ */ #include <odp_posix_extensions.h> #include <odp_config_internal.h> -#include <odp_internal.h> #include <odp/api/align.h> #include <odp/api/system_info.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c index 04a0e535..46865371 100644 --- a/platform/linux-generic/odp_ishmpool.c +++ b/platform/linux-generic/odp_ishmpool.c @@ -44,7 +44,6 @@ #include "config.h" #include <odp_posix_extensions.h> -#include <odp_internal.h> #include <odp/api/spinlock.h> #include <odp/api/align.h> #include <odp/api/debug.h> diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index 316ed067..e0e99550 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -11,13 +11,11 @@ #include <libconfig.h> #include <odp/api/version.h> -#include <odp_internal.h> +#include <odp_global_data.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> #include <odp_libconfig_config.h> -extern struct odp_global_data_s odp_global_data; - int _odp_libconfig_init_global(void) { const char *filename; diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e3204f88..11f8bd43 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -10,6 +10,7 @@ #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp/api/hints.h> #include <odp/api/byteorder.h> #include <odp/api/plat/byteorder_inlines.h> diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 8a5da105..81262a17 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -14,7 +14,8 @@ #include <odp/api/packet.h> #include <odp/api/plat/packet_inlines.h> #include <odp_packet_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp/api/spinlock.h> #include <odp/api/ticketlock.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 32c41427..01ee9234 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -14,7 +14,7 @@ #include <odp/api/plat/thread_inlines.h> #include <odp_pool_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_packet_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c index 4b4434c2..572441d0 100644 --- a/platform/linux-generic/odp_queue_basic.c +++ b/platform/linux-generic/odp_queue_basic.c @@ -14,7 +14,7 @@ #include <odp/api/buffer.h> #include <odp_buffer_internal.h> #include <odp_pool_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp/api/shared_memory.h> #include <odp/api/schedule.h> #include <odp_schedule_if.h> diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c index 08076ab3..912251b7 100644 --- a/platform/linux-generic/odp_queue_if.c +++ b/platform/linux-generic/odp_queue_if.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_queue_if.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 56ea98bc..578e6d22 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -17,7 +17,6 @@ #include <odp/api/plat/sync_inlines.h> #include <odp/api/traffic_mngr.h> -#include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-generic/odp_random.c b/platform/linux-generic/odp_random.c index 22894c47..424243c2 100644 --- a/platform/linux-generic/odp_random.c +++ b/platform/linux-generic/odp_random.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_posix_extensions.h> -#include <odp_internal.h> +#include <stdint.h> #include <odp/api/random.h> #include <openssl/rand.h> diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c index f35c7b02..ca291d15 100644 --- a/platform/linux-generic/odp_schedule_basic.c +++ b/platform/linux-generic/odp_schedule_basic.c @@ -11,7 +11,6 @@ #include <odp_schedule_if.h> #include <odp/api/align.h> #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp/api/thread.h> #include <odp/api/plat/thread_inlines.h> diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c index 08520852..df1ee2c2 100644 --- a/platform/linux-generic/odp_schedule_if.c +++ b/platform/linux-generic/odp_schedule_if.c @@ -7,7 +7,7 @@ #include "config.h" #include <odp_schedule_if.h> -#include <odp_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <stdlib.h> diff --git a/platform/linux-generic/odp_schedule_iquery.c b/platform/linux-generic/odp_schedule_iquery.c index a019157e..b8d7e3b5 100644 --- a/platform/linux-generic/odp_schedule_iquery.c +++ b/platform/linux-generic/odp_schedule_iquery.c @@ -11,7 +11,6 @@ #include <odp/api/align.h> #include <odp/api/queue.h> #include <odp/api/shared_memory.h> -#include <odp_internal.h> #include <odp_debug_internal.h> #include <odp_ring_internal.h> #include <odp_buffer_internal.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index 1dbcb529..9a0dea47 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -19,7 +19,6 @@ #include <odp/api/thrmask.h> #include <odp/api/time.h> -#include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> #include <odp_ishm_internal.h> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index edf261af..7bd323c9 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -12,7 +12,8 @@ #include <odp/api/shared_memory.h> #include <odp/api/plat/strong_types.h> #include <odp_ishm_internal.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_global_data.h> #include <string.h> ODP_STATIC_ASSERT(ODP_CONFIG_SHM_BLOCKS >= ODP_CONFIG_POOLS, diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index d1cda1ea..8b2bfc5c 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -17,7 +17,9 @@ #include <odp/api/system_info.h> #include <odp/api/version.h> -#include <odp_internal.h> +#include <odp_global_data.h> +#include <odp_sysinfo_internal.h> +#include <odp_init_internal.h> #include <odp_debug_internal.h> #include <odp/api/align.h> #include <odp/api/cpu.h> diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 998bad7c..a5f62ec7 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -11,8 +11,8 @@ #include <sched.h> #include <odp/api/thread.h> #include <odp/api/thrmask.h> -#include <odp_internal.h> #include <odp/api/spinlock.h> +#include <odp_init_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> #include <odp/api/shared_memory.h> diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index cfb4ac4a..96308edc 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -12,6 +12,7 @@ #include <odp/api/time.h> #include <odp/api/hints.h> #include <odp_debug_internal.h> +#include <odp_init_internal.h> #include <odp_arch_time_internal.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 9085f1bb..f46aa6e8 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -45,7 +45,8 @@ #include <odp_debug_internal.h> #include <odp/api/event.h> #include <odp/api/hints.h> -#include <odp_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> #include <odp/api/queue.h> #include <odp/api/shared_memory.h> #include <odp/api/spinlock.h> diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index f851a7b0..eeb1ea96 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -29,6 +29,8 @@ #include <odp/api/plat/packet_inlines.h> #include <odp/api/plat/byteorder_inlines.h> #include <odp_macros_internal.h> +#include <odp_init_internal.h> +#include <odp_errno_define.h> /* Local vars */ static const diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c index 6977ef10..6632707f 100644 --- a/platform/linux-generic/odp_weak.c +++ b/platform/linux-generic/odp_weak.c @@ -6,7 +6,6 @@ #include "config.h" -#include <odp_internal.h> #include <odp/api/debug.h> #include <odp_debug_internal.h> #include <odp/api/hints.h> diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 1ecd7d58..803c514f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -25,6 +25,7 @@ #include <odp_packet_dpdk.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> +#include <odp_errno_define.h> #include <protocols/eth.h> #include <protocols/udp.h> diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c index 71651abf..784e8c3c 100644 --- a/platform/linux-generic/pktio/ethtool.c +++ b/platform/linux-generic/pktio/ethtool.c @@ -19,6 +19,7 @@ #include <odp_api.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> static struct ethtool_gstrings *get_stringset(int fd, struct ifreq *ifr) { diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 5e30447f..18fecf88 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -13,6 +13,7 @@ #include <odp_classification_internal.h> #include <odp_ipsec_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp/api/plat/packet_flag_inlines.h> #include <odp/api/hints.h> #include <odp/api/plat/byteorder_inlines.h> diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 45f717d5..6cabf0ea 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -17,6 +17,7 @@ #include <odp_packet_netmap.h> #include <odp_packet_socket.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <protocols/eth.h> #include <sys/ioctl.h> diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c index db6eb226..778c2fac 100644 --- a/platform/linux-generic/pktio/ring.c +++ b/platform/linux-generic/pktio/ring.c @@ -78,7 +78,7 @@ #include <stdbool.h> #include <inttypes.h> #include <odp_packet_io_ring_internal.h> -#include <odp_internal.h> +#include <odp_errno_define.h> static TAILQ_HEAD(, _ring) odp_ring_list; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index d7753850..5be240ec 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -40,6 +40,7 @@ #include <odp_packet_io_internal.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 55fb20f4..eff22a7b 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -31,6 +31,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_debug_internal.h> +#include <odp_errno_define.h> #include <odp_classification_datamodel.h> #include <odp_classification_inlines.h> #include <odp_classification_internal.h> diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c index ec2bb949..c85a88e5 100644 --- a/platform/linux-generic/pktio/sysfs.c +++ b/platform/linux-generic/pktio/sysfs.c @@ -8,6 +8,7 @@ #include <odp_api.h> #include <odp_packet_io_internal.h> +#include <odp_errno_define.h> #include <errno.h> #include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index 032a8ecf..a3587f10 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -47,6 +47,7 @@ #include <odp_packet_internal.h> #include <odp_packet_io_internal.h> #include <odp_classification_internal.h> +#include <odp_errno_define.h> #define BUF_SIZE 65536 diff --git a/platform/linux-generic/test/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c index 553e82b5..87fb18c3 100644 --- a/platform/linux-generic/test/ring/ring_basic.c +++ b/platform/linux-generic/test/ring/ring_basic.c @@ -19,6 +19,7 @@ #include <test_debug.h> #include <odp_cunit_common.h> #include <odp_packet_io_ring_internal.h> +#include <odp_errno_define.h> #include "ring_suites.h" commit 170e93051d25ac491811f1ed66cd5552a0b26ec8 Author: Petri Savolainen <petri.savolainen(a)linaro.org> Date: Thu May 24 10:13:42 2018 +0300 linux-gen: init: remove init.c internal types from header Moved types from header into c file. Changed internal functions to static and changed order of functions (prototypes not needed). Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index f39b6152..9695e77e 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -65,35 +65,8 @@ struct odp_global_data_s { int inotify_pcapng_is_running; }; -enum init_stage { - NO_INIT = 0, /* No init stages completed */ - LIBCONFIG_INIT, - CPUMASK_INIT, - TIME_INIT, - SYSINFO_INIT, - ISHM_INIT, - FDSERVER_INIT, - THREAD_INIT, - POOL_INIT, - QUEUE_INIT, - SCHED_INIT, - PKTIO_INIT, - TIMER_INIT, - CRYPTO_INIT, - CLASSIFICATION_INIT, - TRAFFIC_MNGR_INIT, - NAME_TABLE_INIT, - IPSEC_EVENTS_INIT, - IPSEC_SAD_INIT, - IPSEC_INIT, - ALL_INIT /* All init stages completed */ -}; - extern struct odp_global_data_s odp_global_data; -int _odp_term_global(enum init_stage stage); -int _odp_term_local(enum init_stage stage); - int odp_cpumask_init_global(const odp_init_t *params); int odp_cpumask_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 0cd66ca3..60908f09 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -24,6 +24,30 @@ #include <sys/types.h> #include <pwd.h> +enum init_stage { + NO_INIT = 0, /* No init stages completed */ + LIBCONFIG_INIT, + CPUMASK_INIT, + TIME_INIT, + SYSINFO_INIT, + ISHM_INIT, + FDSERVER_INIT, + THREAD_INIT, + POOL_INIT, + QUEUE_INIT, + SCHED_INIT, + PKTIO_INIT, + TIMER_INIT, + CRYPTO_INIT, + CLASSIFICATION_INIT, + TRAFFIC_MNGR_INIT, + NAME_TABLE_INIT, + IPSEC_EVENTS_INIT, + IPSEC_SAD_INIT, + IPSEC_INIT, + ALL_INIT /* All init stages completed */ +}; + struct odp_global_data_s odp_global_data; void odp_init_param_init(odp_init_t *param) @@ -31,6 +55,152 @@ void odp_init_param_init(odp_init_t *param) memset(param, 0, sizeof(odp_init_t)); } +static int term_global(enum init_stage stage) +{ + int rc = 0; + + switch (stage) { + case ALL_INIT: + case IPSEC_INIT: + if (_odp_ipsec_term_global()) { + ODP_ERR("ODP IPsec term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_SAD_INIT: + if (_odp_ipsec_sad_term_global()) { + ODP_ERR("ODP IPsec SAD term failed.\n"); + rc = -1; + } + /* Fall through */ + + case IPSEC_EVENTS_INIT: + if (_odp_ipsec_events_term_global()) { + ODP_ERR("ODP IPsec events term failed.\n"); + rc = -1; + } + /* Fall through */ + + case NAME_TABLE_INIT: + if (_odp_int_name_tbl_term_global()) { + ODP_ERR("Name table term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TRAFFIC_MNGR_INIT: + if (odp_tm_term_global()) { + ODP_ERR("TM term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CLASSIFICATION_INIT: + if (odp_classification_term_global()) { + ODP_ERR("ODP classification term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CRYPTO_INIT: + if (odp_crypto_term_global()) { + ODP_ERR("ODP crypto term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TIMER_INIT: + if (odp_timer_term_global()) { + ODP_ERR("ODP timer term failed.\n"); + rc = -1; + } + /* Fall through */ + + case PKTIO_INIT: + if (odp_pktio_term_global()) { + ODP_ERR("ODP pktio term failed.\n"); + rc = -1; + } + /* Fall through */ + + case SCHED_INIT: + if (_odp_schedule_term_global()) { + ODP_ERR("ODP schedule term failed.\n"); + rc = -1; + } + /* Fall through */ + + case QUEUE_INIT: + if (_odp_queue_term_global()) { + ODP_ERR("ODP queue term failed.\n"); + rc = -1; + } + /* Fall through */ + + case POOL_INIT: + if (odp_pool_term_global()) { + ODP_ERR("ODP buffer pool term failed.\n"); + rc = -1; + } + /* Fall through */ + + case THREAD_INIT: + if (odp_thread_term_global()) { + ODP_ERR("ODP thread term failed.\n"); + rc = -1; + } + /* Fall through */ + + case FDSERVER_INIT: + if (_odp_fdserver_term_global()) { + ODP_ERR("ODP fdserver term failed.\n"); + rc = -1; + } + /* Fall through */ + + case ISHM_INIT: + if (_odp_ishm_term_global()) { + ODP_ERR("ODP ishm term failed.\n"); + rc = -1; + } + /* Fall through */ + + case SYSINFO_INIT: + if (odp_system_info_term()) { + ODP_ERR("ODP system info term failed.\n"); + rc = -1; + } + /* Fall through */ + + case TIME_INIT: + if (odp_time_term_global()) { + ODP_ERR("ODP time term failed.\n"); + rc = -1; + } + /* Fall through */ + + case CPUMASK_INIT: + if (odp_cpumask_term_global()) { + ODP_ERR("ODP cpumask term failed.\n"); + rc = -1; + } + /* Fall through */ + + case LIBCONFIG_INIT: + if (_odp_libconfig_term_global()) { + ODP_ERR("ODP runtime config term failed.\n"); + rc = -1; + } + /* Fall through */ + + case NO_INIT: + ; + } + + return rc; +} + int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) @@ -168,7 +338,7 @@ int odp_init_global(odp_instance_t *instance, return 0; init_failed: - _odp_term_global(stage); + term_global(stage); return -1; } @@ -178,150 +348,65 @@ int odp_term_global(odp_instance_t instance) ODP_ERR("Bad instance.\n"); return -1; } - return _odp_term_global(ALL_INIT); + return term_global(ALL_INIT); } -int _odp_term_global(enum init_stage stage) +static int term_local(enum init_stage stage) { int rc = 0; + int rc_thd = 0; switch (stage) { case ALL_INIT: - case IPSEC_INIT: - if (_odp_ipsec_term_global()) { - ODP_ERR("ODP IPsec term failed.\n"); - rc = -1; - } - /* Fall through */ - - case IPSEC_SAD_INIT: - if (_odp_ipsec_sad_term_global()) { - ODP_ERR("ODP IPsec SAD term failed.\n"); - rc = -1; - } - /* Fall through */ - - case IPSEC_EVENTS_INIT: - if (_odp_ipsec_events_term_global()) { - ODP_ERR("ODP IPsec events term failed.\n"); - rc = -1; - } - /* Fall through */ - case NAME_TABLE_INIT: - if (_odp_int_name_tbl_term_global()) { - ODP_ERR("Name table term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TRAFFIC_MNGR_INIT: - if (odp_tm_term_global()) { - ODP_ERR("TM term failed.\n"); + case SCHED_INIT: + if (sched_fn->term_local()) { + ODP_ERR("ODP schedule local term failed.\n"); rc = -1; } /* Fall through */ - case CLASSIFICATION_INIT: - if (odp_classification_term_global()) { - ODP_ERR("ODP classification term failed.\n"); + case QUEUE_INIT: + if (queue_fn->term_local()) { + ODP_ERR("ODP queue local term failed.\n"); rc = -1; } /* Fall through */ case CRYPTO_INIT: - if (odp_crypto_term_global()) { - ODP_ERR("ODP crypto term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TIMER_INIT: - if (odp_timer_term_global()) { - ODP_ERR("ODP timer term failed.\n"); - rc = -1; - } - /* Fall through */ - - case PKTIO_INIT: - if (odp_pktio_term_global()) { - ODP_ERR("ODP pktio term failed.\n"); - rc = -1; - } - /* Fall through */ - - case SCHED_INIT: - if (_odp_schedule_term_global()) { - ODP_ERR("ODP schedule term failed.\n"); - rc = -1; - } - /* Fall through */ - - case QUEUE_INIT: - if (_odp_queue_term_global()) { - ODP_ERR("ODP queue term failed.\n"); + if (_odp_crypto_term_local()) { + ODP_ERR("ODP crypto local term failed.\n"); rc = -1; } /* Fall through */ case POOL_INIT: - if (odp_pool_term_global()) { - ODP_ERR("ODP buffer pool term failed.\n"); + if (odp_pool_term_local()) { + ODP_ERR("ODP buffer pool local term failed.\n"); rc = -1; } /* Fall through */ case THREAD_INIT: - if (odp_thread_term_global()) { - ODP_ERR("ODP thread term failed.\n"); - rc = -1; - } - /* Fall through */ - - case FDSERVER_INIT: - if (_odp_fdserver_term_global()) { - ODP_ERR("ODP fdserver term failed.\n"); + rc_thd = odp_thread_term_local(); + if (rc_thd < 0) { + ODP_ERR("ODP thread local term failed.\n"); rc = -1; + } else { + if (!rc) + rc = rc_thd; } /* Fall through */ case ISHM_INIT: - if (_odp_ishm_term_global()) { - ODP_ERR("ODP ishm term failed.\n"); - rc = -1; - } - /* Fall through */ - - case SYSINFO_INIT: - if (odp_system_info_term()) { - ODP_ERR("ODP system info term failed.\n"); - rc = -1; - } - /* Fall through */ - - case TIME_INIT: - if (odp_time_term_global()) { - ODP_ERR("ODP time term failed.\n"); - rc = -1; - } - /* Fall through */ - - case CPUMASK_INIT: - if (odp_cpumask_term_global()) { - ODP_ERR("ODP cpumask term failed.\n"); - rc = -1; - } - /* Fall through */ - - case LIBCONFIG_INIT: - if (_odp_libconfig_term_global()) { - ODP_ERR("ODP runtime config term failed.\n"); + if (_odp_ishm_term_local()) { + ODP_ERR("ODP ishm local term failed.\n"); rc = -1; } /* Fall through */ - case NO_INIT: - ; + default: + break; } return rc; @@ -381,72 +466,11 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) return 0; init_fail: - _odp_term_local(stage); + term_local(stage); return -1; } int odp_term_local(void) { - return _odp_term_local(ALL_INIT); -} - -int _odp_term_local(enum init_stage stage) -{ - int rc = 0; - int rc_thd = 0; - - switch (stage) { - case ALL_INIT: - - case SCHED_INIT: - if (sched_fn->term_local()) { - ODP_ERR("ODP schedule local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case QUEUE_INIT: - if (queue_fn->term_local()) { - ODP_ERR("ODP queue local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case CRYPTO_INIT: - if (_odp_crypto_term_local()) { - ODP_ERR("ODP crypto local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case POOL_INIT: - if (odp_pool_term_local()) { - ODP_ERR("ODP buffer pool local term failed.\n"); - rc = -1; - } - /* Fall through */ - - case THREAD_INIT: - rc_thd = odp_thread_term_local(); - if (rc_thd < 0) { - ODP_ERR("ODP thread local term failed.\n"); - rc = -1; - } else { - if (!rc) - rc = rc_thd; - } - /* Fall through */ - - case ISHM_INIT: - if (_odp_ishm_term_local()) { - ODP_ERR("ODP ishm local term failed.\n"); - rc = -1; - } - /* Fall through */ - - default: - break; - } - - return rc; + return term_local(ALL_INIT); } ----------------------------------------------------------------------- Summary of changes: Makefile.inc | 1 + include/odp/api/spec/cpu.h | 3 +- include/odp/arch/x86_32-linux/odp/api/abi/cpu.h | 9 - include/odp/arch/x86_64-linux/odp/api/abi/cpu.h | 5 - platform/linux-generic/Makefile.am | 25 +- .../arch/default/odp/api/abi/cpu_inlines.h | 15 + .../linux-generic/arch/default/odp_cpu_cycles.c | 6 + .../linux-generic/arch/default/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/mips64/odp_cpu_cycles.c | 6 + .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 +- .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/x86/cpu_flags.c | 8 + platform/linux-generic/arch/x86/cpu_flags.h | 1 + platform/linux-generic/arch/x86/odp/api/abi/cpu.h | 10 +- .../arch/x86/odp/api/abi/cpu_inlines.h | 48 +++ platform/linux-generic/arch/x86/odp_cpu_cycles.c | 31 +- platform/linux-generic/arch/x86/odp_global_time.c | 3 + .../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- .../include/odp/api/plat/cpu_inlines.h | 38 ++ .../include/odp/api/plat/ticketlock_inlines.h | 2 + .../linux-generic/include/odp_debug_internal.h | 2 +- platform/linux-generic/include/odp_global_data.h | 68 ++++ .../{odp_internal.h => odp_init_internal.h} | 90 +---- .../include/odp_packet_io_ipc_internal.h | 1 - platform/linux-generic/include/odp_ring_internal.h | 2 + .../include/odp_schedule_scalable_ordered.h | 1 - .../linux-generic/include/odp_sysinfo_internal.h | 26 ++ .../include/odp_traffic_mngr_internal.h | 1 - platform/linux-generic/odp_barrier.c | 1 + platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_cpu.c | 18 - .../{odp_event_api.c => odp_cpu_api.c} | 4 +- platform/linux-generic/odp_cpumask.c | 2 + platform/linux-generic/odp_crypto.c | 2 +- platform/linux-generic/odp_errno.c | 1 - platform/linux-generic/odp_fdserver.c | 3 +- platform/linux-generic/odp_init.c | 390 +++++++++++---------- platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/odp_ipsec_events.c | 1 + platform/linux-generic/odp_ipsec_sad.c | 5 +- platform/linux-generic/odp_ishm.c | 4 +- platform/linux-generic/odp_ishmphy.c | 1 - platform/linux-generic/odp_ishmpool.c | 1 - platform/linux-generic/odp_libconfig.c | 4 +- platform/linux-generic/odp_packet.c | 1 + platform/linux-generic/odp_packet_io.c | 3 +- platform/linux-generic/odp_pool.c | 2 +- platform/linux-generic/odp_queue_basic.c | 2 +- platform/linux-generic/odp_queue_if.c | 2 +- platform/linux-generic/odp_queue_scalable.c | 1 - platform/linux-generic/odp_random.c | 2 +- platform/linux-generic/odp_rwlock.c | 4 +- platform/linux-generic/odp_schedule_basic.c | 1 - platform/linux-generic/odp_schedule_if.c | 2 +- platform/linux-generic/odp_schedule_iquery.c | 1 - platform/linux-generic/odp_schedule_scalable.c | 2 +- .../linux-generic/odp_schedule_scalable_ordered.c | 2 + platform/linux-generic/odp_shared_memory.c | 3 +- platform/linux-generic/odp_spinlock.c | 2 + platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 2 +- platform/linux-generic/odp_time.c | 1 + platform/linux-generic/odp_timer.c | 3 +- platform/linux-generic/odp_traffic_mngr.c | 2 + platform/linux-generic/odp_weak.c | 1 - platform/linux-generic/pktio/dpdk.c | 1 + platform/linux-generic/pktio/ethtool.c | 1 + platform/linux-generic/pktio/loop.c | 1 + platform/linux-generic/pktio/netmap.c | 1 + platform/linux-generic/pktio/ring.c | 4 +- platform/linux-generic/pktio/socket.c | 1 + platform/linux-generic/pktio/socket_mmap.c | 1 + platform/linux-generic/pktio/sysfs.c | 1 + platform/linux-generic/pktio/tap.c | 1 + platform/linux-generic/test/ring/ring_basic.c | 1 + 75 files changed, 527 insertions(+), 379 deletions(-) create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h create mode 100644 platform/linux-generic/include/odp/api/plat/cpu_inlines.h create mode 100644 platform/linux-generic/include/odp_global_data.h rename platform/linux-generic/include/{odp_internal.h => odp_init_internal.h} (50%) create mode 100644 platform/linux-generic/include/odp_sysinfo_internal.h delete mode 100644 platform/linux-generic/odp_cpu.c copy platform/linux-generic/{odp_event_api.c => odp_cpu_api.c} (75%) hooks/post-receive --

7 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp