From patchwork Tue May 17 19:21:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola Liljedahl X-Patchwork-Id: 68005 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2249935qge; Tue, 17 May 2016 12:23:00 -0700 (PDT) X-Received: by 10.55.203.132 with SMTP id u4mr3647262qkl.12.1463512980126; Tue, 17 May 2016 12:23:00 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g123si3335937qkg.193.2016.05.17.12.22.59; Tue, 17 May 2016 12:23:00 -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 C95BC61747; Tue, 17 May 2016 19:22:59 +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 4493B61784; Tue, 17 May 2016 19:21: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 EA6AC61630; Tue, 17 May 2016 19:21:51 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 9A555615DA for ; Tue, 17 May 2016 19:21:50 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id y84so11107066lfc.0 for ; Tue, 17 May 2016 12:21:50 -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:in-reply-to :references; bh=bd4tve4oQXEw7TNn+7RyaqyGMWLPZWvVDpfL5zfeQ5I=; b=ZDplVewEXAJMp/Dpx7Yc/n/wP+y+UcZ/cB1qToalfSfOw7uCcvDxcC860n9LmNn+rC 5RdS3XBFa6IEIVa4AlTxlCsgWk7Y0oo5M7RNwCNVxDOWIWszypJleNjW9KbnzKT0zQ8O WMpCmKBE6dOqZ0vOoqlx5i1/DytioPy6Cvd44d/3p7ElSrxHRHJpeURnbZu7SXf/96ev yOSQ9mh75GP+3oJ5daUZpBMgGn46nggLFVo88zZaod3rm4edZFI/Jc/547qQNqp8W/Zt uHfmgjEmk8ekXpStMrnotCRU4hAZ2f0K37KNFBRch/DfJ9KLCcUqfINXY3IBCydzGlHm Rkdg== X-Gm-Message-State: AOPr4FU3YRTzpf37B3F38TvSTZZqL74UAoZ0JSf7M8q32KzsOXxhWagER+4LYfYX13Kmq7VbWzs= X-Received: by 10.25.210.144 with SMTP id j138mr1052995lfg.77.1463512909500; Tue, 17 May 2016 12:21:49 -0700 (PDT) Received: from localhost.localdomain (h-155-4-131-235.na.cust.bahnhof.se. [155.4.131.235]) by smtp.gmail.com with ESMTPSA id 92sm749052lfw.25.2016.05.17.12.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 12:21:48 -0700 (PDT) From: Ola Liljedahl To: lng-odp@lists.linaro.org Date: Tue, 17 May 2016 21:21:17 +0200 Message-Id: <1463512877-1218-3-git-send-email-ola.liljedahl@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1463512877-1218-1-git-send-email-ola.liljedahl@linaro.org> References: <1463512877-1218-1-git-send-email-ola.liljedahl@linaro.org> X-Topics: timers patch Subject: [lng-odp] [PATCHv3 2/2] linux-generic: timer: fix failed static assert 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" Fixes https://bugs.linaro.org/show_bug.cgi?id=2211 Ensure tick_buf_t structure is 128 bits large on all platforms, regardless of support for 64-bit atomic operations. Only assert that tick_buf_t is 128 bits large when performing atomic operations on it (requires ODP and platform support for 128 bit atomics). Signed-off-by: Ola Liljedahl --- platform/linux-generic/odp_timer.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 41e7195..a6d3332 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -94,7 +94,15 @@ static odp_timeout_hdr_t *timeout_hdr(odp_timeout_t tmo) *****************************************************************************/ typedef struct tick_buf_s { +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 + /* No atomics support for 64-bit variables, will use separate lock */ + /* Use the same layout as odp_atomic_u64_t but without lock variable */ + struct { + uint64_t v; + } exp_tck;/* Expiration tick or TMO_xxx */ +#else odp_atomic_u64_t exp_tck;/* Expiration tick or TMO_xxx */ +#endif odp_buffer_t tmo_buf;/* ODP_BUFFER_INVALID if timer not active */ #ifdef TB_NEEDS_PAD uint32_t pad;/* Need to be able to access padding for successful CAS */ @@ -105,7 +113,10 @@ ODP_ALIGNED(16) /* 16-byte atomic operations need properly aligned addresses */ #endif ; +#if __GCC_ATOMIC_LLONG_LOCK_FREE >= 2 +/* Only assert this when we perform atomic operations on tick_buf_t */ ODP_STATIC_ASSERT(sizeof(tick_buf_t) == 16, "sizeof(tick_buf_t) == 16"); +#endif typedef struct odp_timer_s { void *user_ptr; @@ -123,7 +134,11 @@ static void timer_init(odp_timer *tim, /* All pad fields need a defined and constant value */ TB_SET_PAD(*tb); /* Release the timer by setting timer state to inactive */ +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 + tb->exp_tck.v = TMO_INACTIVE; +#else _odp_atomic_u64_store_mm(&tb->exp_tck, TMO_INACTIVE, _ODP_MEMMODEL_RLS); +#endif } /* Teardown when timer is freed */ @@ -253,7 +268,11 @@ static odp_timer_pool *odp_timer_pool_new( tp->timers[i].queue = ODP_QUEUE_INVALID; set_next_free(&tp->timers[i], i + 1); tp->timers[i].user_ptr = NULL; +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 + tp->tick_buf[i].exp_tck.v = TMO_UNUSED; +#else odp_atomic_init_u64(&tp->tick_buf[i].exp_tck, TMO_UNUSED); +#endif tp->tick_buf[i].tmo_buf = ODP_BUFFER_INVALID; } tp->tp_idx = tp_idx; @@ -935,7 +954,11 @@ int odp_timeout_fresh(odp_timeout_t tmo) odp_timer_pool *tp = handle_to_tp(hdl); uint32_t idx = handle_to_idx(hdl, tp); tick_buf_t *tb = &tp->tick_buf[idx]; +#if __GCC_ATOMIC_LLONG_LOCK_FREE < 2 + uint64_t exp_tck = tb->exp_tck.v; +#else uint64_t exp_tck = odp_atomic_load_u64(&tb->exp_tck); +#endif /* Return true if the timer still has the same expiration tick * (ignoring the inactive/expired bit) as the timeout */ return hdr->expiration == (exp_tck & ~TMO_INACTIVE);