From patchwork Mon Jul 29 16:19:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13745294 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 E24FBC3DA4A for ; Mon, 29 Jul 2024 16:21:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74A4A6B00A7; Mon, 29 Jul 2024 12:21:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D35F6B00A9; Mon, 29 Jul 2024 12:21:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 572DF6B00A8; Mon, 29 Jul 2024 12:21:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3B1AE6B00A6 for ; Mon, 29 Jul 2024 12:21:42 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F2EEDC0397 for ; Mon, 29 Jul 2024 16:21:41 +0000 (UTC) X-FDA: 82393306002.20.B8B2718 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 4238F180018 for ; Mon, 29 Jul 2024 16:21:40 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ouiv2ePk; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.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=1722270040; 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=dPT79eRMO93ZrwuayO/GcRsT7PMF2J9kIs2W0R0Ojik=; b=cEgRds5/fRpnqbLs/fmnijeuRy3QE7si0oisL7zcu58Q2OMqMojvkykGR3rljBoRBY8yiT uxKG9NOUOF/xLbdDGPjTPlqnMjxVQd/xg+wfgw5nxymXpHpJ63ndCVt8R3dTgtb1COuoDT X5TFptEW7su/py+bZ2x2YBaCxTzzoFE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722270040; a=rsa-sha256; cv=none; b=vRi9gSWLxcOpZQ6awQPafT5gC4Bp8jHryYFwmEz71z/tgr7sA3dMz9u0HroCccutwNygyZ /ekwW8uj+CV2XUZ7PEICw9vyszCNrsqQkiKqoYykKUntXDpMRD5SJapo+m1nos9iqNCxoM I/eWrdJXYYLzHGd5f8Ip7c8YZLdVh/Y= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ouiv2ePk; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722270099; 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=dPT79eRMO93ZrwuayO/GcRsT7PMF2J9kIs2W0R0Ojik=; b=Ouiv2ePkX8K6GazLYQzOt3cY8yJjIJr5lGp3+dU5FIWMI9kr1BleYJh54NvIhwBvYt6sBL UbGQ28wIhuMgeG0kZOo0LUKTIUuLiGe1fnVvnOJsUWbbS3Cc4d4PYD3/5RHbVqVPnipFql gOFTBSLATXn6JKxDKZ+jQit0s6JEI70= 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-396-1Lo1BiuPMUe_TUHCooMZgA-1; Mon, 29 Jul 2024 12:21:32 -0400 X-MC-Unique: 1Lo1BiuPMUe_TUHCooMZgA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 0868F1955D52; Mon, 29 Jul 2024 16:21:29 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.216]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 436081955D45; Mon, 29 Jul 2024 16:21:23 +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 10/24] netfs: Set the request work function upon allocation Date: Mon, 29 Jul 2024 17:19:39 +0100 Message-ID: <20240729162002.3436763-11-dhowells@redhat.com> In-Reply-To: <20240729162002.3436763-1-dhowells@redhat.com> References: <20240729162002.3436763-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4238F180018 X-Stat-Signature: rzkhkh6mskfhhtp3x11tk4xc7qan4p7e X-Rspam-User: X-HE-Tag: 1722270100-808478 X-HE-Meta: U2FsdGVkX19Qn1mzPhngQslyIVkmTXIypHpbaAcEyh3Y6rOymMCsSj2RsZvBps2tkD2UJnYPeuNdaAKV9UE7JfsGAisolnYW2xSKIB86MrHD7YHK0jN/tf/gZbxWVzk/dDQBeQW8tZuVDUZhYy5x0LtBf4rcFB03RZNBoDThSjBDaVhhWRJlcHs6vmlZzQuLUSqYwj/oFI5UdXwp14RZEAM9PRJAHKqpeENLhP5D2irdnw9OOR1zLxD0b456RXoqMZyzcRNIf8AFlYka3mHRtOZSoVBT7QmteoyXmv66/kx2TDp9nDKBiyY6t8qjhTO0tlQiPRvi2dHOcvWkqW0BZ4rUw7n7gQgmIGD32Qh9LeQdI8D2TDJWBnkyEYIeYVliGGkRt2FoBcN1LNhKksWpviNx3ww1p8hyHeVnwvgmb0f98UBQqOWg8KGfPFm1c/bDYBdK2U6d5oSXw9V+xv4HoICeG3cFgaV+mItGDL985BajT8nHLqh/XbJ8RxhdIY2tXDrVuPWcXsb34+Cdjvl+pLIITkP8TJukOtR1v4dSUaCJI5QCyJ+fq6P5uROZCVOa1O2iasvb77xeFTzLB530Xgz4B/2FIX8VYZOHYI0jLfnP86IiTDUCnxOcQXNjjqBu1VRq0dZEn7icLft75sj4ku8m1sr1CtVnNH2hZStX5UdCKj6B/0Q/++9oOv3q1B7fycnI9cGuGZRll9cZYDGJNa7Z1W0f6BiHT3wj/JDYQsbycAs16761YjIZjywBvl/W8wiysZi8YvpLRnfijlqOSjqE110GqmjLYZnZK+BAqbLbDblQH6ExFoi0FLES2OL0QovbXxaXpkvfuwT3XSVbHk2himB/aust37tI7hvtgQTDHx2s7s8quCnRaDJzrOhJ6CbTM/ibGYmjMrjWv6K3GJzpMYflIARmP6I+ullhWXqwBA90+hgn+OXkwq2dbH0Qrmy4LaO8CZltDGUX1X+ MBAHYKar qi8uiR7K99y63o66+YYoSd1ej5sOoL2pprdKG3Bnc6jUylGnoDpD8pU69xTN5bG7f9gm2Uw4/vEi9T1WfxeSi9zF06qmB2UorytvOZAMbD4BJS1xPPwdoWSuyKHXMeuXeVpt9lJtTrC4MdAwOVnb6FuQro57ZJm8SvkkU2exMaeT52sbwsz1hDg0IOVIpn7fOdfycazZu2N12AhLUSpj4QT3/j6r9GNhWjcq5uAWakr76dJSAy6BlFpN0O7lDmy3jGduyZgn7ZqdyImzyP/OLtar1tpGza1qEpTeFFw/8r9+3bsp54h1y/h4bRJyI5elf5A8zzR+1badgvQU8gGOTqpp60TyuCRZ450WiiC78MC0OkV0= 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: Set the work function in the netfs_io_request work_struct when we allocate the request rather than doing this later. This reduces the number of places we need to set it in future code. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/internal.h | 1 + fs/netfs/io.c | 4 +--- fs/netfs/objects.c | 9 ++++++++- fs/netfs/write_issue.c | 1 - 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 9e6e0e59d7e4..f2920b4ee726 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -29,6 +29,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, /* * io.c */ +void netfs_rreq_work(struct work_struct *work); int netfs_begin_read(struct netfs_io_request *rreq, bool sync); /* diff --git a/fs/netfs/io.c b/fs/netfs/io.c index 27dbea0f3867..874bbf2386a4 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -278,7 +278,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq, bool was_async) netfs_rreq_completed(rreq, was_async); } -static void netfs_rreq_work(struct work_struct *work) +void netfs_rreq_work(struct work_struct *work) { struct netfs_io_request *rreq = container_of(work, struct netfs_io_request, work); @@ -584,8 +584,6 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) // TODO: Use bounce buffer if requested rreq->io_iter = rreq->iter; - INIT_WORK(&rreq->work, netfs_rreq_work); - /* Chop the read into slices according to what the cache and the netfs * want and submit each one. */ diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c index f4a642727479..1dbcd7f44eca 100644 --- a/fs/netfs/objects.c +++ b/fs/netfs/objects.c @@ -52,9 +52,16 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, INIT_LIST_HEAD(&rreq->io_streams[0].subrequests); INIT_LIST_HEAD(&rreq->io_streams[1].subrequests); INIT_LIST_HEAD(&rreq->subrequests); - INIT_WORK(&rreq->work, NULL); refcount_set(&rreq->ref, 1); + if (origin == NETFS_READAHEAD || + origin == NETFS_READPAGE || + origin == NETFS_READ_FOR_WRITE || + origin == NETFS_DIO_READ) + INIT_WORK(&rreq->work, netfs_rreq_work); + else + INIT_WORK(&rreq->work, netfs_write_collection_worker); + __set_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags); if (cached) { __set_bit(NETFS_RREQ_WRITE_TO_CACHE, &rreq->flags); diff --git a/fs/netfs/write_issue.c b/fs/netfs/write_issue.c index 2f4f795124a8..6e835670dc58 100644 --- a/fs/netfs/write_issue.c +++ b/fs/netfs/write_issue.c @@ -107,7 +107,6 @@ struct netfs_io_request *netfs_create_write_req(struct address_space *mapping, wreq->contiguity = wreq->start; wreq->cleaned_to = wreq->start; - INIT_WORK(&wreq->work, netfs_write_collection_worker); wreq->io_streams[0].stream_nr = 0; wreq->io_streams[0].source = NETFS_UPLOAD_TO_SERVER;