From patchwork Thu Dec 21 13:23:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13501935 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 6FC76C35274 for ; Thu, 21 Dec 2023 13:25:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A6128D001F; Thu, 21 Dec 2023 08:25:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F201B6B0098; Thu, 21 Dec 2023 08:25:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4C128D001F; Thu, 21 Dec 2023 08:25:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C0E2B6B0096 for ; Thu, 21 Dec 2023 08:25:38 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9478F40DA8 for ; Thu, 21 Dec 2023 13:25:38 +0000 (UTC) X-FDA: 81590897556.20.FF44BA6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id DD0D34000E for ; Thu, 21 Dec 2023 13:25:36 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0GojMa0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703165136; 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=/poDr8aeuvYsVSyxBxV9eTNahVNZ3naX9lqBidu9TAg=; b=SAETfPXYuLGK5UyrGLZtG39PT0ikrmXiBeYOUHhug/spJkM8EeUXfxUksJtUqEhBwV1bvi E3i/kb4thgm06YWQlCGStB5WUsBELN4FEfp332h4fgGcRIRLG7qttjiF309WaHxTB8XQEE 9i0ggtRWOP27D0HXQBkss0ryL7ph6xQ= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S0GojMa0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703165136; a=rsa-sha256; cv=none; b=WgwXK5dMPJzL68bhZE1MrlUYs2aETzVVsN3/77A35mcY7hTPCF8wAPJqqrm2Xszbg3hnnF MJLsPoHwDjfWe8DuoyVgG+U79PMerAJkPPARJgOixtaK+q0i3tw1XaOLf6JTRMFWGL5adn D+gS5LUlHT2pyuFoGOkvN2/NGGnAQ4E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703165136; 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=/poDr8aeuvYsVSyxBxV9eTNahVNZ3naX9lqBidu9TAg=; b=S0GojMa0ByTNeHiuxdJ8GhXR0wSAM5EEGEawL6W1xDt+SeUvLVsPsZVLpaBNLtYQAli6fS Ptny4ZadpmTK69wHgmlYODepsogYcLDbFq7M8LTyfcbPih2z44CRRo0iwDwTJqQPVZP9FH 40Js1u1T8qKenr+kz622vdcJTdPgjI0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-637-pEi7nM3GOhe0QMRKh-q7ig-1; Thu, 21 Dec 2023 08:25:30 -0500 X-MC-Unique: pEi7nM3GOhe0QMRKh-q7ig-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD5113830089; Thu, 21 Dec 2023 13:25:29 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00987C15968; Thu, 21 Dec 2023 13:25:26 +0000 (UTC) From: David Howells To: Jeff Layton , Steve French Cc: David Howells , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Eric Van Hensbergen , Ilya Dryomov , Christian Brauner , linux-cachefs@redhat.com, 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-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 22/40] netfs: Make the refcounting of netfs_begin_read() easier to use Date: Thu, 21 Dec 2023 13:23:17 +0000 Message-ID: <20231221132400.1601991-23-dhowells@redhat.com> In-Reply-To: <20231221132400.1601991-1-dhowells@redhat.com> References: <20231221132400.1601991-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspamd-Queue-Id: DD0D34000E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 4w67sy8s9ddn8bq6qwc5x5hs395neusg X-HE-Tag: 1703165136-395928 X-HE-Meta: U2FsdGVkX1+qPKkNUWxs8S2rUJhCsgfuqMmR4mhuLVGvM82ymvVIPwvuSnSNDHsIrl6El6KPNMQKmGDc27uMf/SJqlHasMaCkwGqULjlL82CKef5iNQjxegq4X1mtwHNDUCHbn7Ww+rqVMXnEMmH4XElmFGMe63jDwz79hcVVT9EJADN/KI4vQ2blNwDPnS88s4PVypt0P7Bx1mTtX+PJ4xlAmNIHGoDlUjUn5vd7mnaVLG2xpDwbp9k0U7l3x4BT2yyDs4hfWCekbrtv1IA9E5TbMEheO+KUeFRrw39TIRsGfQj5EJY3LIEEpZpKoy9IT1QuSPnooNUAOvkxGGZBcq7Gj5fMOMfPihAPd6ZPuC5j0Nq01JiZvOLTOchYpCAAibuGHq1lDo82kH/ZRXqr3FFvBvHZ4xJnnW7pT19j+y5kct3Uiznfx2T7WUg+UqEqrMotaYjF0Qv78pjIc3Tvp6rikbCpHo1oYEP08sOhuZ0d7N1BxQkGyrJcdiUYgXkDJghQOB12kZ6ncGfswRV8NSMIBio2cBgs0Wj/uzcBvHz7kem/ABDeu+nyxJ1g5OSbOsexmDnWXhmXDfFr/Iq4AzYInCmT+LuJHP6KYfOZVf+HAxuYDuD8Ypi8RNVeYINH5w7VHLy4jqGOlSGMfgp80QWvArg1GMbs7zX25I62l3LKcf9b8659cxsaE0nQSxuVrhFrIZRkk/EKWfF7rovuQN1EKRm4m69nkmDr+eCTu4GBxZqcDyl4LHXIKnc1fN/OZMHh/9XXASacsL+Zu9sc6FlrmuZXvfBiEFjkSu5QJGUP2RmfWNB+6Qa6db8mNYd6DHx+eFLdM7MMfUaE1Z51XD9ZkMbZzzn328xVp/cD+VykorB20SuanuZ/f6auMY+1io+f+SHK8Rsyb++KON5BH2x/HSY5MbUbm35CXeHOn+I4qjYRppJ9xyX4/BzSxI5PwfKyAulFOJemhaWjTy IZG4/INk /1muBqsavF7tUiqnNOMXhJ3ow6lI7/mLYoDrW8OtqCvjbpwYz9EMk0Lym0rNKqMKHkkeF+2jjBr8a8Lc+MoDHvYeOaduthUSdxhVhoyH7DSsbexQoupbcK/IQVFsWbg4HNyZ9VTd0imp9CpPEGugvPYWJTK/LBSYS2+h5ZZ9u4+Az0AZ58ya40C/nd/WOZIDQXRICa4zzP1i/hXsXeVlPpKnnbZSHYUe7ZtJCRCr3WCTpnfX9ADvSRDFQLd4UjmriOBZRO8v9OwGTxunYtT6UJEVNBUNLURInlNiOdd4SaOCOe9I8d3/o1pcQeh5tbc9rf1dG+bx92f8WowlHAhvD5pXBtg== 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: Make the refcounting of netfs_begin_read() easier to use by not eating the caller's ref on the netfs_io_request it's given. This makes it easier to use when we need to look in the request struct after. Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/netfs/buffered_read.c | 6 +++++- fs/netfs/io.c | 28 +++++++++++++--------------- include/trace/events/netfs.h | 9 +++++---- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c index 751556faa70b..6b9a44cafbac 100644 --- a/fs/netfs/buffered_read.c +++ b/fs/netfs/buffered_read.c @@ -210,6 +210,7 @@ void netfs_readahead(struct readahead_control *ractl) ; netfs_begin_read(rreq, false); + netfs_put_request(rreq, false, netfs_rreq_trace_put_return); return; cleanup_free: @@ -260,7 +261,9 @@ int netfs_read_folio(struct file *file, struct folio *folio) iov_iter_xarray(&rreq->iter, ITER_DEST, &mapping->i_pages, rreq->start, rreq->len); - return netfs_begin_read(rreq, true); + ret = netfs_begin_read(rreq, true); + netfs_put_request(rreq, false, netfs_rreq_trace_put_return); + return ret; discard: netfs_put_request(rreq, false, netfs_rreq_trace_put_discard); @@ -429,6 +432,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret = netfs_begin_read(rreq, true); if (ret < 0) goto error; + netfs_put_request(rreq, false, netfs_rreq_trace_put_return); have_folio: ret = folio_wait_fscache_killable(folio); diff --git a/fs/netfs/io.c b/fs/netfs/io.c index e228bfb530ea..e83ef5835d25 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -362,6 +362,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async) netfs_rreq_unlock_folios(rreq); + trace_netfs_rreq(rreq, netfs_rreq_trace_wake_ip); clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &rreq->flags); wake_up_bit(&rreq->flags, NETFS_RREQ_IN_PROGRESS); @@ -657,7 +658,6 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) if (rreq->len == 0) { pr_err("Zero-sized read [R=%x]\n", rreq->debug_id); - netfs_put_request(rreq, false, netfs_rreq_trace_put_zero_len); return -EIO; } @@ -665,12 +665,10 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) INIT_WORK(&rreq->work, netfs_rreq_work); - if (sync) - netfs_get_request(rreq, netfs_rreq_trace_get_hold); - /* Chop the read into slices according to what the cache and the netfs * want and submit each one. */ + netfs_get_request(rreq, netfs_rreq_trace_get_for_outstanding); atomic_set(&rreq->nr_outstanding, 1); io_iter = rreq->io_iter; do { @@ -680,25 +678,25 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) } while (rreq->submitted < rreq->len); if (sync) { - /* Keep nr_outstanding incremented so that the ref always belongs to - * us, and the service code isn't punted off to a random thread pool to - * process. + /* Keep nr_outstanding incremented so that the ref always + * belongs to us, and the service code isn't punted off to a + * random thread pool to process. Note that this might start + * further work, such as writing to the cache. */ - for (;;) { - wait_var_event(&rreq->nr_outstanding, - atomic_read(&rreq->nr_outstanding) == 1); + wait_var_event(&rreq->nr_outstanding, + atomic_read(&rreq->nr_outstanding) == 1); + if (atomic_dec_and_test(&rreq->nr_outstanding)) netfs_rreq_assess(rreq, false); - if (!test_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags)) - break; - cond_resched(); - } + + trace_netfs_rreq(rreq, netfs_rreq_trace_wait_ip); + wait_on_bit(&rreq->flags, NETFS_RREQ_IN_PROGRESS, + TASK_UNINTERRUPTIBLE); ret = rreq->error; if (ret == 0 && rreq->submitted < rreq->len) { trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read); ret = -EIO; } - netfs_put_request(rreq, false, netfs_rreq_trace_put_hold); } else { /* If we decrement nr_outstanding to 0, the ref belongs to us. */ if (atomic_dec_and_test(&rreq->nr_outstanding)) diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index 4ea4e34d279f..6daadf2aac8a 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -34,7 +34,9 @@ EM(netfs_rreq_trace_free, "FREE ") \ EM(netfs_rreq_trace_resubmit, "RESUBMT") \ EM(netfs_rreq_trace_unlock, "UNLOCK ") \ - E_(netfs_rreq_trace_unmark, "UNMARK ") + EM(netfs_rreq_trace_unmark, "UNMARK ") \ + EM(netfs_rreq_trace_wait_ip, "WAIT-IP") \ + E_(netfs_rreq_trace_wake_ip, "WAKE-IP") #define netfs_sreq_sources \ EM(NETFS_FILL_WITH_ZEROES, "ZERO") \ @@ -65,14 +67,13 @@ E_(netfs_fail_prepare_write, "prep-write") #define netfs_rreq_ref_traces \ - EM(netfs_rreq_trace_get_hold, "GET HOLD ") \ + EM(netfs_rreq_trace_get_for_outstanding,"GET OUTSTND") \ EM(netfs_rreq_trace_get_subreq, "GET SUBREQ ") \ EM(netfs_rreq_trace_put_complete, "PUT COMPLT ") \ EM(netfs_rreq_trace_put_discard, "PUT DISCARD") \ EM(netfs_rreq_trace_put_failed, "PUT FAILED ") \ - EM(netfs_rreq_trace_put_hold, "PUT HOLD ") \ + EM(netfs_rreq_trace_put_return, "PUT RETURN ") \ EM(netfs_rreq_trace_put_subreq, "PUT SUBREQ ") \ - EM(netfs_rreq_trace_put_zero_len, "PUT ZEROLEN") \ E_(netfs_rreq_trace_new, "NEW ") #define netfs_sreq_ref_traces \