From patchwork Wed Aug 20 08:11:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 35683 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1ACA22055D for ; Wed, 20 Aug 2014 08:11:25 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id b6sf25646301yha.5 for ; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=GLBWPtUXvgkp9z6mb6yv11wnDvtu6I6ufyzC6L4LK0U=; b=amV68LZRaouapvRcuyaeC695LudlibE3y7RM9HAoEXDTXEa4XG6o4U3tXr90mnhvJi rcAvsxffGBZTlZX8McJWB4OL795NpAH9uVPkn71hWCeUsgHpSp4n/wCy7f86tJEEdZaK MeDu/6du/lUyH5QKMVv9/G6TFoJZJh+VJel/LUYsR9hVnX1LGolrY+gSqQaJ76c7JDA6 Lf7T4PELBAdhto+yu+qbzRU5h5uAKnPAVohpyyqAnddQxwG/R92Vyot9lEJRHyZC6Jm5 LLTcQZ0h+zkTnnkINMH/sLaMAXCGuyLizPZEAmaaSrTrXDq/JOfUlME/q64iM4Q7ynPi bFhA== X-Gm-Message-State: ALoCoQm941NwLO/NttBkd37ongYs1mRindn+KM02SPoPesTU9wb/EgDyc4PtVpJKJwz/BD+CT20K X-Received: by 10.236.112.6 with SMTP id x6mr21157285yhg.42.1408522284903; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.49 with SMTP id i46ls192124qgd.10.gmail; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-Received: by 10.220.114.66 with SMTP id d2mr34984732vcq.27.1408522284820; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id sd9si10271606vdb.25.2014.08.20.01.11.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Aug 2014 01:11:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so8518903vcb.25 for ; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-Received: by 10.220.182.1 with SMTP id ca1mr34990843vcb.21.1408522284675; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp34328vcb; Wed, 20 Aug 2014 01:11:24 -0700 (PDT) X-Received: by 10.224.26.12 with SMTP id b12mr74006559qac.92.1408522283954; Wed, 20 Aug 2014 01:11:23 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id x3si32911102qab.111.2014.08.20.01.11.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 Aug 2014 01:11:23 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XK0zK-0003TG-UH; Wed, 20 Aug 2014 08:11:22 +0000 Received: from mail-qg0-f49.google.com ([209.85.192.49]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XK0zE-0003TA-Rn for lng-odp@lists.linaro.org; Wed, 20 Aug 2014 08:11:16 +0000 Received: by mail-qg0-f49.google.com with SMTP id j107so6989700qga.22 for ; Wed, 20 Aug 2014 01:11:11 -0700 (PDT) X-Received: by 10.224.63.18 with SMTP id z18mr77257339qah.23.1408522271585; Wed, 20 Aug 2014 01:11:11 -0700 (PDT) Received: from localhost.localdomain (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id 35sm24792938qgk.26.2014.08.20.01.11.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Aug 2014 01:11:10 -0700 (PDT) From: Petri Savolainen To: lng-odp@lists.linaro.org Date: Wed, 20 Aug 2014 11:11:31 +0300 Message-Id: <1408522291-9642-1-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: patch Subject: [lng-odp] [PATCH v2] Change invalid buffer pool handle to zero X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: petri.savolainen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 For consistency and easier debugging, use zero as the value of an invalid pool handle (in linux-generic). Signed-off-by: Petri Savolainen --- include/odp_buffer_pool.h | 2 +- .../linux-generic/include/odp_buffer_internal.h | 4 +- .../include/odp_buffer_pool_internal.h | 4 +- platform/linux-generic/odp_buffer_pool.c | 54 ++++++++++++++-------- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/include/odp_buffer_pool.h b/include/odp_buffer_pool.h index 26d9f14..fe88898 100644 --- a/include/odp_buffer_pool.h +++ b/include/odp_buffer_pool.h @@ -27,7 +27,7 @@ extern "C" { #define ODP_BUFFER_POOL_NAME_LEN 32 /** Invalid buffer pool */ -#define ODP_BUFFER_POOL_INVALID (0xffffffff) +#define ODP_BUFFER_POOL_INVALID 0 /** ODP buffer pool */ typedef uint32_t odp_buffer_pool_t; diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index bffd0dd..56f9759 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -48,7 +48,7 @@ typedef union odp_buffer_bits_t { odp_buffer_t handle; struct { - uint32_t pool:ODP_BUFFER_POOL_BITS; + uint32_t pool_id:ODP_BUFFER_POOL_BITS; /* pool index */ uint32_t index:ODP_BUFFER_INDEX_BITS; }; } odp_buffer_bits_t; @@ -91,7 +91,7 @@ typedef struct odp_buffer_hdr_t { odp_atomic_int_t ref_count; /* reference count */ odp_buffer_scatter_t scatter; /* Scatter/gather list */ int type; /* type of next header */ - odp_buffer_pool_t pool; /* buffer pool */ + odp_buffer_pool_t pool; /* buffer pool handle */ } odp_buffer_hdr_t; diff --git a/platform/linux-generic/include/odp_buffer_pool_internal.h b/platform/linux-generic/include/odp_buffer_pool_internal.h index 1c0a9fc..7e3f0c2 100644 --- a/platform/linux-generic/include/odp_buffer_pool_internal.h +++ b/platform/linux-generic/include/odp_buffer_pool_internal.h @@ -68,7 +68,7 @@ struct pool_entry_s { extern void *pool_entry_ptr[]; -static inline void *get_pool_entry(odp_buffer_pool_t pool_id) +static inline void *get_pool_entry(uint32_t pool_id) { return pool_entry_ptr[pool_id]; } @@ -83,7 +83,7 @@ static inline odp_buffer_hdr_t *odp_buf_to_hdr(odp_buffer_t buf) odp_buffer_hdr_t *hdr; handle.u32 = buf; - pool_id = handle.pool; + pool_id = handle.pool_id; index = handle.index; #ifdef POOL_ERROR_CHECK diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c index a48781a..82aab3a 100644 --- a/platform/linux-generic/odp_buffer_pool.c +++ b/platform/linux-generic/odp_buffer_pool.c @@ -80,25 +80,40 @@ void *pool_entry_ptr[ODP_CONFIG_BUFFER_POOLS]; static __thread odp_buffer_chunk_hdr_t *local_chunk[ODP_CONFIG_BUFFER_POOLS]; +static inline odp_buffer_pool_t pool_index_to_handle(uint32_t pool_id) +{ + return pool_id + 1; +} + + +static inline uint32_t pool_handle_to_index(odp_buffer_pool_t pool_hdl) +{ + return pool_hdl - 1; +} + + static inline void set_handle(odp_buffer_hdr_t *hdr, pool_entry_t *pool, uint32_t index) { - uint32_t pool_id = (uint32_t) pool->s.pool; + odp_buffer_pool_t pool_hdl = pool->s.pool; + uint32_t pool_id = pool_handle_to_index(pool_hdl); - if (pool_id > ODP_CONFIG_BUFFER_POOLS) - ODP_ERR("set_handle: Bad pool id\n"); + if (pool_id >= ODP_CONFIG_BUFFER_POOLS) { + ODP_ERR("set_handle: Bad pool handle %u\n", pool_hdl); + exit(0); + } if (index > ODP_BUFFER_MAX_INDEX) ODP_ERR("set_handle: Bad buffer index\n"); - hdr->handle.pool = pool_id; - hdr->handle.index = index; + hdr->handle.pool_id = pool_id; + hdr->handle.index = index; } int odp_buffer_pool_init_global(void) { - odp_buffer_pool_t i; + uint32_t i; pool_tbl = odp_shm_reserve("odp_buffer_pools", sizeof(pool_table_t), @@ -113,7 +128,7 @@ int odp_buffer_pool_init_global(void) /* init locks */ pool_entry_t *pool = &pool_tbl->pool[i]; LOCK_INIT(&pool->s.lock); - pool->s.pool = i; + pool->s.pool = pool_index_to_handle(i); pool_entry_ptr[i] = pool; } @@ -363,9 +378,9 @@ odp_buffer_pool_t odp_buffer_pool_create(const char *name, size_t buf_size, size_t buf_align, int buf_type) { - odp_buffer_pool_t i; + odp_buffer_pool_t pool_hdl = ODP_BUFFER_POOL_INVALID; pool_entry_t *pool; - odp_buffer_pool_t pool_id = ODP_BUFFER_POOL_INVALID; + uint32_t i; for (i = 0; i < ODP_CONFIG_BUFFER_POOLS; i++) { pool = get_pool_entry(i); @@ -388,20 +403,20 @@ odp_buffer_pool_t odp_buffer_pool_create(const char *name, UNLOCK(&pool->s.lock); - pool_id = i; + pool_hdl = pool->s.pool; break; } UNLOCK(&pool->s.lock); } - return pool_id; + return pool_hdl; } odp_buffer_pool_t odp_buffer_pool_lookup(const char *name) { - odp_buffer_pool_t i; + uint32_t i; pool_entry_t *pool; for (i = 0; i < ODP_CONFIG_BUFFER_POOLS; i++) { @@ -411,7 +426,7 @@ odp_buffer_pool_t odp_buffer_pool_lookup(const char *name) if (strcmp(name, pool->s.name) == 0) { /* found it */ UNLOCK(&pool->s.lock); - return i; + return pool->s.pool; } UNLOCK(&pool->s.lock); } @@ -420,11 +435,12 @@ odp_buffer_pool_t odp_buffer_pool_lookup(const char *name) } -odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool_id) +odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool_hdl) { pool_entry_t *pool; odp_buffer_chunk_hdr_t *chunk; odp_buffer_bits_t handle; + uint32_t pool_id = pool_handle_to_index(pool_hdl); pool = get_pool_entry(pool_id); chunk = local_chunk[pool_id]; @@ -462,12 +478,12 @@ odp_buffer_t odp_buffer_alloc(odp_buffer_pool_t pool_id) void odp_buffer_free(odp_buffer_t buf) { odp_buffer_hdr_t *hdr; - odp_buffer_pool_t pool_id; + uint32_t pool_id; pool_entry_t *pool; odp_buffer_chunk_hdr_t *chunk_hdr; hdr = odp_buf_to_hdr(buf); - pool_id = hdr->pool; + pool_id = pool_handle_to_index(hdr->pool); pool = get_pool_entry(pool_id); chunk_hdr = local_chunk[pool_id]; @@ -500,13 +516,15 @@ odp_buffer_pool_t odp_buffer_pool(odp_buffer_t buf) } -void odp_buffer_pool_print(odp_buffer_pool_t pool_id) +void odp_buffer_pool_print(odp_buffer_pool_t pool_hdl) { pool_entry_t *pool; odp_buffer_chunk_hdr_t *chunk_hdr; uint32_t i; + uint32_t pool_id; - pool = get_pool_entry(pool_id); + pool_id = pool_handle_to_index(pool_hdl); + pool = get_pool_entry(pool_id); printf("Pool info\n"); printf("---------\n");