[dpdk-dev] [PATCH 1/2] drivers/mempool: add stack mempool handler as driver

Hunt, David david.hunt at intel.com
Mon Mar 20 15:50:40 CET 2017


On 20/3/2017 10:03 AM, Shreyansh Jain wrote:
> CONFIG_RTE_DRIVER_MEMPOOL_STACK option added to common_base.
> Stack mempool handler moved from lib/librte_mempool into drivers/mempool.
>
> With this patch, the Stack mempool handler registration is optional and
> toggled via the configuration file. In case disabled (N), it would imply
> request for creating of mempool would fail.
>
> Signed-off-by: Shreyansh Jain <shreyansh.jain at nxp.com>
> ---
>   config/common_base                                 |   5 +
>   drivers/Makefile                                   |   1 +
>   drivers/mempool/Makefile                           |  36 +++++
>   drivers/mempool/stack/Makefile                     |  55 ++++++++
>   drivers/mempool/stack/rte_mempool_stack.c          | 147 +++++++++++++++++++++
>   .../mempool/stack/rte_mempool_stack_version.map    |   4 +
>   lib/librte_mempool/Makefile                        |   1 -
>   lib/librte_mempool/rte_mempool_stack.c             | 147 ---------------------
>   8 files changed, 248 insertions(+), 148 deletions(-)
>   create mode 100644 drivers/mempool/Makefile
>   create mode 100644 drivers/mempool/stack/Makefile
>   create mode 100644 drivers/mempool/stack/rte_mempool_stack.c
>   create mode 100644 drivers/mempool/stack/rte_mempool_stack_version.map
>   delete mode 100644 lib/librte_mempool/rte_mempool_stack.c
>
> diff --git a/config/common_base b/config/common_base
> index 37aa1e1..3e70aa0 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -464,6 +464,11 @@ CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512
>   CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n
>   
>   #
> +# Compile Mempool drivers
> +#
> +CONFIG_RTE_DRIVER_MEMPOOL_STACK=y
> +
> +#
>   # Compile librte_mbuf
>   #
>   CONFIG_RTE_LIBRTE_MBUF=y
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 81c03a8..193056b 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -31,6 +31,7 @@
>   
>   include $(RTE_SDK)/mk/rte.vars.mk
>   
> +DIRS-y += mempool
>   DIRS-y += net
>   DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
>   
> diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile
> new file mode 100644
> index 0000000..b256a34
> --- /dev/null
> +++ b/drivers/mempool/Makefile
> @@ -0,0 +1,36 @@
> +#   BSD LICENSE
> +#
> +#   Copyright(c) 2017 NXP. All rights reserved.
> +#   All rights reserved.
> +#
> +#   Redistribution and use in source and binary forms, with or without
> +#   modification, are permitted provided that the following conditions
> +#   are met:
> +#
> +#     * Redistributions of source code must retain the above copyright
> +#       notice, this list of conditions and the following disclaimer.
> +#     * Redistributions in binary form must reproduce the above copyright
> +#       notice, this list of conditions and the following disclaimer in
> +#       the documentation and/or other materials provided with the
> +#       distribution.
> +#     * Neither the name of NXP nor the names of its
> +#       contributors may be used to endorse or promote products derived
> +#       from this software without specific prior written permission.
> +#
> +#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> +#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> +#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> +#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> +#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> +#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> +#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +include $(RTE_SDK)/mk/rte.vars.mk
> +
> +DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack
> +
> +include $(RTE_SDK)/mk/rte.subdir.mk
> diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile
> new file mode 100644
> index 0000000..f98eb5b
> --- /dev/null
> +++ b/drivers/mempool/stack/Makefile
> @@ -0,0 +1,55 @@
> +#   BSD LICENSE
> +#
> +#   Copyright(c) 2017 NXP.
> +#   All rights reserved.
> +#
> +#   Redistribution and use in source and binary forms, with or without
> +#   modification, are permitted provided that the following conditions
> +#   are met:
> +#
> +#     * Redistributions of source code must retain the above copyright
> +#       notice, this list of conditions and the following disclaimer.
> +#     * Redistributions in binary form must reproduce the above copyright
> +#       notice, this list of conditions and the following disclaimer in
> +#       the documentation and/or other materials provided with the
> +#       distribution.
> +#     * Neither the name of NXP nor the names of its
> +#       contributors may be used to endorse or promote products derived
> +#       from this software without specific prior written permission.
> +#
> +#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> +#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> +#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> +#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> +#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> +#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> +#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +include $(RTE_SDK)/mk/rte.vars.mk
> +
> +#
> +# library name
> +#
> +LIB = librte_mempool_stack.a
> +
> +CFLAGS += -O3
> +CFLAGS += $(WERROR_FLAGS)
> +
> +# Headers
> +CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
> +
> +EXPORT_MAP := rte_mempool_stack_version.map
> +
> +LIBABIVER := 1
> +
> +SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c
> +
> +# this lib depends upon:
> +DEPDIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += lib/librte_eal
> +DEPDIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += lib/librte_mempool
> +
> +include $(RTE_SDK)/mk/rte.lib.mk
> diff --git a/drivers/mempool/stack/rte_mempool_stack.c b/drivers/mempool/stack/rte_mempool_stack.c
> new file mode 100644
> index 0000000..817f77e
> --- /dev/null
> +++ b/drivers/mempool/stack/rte_mempool_stack.c
> @@ -0,0 +1,147 @@
> +/*-
> + *   BSD LICENSE
> + *
> + *   Copyright(c) 2016 Intel Corporation. All rights reserved.
> + *   All rights reserved.
> + *
> + *   Redistribution and use in source and binary forms, with or without
> + *   modification, are permitted provided that the following conditions
> + *   are met:
> + *
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in
> + *       the documentation and/or other materials provided with the
> + *       distribution.
> + *     * Neither the name of Intel Corporation nor the names of its
> + *       contributors may be used to endorse or promote products derived
> + *       from this software without specific prior written permission.
> + *
> + *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> + *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> + *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> + *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#include <stdio.h>
> +#include <rte_mempool.h>
> +#include <rte_malloc.h>
> +
> +struct rte_mempool_stack {
> +	rte_spinlock_t sl;
> +
> +	uint32_t size;
> +	uint32_t len;
> +	void *objs[];
> +};
> +
> +static int
> +stack_alloc(struct rte_mempool *mp)
> +{
> +	struct rte_mempool_stack *s;
> +	unsigned n = mp->size;
> +	int size = sizeof(*s) + (n+16)*sizeof(void *);
> +
> +	/* Allocate our local memory structure */
> +	s = rte_zmalloc_socket("mempool-stack",
> +			size,
> +			RTE_CACHE_LINE_SIZE,
> +			mp->socket_id);
> +	if (s == NULL) {
> +		RTE_LOG(ERR, MEMPOOL, "Cannot allocate stack!\n");
> +		return -ENOMEM;
> +	}
> +
> +	rte_spinlock_init(&s->sl);
> +
> +	s->size = n;
> +	mp->pool_data = s;
> +
> +	return 0;
> +}
> +
> +static int
> +stack_enqueue(struct rte_mempool *mp, void * const *obj_table,
> +		unsigned n)
> +{
> +	struct rte_mempool_stack *s = mp->pool_data;
> +	void **cache_objs;
> +	unsigned index;
> +
> +	rte_spinlock_lock(&s->sl);
> +	cache_objs = &s->objs[s->len];
> +
> +	/* Is there sufficient space in the stack ? */
> +	if ((s->len + n) > s->size) {
> +		rte_spinlock_unlock(&s->sl);
> +		return -ENOBUFS;
> +	}
> +
> +	/* Add elements back into the cache */
> +	for (index = 0; index < n; ++index, obj_table++)
> +		cache_objs[index] = *obj_table;
> +
> +	s->len += n;
> +
> +	rte_spinlock_unlock(&s->sl);
> +	return 0;
> +}
> +
> +static int
> +stack_dequeue(struct rte_mempool *mp, void **obj_table,
> +		unsigned n)
> +{
> +	struct rte_mempool_stack *s = mp->pool_data;
> +	void **cache_objs;
> +	unsigned index, len;
> +
> +	rte_spinlock_lock(&s->sl);
> +
> +	if (unlikely(n > s->len)) {
> +		rte_spinlock_unlock(&s->sl);
> +		return -ENOENT;
> +	}
> +
> +	cache_objs = s->objs;
> +
> +	for (index = 0, len = s->len - 1; index < n;
> +			++index, len--, obj_table++)
> +		*obj_table = cache_objs[len];
> +
> +	s->len -= n;
> +	rte_spinlock_unlock(&s->sl);
> +	return 0;
> +}
> +
> +static unsigned
> +stack_get_count(const struct rte_mempool *mp)
> +{
> +	struct rte_mempool_stack *s = mp->pool_data;
> +
> +	return s->len;
> +}
> +
> +static void
> +stack_free(struct rte_mempool *mp)
> +{
> +	rte_free((void *)(mp->pool_data));
> +}
> +
> +static struct rte_mempool_ops ops_stack = {
> +	.name = "stack",
> +	.alloc = stack_alloc,
> +	.free = stack_free,
> +	.enqueue = stack_enqueue,
> +	.dequeue = stack_dequeue,
> +	.get_count = stack_get_count
> +};
> +
> +MEMPOOL_REGISTER_OPS(ops_stack);
> diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
> new file mode 100644
> index 0000000..8591cc0
> --- /dev/null
> +++ b/drivers/mempool/stack/rte_mempool_stack_version.map
> @@ -0,0 +1,4 @@
> +DPDK_17.05 {
> +
> +	local: *;
> +};
> diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile
> index 057a6ab..a4c089e 100644
> --- a/lib/librte_mempool/Makefile
> +++ b/lib/librte_mempool/Makefile
> @@ -44,7 +44,6 @@ LIBABIVER := 2
>   SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool.c
>   SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool_ops.c
>   SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool_ring.c
> -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool_stack.c
>   # install includes
>   SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h
>   
> diff --git a/lib/librte_mempool/rte_mempool_stack.c b/lib/librte_mempool/rte_mempool_stack.c
> deleted file mode 100644
> index 817f77e..0000000
> --- a/lib/librte_mempool/rte_mempool_stack.c
> +++ /dev/null
> @@ -1,147 +0,0 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright(c) 2016 Intel Corporation. All rights reserved.
> - *   All rights reserved.
> - *
> - *   Redistribution and use in source and binary forms, with or without
> - *   modification, are permitted provided that the following conditions
> - *   are met:
> - *
> - *     * Redistributions of source code must retain the above copyright
> - *       notice, this list of conditions and the following disclaimer.
> - *     * Redistributions in binary form must reproduce the above copyright
> - *       notice, this list of conditions and the following disclaimer in
> - *       the documentation and/or other materials provided with the
> - *       distribution.
> - *     * Neither the name of Intel Corporation nor the names of its
> - *       contributors may be used to endorse or promote products derived
> - *       from this software without specific prior written permission.
> - *
> - *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> - *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> - *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> - *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> - *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> - *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> - *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> - *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> - *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> - *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> - *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> - */
> -
> -#include <stdio.h>
> -#include <rte_mempool.h>
> -#include <rte_malloc.h>
> -
> -struct rte_mempool_stack {
> -	rte_spinlock_t sl;
> -
> -	uint32_t size;
> -	uint32_t len;
> -	void *objs[];
> -};
> -
> -static int
> -stack_alloc(struct rte_mempool *mp)
> -{
> -	struct rte_mempool_stack *s;
> -	unsigned n = mp->size;
> -	int size = sizeof(*s) + (n+16)*sizeof(void *);
> -
> -	/* Allocate our local memory structure */
> -	s = rte_zmalloc_socket("mempool-stack",
> -			size,
> -			RTE_CACHE_LINE_SIZE,
> -			mp->socket_id);
> -	if (s == NULL) {
> -		RTE_LOG(ERR, MEMPOOL, "Cannot allocate stack!\n");
> -		return -ENOMEM;
> -	}
> -
> -	rte_spinlock_init(&s->sl);
> -
> -	s->size = n;
> -	mp->pool_data = s;
> -
> -	return 0;
> -}
> -
> -static int
> -stack_enqueue(struct rte_mempool *mp, void * const *obj_table,
> -		unsigned n)
> -{
> -	struct rte_mempool_stack *s = mp->pool_data;
> -	void **cache_objs;
> -	unsigned index;
> -
> -	rte_spinlock_lock(&s->sl);
> -	cache_objs = &s->objs[s->len];
> -
> -	/* Is there sufficient space in the stack ? */
> -	if ((s->len + n) > s->size) {
> -		rte_spinlock_unlock(&s->sl);
> -		return -ENOBUFS;
> -	}
> -
> -	/* Add elements back into the cache */
> -	for (index = 0; index < n; ++index, obj_table++)
> -		cache_objs[index] = *obj_table;
> -
> -	s->len += n;
> -
> -	rte_spinlock_unlock(&s->sl);
> -	return 0;
> -}
> -
> -static int
> -stack_dequeue(struct rte_mempool *mp, void **obj_table,
> -		unsigned n)
> -{
> -	struct rte_mempool_stack *s = mp->pool_data;
> -	void **cache_objs;
> -	unsigned index, len;
> -
> -	rte_spinlock_lock(&s->sl);
> -
> -	if (unlikely(n > s->len)) {
> -		rte_spinlock_unlock(&s->sl);
> -		return -ENOENT;
> -	}
> -
> -	cache_objs = s->objs;
> -
> -	for (index = 0, len = s->len - 1; index < n;
> -			++index, len--, obj_table++)
> -		*obj_table = cache_objs[len];
> -
> -	s->len -= n;
> -	rte_spinlock_unlock(&s->sl);
> -	return 0;
> -}
> -
> -static unsigned
> -stack_get_count(const struct rte_mempool *mp)
> -{
> -	struct rte_mempool_stack *s = mp->pool_data;
> -
> -	return s->len;
> -}
> -
> -static void
> -stack_free(struct rte_mempool *mp)
> -{
> -	rte_free((void *)(mp->pool_data));
> -}
> -
> -static struct rte_mempool_ops ops_stack = {
> -	.name = "stack",
> -	.alloc = stack_alloc,
> -	.free = stack_free,
> -	.enqueue = stack_enqueue,
> -	.dequeue = stack_dequeue,
> -	.get_count = stack_get_count
> -};
> -
> -MEMPOOL_REGISTER_OPS(ops_stack);

Shreyansh,
     Could I suggest you add the parameter "--find-renames" when 
generating the patch files, as this will reduce the size of the patches 
significantly, making for easier review. The patch line count in this 
particular case would be reduced by approx 75%.
Regards,
Dave.



More information about the dev mailing list