Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2801277pxk; Sun, 20 Sep 2020 18:23:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgCIuNkiZXdi5YArLUHOR0Ks9ewyPHCnB1gdhhJUQZV93Rte4xUxHrF8LEkVTnaW/UKT5Q X-Received: by 2002:a50:ec10:: with SMTP id g16mr19521986edr.214.1600651414498; Sun, 20 Sep 2020 18:23:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600651414; cv=none; d=google.com; s=arc-20160816; b=ltday8W6Xn/bZE6/RzmRcLJWroDbohGp/FQw8vd+6FHSANSazXdxdTDG2qSE8VIVDO ri8Ak7jHVtIvdDIlb598SAsgoYVpz9rirF3lIQIXj/ft253h//z0I+prOslJzBPLrNEd FAmfTPQRwD4TSyaxgx6CBQWxqv4UafvMZj0EQTon37Sbxk+PL6VcdOwbpIHs24Dvwo9q 3mEWccTtEM/E0ON5EAFtZzOpvpwAEw0Icsw8tvv3EdSs/PsW5Xssfr6psMP/xM8TGNC2 +coARbMFIo3OhAcHhS2N040+pd5HrYABBm2gzFednPrFTCKgQjDj34dPJdcjeX4s/0Vi h/Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Mf+7JZ/mg/EikmfDrCLNr7s+VRR1YOwhEGeUtqMwDoA=; b=qPE9dvilA6/cz4QV9Y7fNLkn9K1piq+bBmaTAgyhXJeh3NDO26b2RMeIh3y3c0J32y apLqhcqRPCBzb0mod4JvMtePekKScQfU/ASjq9yhCiWgwAdf9H18+7x0sNtueQouZnql p0Yu4fWFx1JGyB+kCx4Hx+0gVkLcJFTvRC9CQqwUPh85OUos6dy/j5WmGH/+/HO016+L UQb6+WB0Xyb32l1v/I8MWXd3cWmFFFhPtGmcDohIIUB7LOh/3LTlswOoOk6ylMBuej5A 7Nl9vjEGg7W9DNfnXRo7PNT45Tt+ZlVHku5H+d8bccyY+6Wf4ijfw7Ydm/FSQd3YYDsk S8mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=dAI9eFch; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x27si4273958ejb.677.2020.09.20.18.23.11; Sun, 20 Sep 2020 18:23:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=dAI9eFch; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbgIUBWJ (ORCPT + 99 others); Sun, 20 Sep 2020 21:22:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726442AbgIUBWD (ORCPT ); Sun, 20 Sep 2020 21:22:03 -0400 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CF9BC0613CE for ; Sun, 20 Sep 2020 18:22:03 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id q63so13423021qkf.3 for ; Sun, 20 Sep 2020 18:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mf+7JZ/mg/EikmfDrCLNr7s+VRR1YOwhEGeUtqMwDoA=; b=dAI9eFchpbd2gCfaYWOGjs6JKRsLvxSaLWl9UaZ3G/qBkLT4MISz1aZNDeM+NF1ZqI yQ77W6VhUI9ArysqOwV3uAt/eB2YIIec+g2fK+sjKaF7BKTlnFD0zpKsLpvWgcG0uSKg t91rDZVu39lAtwsdiRfLlk6OX7sdgNCp7bwEU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mf+7JZ/mg/EikmfDrCLNr7s+VRR1YOwhEGeUtqMwDoA=; b=MpCJMRYun48JAnuXe1D/0zojPK/FlpXPK7zSl+d4it939xcie8RW30qZiu+fm0xPu7 uwElpskpGbrvTKfkH9jMeWbgyPpyqf4eW/r4PuzvwQAmAmp1nBMrj2qphpBF9EzMnHCI zssbn4f4Xg/RCLTPTYyi0K1OQESekk1TjaBVanaboAK+A5i/E9MpJLvzCaoAFLEJKvQU TrnhLdrWY7R38+gDaEHaVbpQLHoklOGhPpeEdGKNK1+DgQ0q7S2ylfUY3lyKPJW+rxNJ qyA5sKlAcL4wgoH9WMZEBGVcLK2hU7l0u/IJCYJBhpQSPa2Tt/zwzwrPyt1m+oDmn33Z 69Og== X-Gm-Message-State: AOAM532na/Sk/SWdX0kVdejzoRGql2OyOObT7OsPnZQjhyySR33ZP8Pj HZFNbDTPpFsS4VGfvr8r1r2VL2UxMDjeWw== X-Received: by 2002:a37:b406:: with SMTP id d6mr1481334qkf.485.1600651321944; Sun, 20 Sep 2020 18:22:01 -0700 (PDT) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:cad3:ffff:feb3:bd59]) by smtp.gmail.com with ESMTPSA id l26sm7741951qki.62.2020.09.20.18.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 18:22:01 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Ingo Molnar , Josh Triplett , Lai Jiangshan , Marco Elver , Mathieu Desnoyers , neeraj.iitr10@gmail.com, "Paul E. McKenney" , rcu@vger.kernel.org, Steven Rostedt , "Uladzislau Rezki (Sony)" Subject: [RFC v5 4/5] rcu/trace: Add tracing for how segcb list changes Date: Sun, 20 Sep 2020 21:21:51 -0400 Message-Id: <20200921012152.2831904-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200921012152.2831904-1-joel@joelfernandes.org> References: <20200921012152.2831904-1-joel@joelfernandes.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Track how the segcb list changes before/after acceleration, during queuing and during dequeuing. This has proved useful to discover an optimization to avoid unwanted GP requests when there are no callbacks accelerated. The overhead is minimal as each segment's length is now stored in the respective segment. Signed-off-by: Joel Fernandes (Google) --- include/trace/events/rcu.h | 25 +++++++++++++++++++++++++ kernel/rcu/rcu_segcblist.c | 34 ++++++++++++++++++++++++++++++++++ kernel/rcu/rcu_segcblist.h | 5 +++++ kernel/rcu/tree.c | 9 +++++++++ 4 files changed, 73 insertions(+) diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index 155b5cb43cfd..7b84df3c95df 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -505,6 +505,31 @@ TRACE_EVENT_RCU(rcu_callback, __entry->qlen) ); +TRACE_EVENT_RCU(rcu_segcb, + + TP_PROTO(const char *ctx, int *cb_count, unsigned long *gp_seq), + + TP_ARGS(ctx, cb_count, gp_seq), + + TP_STRUCT__entry( + __field(const char *, ctx) + __array(int, cb_count, 4) + __array(unsigned long, gp_seq, 4) + ), + + TP_fast_assign( + __entry->ctx = ctx; + memcpy(__entry->cb_count, cb_count, 4 * sizeof(int)); + memcpy(__entry->gp_seq, gp_seq, 4 * sizeof(unsigned long)); + ), + + TP_printk("%s cb_count: (DONE=%d, WAIT=%d, NEXT_READY=%d, NEXT=%d) " + "gp_seq: (DONE=%lu, WAIT=%lu, NEXT_READY=%lu, NEXT=%lu)", __entry->ctx, + __entry->cb_count[0], __entry->cb_count[1], __entry->cb_count[2], __entry->cb_count[3], + __entry->gp_seq[0], __entry->gp_seq[1], __entry->gp_seq[2], __entry->gp_seq[3]) + +); + /* * Tracepoint for the registration of a single RCU callback of the special * kvfree() form. The first argument is the RCU type, the second argument diff --git a/kernel/rcu/rcu_segcblist.c b/kernel/rcu/rcu_segcblist.c index 314799426c2d..72b284f965aa 100644 --- a/kernel/rcu/rcu_segcblist.c +++ b/kernel/rcu/rcu_segcblist.c @@ -13,6 +13,7 @@ #include #include "rcu_segcblist.h" +#include "rcu.h" /* Initialize simple callback list. */ void rcu_cblist_init(struct rcu_cblist *rclp) @@ -344,6 +345,39 @@ void rcu_segcblist_extract_done_cbs(struct rcu_segcblist *rsclp, rcu_segcblist_add_len(rsclp, -(rclp->len)); } +/* + * Return how many CBs each segment along with their gp_seq values. + * + * This function is O(N) where N is the number of callbacks. Only used from + * tracing code which is usually disabled in production. + */ +#ifdef CONFIG_RCU_TRACE +static void rcu_segcblist_countseq(struct rcu_segcblist *rsclp, + int cbcount[RCU_CBLIST_NSEGS], + unsigned long gpseq[RCU_CBLIST_NSEGS]) +{ + int i; + + for (i = 0; i < RCU_CBLIST_NSEGS; i++) + cbcount[i] = 0; + + for (i = 0; i < RCU_CBLIST_NSEGS; i++) { + cbcount[i] = rcu_segcblist_get_seglen(rsclp, i); + gpseq[i] = rsclp->gp_seq[i]; + } +} + +void trace_rcu_segcb_list(struct rcu_segcblist *rsclp, char *context) +{ + int cbs[RCU_CBLIST_NSEGS]; + unsigned long gps[RCU_CBLIST_NSEGS]; + + rcu_segcblist_countseq(rsclp, cbs, gps); + + trace_rcu_segcb(context, cbs, gps); +} +#endif + /* * Extract only those callbacks still pending (not yet ready to be * invoked) from the specified rcu_segcblist structure and place them in diff --git a/kernel/rcu/rcu_segcblist.h b/kernel/rcu/rcu_segcblist.h index 78949e125364..ca2a403591e4 100644 --- a/kernel/rcu/rcu_segcblist.h +++ b/kernel/rcu/rcu_segcblist.h @@ -120,3 +120,8 @@ void rcu_segcblist_advance(struct rcu_segcblist *rsclp, unsigned long seq); bool rcu_segcblist_accelerate(struct rcu_segcblist *rsclp, unsigned long seq); void rcu_segcblist_merge(struct rcu_segcblist *dst_rsclp, struct rcu_segcblist *src_rsclp); +#ifdef CONFIG_RCU_TRACE +void trace_rcu_segcb_list(struct rcu_segcblist *rsclp, char *context); +#else +#define trace_rcu_segcb_list(...) +#endif diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 23fb6d7b6d4a..3afb0e4daca6 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -1492,6 +1492,8 @@ static bool rcu_accelerate_cbs(struct rcu_node *rnp, struct rcu_data *rdp) if (!rcu_segcblist_pend_cbs(&rdp->cblist)) return false; + trace_rcu_segcb_list(&rdp->cblist, "SegCbPreAcc"); + /* * Callbacks are often registered with incomplete grace-period * information. Something about the fact that getting exact @@ -1512,6 +1514,8 @@ static bool rcu_accelerate_cbs(struct rcu_node *rnp, struct rcu_data *rdp) else trace_rcu_grace_period(rcu_state.name, gp_seq_req, TPS("AccReadyCB")); + trace_rcu_segcb_list(&rdp->cblist, "SegCbPostAcc"); + return ret; } @@ -2470,6 +2474,9 @@ static void rcu_do_batch(struct rcu_data *rdp) /* Invoke callbacks. */ tick_dep_set_task(current, TICK_DEP_BIT_RCU); rhp = rcu_cblist_dequeue(&rcl); + + trace_rcu_segcb_list(&rdp->cblist, "SegCbDequeued"); + for (; rhp; rhp = rcu_cblist_dequeue(&rcl)) { rcu_callback_t f; @@ -2984,6 +2991,8 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) trace_rcu_callback(rcu_state.name, head, rcu_segcblist_n_cbs(&rdp->cblist)); + trace_rcu_segcb_list(&rdp->cblist, "SegCBQueued"); + /* Go handle any RCU core processing required. */ if (IS_ENABLED(CONFIG_RCU_NOCB_CPU) && unlikely(rcu_segcblist_is_offloaded(&rdp->cblist))) { -- 2.28.0.681.g6f77f65b4e-goog