From patchwork Wed Nov 6 12:35:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13864631 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 A861FD44D54 for ; Wed, 6 Nov 2024 12:37:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F9A36B00B4; Wed, 6 Nov 2024 07:37:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AA1A6B00B5; Wed, 6 Nov 2024 07:37:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 271816B00B6; Wed, 6 Nov 2024 07:37:02 -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 0B00D6B00B4 for ; Wed, 6 Nov 2024 07:37:02 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BB90E161B38 for ; Wed, 6 Nov 2024 12:37:01 +0000 (UTC) X-FDA: 82755618834.30.3A8EFD0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 92486C000C for ; Wed, 6 Nov 2024 12:36:44 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BRedkBA7; spf=pass (imf10.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=1730896535; 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=DcVHB7lC67w2eR4priH0haJ+ZZ3nKqz/X3l6vIHANL1DcZk/AtRRUGWilNk5JLuSlnbD/p j7WbWEb/4WO59/uxgzRL+yAKjgwPT4h9VweDN+xKchskLvuvrJhBwN2wFtkf4JIfSepVlx 10dpUpQdYzmif/PNH1tyRUOzcivines= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730896535; a=rsa-sha256; cv=none; b=pqMoMcsdfPC3k8+WYveIJmruv/PF3Kx+WDiXf+l67wNRUtZmIVxxSvWfnPoiWvm9Exz0hL VYMyOtea+RxgLaLKI2q2sYHbFJJO/dYG3ZbkAK6ZAMLd+zL+4Y/wezf4Rz5x/2lutVzWDN ZTpkAnlnRKwX45kKL96AIUrfhHZ8S50= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BRedkBA7; spf=pass (imf10.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730896619; 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=BRedkBA7L+noYIJ9zlA4Rh4LVnvZDPRmmysTxTVLi9O1RePdxD0n98M65AOuhkkwDeLiz8 qSWSbQ+HwhHgi6Aq0TmHbxoRS0w1Zj6lRGBk+jTNUn2bOrOynV9zNrCA5C37ar/EvSeKuy TUCO6AnXCTyrUl+kG1tFkfoBXA4V8zU= Received: from mx-prod-mc-01.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-679-Rc_zTJ89Mlq3agr3Fx5RSg-1; Wed, 06 Nov 2024 07:36:55 -0500 X-MC-Unique: Rc_zTJ89Mlq3agr3Fx5RSg-1 X-Mimecast-MFC-AGG-ID: Rc_zTJ89Mlq3agr3Fx5RSg Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 222B31955D42; Wed, 6 Nov 2024 12:36:52 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1991D1955F45; Wed, 6 Nov 2024 12:36:45 +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 v3 05/33] netfs: Use a folio_queue allocation and free functions Date: Wed, 6 Nov 2024 12:35:29 +0000 Message-ID: <20241106123559.724888-6-dhowells@redhat.com> In-Reply-To: <20241106123559.724888-1-dhowells@redhat.com> References: <20241106123559.724888-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Server: rspam10 X-Stat-Signature: r55aoiy6fujpdaynwc37gbe7ynoap7hx X-Rspamd-Queue-Id: 92486C000C X-Rspam-User: X-HE-Tag: 1730896604-500637 X-HE-Meta: U2FsdGVkX1/RBWzep3cq4ev9zsJ8ziSUKcSGJHewhOcmcpEPqatiFriPPJEI83MseT3IVRghcZthCJWoWmZCAJKl4XRmLTpl0Ik25GzB7Y5F0WIizBkaqU26ZCXp2O6E5ucBXu3FfwEbS6AxCZi0gLNfDzlfy4yyHVT/GfldpCNgCqjZqt+z1h5s6iHDXy4L/jhF+hKoxwPDEJ1EInLCg8FzNJeWsZPlkcLme5p9fit6QaORm0QXCPeOGHS380xh4RYSGEo4sX6iKd1dk2V3YedwUp2ze4tTY+9LpJSPQwh7Qf5aOptasJ8F3bLZG0t79dRDm4cXftiKBBiHa4MpOAuKuVpBpLsEjOxdf6r9tVAj7XuYEJCx9Lqycb8eeqnz/KaK4odG1U03X3pS5iosPo6giqWQ0vorTTaUVEZvHXbQ1iCZELrcmf5rARq/AwhVs0tcSvJN19tQ5DjLFnDGBQrTrpZIeS+knotPz7AQCF7GDztplCk1gL6smIykldBEjMnRJccDC3Fusfw3lWUGBxj7Cdansx+CLiJBev3jLZ/2J2zs8POh6OZozH08T1HKSzAQ5sLftBCumWY9wxCU7JjoMbV/SOzcRj2SN2DAX0QCRN+Z8hlS/iWCPlVTPux77BHNkaaD4n7QT/TwMSB/lDh/dXSdptPrH4bnYZ9elpc1eNq90JrraYBLJpgGroOMQGxLtUxXYRpGOB/YaoBXQhDrH9IbzknTUox0faQOj5IFYDNvBaPjnE9I+k/aiU2nyGEJyby6jJ5tr+YPV/MV7wq7iJDd+KG8bOvbq523dJ+p1WFLUAJmCtuJABPxybdWDHdi4btI28Q8Qzyy2FERKnJQ6uzNizkhg/8br0L1hkufS/51UE1MjlI93iOesFyujBGUhi1MGj6769XXbsYT/GFT4Qqr8YenG0JJGZ0fao6QQ/hu66f8YP4Ws8IWthsnFt6XfDGyfQayB9gjT+c D0h1UfkA 831ayrMvLaF2wjwDec9EBw4htqw0G/l9utLCkJNO8m+IqQW6XVhRUuDQHeiOYgK8PmPSJdTeSciaDyaKQiF4RuTgMXlPfrf+xBLQcCeuFgd9GO7BxIihuF13Ph6TEoctPIvzg0GxAN0s0SJDFWd4CjtC9G7wxFmi6qaY5XilO52+/PQlWPLIT5Df5fgY1qAfsvrmkgnJ6YzXgqeyKGtuVm8QVwWFhOlUsb0FhkHYmZVjgqDiCMIpwSHKhZisdVHl2SH3MDYJDCDZgktqcaXaSwlAUhHYWU7zHJP0hQX4THL4rE/We97Pv/4ghtrPwGrxHFC1g8mtB2sqemnWcPCX948AwOwMkrLo4xmQu+3YVtcZ2uZChLCk5G0YCu/spr6vSxBbs0TtacGlYWsBlmM701h2bmyVJvuH/Ked1DXHqisADgsQmBrcd3wHXGjJCTnSYq4+ON/T2A/D9I6iKflr2zmdpsfX1B74MxMNU 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