From patchwork Fri Feb 13 23:14:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 44683 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7C42B2153D for ; Fri, 13 Feb 2015 23:14:42 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id d17sf13892908eek.2 for ; Fri, 13 Feb 2015 15:14:41 -0800 (PST) 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:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=39PzqB2iI23aJZnhS+xyAalO5I9eAbjwarqN3po9X6o=; b=cV+CLRnx+N6QyP4X/WRhzFyE+zw89806UZHm/0bS/gslsfFE/eZ6eJonC9z2hvf1/0 z+ULfdEbUKs4ABKh3NTfuCF5WUEMauy9z0S/vK0hsV/gSdH/8HIL+yTR0vRfuODcSxTU Ja1EMHzGzGAG/gcd9Q7oRQMHU5g7F7ioXMH+iUZ/k/4D5lVcNqqxXe9gysOkd71ZYlKt dajR0yvnsNVBmpmHh9PHcmgS7pduOFb7FXBgJ7qz0GHGPf4OeZWn9xfIFU5fswdvvSW6 dLSygdbEalxU3r7UoFWdh1bWmmultk33PUgrsvsZF9NT0CbpwZkdeaQBUQQF/DzdXdx6 T/SA== X-Gm-Message-State: ALoCoQlVR1nqe2TFsBAwOiKkkOl0Vf/HFO/rEykx4/2XGNV5mpG5FVOnWJWSINOsoo5H99mIrbqG X-Received: by 10.180.99.3 with SMTP id em3mr1604823wib.7.1423869281762; Fri, 13 Feb 2015 15:14:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.42 with SMTP id v10ls351544laj.56.gmail; Fri, 13 Feb 2015 15:14:41 -0800 (PST) X-Received: by 10.152.44.137 with SMTP id e9mr10687391lam.100.1423869281273; Fri, 13 Feb 2015 15:14:41 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id l9si2816647lah.3.2015.02.13.15.14.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Feb 2015 15:14:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labpn19 with SMTP id pn19so19334869lab.4 for ; Fri, 13 Feb 2015 15:14:41 -0800 (PST) X-Received: by 10.152.185.72 with SMTP id fa8mr10373090lac.73.1423869281129; Fri, 13 Feb 2015 15:14:41 -0800 (PST) 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.112.35.133 with SMTP id h5csp161608lbj; Fri, 13 Feb 2015 15:14:40 -0800 (PST) X-Received: by 10.140.133.21 with SMTP id 21mr140202qhf.94.1423869279733; Fri, 13 Feb 2015 15:14:39 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id b15si4562558qah.81.2015.02.13.15.14.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 13 Feb 2015 15:14:39 -0800 (PST) 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-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YMPRU-0005jB-QV; Fri, 13 Feb 2015 23:14:36 +0000 Received: from mail-pd0-f178.google.com ([209.85.192.178]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YMPRO-0005iR-NU for lng-odp@lists.linaro.org; Fri, 13 Feb 2015 23:14:30 +0000 Received: by pdjz10 with SMTP id z10so22252186pdj.12 for ; Fri, 13 Feb 2015 15:14:25 -0800 (PST) X-Received: by 10.70.128.79 with SMTP id nm15mr19397180pdb.104.1423869265361; Fri, 13 Feb 2015 15:14:25 -0800 (PST) Received: from localhost.localdomain ([210.177.145.245]) by mx.google.com with ESMTPSA id l4sm7723556pdj.47.2015.02.13.15.14.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Feb 2015 15:14:24 -0800 (PST) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Fri, 13 Feb 2015 15:14:21 -0800 Message-Id: <1423869261-591-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: patch Subject: [lng-odp] [PATCHv2 4/4] linux-generic: pools: cleanup to reflect new pool parameters 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: bill.fischofer@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.215.48 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 Signed-off-by: Bill Fischofer --- platform/linux-generic/include/odp_pool_internal.h | 1 + platform/linux-generic/odp_pool.c | 66 +++++++++++----------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h index c5354e5..0c0c0be 100644 --- a/platform/linux-generic/include/odp_pool_internal.h +++ b/platform/linux-generic/include/odp_pool_internal.h @@ -119,6 +119,7 @@ struct pool_entry_s { odp_atomic_u64_t blkempty; odp_atomic_u64_t high_wm_count; odp_atomic_u64_t low_wm_count; + uint32_t buf_num; uint32_t seg_size; uint32_t high_wm; uint32_t low_wm; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index c07392f..1fe0c5f 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -136,13 +136,9 @@ odp_pool_t odp_pool_create(const char *name, ODP_CACHE_LINE_SIZE_ROUNDUP(init_params->udata_size) : 0; - uint32_t blk_size, buf_stride; - uint32_t buf_align; - - if (params->type == ODP_POOL_PACKET) - buf_align = 0; - else - buf_align = params->buf.align; + uint32_t blk_size, buf_stride, buf_num; + uint32_t buf_align = + params->type == ODP_POOL_BUFFER ? params->buf.align : 0; /* Validate requested buffer alignment */ if (buf_align > ODP_CONFIG_BUFFER_ALIGN_MAX || @@ -158,35 +154,41 @@ odp_pool_t odp_pool_create(const char *name, /* Calculate space needed for buffer blocks and metadata */ switch (params->type) { case ODP_POOL_BUFFER: - case ODP_POOL_TIMEOUT: + buf_num = params->buf.num; blk_size = params->buf.size; /* Optimize small raw buffers */ if (blk_size > ODP_MAX_INLINE_BUF || params->buf.align != 0) blk_size = ODP_ALIGN_ROUNDUP(blk_size, buf_align); - buf_stride = params->type == ODP_POOL_BUFFER ? - sizeof(odp_buffer_hdr_stride) : - sizeof(odp_timeout_hdr_stride); + buf_stride = sizeof(odp_buffer_hdr_stride); break; case ODP_POOL_PACKET: headroom = ODP_CONFIG_PACKET_HEADROOM; tailroom = ODP_CONFIG_PACKET_TAILROOM; - unseg = params->pkt.seg_len > ODP_CONFIG_PACKET_BUF_LEN_MAX; + buf_num = params->pkt.num; + uint32_t seg_len = params->pkt.seg_len == 0 ? + ODP_CONFIG_PACKET_SEG_LEN_MIN : + headroom + params->pkt.seg_len + tailroom; + uint32_t pkt_len = params->pkt.len <= seg_len ? + seg_len : params->pkt.len; + unseg = pkt_len > ODP_CONFIG_PACKET_BUF_LEN_MAX; if (unseg) - blk_size = ODP_ALIGN_ROUNDUP( - headroom + params->pkt.seg_len + tailroom, - buf_align); + blk_size = ODP_ALIGN_ROUNDUP(seg_len, + ODP_CONFIG_BUFFER_ALIGN_MIN); else - blk_size = ODP_ALIGN_ROUNDUP( - headroom + params->pkt.seg_len + tailroom, + blk_size = ODP_ALIGN_ROUNDUP(pkt_len, ODP_CONFIG_PACKET_SEG_LEN_MIN); - buf_stride = params->type == ODP_POOL_PACKET ? - sizeof(odp_packet_hdr_stride) : - sizeof(odp_any_hdr_stride); + buf_stride = sizeof(odp_packet_hdr_stride); + break; + + case ODP_POOL_TIMEOUT: + blk_size = 0; + buf_num = params->tmo.num; + buf_stride = sizeof(odp_timeout_hdr_stride); break; default: @@ -194,7 +196,7 @@ odp_pool_t odp_pool_create(const char *name, } /* Validate requested number of buffers against addressable limits */ - if (params->buf.num > + if (buf_num > (ODP_BUFFER_MAX_BUFFERS / (buf_stride / ODP_CACHE_LINE_SIZE))) return ODP_POOL_INVALID; @@ -231,14 +233,15 @@ odp_pool_t odp_pool_create(const char *name, block_size = 0; pool->s.buf_align = blk_size == 0 ? 0 : sizeof(void *); } else { - block_size = params->buf.num * blk_size; + block_size = buf_num * blk_size; pool->s.buf_align = buf_align; } pad_size = ODP_CACHE_LINE_SIZE_ROUNDUP(block_size) - block_size; - mdata_size = params->buf.num * buf_stride; - udata_size = params->buf.num * udata_stride; + mdata_size = buf_num * buf_stride; + udata_size = buf_num * udata_stride; + pool->s.buf_num = buf_num; pool->s.pool_size = ODP_PAGE_SIZE_ROUNDUP(block_size + pad_size + mdata_size + @@ -375,8 +378,8 @@ odp_pool_t odp_pool_create(const char *name, pool->s.tailroom = tailroom; /* Watermarks are hard-coded for now to control caching */ - pool->s.high_wm = params->buf.num / 2; - pool->s.low_wm = params->buf.num / 4; + pool->s.high_wm = buf_num / 2; + pool->s.low_wm = buf_num / 4; pool_hdl = pool->s.pool_hdl; break; @@ -417,10 +420,7 @@ int odp_pool_info(odp_pool_t pool_hdl, odp_pool_info_t *info) info->name = pool->s.name; info->shm = pool->s.flags.user_supplied_shm ? pool->s.pool_shm : ODP_SHM_INVALID; - info->params.buf.size = pool->s.params.buf.size; - info->params.buf.align = pool->s.params.buf.align; - info->params.buf.num = pool->s.params.buf.num; - info->params.type = pool->s.params.type; + info->params = pool->s.params; return 0; } @@ -446,7 +446,7 @@ int odp_pool_destroy(odp_pool_t pool_hdl) flush_cache(&local_cache[pool_id], &pool->s); /* Call fails if pool has allocated buffers */ - if (odp_atomic_load_u32(&pool->s.bufcount) < pool->s.params.buf.num) { + if (odp_atomic_load_u32(&pool->s.bufcount) < pool->s.buf_num) { POOL_UNLOCK(&pool->s.lock); return -1; } @@ -591,10 +591,10 @@ void odp_pool_print(odp_pool_t pool_hdl) ODP_DBG(" tailroom %u\n", pool->s.tailroom); ODP_DBG(" buf align %u requested, %u used\n", pool->s.params.buf.align, pool->s.buf_align); - ODP_DBG(" num bufs %u\n", pool->s.params.buf.num); + ODP_DBG(" num bufs %u\n", pool->s.buf_num); ODP_DBG(" bufs available %u %s\n", bufcount, pool->s.low_wm_assert ? " **low wm asserted**" : ""); - ODP_DBG(" bufs in use %u\n", pool->s.params.buf.num - bufcount); + ODP_DBG(" bufs in use %u\n", pool->s.buf_num - bufcount); ODP_DBG(" buf allocs %lu\n", bufallocs); ODP_DBG(" buf frees %lu\n", buffrees); ODP_DBG(" buf empty %lu\n", bufempty);