From fbba0a3bf2dbfd86e48efe9745af9f94203d5f80 Mon Sep 17 00:00:00 2001 From: Mohammad Abdul Awal Date: Thu, 11 May 2017 13:36:12 +0100 Subject: Added rte_ring wrapper functions to support dpdk-17.05 and older version Change-Id: I5cfcff8be275ab2a2fb4ad6a62777a8cb88f425b Signed-off-by: Mohammad Abdul Awal --- lib/libtle_misc/Makefile | 35 +++++++++ lib/libtle_misc/tle_dpdk_wrapper.h | 141 +++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 lib/libtle_misc/Makefile create mode 100644 lib/libtle_misc/tle_dpdk_wrapper.h (limited to 'lib/libtle_misc') diff --git a/lib/libtle_misc/Makefile b/lib/libtle_misc/Makefile new file mode 100644 index 0000000..287d533 --- /dev/null +++ b/lib/libtle_misc/Makefile @@ -0,0 +1,35 @@ +# Copyright (c) 2017 Intel Corporation. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +ifeq ($(RTE_SDK),) +$(error "Please define RTE_SDK environment variable") +endif + +# Default target, can be overwritten by command line or environment +RTE_TARGET ?= x86_64-native-linuxapp-gcc + +include $(RTE_SDK)/mk/rte.vars.mk + +# library name +LIB = libtle_misc.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) + +EXPORT_MAP := tle_misc_version.map + +LIBABIVER := 1 + +SYMLINK-y-include += tle_dpdk_wrapper.h + +include $(TLDK_ROOT)/mk/tle.lib.mk diff --git a/lib/libtle_misc/tle_dpdk_wrapper.h b/lib/libtle_misc/tle_dpdk_wrapper.h new file mode 100644 index 0000000..6757663 --- /dev/null +++ b/lib/libtle_misc/tle_dpdk_wrapper.h @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2017 Intel Corporation. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TLE_DPDK_WRAPPER_H_ +#define TLE_DPDK_WRAPPER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0) + +static inline uint32_t +_rte_ring_mp_enqueue_bulk(struct rte_ring *r, void * const *obj_table, + uint32_t n) +{ + uint32_t rc; + + rc = rte_ring_mp_enqueue_bulk(r, (void * const *)obj_table, n, NULL); + if (rc == n) + return 0; + else + return -ENOSPC; +} + +static inline uint32_t +_rte_ring_mp_enqueue_burst(struct rte_ring *r, void * const *obj_table, + uint32_t n) +{ + return rte_ring_mp_enqueue_burst(r, (void * const *)obj_table, n, NULL); +} + +static inline uint32_t +_rte_ring_mc_dequeue_burst(struct rte_ring *r, void **obj_table, uint32_t n) +{ + return rte_ring_mc_dequeue_burst(r, (void **)obj_table, n, NULL); +} + +static inline uint32_t +_rte_ring_enqueue_burst(struct rte_ring *r, void * const *obj_table, uint32_t n) +{ + return rte_ring_enqueue_burst(r, (void * const *)obj_table, n, NULL); +} + +static inline uint32_t +_rte_ring_dequeue_burst(struct rte_ring *r, void **obj_table, uint32_t n) +{ + return rte_ring_dequeue_burst(r, (void **)obj_table, n, NULL); +} + +static inline uint32_t +_rte_ring_get_size(struct rte_ring *r) +{ + return r->size; +} + +static inline uint32_t +_rte_ring_get_mask(struct rte_ring *r) +{ + return r->mask; +} + +static inline void ** +_rte_ring_get_data(struct rte_ring *r) +{ + return (void **)(&r[1]); +} + +#else + +static inline uint32_t +_rte_ring_mp_enqueue_bulk(struct rte_ring *r, void * const *obj_table, + uint32_t n) +{ + return rte_ring_mp_enqueue_bulk(r, (void * const *)obj_table, n); +} + +static inline uint32_t +_rte_ring_mp_enqueue_burst(struct rte_ring *r, void * const *obj_table, + uint32_t n) +{ + return rte_ring_mp_enqueue_burst(r, (void * const *)obj_table, n); +} + +static inline uint32_t +_rte_ring_mc_dequeue_burst(struct rte_ring *r, void **obj_table, uint32_t n) +{ + return rte_ring_mc_dequeue_burst(r, (void **)obj_table, n); +} + +static inline uint32_t +_rte_ring_enqueue_burst(struct rte_ring *r, void * const *obj_table, uint32_t n) +{ + return rte_ring_enqueue_burst(r, (void * const *)obj_table, n); +} + +static inline uint32_t +_rte_ring_dequeue_burst(struct rte_ring *r, void **obj_table, uint32_t n) +{ + return rte_ring_dequeue_burst(r, (void **)obj_table, n); +} + +static inline uint32_t +_rte_ring_get_size(struct rte_ring *r) +{ + return r->prod.size; +} + +static inline uint32_t +_rte_ring_get_mask(struct rte_ring *r) +{ + return r->prod.mask; +} + +static inline void ** +_rte_ring_get_data(struct rte_ring *r) +{ + return (void **)r->ring; +} + +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* TLE_DPDK_WRAPPER_H_ */ -- cgit 1.2.3-korg