From patchwork Fri Nov 8 17:32:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13868563 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 83620D64072 for ; Fri, 8 Nov 2024 17:33:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13FD86B00A4; Fri, 8 Nov 2024 12:33:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F0066B00A3; Fri, 8 Nov 2024 12:33:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF9F56B00A4; Fri, 8 Nov 2024 12:33:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D1AE56B00A2 for ; Fri, 8 Nov 2024 12:33:35 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5C1D01A0EA4 for ; Fri, 8 Nov 2024 17:33:35 +0000 (UTC) X-FDA: 82763624034.18.8440023 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id A2DA5180023 for ; Fri, 8 Nov 2024 17:33:28 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PgFHi8t4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731087042; a=rsa-sha256; cv=none; b=ceG0GBrY1TcaeKs72exsVYl8DJlh3Zxo7qMSUhFn9VH8v0w4o3M4IhVizKKhT+lDQhuvxX AlVxSQ4XOCIG6s/Yjc8xTUAMU+PILZYM00wRRRUQYvvh1pAcDOeEApj7bfp5ZJrMgRWCj9 5rVQq2j/S5SEA1BO7K8feWN17ouurx4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PgFHi8t4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1731087042; 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=hfYgHdlBWDS4NhO8Dr0ajBWSYRngKZtvUN9Ywwb1V79NXbLx+XK3D6nezoZV/hHbeOQG4G /UcNC7Yf7BCv73gbUgrWYNF2fgB8GHvpDtaFNuT53rlOYbF9IFhqDl8Y6ITwU7EziFkfjd hh1PAutwb/RfrE6GayuWaXVhiqLONAo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731087213; 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=PgFHi8t4m7NtLjcWF2QuXTR2Oh9OklROfUV00eM84O04l0tTo7R5/fon7+wxXG5lad27zW YhF0c8XBQ3LHECLDAiPCazBNjU3XT8shU8C+al9bJR3Y8lmM+G5LQyQp8rBbCUsqeJsy/K sy6ur67SABYXY0xb2oz9/cQFhFkxjPU= Received: from mx-prod-mc-02.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-582-Du4WdgOCP7qkPE5ndOmvBQ-1; Fri, 08 Nov 2024 12:33:26 -0500 X-MC-Unique: Du4WdgOCP7qkPE5ndOmvBQ-1 X-Mimecast-MFC-AGG-ID: Du4WdgOCP7qkPE5ndOmvBQ Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4923B1953955; Fri, 8 Nov 2024 17:33:23 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CA29E195E485; Fri, 8 Nov 2024 17:33:17 +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 v4 05/33] netfs: Use a folio_queue allocation and free functions Date: Fri, 8 Nov 2024 17:32:06 +0000 Message-ID: <20241108173236.1382366-6-dhowells@redhat.com> In-Reply-To: <20241108173236.1382366-1-dhowells@redhat.com> References: <20241108173236.1382366-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Stat-Signature: 64r85jqnsq1ikbwu58y36o7ismhoh48m X-Rspamd-Queue-Id: A2DA5180023 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731087208-222022 X-HE-Meta: U2FsdGVkX1/hmZhH0EObVfu9GIWLcgUN43T8yw6SYx1jBYggALjCYi0L+Z+CB2S8j3/ttqkXYdFUIGwjF2iaUd5VXC8oclw1vHoz0dUDlrbg46MMiwnSnuPRb/ESvD5BvmfsGu0/ZiWcn0cSb0zkCa+dO3SQE4JgVGZiketqIQVHsHKR40BvRvoaS9/vaCToRTm9Jkx47SVuFSAFqKanBbB99d1uc3/R8n6n7RBXjhw+hgKYg2JXl28yt8Nc7jdDaNouuStxx2pNkLUc7QrZHOJq0SP4F5xpd1ib3RxvYNvA5mOS7qF3d6MRlWJ1IZfOHd6eeFJiijLcT6lZF/lMniy9Zf0jLT+LMQ2zhMYnfEeNLupR8/OUs+wMPNAKdAzQC4Lv6wx4sksKDvm7gV7QMLHOIsqsaEZeGSZpQmgA4+9Sslq0DjBq/oGXR9m3MctHR1pTVyNugt1+/YVQzNtMQ3X5qFJXY+CSGcQFkhS9KOglVv/9abSMSGt81RlKeBO4ashs1s2PLJmrQuA3gx2BuVyS7DEeqDzn9YsBFmQjAnrYFjquqy85V/2cQx3IoKwADVBLapxBXUb/Fb2L1Eoif2V/C/aE9ekQWwcpivfIhr81Z0TfJ8tSPhYomarZ+EPKqJygeniInahQc4lCeT5zihs9jdUE68Wy8YYrxLD8g4zBWUe0Ah4qK8NSLleBNVDqN0dYf9rYkL9q5lcST7SWxQR/XViNiojZ3brac0IkS7gIr+LEV2Yc879naPqZtyuWcpyVEkmwYlPA/EbPc06grnKNZMVndfKqGYLtmc+merxxJZq1j5xu7f8slNp1/HbaV1iphkodpPfh1u602oLLwShHH8bXbTB+C3uIpHjLuZZbzPm1CxjUvNuZSWgcdpizFKZG2tYNAa2EE9puA1IwDNTP2qJ77mT1NWownLhhVNfXkXy1Jvyt2+yh0TXZCSak7LfeZA+gTxgIgRMJYzA 4boq9TFc M7U7mxzp+RgPg2rwXtBExvL7YnU/YTpwn4FYbpJY6RIfCNBI8jGGVb+sBP2VuDqq+B1ize02FdwapLC0GXlWbYbJ8J5IuL2uEaVn5lhrn+pl2H7WHTaANlTQyuiyAlrtlSSPibPgaaaY0f+Lj88lViEWg38iTJSO4IPdt3j7WJBEmNztP2fRw9SXZMnV4MQNnYUIsJgjTjxhmVMlRu4U3sQO727dnztj+smGgMwou9OI7AJ0uV/oOKShOAZCsH077RJ/e2vP4Np8u7gCwpEzd6tm9BX38f+DJeSBfwuSm2q5qbw825X4vzeEaVOmw5/qlq8GhvcqzXv91WA7XOEbSE124RlelHUO/N+bu2tdYT5YFPftBIm/S4VyyeM3hloxHZRwwRvQF47HGG3kOhz9w+WRL8iwN25y2K++ADKRroPT2lcyj+2urvATn2mu9QAKRr4HLi96X2UYnCw8zW4IckIbHJbww+hK6lnC8 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