From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F713C2D0C1 for ; Thu, 19 Dec 2019 21:14:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 118A324679 for ; Thu, 19 Dec 2019 21:14:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="whUB+AfK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727151AbfLSVN7 (ORCPT ); Thu, 19 Dec 2019 16:13:59 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33412 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726967AbfLSVN6 (ORCPT ); Thu, 19 Dec 2019 16:13:58 -0500 Received: by mail-pf1-f196.google.com with SMTP id z16so3999188pfk.0 for ; Thu, 19 Dec 2019 13:13:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AgO/47tZIxvVJC669ttTdtG/Znfw1BmDdkytg6xCB4Y=; b=whUB+AfKiwN8ECIkMHp0e0YfDbAkUtQz33jBgFfW/Q827xTfxTV9F/Q5DI6bUSau6x BJzkRHXuHkopY+JIPQlCK9ZX2tzijX0WNjW+eZ8B1zDteVlui888czWXpidpu5RBcHGh IkpzhrzS/hXvgAp1+FEMAqgUFUbjQ0GtXoAuI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AgO/47tZIxvVJC669ttTdtG/Znfw1BmDdkytg6xCB4Y=; b=Cv2gMqmiRVTlsyGGDLN5nm6COpt0/GQFrLtIcCvK3uWqxOk7atZ7/LNYt/odsYgeaW vq6uyEPB416fE7KEWxCEHAHIEKMEvxM7vSLi3JVr13xSelxpbw6TSw/gmONt4TJSJLGJ J/8ORK0HXmIZZhYmAC+8oPD9QCiKH4u1NChMVnpOGbPlGgLf7GXCOxk6F6AIevVHt68U NAckg4NoztqlQJfes2j0Hhqur4Ri5a9Drw2J2gL9U1CHH5nHakkK1EYM7lvNO0bpnAeF mPQpCkpMiLYvOpW0T/KggbHkB0FeMZH3I0OpCrmF8Gai0OOrfMMgB1tiWX9mHu+bccC7 Wv1g== X-Gm-Message-State: APjAAAWg8oQgCNKT7C9s4H7Mm6UiNP8ce2+AgbeRmGj7KhT7gSD21QLt OcXlHsfR5Xn4x3yZrUrlvLIyAX7+p4w= X-Google-Smtp-Source: APXvYqwuv5GC/ueDm/Dh6HQenN+iHtp83AKTiRSjtUQwuBvjJEM7Zzd8K4MrrwRa1V9K8Nhm6djmLg== X-Received: by 2002:a62:1c95:: with SMTP id c143mr11616195pfc.219.1576790037454; Thu, 19 Dec 2019 13:13:57 -0800 (PST) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:9c46:e0da:efbf:69cc]) by smtp.gmail.com with ESMTPSA id 73sm8616834pgc.13.2019.12.19.13.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 13:13:56 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , bristot@redhat.com, frextrite@gmail.com, madhuparnabhowmik04@gmail.com, urezki@gmail.com, Davidlohr Bueso , Josh Triplett , Lai Jiangshan , Mathieu Desnoyers , "Paul E. McKenney" , rcu@vger.kernel.org, Steven Rostedt Subject: [PATCH v3 rcu-dev] rcuperf: Measure memory footprint during kfree_rcu() test Date: Thu, 19 Dec 2019 16:13:49 -0500 Message-Id: <20191219211349.235877-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During changes to kfree_rcu() code, we often check the amount of free memory. As an alternative to checking this manually, this commit adds a measurement in the test itself. It measures four times during the test for available memory, digitally filters these measurements to produce a running average with a weight of 0.5, and compares this digitally filtered value with the amount of available memory at the beginning of the test. We apply the digital filter only once we are more than 25% into the test. At the 25% mark, we just read available memory and don't apply any filtering. This prevents the first sample from skewing the results as we would not consider memory readings that were before memory was allocated. A sample run shows something like: Total time taken by all kfree'ers: 6369738407 ns, loops: 10000, batches: 764, memory footprint: 216MB Signed-off-by: Joel Fernandes (Google) --- v1->v2: Minor corrections v1->v3: Use long long to prevent 32-bit system's overflow Handle case where some threads start later than others. Start measuring only once 25% into the test. Slightly more accurate. Cc: bristot@redhat.com Cc: frextrite@gmail.com Cc: madhuparnabhowmik04@gmail.com Cc: urezki@gmail.com Signed-off-by: Joel Fernandes (Google) kernel/rcu/rcuperf.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c index da94b89cd531..67e0f804ea97 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -604,6 +605,8 @@ struct kfree_obj { struct rcu_head rh; }; +long long mem_begin; + static int kfree_perf_thread(void *arg) { @@ -611,6 +614,7 @@ kfree_perf_thread(void *arg) long me = (long)arg; struct kfree_obj *alloc_ptr; u64 start_time, end_time; + long long mem_during = si_mem_available(); VERBOSE_PERFOUT_STRING("kfree_perf_thread task started"); set_cpus_allowed_ptr(current, cpumask_of(me % nr_cpu_ids)); @@ -626,6 +630,15 @@ kfree_perf_thread(void *arg) } do { + // Moving average of memory availability measurements. + // Start measuring only from when we are at least 25% into the test. + if (loop && kfree_loops > 3 && (loop % (kfree_loops / 4) == 0)) { + if (loop == (kfree_loops / 4)) + mem_during = si_mem_available(); + else + mem_during = (mem_during + si_mem_available()) / 2; + } + for (i = 0; i < kfree_alloc_num; i++) { alloc_ptr = kmalloc(sizeof(struct kfree_obj), GFP_KERNEL); if (!alloc_ptr) @@ -645,9 +658,13 @@ kfree_perf_thread(void *arg) else b_rcu_gp_test_finished = cur_ops->get_gp_seq(); - pr_alert("Total time taken by all kfree'ers: %llu ns, loops: %d, batches: %ld\n", + // The "memory footprint" field represents how much in-flight + // memory is allocated during the test and waiting to be freed. + pr_alert("Total time taken by all kfree'ers: %llu ns, loops: %d, batches: %ld, memory footprint: %lldMB\n", (unsigned long long)(end_time - start_time), kfree_loops, - rcuperf_seq_diff(b_rcu_gp_test_finished, b_rcu_gp_test_started)); + rcuperf_seq_diff(b_rcu_gp_test_finished, b_rcu_gp_test_started), + (mem_begin - mem_during) >> (20 - PAGE_SHIFT)); + if (shutdown) { smp_mb(); /* Assign before wake. */ wake_up(&shutdown_wq); @@ -719,6 +736,8 @@ kfree_perf_init(void) goto unwind; } + mem_begin = si_mem_available(); + for (i = 0; i < kfree_nrealthreads; i++) { firsterr = torture_create_kthread(kfree_perf_thread, (void *)i, kfree_reader_tasks[i]); -- 2.24.1.735.g03f4e72817-goog