From patchwork Mon Jan 22 12:38:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13525411 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 800A3C47DAF for ; Mon, 22 Jan 2024 12:39:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8933F6B0081; Mon, 22 Jan 2024 07:39:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 81B9B6B0085; Mon, 22 Jan 2024 07:39:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 695366B0087; Mon, 22 Jan 2024 07:39:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 58ECB6B0081 for ; Mon, 22 Jan 2024 07:39:01 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 322791A098B for ; Mon, 22 Jan 2024 12:39:01 +0000 (UTC) X-FDA: 81706901682.26.DD7EF01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 78F13C001C for ; Mon, 22 Jan 2024 12:38:59 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dsokuTG6; spf=pass (imf22.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1705927139; a=rsa-sha256; cv=none; b=jNk1xfTUPtIZN40R63GSHeAL/OQMYotzTZubw0rIC3Qj1WDUWUrYwsMeF288JKemw8UV6j Zg2+2xA62yamu++eKOlYx+/RtqeunNe9NlUYG8wN0fC5TJ0972ppTlUtrAOym6gGRgwZNW wwh7WI8IgNyGlzo7poKq7tt87Y1KRxQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dsokuTG6; spf=pass (imf22.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1705927139; 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=LLfnoKn4t/yDid+WiN3BaWAqYKQWNZ/dauf1CAfFF1o=; b=SfbXLWeeBo9njDCRSBO/gLQAhgmCCdLBSkiaONOcl4vhpntueMd5LVktTV2xgZaddiaDqp e3bLnWMyD9l3Vj7j4NKIdJdsc+VoVEa7GQTRPHf6yDXyhM5iUJ9NPBMM2sss3zRA2sKnlK +3OEJT/O7lUOQfQuPHQxt/B7GGFFbeI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705927138; 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=LLfnoKn4t/yDid+WiN3BaWAqYKQWNZ/dauf1CAfFF1o=; b=dsokuTG6hWCNBRDFhmP/II9qesx6w/8pUDeVG6cd7uiv7EEd0PMSIVdt1sXQj2wUNlLdSj MZBWhfd/JrYxNJJxSnWR3d1ERZ39ktRpeK4NmUoMrNbx0POfPj9Q5fQS7KM3K/dx5yPQwv yw1QX1JPwfr6ORy776/AoxRLMCgRLE4= 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-638-vstBTg2yNa2a-V6xl5BWBg-1; Mon, 22 Jan 2024 07:38:54 -0500 X-MC-Unique: vstBTg2yNa2a-V6xl5BWBg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 DCE273C025A1; Mon, 22 Jan 2024 12:38:53 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0330D111E408; Mon, 22 Jan 2024 12:38:51 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Jeff Layton , Matthew Wilcox , 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, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com Subject: [PATCH 01/10] netfs: Don't use certain internal folio_*() functions Date: Mon, 22 Jan 2024 12:38:34 +0000 Message-ID: <20240122123845.3822570-2-dhowells@redhat.com> In-Reply-To: <20240122123845.3822570-1-dhowells@redhat.com> References: <20240122123845.3822570-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 78F13C001C X-Stat-Signature: uc9kgxyncj4s8xgubkcxfh41apmnhn88 X-Rspam-User: X-HE-Tag: 1705927139-298585 X-HE-Meta: U2FsdGVkX1/yEwXDIzjT6DQUdDFjN2twJeT8hbPH0aXm7/60qEIx4PdhWXjxiTOHdzfaXLSMKX4Dd97qIX1UHYJGZjjtFthjO/JydFfclqMXPWMiBywdCCYPBeKqTiz8nxlHtU7nU/ZSFVCf2Nsu+9zQMK4XzlmF+C/uBYsOj1FcvmD/23sHq0Mtuu4P2PKWV5QGfFB2VjkA6wbbNboZJFwlYgP2xvSn6PqHBqGtCT3FdFDBhO1cbBd7U3146Yy8GfivkJPi3lp9qGIuKajcxiqSf3c1/pAvrhPQ4IlPEnhAwhynGtvztQzG/F0MtJ5d7TbHXJ93+Y6GnJto6ssqexsRj59GRYIf302DtsqjRKZtCsLYCbuxOno2kA6e77wLfuU+M+jE+a9zHUiQ909Klvwj32WD9Xm2JBccjEZB1ekO1puStoSugpSHW/FkNLFhTFIjFFJQAKc7gHSe1tktzjgUedcEGUJjCtJte+t+2L+7JWKUgRototESABZfQ1jKZQtR17wCrSuj4CO6kRXso5KnFyTYYiJQAu0wXHjj2bdiwQT7hXMQHBij232q98gG03BkFAYGysb0KpElaG6Bkb2a1PWNZwlQFsV/IO6Z+eN4ylbO/dCjQP+Vqs794e/UZfGJG6A0E/ciqijmg+XUqNB2TB/1yJT6n4DxHORZ4vx94Vk0E99jsOssKwgxxaULkK0Z/5GsEEAFynFFWTsm+OJ7M+gbMYWTtkA2ErzN2H5sBu6RV2fQrjEwZAMu7u1noSVAlxglGqIyECWTuoORPXGcJG51YYWmp8IgFWHA6jUcJo9tFdj9TMi5FdOat3WVxk0zvu1ieyF2nka0XhumpmNRLFnKseYQH5xm9/k1fM7f0X988H6g0Bmp4QdYd0HJjl7Gnah3XcKo5YIyjnSRk8D9LZvQLpGbKNWjLIPNe0254Zm4UO1gY/5ByISL6OTYJb2z9cDyRVGxuY3AGkY RxiOWzzB fFTL5OyZ0uVzs542fOFNqHZ+S8nj1BRnK+Fz4d1bJ/gSHm/w99UdO+ZUeFxQ322lWIQi4x09tW41RXix84lWJe2fzKDv+m/2yb0jUqKcaU0+noXQgYZbMt/WBflWwTTRoST7HHVdiAbL1FTlLWSUR7dvRRfxk5CXU1tE/8zxC9hBrGPFHt+jTqtY0UF6il2Vo0+JOpZirjr+RaPN6Xv97jwSGA5XXPowxcS9AJbYhB+K2PTg7ZHJbWHuOVE/f3922k/K+e+47CYFRUF0PlUV9FxUl9+f7s3LUryrNAMI9esyzhBoVfv96gdsKIwpVzJ+3TS0lrezArAxW88Qvj1H2vLiBZK+qVgZI66jn7MHmn1Cicb3gX50zvpEednUpx4t4rK6DjIVFfbPEAdnCAIET6H0lAw== 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: Filesystems should not be using folio->index not folio_index(folio) and folio->mapping, not folio_mapping() or folio_file_mapping() in filesystem code. Change this automagically with: perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g' fs/netfs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/netfs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/netfs/*.c Reported-by: Matthew Wilcox Signed-off-by: David Howells cc: Jeff Layton cc: linux-afs@lists.infradead.org cc: linux-cachefs@redhat.com cc: linux-cifs@vger.kernel.org cc: linux-erofs@lists.ozlabs.org cc: linux-fsdevel@vger.kernel.org --- fs/netfs/buffered_read.c | 12 ++++++------ fs/netfs/buffered_write.c | 10 +++++----- fs/netfs/io.c | 2 +- fs/netfs/misc.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c index a59e7b2edaac..3298c29b5548 100644 --- a/fs/netfs/buffered_read.c +++ b/fs/netfs/buffered_read.c @@ -101,7 +101,7 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) } if (!test_bit(NETFS_RREQ_DONT_UNLOCK_FOLIOS, &rreq->flags)) { - if (folio_index(folio) == rreq->no_unlock_folio && + if (folio->index == rreq->no_unlock_folio && test_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags)) _debug("no unlock"); else @@ -246,13 +246,13 @@ EXPORT_SYMBOL(netfs_readahead); */ int netfs_read_folio(struct file *file, struct folio *folio) { - struct address_space *mapping = folio_file_mapping(folio); + struct address_space *mapping = folio->mapping; struct netfs_io_request *rreq; struct netfs_inode *ctx = netfs_inode(mapping->host); struct folio *sink = NULL; int ret; - _enter("%lx", folio_index(folio)); + _enter("%lx", folio->index); rreq = netfs_alloc_request(mapping, file, folio_file_pos(folio), folio_size(folio), @@ -460,7 +460,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret = PTR_ERR(rreq); goto error; } - rreq->no_unlock_folio = folio_index(folio); + rreq->no_unlock_folio = folio->index; __set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags); ret = netfs_begin_cache_read(rreq, ctx); @@ -518,7 +518,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, size_t offset, size_t len) { struct netfs_io_request *rreq; - struct address_space *mapping = folio_file_mapping(folio); + struct address_space *mapping = folio->mapping; struct netfs_inode *ctx = netfs_inode(mapping->host); unsigned long long start = folio_pos(folio); size_t flen = folio_size(folio); @@ -535,7 +535,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, goto error; } - rreq->no_unlock_folio = folio_index(folio); + rreq->no_unlock_folio = folio->index; __set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags); ret = netfs_begin_cache_read(rreq, ctx); if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index 93dc76f34e39..e7f9ba6fb16b 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -343,7 +343,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, break; default: WARN(true, "Unexpected modify type %u ix=%lx\n", - howto, folio_index(folio)); + howto, folio->index); ret = -EIO; goto error_folio_unlock; } @@ -648,7 +648,7 @@ static void netfs_pages_written_back(struct netfs_io_request *wreq) xas_for_each(&xas, folio, last) { WARN(!folio_test_writeback(folio), "bad %zx @%llx page %lx %lx\n", - wreq->len, wreq->start, folio_index(folio), last); + wreq->len, wreq->start, folio->index, last); if ((finfo = netfs_folio_info(folio))) { /* Streaming writes cannot be redirtied whilst under @@ -795,7 +795,7 @@ static void netfs_extend_writeback(struct address_space *mapping, continue; if (xa_is_value(folio)) break; - if (folio_index(folio) != index) { + if (folio->index != index) { xas_reset(xas); break; } @@ -901,7 +901,7 @@ static ssize_t netfs_write_back_from_locked_folio(struct address_space *mapping, long count = wbc->nr_to_write; int ret; - _enter(",%lx,%llx-%llx,%u", folio_index(folio), start, end, caching); + _enter(",%lx,%llx-%llx,%u", folio->index, start, end, caching); wreq = netfs_alloc_request(mapping, NULL, start, folio_size(folio), NETFS_WRITEBACK); @@ -1047,7 +1047,7 @@ static ssize_t netfs_writepages_begin(struct address_space *mapping, start = folio_pos(folio); /* May regress with THPs */ - _debug("wback %lx", folio_index(folio)); + _debug("wback %lx", folio->index); /* At this point we hold neither the i_pages lock nor the page lock: * the page may be truncated or invalidated (changing page->mapping to diff --git a/fs/netfs/io.c b/fs/netfs/io.c index 4309edf33862..e8ff1e61ce79 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -124,7 +124,7 @@ static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq, /* We might have multiple writes from the same huge * folio, but we mustn't unlock a folio more than once. */ - if (have_unlocked && folio_index(folio) <= unlocked) + if (have_unlocked && folio->index <= unlocked) continue; unlocked = folio_next_index(folio) - 1; trace_netfs_folio(folio, netfs_folio_trace_end_copy); diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c index 0e3af37fc924..90051ced8e2a 100644 --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -180,7 +180,7 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length) struct netfs_folio *finfo = NULL; size_t flen = folio_size(folio); - _enter("{%lx},%zx,%zx", folio_index(folio), offset, length); + _enter("{%lx},%zx,%zx", folio->index, offset, length); folio_wait_fscache(folio);