From patchwork Thu Jun 2 13:27:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 13172 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id DD55B5A6B; Thu, 2 Jun 2016 15:27:47 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 0C5F75A57 for ; Thu, 2 Jun 2016 15:27:45 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 02 Jun 2016 06:27:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,406,1459839600"; d="scan'208";a="993801736" Received: from sie-lab-214-251.ir.intel.com (HELO silpixa373510.ir.intel.com) ([10.237.214.251]) by fmsmga002.fm.intel.com with ESMTP; 02 Jun 2016 06:27:44 -0700 From: David Hunt To: dev@dpdk.org Cc: olivier.matz@6wind.com, viktorin@rehivetech.com, jerin.jacob@caviumnetworks.com, David Hunt Date: Thu, 2 Jun 2016 14:27:21 +0100 Message-Id: <1464874043-67467-4-git-send-email-david.hunt@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464874043-67467-1-git-send-email-david.hunt@intel.com> References: <1464797998-76690-1-git-send-email-david.hunt@intel.com> <1464874043-67467-1-git-send-email-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v7 3/5] mempool: add default external mempool ops X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The first patch in this series added the framework for an external mempool manager. This patch in the series adds a set of default ops (functioni callbacks) based on rte_ring. Signed-off-by: Olivier Matz Signed-off-by: David Hunt --- lib/librte_mempool/Makefile | 1 + lib/librte_mempool/rte_mempool.h | 2 + lib/librte_mempool/rte_mempool_default.c | 153 +++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 lib/librte_mempool/rte_mempool_default.c diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile index 4cbf772..8cac29b 100644 --- a/lib/librte_mempool/Makefile +++ b/lib/librte_mempool/Makefile @@ -43,6 +43,7 @@ LIBABIVER := 2 # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c +SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_default.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index c33eeb8..b90f57c 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -413,6 +413,8 @@ extern struct rte_mempool_ops_table rte_mempool_ops_table; static inline struct rte_mempool_ops * rte_mempool_ops_get(int ops_index) { + RTE_VERIFY(ops_index < RTE_MEMPOOL_MAX_OPS_IDX); + return &rte_mempool_ops_table.ops[ops_index]; } diff --git a/lib/librte_mempool/rte_mempool_default.c b/lib/librte_mempool/rte_mempool_default.c new file mode 100644 index 0000000..f2e7d95 --- /dev/null +++ b/lib/librte_mempool/rte_mempool_default.c @@ -0,0 +1,153 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-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 +#include + +#include +#include +#include + +static int +common_ring_mp_put(void *p, void * const *obj_table, unsigned n) +{ + return rte_ring_mp_enqueue_bulk((struct rte_ring *)p, obj_table, n); +} + +static int +common_ring_sp_put(void *p, void * const *obj_table, unsigned n) +{ + return rte_ring_sp_enqueue_bulk((struct rte_ring *)p, obj_table, n); +} + +static int +common_ring_mc_get(void *p, void **obj_table, unsigned n) +{ + return rte_ring_mc_dequeue_bulk((struct rte_ring *)p, obj_table, n); +} + +static int +common_ring_sc_get(void *p, void **obj_table, unsigned n) +{ + return rte_ring_sc_dequeue_bulk((struct rte_ring *)p, obj_table, n); +} + +static unsigned +common_ring_get_count(void *p) +{ + return rte_ring_count((struct rte_ring *)p); +} + + +static void * +common_ring_alloc(const struct rte_mempool *mp) +{ + int rg_flags = 0, ret; + char rg_name[RTE_RING_NAMESIZE]; + struct rte_ring *r; + + ret = snprintf(rg_name, sizeof(rg_name), + RTE_MEMPOOL_MZ_FORMAT, mp->name); + if (ret < 0 || ret >= (int)sizeof(rg_name)) { + rte_errno = ENAMETOOLONG; + return NULL; + } + + /* ring flags */ + if (mp->flags & MEMPOOL_F_SP_PUT) + rg_flags |= RING_F_SP_ENQ; + if (mp->flags & MEMPOOL_F_SC_GET) + rg_flags |= RING_F_SC_DEQ; + + /* Allocate the ring that will be used to store objects. + * Ring functions will return appropriate errors if we are + * running as a secondary process etc., so no checks made + * in this function for that condition. */ + r = rte_ring_create(rg_name, rte_align32pow2(mp->size + 1), + mp->socket_id, rg_flags); + + return r; +} + +static void +common_ring_free(void *p) +{ + rte_ring_free((struct rte_ring *)p); +} + +/* + * The following 4 declarations of mempool ops structs address + * the need for the backward compatible mempool managers for + * single/multi producers and single/multi consumers as dictated by the + * flags provided to the rte_mempool_create function + */ +static const struct rte_mempool_ops ops_mp_mc = { + .name = "ring_mp_mc", + .alloc = common_ring_alloc, + .free = common_ring_free, + .put = common_ring_mp_put, + .get = common_ring_mc_get, + .get_count = common_ring_get_count, +}; + +static const struct rte_mempool_ops ops_sp_sc = { + .name = "ring_sp_sc", + .alloc = common_ring_alloc, + .free = common_ring_free, + .put = common_ring_sp_put, + .get = common_ring_sc_get, + .get_count = common_ring_get_count, +}; + +static const struct rte_mempool_ops ops_mp_sc = { + .name = "ring_mp_sc", + .alloc = common_ring_alloc, + .free = common_ring_free, + .put = common_ring_mp_put, + .get = common_ring_sc_get, + .get_count = common_ring_get_count, +}; + +static const struct rte_mempool_ops ops_sp_mc = { + .name = "ring_sp_mc", + .alloc = common_ring_alloc, + .free = common_ring_free, + .put = common_ring_sp_put, + .get = common_ring_mc_get, + .get_count = common_ring_get_count, +}; + +MEMPOOL_REGISTER_OPS(ops_mp_mc); +MEMPOOL_REGISTER_OPS(ops_sp_sc); +MEMPOOL_REGISTER_OPS(ops_mp_sc); +MEMPOOL_REGISTER_OPS(ops_sp_mc);