From patchwork Fri Oct 25 20:39:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13851557 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 25BDCD149F2 for ; Fri, 25 Oct 2024 20:41:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4A826B0095; Fri, 25 Oct 2024 16:41:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ACB2F6B0096; Fri, 25 Oct 2024 16:41:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 992646B0098; Fri, 25 Oct 2024 16:41:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 75D4A6B0095 for ; Fri, 25 Oct 2024 16:41:02 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 17E78A1109 for ; Fri, 25 Oct 2024 20:40:26 +0000 (UTC) X-FDA: 82713293754.28.FB4EE7D 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 D784740012 for ; Fri, 25 Oct 2024 20:40:50 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f86jeAsd; spf=pass (imf12.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=1729888807; 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=DUlYZzbaKUHX76MZjhLNdaJFIvV/RRK5UT5LJFkHe/Y=; b=f8QGm7BEv7tgVvLIX7xe1+LMXuk29q1AKvZWuKFFTFviUJ4jqaD39pwvQ/72UJUx/kowSS Im+ZWLO6SGfG3/buUEFmal+xo96CyeoOpdyJMpkwemO8qWTJVMX4a+WxC6FCmP9fVyUCq9 l40HlEZs9FqRzKM8GaeIswb39Jk4ypw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=f86jeAsd; spf=pass (imf12.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=1729888807; a=rsa-sha256; cv=none; b=bG3fMlZ/MjK72ch7aG//GOIL77UHEJzHAOH9a7l53JD63h+8NiA6vt9NB2meoHavzV7Qw0 Fal+F7ghudq2/CdL33f0FhOXLic7rHuIoPKlUcR4ZtJxWo8w52HLy7zWp9NHZwRoqW2mLS 9CRHZBXP0NvsOwNpbr71yAcMBimQxVU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729888859; 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=DUlYZzbaKUHX76MZjhLNdaJFIvV/RRK5UT5LJFkHe/Y=; b=f86jeAsdmAxwmKVz5v/UwXL/1IXAamiv+OuZg+A4CcFw1NmYpVRMekqPgo9Yk/w18Pu2Wf ZV2VqcPkga/hQr74xIx/fPIER5c1cQrx37gPfPGHOnzW8kovNV55upnGG56E7AjnmbedYl Pi3jHAsFas8IHHtD3AMJRIqf6BS+NG0= Received: from mx-prod-mc-05.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-287-EO2hKmbnNG-xrVEdoqjWHA-1; Fri, 25 Oct 2024 16:40:52 -0400 X-MC-Unique: EO2hKmbnNG-xrVEdoqjWHA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 84BE91955EA3; Fri, 25 Oct 2024 20:40:49 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5C7951956056; Fri, 25 Oct 2024 20:40:44 +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 v2 04/31] netfs: Use a folio_queue allocation and free functions Date: Fri, 25 Oct 2024 21:39:31 +0100 Message-ID: <20241025204008.4076565-5-dhowells@redhat.com> In-Reply-To: <20241025204008.4076565-1-dhowells@redhat.com> References: <20241025204008.4076565-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Rspam-User: X-Stat-Signature: tyaq98bg5pettpbeb3k115piyficuruq X-Rspamd-Queue-Id: D784740012 X-Rspamd-Server: rspam11 X-HE-Tag: 1729888850-922522 X-HE-Meta: U2FsdGVkX19PHk+slJZ4gmkFbVx/yj7PT2UZcUDw/b7Fc6bZ0xKxLg2wZb4Wq6nzLaPMRDFNVcCex5lZ+Sop5M6tOPeq8r1vq/99lM/HFRuJfPUfvCE92UO4a7oNHlwHIK79QKVIoKGxdbgYSNWK1fC1o8hl5/FnLago5FPxKa9h6NaZstMWrg9IThkvjv7XRYD1c+NN1oy/mFPxX9KkT0Sx5SmgJca/PxLXQoiIDRPi9Pe/KXaQ95GX8UUTvaBPJ9NN69Fc4rXWruOEFj+ePkJ68ptebLeIZ2PfaUH7FMjLWy1cgkeBYc6isc9KGrhoRKTlkWLHT1baRM+GVvGWHY9PWQkDt0cKxiV55rKHalb47Uz/lscB5SKE369SIPSD9JeKUvPx87NvZjUGd93fNTYp2Z7eqCT9ILMed3nmC3GoBPwTT4sOjbrcyxZCZdS1p3FLtyugob34eRyY6Tb/0KwF8552PuskBJzCCnaWG672bncStEmLTXH8W1JHnk++3VJve3s8iEqkjONvwAJ3ktP/Lq4MtUt2KxMKn2H+FjwTvMbv5I4riC2HxNLWskqjNbgq815zfe0R1LGHPZswVTPN2cJxBf75CxtZa3j3XUlwd+29HKawW+6+6XmZqZQymcBCw0Gcac7JLbzuxA5N1vQGsxUWf39PJqPVWgjfOeDl8fpc3i1bhJ4gEJ75PWJMgsUe6FZhgfyuZHIiFOmXRVufrAPHYuS3Kf6lixIYWO8f/Ft7cgaED/kMHg90g1s/DYSeL9gFd3jixa4Wez3iRv9vmkbxCE6+1J1CEw6pSiuNPZ7V3UB7FKWvZryQOptM44uiLUjwa+FN1bZFPSRPcYj0e7BBD6Ff906KeVtq2udytsrte8h6i59rsmodEU7DTEmR1WNlBM5KeRlh1MRWmmT6OkdQauDlePdcSWms92pRzErN/U3kBPaER26EY3FK++z/nNsDZR7Y4BP44hz 9sAipcAV nlGUk/XXv8BV3VK+AtphcOI+dWtDKLNHns+lGX0aY8ZueUmX1+/xB5mEi8hzug3pRAKd9VX93mJOareZKb12JJlneERUm9ILa/hflRpfxK+xfH8loOw3TsxzHJzLS7eZ3Py0Vl3ssD7BOcsxT+6zZ0MYQkR2JpywwKKwTKsO34+A3VVw6YD58rFDfxO4fYrVl76QidbKog8PFy0gvtXVByhrlTXsU7Ezp6ZWu5r4gui2yGSbvAAN77t2pNYAmLZAJZnOo7Q90w2Twk+NOAzZ5ePB/FcFJcc4kObTTQs64gwqVWNUtQzaLPgmlJziS8Q2RslHKUCuTuj3Cg6Xu3gb6/saLFrZRB34RyJOsObRM10eGgUdo7tbB56Z6i47Bn8owUEuoLfdjcpmnqhs= 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: Provide and use folio_queue allocation and free functions to combine the allocation, initialisation and stat (un)accounting steps that are repeated in several places. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/buffered_read.c | 12 +++--------- fs/netfs/misc.c | 38 ++++++++++++++++++++++++++++++++++---- include/linux/netfs.h | 5 +++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c index 7ac34550c403..b5a7beb9d01b 100644 --- a/fs/netfs/buffered_read.c +++ b/fs/netfs/buffered_read.c @@ -131,11 +131,9 @@ static ssize_t netfs_prepare_read_iterator(struct netfs_io_subrequest *subreq) struct folio_queue *tail = rreq->buffer_tail, *new; size_t added; - new = kmalloc(sizeof(*new), GFP_NOFS); + new = netfs_folioq_alloc(GFP_NOFS); if (!new) return -ENOMEM; - netfs_stat(&netfs_n_folioq); - folioq_init(new); new->prev = tail; tail->next = new; rreq->buffer_tail = new; @@ -359,11 +357,9 @@ static int netfs_prime_buffer(struct netfs_io_request *rreq) struct folio_batch put_batch; size_t added; - folioq = kmalloc(sizeof(*folioq), GFP_KERNEL); + folioq = netfs_folioq_alloc(GFP_KERNEL); if (!folioq) return -ENOMEM; - netfs_stat(&netfs_n_folioq); - folioq_init(folioq); rreq->buffer = folioq; rreq->buffer_tail = folioq; rreq->submitted = rreq->start; @@ -436,12 +432,10 @@ static int netfs_create_singular_buffer(struct netfs_io_request *rreq, struct fo { struct folio_queue *folioq; - folioq = kmalloc(sizeof(*folioq), GFP_KERNEL); + folioq = netfs_folioq_alloc(GFP_KERNEL); if (!folioq) return -ENOMEM; - netfs_stat(&netfs_n_folioq); - folioq_init(folioq); folioq_append(folioq, folio); BUG_ON(folioq_folio(folioq, 0) != folio); BUG_ON(folioq_folio_order(folioq, 0) != folio_order(folio)); diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c index 78fe5796b2b2..6cd7e1ee7a14 100644 --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -8,6 +8,38 @@ #include #include "internal.h" +/** + * netfs_folioq_alloc - Allocate a folio_queue struct + * @gfp: Allocation constraints + * + * Allocate, initialise and account the folio_queue struct. + */ +struct folio_queue *netfs_folioq_alloc(gfp_t gfp) +{ + struct folio_queue *fq; + + fq = kmalloc(sizeof(*fq), gfp); + if (fq) { + netfs_stat(&netfs_n_folioq); + folioq_init(fq); + } + return fq; +} +EXPORT_SYMBOL(netfs_folioq_alloc); + +/** + * netfs_folioq_free - Free a folio_queue struct + * @folioq: The object to free + * + * Free and unaccount the folio_queue struct. + */ +void netfs_folioq_free(struct folio_queue *folioq) +{ + netfs_stat_d(&netfs_n_folioq); + kfree(folioq); +} +EXPORT_SYMBOL(netfs_folioq_free); + /* * Make sure there's space in the rolling queue. */ @@ -87,8 +119,7 @@ struct folio_queue *netfs_delete_buffer_head(struct netfs_io_request *wreq) if (next) next->prev = NULL; - netfs_stat_d(&netfs_n_folioq); - kfree(head); + netfs_folioq_free(head); wreq->buffer = next; return next; } @@ -111,8 +142,7 @@ void netfs_clear_buffer(struct netfs_io_request *rreq) folio_put(folio); } } - netfs_stat_d(&netfs_n_folioq); - kfree(p); + netfs_folioq_free(p); } } diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 5eaceef41e6c..b2fa569e875d 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -21,6 +21,7 @@ enum netfs_sreq_ref_trace; typedef struct mempool_s mempool_t; +struct folio_queue; /** * folio_start_private_2 - Start an fscache write on a folio. [DEPRECATED] @@ -454,6 +455,10 @@ void netfs_end_io_write(struct inode *inode); int netfs_start_io_direct(struct inode *inode); void netfs_end_io_direct(struct inode *inode); +/* Miscellaneous APIs. */ +struct folio_queue *netfs_folioq_alloc(gfp_t gfp); +void netfs_folioq_free(struct folio_queue *folioq); + /** * netfs_inode - Get the netfs inode context from the inode * @inode: The inode to query