From patchwork Fri Oct 28 15:56:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 12418 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp909603wru; Fri, 28 Oct 2022 09:00:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6l85TS0JKRuqVt2hiBgcWMGVpn7ItlDOUT6Q+aipKqdxTeakCaxfBxm/s2Q5JLF1d1g6J9 X-Received: by 2002:a05:6402:5507:b0:452:183f:16d1 with SMTP id fi7-20020a056402550700b00452183f16d1mr140349edb.96.1666972805512; Fri, 28 Oct 2022 09:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666972805; cv=none; d=google.com; s=arc-20160816; b=zelzIfYl4i9v+2AhvC2JMdAeC3rLnlp+HePSzclxnTIf3RzmsM0A+fQCCBEwDYezGK KWJZJA/8Cofd6seDv3NiU5JByFBU8qyk2oXBuOpee+LihivGo98nZnDVKchBj9DCAOC2 HyWjS/Ijs11nF4H8me/5WVarHeA4CG+as2t7MRHISEt10hULwA9WPqfqtYNhFy7ZstGt uekknTGP+R5j98oGMsEBvAUTUiqcN39R08Hfct0fSkTOXeFkyw58YwPNvP/EwEsVZUve bIol1dlDf/X0rOdly0wHwy6aHtKwdeMCYs+XfHlcuXRVWsRh/P4tkAykNWCW65DrVCoO pIOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=8mz49wttlzj7st73tGZCyVzXgiU4Srd49oYynmDnpsc=; b=rAXYSM+wPwavW0sIdS1V3kT6xbJVVcmcy/xkcFytzrCv8c/oI5RF2DknThe97WBADQ 6dDhpIF2N/b+XTVCiu9jgSPOQMIzsK7VX8YvqWOv5e7iHl9mUxSu1WwIxR/nj/oZgELa Ocbfqcm9yEBch5tYpnRIFO/rPrRL/EPgWYciKiBpYn8tWhUglh89sH+WDr2f2H0G5RC7 zgLvoPDlYR61rQFjBpuqkyHFyy4v0TL+r9AwTrp7C+/xrQcW08+L2/QmRfikBCD6BQOv dkMFJID1YFIW3vSXOdI/Ub0e47zCe2S9res+oKA99EXvBg6J92KQCqlkmJamHwOt9afL fKcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ejife7c5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f17-20020a0564021e9100b00461cf92400csi5613691edf.488.2022.10.28.08.59.41; Fri, 28 Oct 2022 09:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ejife7c5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbiJ1P6s (ORCPT + 99 others); Fri, 28 Oct 2022 11:58:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230111AbiJ1P5g (ORCPT ); Fri, 28 Oct 2022 11:57:36 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B57A1D5840 for ; Fri, 28 Oct 2022 08:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666972595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8mz49wttlzj7st73tGZCyVzXgiU4Srd49oYynmDnpsc=; b=ejife7c5sawwMBolx+QCTf9WYlo1RNTFL/KHZsacR3fTI4ijwohV2riCoAxf13byjprbjg Su8gmG0nH8yJ84Wtk5eLu4Wz3c6qApOaLuL6iPikhJJMqt8BWrUous24Y8AAf44rGf462a bCJ7KuEvqmpgdO1UlquL8j9gDSU/3dE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-hQrdFcQeMhyxzMYYdKQMxA-1; Fri, 28 Oct 2022 11:56:31 -0400 X-MC-Unique: hQrdFcQeMhyxzMYYdKQMxA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5273185A794; Fri, 28 Oct 2022 15:56:30 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AF3FFD48; Fri, 28 Oct 2022 15:56:29 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [RFC PATCH 6/9] cifs: Add a function to read into an iter from a socket From: David Howells To: Steve French , Al Viro Cc: Steve French , Shyam Prasad N , Rohith Surabattula , linux-cifs@vger.kernel.org, dhowells@redhat.com, Shyam Prasad N , Rohith Surabattula , Tom Talpey , Christoph Hellwig , Matthew Wilcox , Jeff Layton , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 28 Oct 2022 16:56:28 +0100 Message-ID: <166697258876.61150.3530237818849429372.stgit@warthog.procyon.org.uk> In-Reply-To: <166697254399.61150.1256557652599252121.stgit@warthog.procyon.org.uk> References: <166697254399.61150.1256557652599252121.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747947676219564428?= X-GMAIL-MSGID: =?utf-8?q?1747947676219564428?= Add a helper function to read data from a socket into the given iterator. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: linux-cifs@vger.kernel.org --- fs/cifs/cifsproto.h | 3 +++ fs/cifs/connect.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 83e83d8beabb..c5e39cf26e93 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -240,6 +240,9 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server, unsigned int page_offset, unsigned int to_read); extern int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb); +extern int cifs_read_iter_from_socket(struct TCP_Server_Info *server, + struct iov_iter *iter, + unsigned int to_read); extern int cifs_match_super(struct super_block *, void *); extern int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx); extern void cifs_umount(struct cifs_sb_info *); diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index ffb291579bb9..bcd34fdd8798 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -790,6 +790,22 @@ cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page, return cifs_readv_from_socket(server, &smb_msg); } +int +cifs_read_iter_from_socket(struct TCP_Server_Info *server, struct iov_iter *iter, + unsigned int to_read) +{ + struct msghdr smb_msg; + int ret; + + smb_msg.msg_iter = *iter; + if (smb_msg.msg_iter.count > to_read) + smb_msg.msg_iter.count = to_read; + ret = cifs_readv_from_socket(server, &smb_msg); + if (ret > 0) + iov_iter_advance(iter, ret); + return ret; +} + static bool is_smb_response(struct TCP_Server_Info *server, unsigned char type) {