From patchwork Wed Feb 24 22:49:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary.robertson@linaro.org X-Patchwork-Id: 62839 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2678768lbl; Wed, 24 Feb 2016 14:51:09 -0800 (PST) X-Received: by 10.107.33.7 with SMTP id h7mr76680ioh.30.1456354269063; Wed, 24 Feb 2016 14:51:09 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e10si305284igx.99.2016.02.24.14.51.08; Wed, 24 Feb 2016 14:51:09 -0800 (PST) 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 Received: by lists.linaro.org (Postfix, from userid 109) id 7A5FA63646; Wed, 24 Feb 2016 22:51:08 +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 2D1C563A1B; Wed, 24 Feb 2016 22:50:34 +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 7BEB463A17; Wed, 24 Feb 2016 22:50:19 +0000 (UTC) Received: from mail-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by lists.linaro.org (Postfix) with ESMTPS id 0817B63015 for ; Wed, 24 Feb 2016 22:50:16 +0000 (UTC) Received: by mail-oi0-f54.google.com with SMTP id x21so27832026oix.2 for ; Wed, 24 Feb 2016 14:50:16 -0800 (PST) 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=H37yRxVLrbBv5PfB6wDy4XVzsUFaXv7lvCDrzBFzaTc=; b=D25siLyr4AnJc13tSmOgv1HetS28CHiclq989Inm1c1bH8cBob9wMrk6UKf5JMpOs5 boyG9NJOv2XB876fI4r1l9gsVj1xQVNoTKaYk5GO3GaaqDRFoGfO7HV6dvRIBTtBC71C NCl9V0T/xD7VO68NxMiG0ZipcB+5eJGou5dhbHYLVrgTUfxBl68yTmOGJOw3YliNJklV QRaoUreDaKLsVsrl9GIr8u5th/Ft3UWmGvaWujCrXur+aFZE6AWFpyWjdGZf9NF8DLuO Pc+V6Yv8LChEcskQzEHzjkXA0jIE2keWj5nOpChEr5t+jbLa/Sm48nLwzfU+Jhh3cmwz vcyg== X-Gm-Message-State: AG10YOS96Ed+LeWIkXXgQgnW2kfRgb1LD+dr2zhoKb4GTAeNQbSmuC+SkAMFnoJhZyFlSLRbboE= X-Received: by 10.202.83.194 with SMTP id h185mr32957187oib.134.1456354215522; Wed, 24 Feb 2016 14:50:15 -0800 (PST) Received: from honkintosh.cybertech.lan (65-120-133-114.dia.static.qwest.net. [65.120.133.114]) by smtp.googlemail.com with ESMTPSA id qs6sm3271948oeb.3.2016.02.24.14.50.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Feb 2016 14:50:14 -0800 (PST) From: "Gary S. Robertson" To: mike.holmes@linaro.org, bill.fischofer@linaro.org, maxim.uvarov@linaro.org, anders.roxell@linaro.org, petri.savolainen@linaro.org Date: Wed, 24 Feb 2016 16:49:58 -0600 Message-Id: <1456354201-31304-2-git-send-email-gary.robertson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456354201-31304-1-git-send-email-gary.robertson@linaro.org> References: <1456354201-31304-1-git-send-email-gary.robertson@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [API-NEXT PATCH 1/4] linux-generic: Correct worker count calculation in tests 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" During the process of addressing Linaro BUG 2027 which relates to inaccurate reporting of available CPUs by ODP linux-generic when running atop a kernel compiled with NO_HZ_FULL support, a number of instances were encountered in the validation and performance test software where incorrect methods were used to determine the proper (or maximum) number of worker threads to create. The use of odp_cpu_count() for this purpose is incorrect and deprecated... odp_cpumask_default_worker() should always be used to determine the set and number of CPUs available for creating worker threads. The use of odp_cpu_count() for this purpose in conjunction with the correct means of determining available CPUs resulted in some tests hanging in calls to odp_barrier_wait() as the barriers were initialized to expect threads on ALL CPUs rather than on worker CPUs alone... and there were too few worker threads created to satisfy the barriers. The changes below correct all instances I could find of this deprecated technique and allowed all tests to complete successfully with the BUG 2027 patch applied. (BTW they also run correctly without that patch after the application of the modifications included here.) Signed-off-by: Gary S. Robertson --- test/performance/odp_atomic.c | 9 ++++++--- test/validation/cpumask/cpumask.c | 2 +- test/validation/shmem/shmem.c | 5 ++++- test/validation/timer/timer.c | 16 +++++++++------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index 69c23e2..491f249 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -303,6 +303,8 @@ int odp_test_thread_exit(pthrd_arg *arg) /** test init globals and call odp_init_global() */ int odp_test_global_init(void) { + odp_cpumask_t unused; + memset(thread_tbl, 0, sizeof(thread_tbl)); if (odp_init_global(NULL, NULL)) { @@ -310,7 +312,8 @@ int odp_test_global_init(void) return -1; } - num_workers = odp_cpu_count(); + num_workers = odp_cpumask_default_worker(&unused, 0); + /* force to max CPU count */ if (num_workers > MAX_WORKERS) num_workers = MAX_WORKERS; @@ -378,7 +381,7 @@ int main(int argc, char *argv[]) goto err_exit; } if (test_type < TEST_MIX || test_type > TEST_MAX || - pthrdnum > odp_cpu_count() || pthrdnum < 0) { + pthrdnum > num_workers || pthrdnum < 0) { usage(); goto err_exit; } @@ -386,7 +389,7 @@ int main(int argc, char *argv[]) } if (pthrdnum == 0) - pthrdnum = odp_cpu_count(); + pthrdnum = num_workers; test_atomic_init(); test_atomic_store(); diff --git a/test/validation/cpumask/cpumask.c b/test/validation/cpumask/cpumask.c index 017332a..24e67b0 100644 --- a/test/validation/cpumask/cpumask.c +++ b/test/validation/cpumask/cpumask.c @@ -67,7 +67,7 @@ void cpumask_test_odp_cpumask_def(void) mask_count = odp_cpumask_count(&mask); CU_ASSERT(mask_count == num_control); - CU_ASSERT(num_control == 1); + CU_ASSERT(num_control >= 1); CU_ASSERT(num_worker <= available_cpus); CU_ASSERT(num_worker > 0); } diff --git a/test/validation/shmem/shmem.c b/test/validation/shmem/shmem.c index ba4973d..ef2f64f 100644 --- a/test/validation/shmem/shmem.c +++ b/test/validation/shmem/shmem.c @@ -6,6 +6,8 @@ #include #include +#include + #include "shmem.h" #define ALIGE_SIZE (128) @@ -52,6 +54,7 @@ void shmem_test_odp_shm_sunnyday(void) pthrd_arg thrdarg; odp_shm_t shm; test_shared_data_t *test_shared_data; + odp_cpumask_t unused; shm = odp_shm_reserve(TESTNAME, sizeof(test_shared_data_t), ALIGE_SIZE, 0); @@ -70,7 +73,7 @@ void shmem_test_odp_shm_sunnyday(void) test_shared_data->foo = TEST_SHARE_FOO; test_shared_data->bar = TEST_SHARE_BAR; - thrdarg.numthrds = odp_cpu_count(); + thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0); if (thrdarg.numthrds > MAX_WORKERS) thrdarg.numthrds = MAX_WORKERS; diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c index c17c407..b2e5752 100644 --- a/test/validation/timer/timer.c +++ b/test/validation/timer/timer.c @@ -15,6 +15,7 @@ #include #include +#include #include "odp_cunit_common.h" #include "test_debug.h" #include "timer.h" @@ -41,12 +42,6 @@ static odp_atomic_u32_t ndelivtoolate; * caches may make this number lower than the capacity of the pool */ static odp_atomic_u32_t timers_allocated; -/** @private min() function */ -static int min(int a, int b) -{ - return a < b ? a : b; -} - /* @private Timer helper structure */ struct test_timer { odp_timer_t tim; /* Timer handle */ @@ -457,10 +452,17 @@ void timer_test_odp_timer_all(void) int rc; odp_pool_param_t params; odp_timer_pool_param_t tparam; + odp_cpumask_t unused; + /* Reserve at least one core for running other processes so the timer * test hopefully can run undisturbed and thus get better timing * results. */ - int num_workers = min(odp_cpu_count() - 1, MAX_WORKERS); + int num_workers = odp_cpumask_default_worker(&unused, 0); + + /* force to max CPU count */ + if (num_workers > MAX_WORKERS) + num_workers = MAX_WORKERS; + /* On a single-CPU machine run at least one thread */ if (num_workers < 1) num_workers = 1;