From patchwork Thu Jun 20 17:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13705991 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 9F9E9C27C79 for ; Thu, 20 Jun 2024 17:33:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC59B6B039D; Thu, 20 Jun 2024 13:33:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C2CFE8D00AF; Thu, 20 Jun 2024 13:33:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9BB1E6B0395; Thu, 20 Jun 2024 13:33:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6A83E6B038E for ; Thu, 20 Jun 2024 13:33:18 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2CBE5A1EA7 for ; Thu, 20 Jun 2024 17:33:18 +0000 (UTC) X-FDA: 82251963276.20.C3D0979 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 7F8FD80027 for ; Thu, 20 Jun 2024 17:33:16 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTKJjq4r; spf=pass (imf30.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=1718904789; 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=tcCzhA8XUd6wWPEL49ATAv4+dcrLDrKKLcUOQlZf5aE=; b=NoIKXfdZO+ho+0a+M+pzSk83qORAiz8f10319htmk0kO7jkxJ67Kse4ZJ0QjdI08tfRz10 jPKqNlMJlh25r+oZWccKJK1IAvhd/gLSiBg7+QQWByjPqxdM+k5zac9qBui3iOc0daXAhi F2xu8wY0tQLiufQdNz7rQcwx78dGAXM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTKJjq4r; spf=pass (imf30.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=1718904789; a=rsa-sha256; cv=none; b=Hy24V/x2AHJfcy1/JjfN7WBA5KXTOz+tVMPKlsCsRXf9+gRLZKj/q+FcwAhZT5S00e2CZH 89QmaQfb8OMOLVKvKV6nUfI42UoWqmWyXd7f3tNKliF1/X0SUHi4VnnuUJgCcoEMHw8M0h HopwR3WreQCqKsn1fVv8WerO5APiq6w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718904795; 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=tcCzhA8XUd6wWPEL49ATAv4+dcrLDrKKLcUOQlZf5aE=; b=TTKJjq4rZPOpM61bkRtrcAdbo+57zLEVtls+I6TLXh+GUYyXNdyz2KRj1t7lbhvW693sB2 X5zHm3q71aUH6irtG8eH9qIac+FfO1K8SQ1fz7rundkqZC94SmWzUglJUY2caOeFPx3wOK uMqf5QYqqY6UauScXBLTz1vF1CE/HjI= 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-694-dzyJCI2LOGq-cKgSo75gZA-1; Thu, 20 Jun 2024 13:33:14 -0400 X-MC-Unique: dzyJCI2LOGq-cKgSo75gZA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 E57F51956087; Thu, 20 Jun 2024 17:33:10 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.39.195.156]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B52743000602; Thu, 20 Jun 2024 17:33:04 +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, Steve French Subject: [PATCH 10/17] cifs: Only pick a channel once per read request Date: Thu, 20 Jun 2024 18:31:28 +0100 Message-ID: <20240620173137.610345-11-dhowells@redhat.com> In-Reply-To: <20240620173137.610345-1-dhowells@redhat.com> References: <20240620173137.610345-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: 7o9s9krcomiqfuh6suo78abhhu97xr94 X-Rspam-User: X-Rspamd-Queue-Id: 7F8FD80027 X-Rspamd-Server: rspam02 X-HE-Tag: 1718904796-294825 X-HE-Meta: U2FsdGVkX18Ound1slovG5fdIVLA6LRC46yaXBBxb7MozcaUqXAHGwWYcPWIonNysmSZnfNSkCgJyXhBS6PzvguLirLntLBOaVNWSxwU+p7x8av3hvUmLyluwRBi7UzjYfjecWns5Or4NkfBF/1ZUTQkv2XbuoHTuCuvzZq+NpHb727E5qalty0Erybq2Bc3NDEQXXZG1xruRiSWUHdcXVCo/gvEzNFlOUUHDZtUxSdstNGWFR3rw45VRtIZC4w5Y9+PTBFBxEvgnDg94n48E9jLTTi2WFkVjTTz/ffS0dA9kv036mcpzHptKDhod4zOLLi/TIQrDw5vRfcfv8OCd1i59G6FwkGTS6WYMEW2DuiQGCdKb34+NmtRDwEKu9yxlr/7SJnr5oDbjDlGkudgDW02MX4KDtmrfpwPmv76qLqUatT9CVmD7wHZ37QPlSPPXUa/gLm8SH3jNLKP+d24zXuhdpWctH+lohqkmLaOmIpbmfXJat3rL1xetvbg6H7gR8f+dmgFbZijWDW8wtb+xXXXpjMNkT/PEW2KS2ywbF3X6D1HW9wDVHbvWxIaT8y6/0mohlYhnkPm5jQ7Q3KXBT9O0vYYsGNDYAzDExkzRj4Qg4hp1X2Loy543+y556BsAuqjk+gdxvwypENEc2QdXjP2fPFjpDGh+aBl/V7zmNVZ4nhC3dA0GOvtEAowC212Spe63b78HrW12XyeG0b9WPzYor/NLaUe9SIxhHt6UnvexA8CXpjtzKsVIoUA2B2QovctxXXDgG4B1uPWAZTrNY5rK5fVVyukVOJpW0d8sm9LHZJl9rTmpzH3kQ8ZCB0r0bxsyWoALx0fP2R1Lfk44K3DRDb5G59M5FnTn9KYnfP+/CjPhYNgaBjCesoSPuVGWB+P+GUc0VElSnV2/Ed3drPbwJKzE3Rh0vSs1W3oDWA8t3sQVqWHTdDtx/LrQo9NTAZd+btJDzkJfzW3cH2 sOA/YcFW KL0DDc5+LiYQeFMBdbSwPXRysP/9eF3fT5qnGmoYKohZAtaNKpZoHrKYo/U7cpHZRfoVnV7oJRJx5Ju6ajor1Uj3Ty8NZZa+LjM/O4W1VpKwb8gUE62pAZ3r/UVBcbcRFayQw5tOB224ayJsQGRO5o8/TYVZ1mkzOyYNTGYPj8O6cqz097yWqOLa1lDfH8Ai88hUhJrGTjYK8usilhPo1AQp4uxObgbqcB5Pt94mzdkj7KaiQO19GxrTqP9eugn19B/ymoBBiCTRugtKt0NMOmrlpth+N7+UCqN+zIVj/zzAvjhLsY8k7Re0DbcEfZcVMEhm575nEtM7FhYFKj9qzh8xrCKLdcDmCMMjoE6pA6/3atL5Dlb/KrhRpJwU7xCWT9UiNLdlTli2rTMPU/KO3hwOqlyp/l5PgLkfFkcfxNoDmf8m3Rjd1HNG5b2ije0Q1Jo5L8WOrk8SVLxdOGVm/FneU6rQPHolmyXBk 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: In cifs, only pick a channel when setting up a read request rather than doing so individually for every subrequest and instead use that channel for all. This mirrors what the code in v6.9 does. Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/cifsglob.h | 1 + fs/smb/client/file.c | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 4b00512fb9f9..b48d3f5e8889 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -1494,6 +1494,7 @@ struct cifs_aio_ctx { struct cifs_io_request { struct netfs_io_request rreq; struct cifsFileInfo *cfile; + struct TCP_Server_Info *server; }; /* asynchronous read support */ diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 67dd8fcd0e6d..16fa1ac1ed2d 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -134,17 +134,15 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq) static bool cifs_clamp_length(struct netfs_io_subrequest *subreq) { struct netfs_io_request *rreq = subreq->rreq; - struct TCP_Server_Info *server; struct cifs_io_subrequest *rdata = container_of(subreq, struct cifs_io_subrequest, subreq); struct cifs_io_request *req = container_of(subreq->rreq, struct cifs_io_request, rreq); + struct TCP_Server_Info *server = req->server; struct cifs_sb_info *cifs_sb = CIFS_SB(rreq->inode->i_sb); size_t rsize = 0; int rc; rdata->xid = get_xid(); rdata->have_xid = true; - - server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses); rdata->server = server; if (cifs_sb->ctx->rsize == 0) @@ -203,14 +201,7 @@ static void cifs_req_issue_read(struct netfs_io_subrequest *subreq) __set_bit(NETFS_SREQ_CLEAR_TAIL, &subreq->flags); rdata->pid = pid; - rc = adjust_credits(rdata->server, &rdata->credits, rdata->subreq.len); - if (!rc) { - if (rdata->req->cfile->invalidHandle) - rc = -EAGAIN; - else - rc = rdata->server->ops->async_readv(rdata); - } - + rc = rdata->server->ops->async_readv(rdata); out: if (rc) netfs_subreq_terminated(subreq, rc, false); @@ -250,6 +241,7 @@ static int cifs_init_request(struct netfs_io_request *rreq, struct file *file) open_file = file->private_data; rreq->netfs_priv = file->private_data; req->cfile = cifsFileInfo_get(open_file); + req->server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses); } else if (rreq->origin != NETFS_WRITEBACK) { WARN_ON_ONCE(1); return -EIO;