From patchwork Wed May 18 14:24:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 68048 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2666715qge; Wed, 18 May 2016 07:24:48 -0700 (PDT) X-Received: by 10.55.150.5 with SMTP id y5mr8043373qkd.144.1463581487852; Wed, 18 May 2016 07:24:47 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d184si6984763qke.40.2016.05.18.07.24.47; Wed, 18 May 2016 07:24:47 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0EFE7617E1; Wed, 18 May 2016 14:24:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C762B617D0; Wed, 18 May 2016 14:24:40 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 092B3617D6; Wed, 18 May 2016 14:24:34 +0000 (UTC) Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com [209.85.215.50]) by lists.linaro.org (Postfix) with ESMTPS id EC22A615E1 for ; Wed, 18 May 2016 14:24:30 +0000 (UTC) Received: by mail-lf0-f50.google.com with SMTP id u64so20785572lff.3 for ; Wed, 18 May 2016 07:24:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=q7W19Qwyr1Jjdr2usnioi2a5hzKEgPx4wqPsIEiHtUE=; b=VgHm1RP5X8DnGOvQqJhmJeVIGCCSOQ0/j1Bs+d8pw8nXg9/Z6oElR6w3A5ee0Few1T JhPS5tjNOuChTC1NtTQdO6A6+sQz5gvq6YowL+W4/TlJLZI3vmkG7lNP3piJduzlrMYr HypHFGzfG1MVgHIz75uSLU7UPhXPrJ4Z3NqWemY00/uH2ImMqNmeGjS+NjSSNGMyBX/2 DJzUpzV8E49zp4c+ZSNRnUUhT63KZIebGc5/nArXXzGRlAXHOG1wjU6lOrKQQFC9U3Dm swj61YZjk9QxX9bDhhn9Sr4zjU47eBk5e2q4Ab+9aej9DQDjsq54BG5N4FRqvocRcw/b PDbA== X-Gm-Message-State: AOPr4FUyi+EBBGkfo8FrAh0/KnAeV/ETgZknPP77i1JqfsAn8twUlobPsPrpjD8mW/8+eKjUUTQ= X-Received: by 10.25.16.73 with SMTP id f70mr2811855lfi.34.1463581469905; Wed, 18 May 2016 07:24:29 -0700 (PDT) Received: from localhost.localdomain (ppp91-77-173-31.pppoe.mtu-net.ru. [91.77.173.31]) by smtp.gmail.com with ESMTPSA id v4sm1484442lbi.20.2016.05.18.07.24.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 May 2016 07:24:29 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 18 May 2016 17:24:15 +0300 Message-Id: <1463581455-24846-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 X-Topics: timers patch Subject: [lng-odp] [PATCHv2] linux-generic: timer fix odp_timer_pool_create return code X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" 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" Accodring to API return code for fail case is ODP_TIMER_POOL_INVALID and errno set event if it's defined to NULL. Also add check on pool alloc that input parameter is not invalid. https://bugs.linaro.org/show_bug.cgi?id=2139 Signed-off-by: Maxim Uvarov --- v2: added missed ) on if statement. (looks like forgot to git ---ammend it ) platform/linux-generic/odp_timer.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index a6d3332..8696074 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -227,16 +227,15 @@ static inline odp_timer_t tp_idx_to_handle(struct odp_timer_pool_s *tp, static void itimer_init(odp_timer_pool *tp); static void itimer_fini(odp_timer_pool *tp); -static odp_timer_pool *odp_timer_pool_new( - const char *_name, - const odp_timer_pool_param_t *param) +static odp_timer_pool_t odp_timer_pool_new(const char *_name, + const odp_timer_pool_param_t *param) { uint32_t tp_idx = odp_atomic_fetch_add_u32(&num_timer_pools, 1); if (odp_unlikely(tp_idx >= MAX_TIMER_POOLS)) { /* Restore the previous value */ odp_atomic_sub_u32(&num_timer_pools, 1); __odp_errno = ENFILE; /* Table overflow */ - return NULL; + return ODP_TIMER_POOL_INVALID; } size_t sz0 = ODP_ALIGN_ROUNDUP(sizeof(odp_timer_pool), ODP_CACHE_LINE_SIZE); @@ -804,10 +803,9 @@ odp_timer_pool_create(const char *name, /* Verify that we have a valid (non-zero) timer resolution */ if (param->res_ns == 0) { __odp_errno = EINVAL; - return NULL; + return ODP_TIMER_POOL_INVALID; } - odp_timer_pool_t tp = odp_timer_pool_new(name, param); - return tp; + return odp_timer_pool_new(name, param); } void odp_timer_pool_start(void) @@ -855,15 +853,17 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid, odp_queue_t queue, void *user_ptr) { + odp_timer_t hdl; + + if (odp_unlikely(tpid == ODP_TIMER_POOL_INVALID)) + ODP_ABORT("Invalid timer pool.\n"); if (odp_unlikely(queue == ODP_QUEUE_INVALID)) ODP_ABORT("%s: Invalid queue handle\n", tpid->name); /* We don't care about the validity of user_ptr because we will not * attempt to dereference it */ - odp_timer_t hdl = timer_alloc(tpid, queue, user_ptr); - if (odp_likely(hdl != ODP_TIMER_INVALID)) { - /* Success */ - return hdl; - } + hdl = timer_alloc(tpid, queue, user_ptr); + if (odp_likely(hdl != ODP_TIMER_INVALID)) + return hdl; /* Success */ /* errno set by timer_alloc() */ return ODP_TIMER_INVALID; }