From patchwork Thu Oct 24 14:05:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13849274 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 EF9A1CE8E7A for ; Thu, 24 Oct 2024 14:08:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 820536B00BC; Thu, 24 Oct 2024 10:08:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D0366B00BD; Thu, 24 Oct 2024 10:08:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 671578D0003; Thu, 24 Oct 2024 10:08:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 472CF6B00BC for ; Thu, 24 Oct 2024 10:08:04 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1E21FC0F48 for ; Thu, 24 Oct 2024 14:07:44 +0000 (UTC) X-FDA: 82708673964.13.E75374C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 5D758120022 for ; Thu, 24 Oct 2024 14:07:37 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GSvwBpVN; spf=pass (imf29.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729778804; a=rsa-sha256; cv=none; b=d7gDTgwTFvxRxzkg3zb1aKTr5oVnURPEOY5aOOtERvXjqim5W7L5tWmLw1Blkq0Ku/W/q6 pyEoRybIRZD1e3jW9FaA27H+19eIWwbm7pYNGaK3yABuuCOIuF5V9OSsFz6104o1HSY63w txvVtRgg8+MaPlKKSd7stCI8saUp6wg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GSvwBpVN; spf=pass (imf29.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729778804; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3kDl7vtgTz4UJLk1NBKECBmgzlrlbYChuV4j2ks8Pq0=; b=i72WpgiQ3RSuJDn735PfXR+epsTtqmpxDN09ZAD+22u81GEsasrj4+1UuFs3IRl37frR1u 5I2fBzvcV2NZmPjXNq/wLmtTCu4PmlgrRErMiIbtcmTDOv/1mK9u8tztu03mZBelcFYYie QJ7r7BCrN2xp+CFpok1TwYcBT5Iqocc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729778881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3kDl7vtgTz4UJLk1NBKECBmgzlrlbYChuV4j2ks8Pq0=; b=GSvwBpVN33H7FFh54iKn9cwneXpfb0ZPH+rzx0HRRUDHoGQQNJ0VvY2WM8xPe7smStqCpc 8Jv13jy27d1uhyz3q50R2qsOuo1LZgd2kxmvgA1djW7LmcSjNZhljLOnyd9DNkj2wBRW8w h2uwSB1TnFyewasKDNkQdzLCnI28A/I= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-451-eWp8axh7PCKxtyFvvhMAIQ-1; Thu, 24 Oct 2024 10:07:59 -0400 X-MC-Unique: eWp8axh7PCKxtyFvvhMAIQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66D6A1955F69; Thu, 24 Oct 2024 14:07:56 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CAADE300018D; Thu, 24 Oct 2024 14:07:50 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/27] cachefiles: Add some subrequest tracepoints Date: Thu, 24 Oct 2024 15:05:14 +0100 Message-ID: <20241024140539.3828093-17-dhowells@redhat.com> In-Reply-To: <20241024140539.3828093-1-dhowells@redhat.com> References: <20241024140539.3828093-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: j1jddfrwskwrugdpqu513j96e5fzjepc X-Rspamd-Queue-Id: 5D758120022 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1729778857-541653 X-HE-Meta: U2FsdGVkX19l6q6R1YWYAt7gjiaXwD2YICm1hAiV5nxgP47ZfESQmyXqgEn+r0163Jy1kdm29CC3NfTo3uf5wpx838azMUSCLinC9s2DDPpIbuQ6rKq520yOYYEBQbB7Ck+bNouMlOGRXnUkjxkR79QAI9vfkivYSEUjhDU4Cjot5TjkDatMTSvBa8sJfBojZ194eCf3dgVx2ZGhRtwOZZL6nBmMRkuiKyLo0aoY+QM8KPc2PsNEFoM+L/Zrc7RjmyjJyQKZP0v+nx4YvMt+CcjNjx0dveUD1Ppo2Plm7/arQ+LqB/v0GE1GGB0GyzmYzTD2JY78N3vCsAsxxXzcjdbBGOwF5XqprroJCLKn/kcDcYrHnlG8uq5whlhAI3Qr3/yQ0sjROBfD5bGTYqYOv+NckDp+k3Q0YW1ZK1PJxT7yqZRiL1UmBa5QyNVLt26vjt6lUk7gs2rXGSwcEHvKBgbP1ELOGDyZac7ZDK1XZL2WZCdmIu5BlVvXW6Id3fWbyMCTI8KHAIdxLYwuxztmyqMsB37pS8dpqFXcDM+biTJDQObeJnn+E1rnXLX/H78Y90jmvrqvGya1Vads1Jg+Y7cHrG5tR7N0Hv+T5Z9Um7dCqasPThIfMwJq7pRONhhU+Id3i7CaN27vQnOf2KXh1ZFpUNUkTZGzPVJoPg+3FCgFUUOXlKl6hVNebnKtOqFQKoryelmZUM0DFFjsYAE2wdnMdR3SD+BuGJJy+f8432f4MOBvGWnonGikTvvRm53kae/UDZNqH9/TuqybTZ23HCi4uDpmRMZ/Yjt3d1zx4uyLPOHi4W6xUixnyvudxmEEJMltjf6cLD08xuZatUxxUgba5y9l9vKZ/jb6OIegQMCaXZ1/2Gg10vnXjJ/MXpuDp7oEle6SIAGk7sQl0O1LGJqUoAV+NvjCYTlkEVH6kKNIwiGBjv7KDW4zvnrgH3mLBijNYhp2bkp4BWYRFqz UKVxoKyd CYzXQnz6tg0J1Ck6F6btJn+/c9QiCpjDoPOfxgOzl7O9v/FroM7+GzzKozNUBrlB0lx3GvbkOp/COPWWD/f3K5Kj2jrAw5QsRMFH+8BYVKnhMVBNUsSA3Lt9vP4+1vd3ST8/O1qAzOAF9VcgfA8ovLxJ3hFsdv5IAx8EQm7wd3tI4g4cVdvvLGOfIyXdVlgfwm8hQu7Ys5QdIfkiq7PrgGxp2MMbbnL/SXGpmB6a3RMKAbg2zTdfx9vzgzW5rm9mByER1lQ/adZ3Yd2G3vWaL5nIMqrIx7ltDTUCC0kluY/KAF90LOSQGPkX256wQWO1XMDierT03zCeSaWQWWppdgQ6Rlu0T2weACsAillSN5/+hZHw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add some tracepoints into the cachefiles write paths. Signed-off-by: David Howells cc: netfs@lists.linux.dev --- fs/cachefiles/io.c | 4 ++++ include/trace/events/netfs.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/fs/cachefiles/io.c b/fs/cachefiles/io.c index 6a821a959b59..92058ae43488 100644 --- a/fs/cachefiles/io.c +++ b/fs/cachefiles/io.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "internal.h" struct cachefiles_kiocb { @@ -366,6 +367,7 @@ static int cachefiles_write(struct netfs_cache_resources *cres, if (!fscache_wait_for_operation(cres, FSCACHE_WANT_WRITE)) { if (term_func) term_func(term_func_priv, -ENOBUFS, false); + trace_netfs_sreq(term_func_priv, netfs_sreq_trace_cache_nowrite); return -ENOBUFS; } @@ -695,6 +697,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) iov_iter_truncate(&subreq->io_iter, len); } + trace_netfs_sreq(subreq, netfs_sreq_trace_cache_prepare); cachefiles_begin_secure(cache, &saved_cred); ret = __cachefiles_prepare_write(object, cachefiles_cres_file(cres), &start, &len, len, true); @@ -704,6 +707,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) return; } + trace_netfs_sreq(subreq, netfs_sreq_trace_cache_write); cachefiles_write(&subreq->rreq->cache_resources, subreq->start, &subreq->io_iter, netfs_write_subrequest_terminated, subreq); diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index a0f5b13aab86..7c3c866ae183 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -74,6 +74,9 @@ #define netfs_sreq_traces \ EM(netfs_sreq_trace_add_donations, "+DON ") \ EM(netfs_sreq_trace_added, "ADD ") \ + EM(netfs_sreq_trace_cache_nowrite, "CA-NW") \ + EM(netfs_sreq_trace_cache_prepare, "CA-PR") \ + EM(netfs_sreq_trace_cache_write, "CA-WR") \ EM(netfs_sreq_trace_clear, "CLEAR") \ EM(netfs_sreq_trace_discard, "DSCRD") \ EM(netfs_sreq_trace_donate_to_prev, "DON-P") \