From patchwork Thu Jul 11 13:29:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 13730730 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23434C3DA49 for ; Thu, 11 Jul 2024 13:29:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 808276B00A1; Thu, 11 Jul 2024 09:29:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 790F06B00A2; Thu, 11 Jul 2024 09:29:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 632C66B00A3; Thu, 11 Jul 2024 09:29:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 419116B00A1 for ; Thu, 11 Jul 2024 09:29:12 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E2ADEA0607 for ; Thu, 11 Jul 2024 13:29:11 +0000 (UTC) X-FDA: 82327552902.30.41B82F0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 339CF18000A for ; Thu, 11 Jul 2024 13:29:10 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lnXshWEc; spf=pass (imf06.hostedemail.com: domain of hawk@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=hawk@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720704518; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VigyS0kQQ56bwb0M/vpZa26Meg9GoOnOTXPJC3GA0/s=; b=hb8LgBPnXAyoBIC+z/Xsa7R+Y/hjDjh26V72ya7gnQFpafW3AqokqkaMqEVn1PcQfyDwis gRmO1kBEGz5avesG780tAtASFF1TrxunkcGe2icmixtad4YRvk10GMt2UAJm1erUedOpp9 Lz3h2cPIg6md7MYjJ0gG+WOygXcRvbY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720704518; a=rsa-sha256; cv=none; b=XsAAWkBXzLdg1SgV7tkQnO6ZAsFpJOpwhsFKoHcIEnr5yfvJzNhJOh36X0NZmQxkB3uywH FbEn7DxY6dpHKlhh1W5IPzLxCXTTghl+YII+O7WIfTJWIXUNJbunJuIcs8KILcrXkKnger oY5wpU/bCFrCDM+33Js0MPEipxxn4lI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lnXshWEc; spf=pass (imf06.hostedemail.com: domain of hawk@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=hawk@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 05F9661A8E; Thu, 11 Jul 2024 13:29:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37D8DC116B1; Thu, 11 Jul 2024 13:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720704548; bh=71qZnHa/lOQXOs6SPxp3YR6prqZbbSZTednAdP42Nvw=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=lnXshWEcQmP4VRNf41OlqGBQFa9tJ3wyNmFf9hqXdO/3++NfHoBJ/Xy2ewfxM9vGh 0YKn9zTu2OBXDdqWDy554AlBqmCzJ/jpuYHq6ZR6TaxKsaLBwdhv+Z3QzwgojDV0uL xMCfwonkVgOttj0Mje6clsRQaE7t9BJFHmc0LZOUxmWBOi+5kaK3z4qnY+Gw4ON8pU E/U13b99c/k9Pp3fMGlMx2dJIhNcLln28AcKkW65HrF94toRmbo1Afx8nPIyW4DJ/9 PVn6gvsm3eX2vSqplagOMgS4ez0szl1yoBs8MHwkcJwguZXFkmnTgynhN7gZbUcpM3 dUxY/zrrEeZfA== Subject: [PATCH V7 2/2 RFC] cgroup/rstat: add tracepoint for ongoing flusher waits From: Jesper Dangaard Brouer To: tj@kernel.org, cgroups@vger.kernel.org, yosryahmed@google.com, shakeel.butt@linux.dev Cc: Jesper Dangaard Brouer , hannes@cmpxchg.org, lizefan.x@bytedance.com, longman@redhat.com, kernel-team@cloudflare.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Thu, 11 Jul 2024 15:29:04 +0200 Message-ID: <172070452878.2992819.10548676901200594081.stgit@firesoul> In-Reply-To: <172070450139.2992819.13210624094367257881.stgit@firesoul> References: <172070450139.2992819.13210624094367257881.stgit@firesoul> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Rspamd-Queue-Id: 339CF18000A X-Stat-Signature: 9cr67aediz8jqz6zw9qeqzawfmcsrdyx X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720704550-443569 X-HE-Meta: U2FsdGVkX19v7vGGJc0G+O88vyvIJM0Rk2bxK6BB1xKqhXAVXZRTrPsKzorfncWxdiK8Do5Z1SEH18aah3isOyQl+jbO45HLaxS+WDLHBjKUtkxwEhnzw2DZ6GoQRNlJbx00f2mwBiJN3qNCcH/aMUb0NOfm+hZHRORsSeuqz2i+OqAVGOR5Qt+O/qx77gB/wPfQmRnOpWWk+N6A5kaAMfz/unVsnLZre6fidOMAK4aDX8Vib1YTLv7Q58cyRQ8BUFwQT616NJPuP1tFMpyBp644DZ2blh26yXUCh5NignEV1mVdbCasH6lUIgQ+kjPQjUrVh/pirD4JDxX9CvqPizq/XUUizBsj0xdruQ0i9HZscsX4Y3+whoGbTbrYSWzlLotolTkMUj+VRsm2GrvRrVdK7klbzm2wK/6UvckVe4JAsnbY1Qyv6+9YZ7g0dQK5xiBBtGvx+FU4XIz/T5tO9Mnkp2/j4NQFMulnoYk6SDvA0eBkpgKL4EzAiSU8aFUL2NUdrgwtPe/kOCFnPV6JyVt+MfV/nwQr2FrSzSXV3Zn3lgtjNKOnPmoqvRFS+y7lbYiyhPZl4S/pr8K9BSylvaCV53lQ+Rq3SQSsqkImcCyvRZPbGbyVKaRsH9Zq9xmA2BRn/rXnROzSJxe2eDLUBGmy18xmrq+2qwm9q/+IpQPZrAuT/20nSvwUojXcIYtCqJjUg0fawEZlbI4Wbotx15+79ar8xkvls7onrGJzJHHzaZPsIj9qruMmK8CIRtMpqxEiORvExOz+KxWPfI10eb2kfCrWhIz4nw/7hahLz9ATKwxsn5xADE5jN60JrvFjcdagxLFH5f9oIZbP76UVm/kBjg+WV+XgrVUGlKobuLYCpfrA1Y08EYG5Pp3Cx5lH9ws1JNEK/DdXROHZ/15nKjrm7w+t6i5YxFGcPmNsecw1ummWNHqtQZHPEAO1kIb52zR0VbHRbhEWWJiqzof xXklPYht 8hLZdNnJP0W5l50/812XxJfj3ts42hh328vOPXldMfuVw4jrgxW6EmIAVuXQK4Cj1xEqtlBfxot58jXsNq3EVpr0hFx5mNNAmktD8a9/b3V5ETd2qz1a7hVEukglMNpTfZIm3lm+3kRMrgU2n91a1AL3a93/O7bfZPMR/ePlq8qcVrprdmSR1IhXl2BQe3GBeSP6f51WOyG4GVGXjc9BfTTsFx1Emi81ghcY8MIoLr4V823C6mmpmQHfhXQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000721, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: I'll be using this tracepoint in production and will report back on findings, e.g. measuring how often the race for ongoing flusher happens. Tthen we can decide if it is worth to keep/apply this patch. Signed-off-by: Jesper Dangaard Brouer --- include/trace/events/cgroup.h | 49 +++++++++++++++++++++++++++++++++++++++++ kernel/cgroup/rstat.c | 15 ++++++++++--- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/include/trace/events/cgroup.h b/include/trace/events/cgroup.h index af2755bda6eb..c8d84e9a08dc 100644 --- a/include/trace/events/cgroup.h +++ b/include/trace/events/cgroup.h @@ -296,6 +296,55 @@ DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_unlock_fastpath, TP_ARGS(cgrp, cpu, contended) ); +DECLARE_EVENT_CLASS(cgroup_ongoing, + + TP_PROTO(struct cgroup *cgrp, struct cgroup *cgrp_ongoing, \ + long res, unsigned int race, ktime_t ts), + + TP_ARGS(cgrp, cgrp_ongoing, res, race, ts), + + TP_STRUCT__entry( + __field( int, root ) + __field( int, level ) + __field( u64, id ) + __field( u64, id_ongoing ) + __field( ktime_t, ts ) + __field( long, res ) + __field( u64, race ) + ), + + TP_fast_assign( + __entry->root = cgrp->root->hierarchy_id; + __entry->id = cgroup_id(cgrp); + __entry->level = cgrp->level; + __entry->id_ongoing = cgroup_id(cgrp_ongoing); + __entry->res = res; + __entry->race = race; + __entry->ts = ts; + ), + + TP_printk("root=%d id=%llu level=%d ongoing_flusher=%llu res=%ld race=%llu ts=%lld", + __entry->root, __entry->id, __entry->level, + __entry->id_ongoing, __entry->res, __entry->race, __entry->ts) +); + +DEFINE_EVENT(cgroup_ongoing, cgroup_ongoing_flusher, + + TP_PROTO(struct cgroup *cgrp, struct cgroup *cgrp_ongoing, \ + long res, unsigned int race, ktime_t ts), + + TP_ARGS(cgrp, cgrp_ongoing, res, race, ts) +); + +DEFINE_EVENT(cgroup_ongoing, cgroup_ongoing_flusher_wait, + + TP_PROTO(struct cgroup *cgrp, struct cgroup *cgrp_ongoing, \ + long res, unsigned int race, ktime_t ts), + + TP_ARGS(cgrp, cgrp_ongoing, res, race, ts) +); + + #endif /* _TRACE_CGROUP_H */ /* This part must be outside protection */ diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index fe2a81a310bb..2d7af86e31c8 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -321,6 +321,7 @@ static inline void __cgroup_rstat_unlock(struct cgroup *cgrp, int cpu_in_loop) static bool cgroup_rstat_trylock_flusher(struct cgroup *cgrp) { struct cgroup *ongoing; + unsigned int race = 0; bool locked; /* Check if ongoing flusher is already taking care of this, if @@ -330,17 +331,25 @@ static bool cgroup_rstat_trylock_flusher(struct cgroup *cgrp) retry: ongoing = READ_ONCE(cgrp_rstat_ongoing_flusher); if (ongoing && cgroup_is_descendant(cgrp, ongoing)) { - wait_for_completion_interruptible_timeout( + ktime_t ts = ktime_get_mono_fast_ns(); + long res = 0; + + trace_cgroup_ongoing_flusher(cgrp, ongoing, 0, race, ts); + + res = wait_for_completion_interruptible_timeout( &ongoing->flush_done, MAX_WAIT); - /* TODO: Add tracepoint here */ + trace_cgroup_ongoing_flusher_wait(cgrp, ongoing, res, race, ts); + return false; } locked = __cgroup_rstat_trylock(cgrp, -1); if (!locked) { /* Contended: Handle loosing race for ongoing flusher */ - if (!ongoing && READ_ONCE(cgrp_rstat_ongoing_flusher)) + if (!ongoing && READ_ONCE(cgrp_rstat_ongoing_flusher)) { + race++; goto retry; + } __cgroup_rstat_lock(cgrp, -1, false); }