From patchwork Fri Apr 29 16:16:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 66959 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp878618qge; Fri, 29 Apr 2016 09:17:05 -0700 (PDT) X-Received: by 10.50.154.3 with SMTP id vk3mr5427869igb.27.1461946625003; Fri, 29 Apr 2016 09:17:05 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id zd3si5920295igc.53.2016.04.29.09.17.04; Fri, 29 Apr 2016 09:17:04 -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 1C83C615FD; Fri, 29 Apr 2016 16:17:04 +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 E827A615DF; Fri, 29 Apr 2016 16:16:58 +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 957F0615E6; Fri, 29 Apr 2016 16:16:56 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 7C352615D3 for ; Fri, 29 Apr 2016 16:16:54 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id u64so123801837lff.3 for ; Fri, 29 Apr 2016 09:16:54 -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=Dg6/g0P9CTtdowjLcQIEOweIdveWvY8ocIlr0W4Fnmw=; b=ZHKlanfT0yF25JjXgKwnVSeRVNzwhIV+M1/mLCRxBrGbyOj40+tXpScW6opI5Sl8Uc O5F2Mg8ivrjuDJ46y/8LsjJfVXXX8ozebo/xRYni7+3/nCGbwVMgbYmzMPeQwyWr5z12 /xvD/1VZi6zkbh3RN7AOIYylkekieXqWHzOxtANcK3+/mphvD+5Axddxqo26x4+tSert u2tHzYB1Dp6jf8FAuRbCK4jKxQtwtopUxr4YiC4Ec3ZL2sHdUXVov8uXqhZzjJWm2Qmf ReXSU9q99j+Tv6jb0GA9J+XTQKntDhfO+XTfOQkrg6ThxueLctT6LfoP5SQ8hHdASF2t OSsQ== X-Gm-Message-State: AOPr4FWRxJukx28YmCdbyv5W1+ETsu+T2SvcbDs/fBZpG6UNIYw+1o6qbRoodpbPNuN+zRhrrLw= X-Received: by 10.25.165.129 with SMTP id o123mr4289929lfe.105.1461946612839; Fri, 29 Apr 2016 09:16:52 -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 p127sm2464939lfb.27.2016.04.29.09.16.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Apr 2016 09:16:52 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 29 Apr 2016 19:16:46 +0300 Message-Id: <1461946606-1572-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 --- 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 ac72709..52cee99 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -214,16 +214,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); @@ -787,10 +786,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) @@ -833,15 +831,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; }