From patchwork Tue Jan 31 18:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 51007 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp63359wrn; Tue, 31 Jan 2023 10:32:49 -0800 (PST) X-Google-Smtp-Source: AK7set81I72XnfsUcHH9NpIRzgw2yoQDcpPrjWnDXGEpwtlVneSTB1NApFpQTjAadH6EswlUOJHP X-Received: by 2002:a05:6a20:8e1a:b0:bc:a96b:c7f7 with SMTP id y26-20020a056a208e1a00b000bca96bc7f7mr15032573pzj.9.1675189969361; Tue, 31 Jan 2023 10:32:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675189969; cv=none; d=google.com; s=arc-20160816; b=zEpVjSKrspNTmZIqWuiWIuTcnAar7y/fbJzzMwDRw7qv+RJmq6ZCu7ZiTI5h/k+iX0 76T5i/ig62QyzDoXkGXllEYpzuTa7zrLI625/8uUQy4t4alhsIqcDcknrKGrwa2IWqCy 12D7Jos69h1SnImU5UV+bPKTbSbO2ISc+5SMSRi+Rm6GmPLvhx+8KB1L3BXHnUJdF31K NQHJHApIoEebNMczKBVTeYvwZAO2O91EN95CqqrOYdDG13QGUrQjaLAXz2KmAl8fTBoD wxY9Z4SSO8RDLinCFl4uAfRs5QPIReXn/W+aTxkIyyH4zKMUlZdq6bEYPp/DK0vuBzpK XTpQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZbR1ERx60swPmHLlvc4O0e0pHhwkZikBmUg0OVIfTvo=; b=K1K+cBbfyHaaZsZV64TYwe+JnJDiWibGmIztTENsq3rUPNyhZ5IDdnaDYNk+N4H8Tb lJeZlkUvXdUHKS+Uplp7afsaBEGd+R0+bNInCucMrysQN+NdIy0KZ4qvFKucI3/Uv6rd rQBZcAkRimyjb4DcrelJS+LWVHj4Xs3dl5auMDoIh7o9BaEQFAWyWMeyz4U46B+NH39V 0QJpo0P4QfkXZOOHIVSH9NRJwzrp0BLuLR6U1oF/l9tdPFKgTz7Fm2WnQW4YVjSd4oQJ g9Y/SiaiHaTmfT4DiUsekcGT1DfB3+vH4M9b+VKAO+3opeH71vzCz/R0L32qklHDh1cn q0dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=H62SLQbp; 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 n27-20020a63721b000000b0047798cc3bffsi17279438pgc.246.2023.01.31.10.32.05; Tue, 31 Jan 2023 10:32:49 -0800 (PST) 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=H62SLQbp; 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 S231644AbjAaSbT (ORCPT + 99 others); Tue, 31 Jan 2023 13:31:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231639AbjAaSao (ORCPT ); Tue, 31 Jan 2023 13:30:44 -0500 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 0D9505898A for ; Tue, 31 Jan 2023 10:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675189792; 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=ZbR1ERx60swPmHLlvc4O0e0pHhwkZikBmUg0OVIfTvo=; b=H62SLQbpjSsbbznzW8jgUQnKsQfMTI3iWDmQWSrSb+x0z77eFFlbR0+baTW55/w1QTm0QF RyJBlKlb4hchEeH1xtnnQPsh+KLEWmv0d70dmwQtjb3tncQUCM3WtxGsprTwZET2WRtGnM 3ADLE3q3as5pVGngru/OU7ihuezfhog= 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-362-k0cp-MPHOwaLT3XLGoi8hg-1; Tue, 31 Jan 2023 13:29:38 -0500 X-MC-Unique: k0cp-MPHOwaLT3XLGoi8hg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F48E88262D; Tue, 31 Jan 2023 18:29:16 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAF682026D4B; Tue, 31 Jan 2023 18:29:14 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Al Viro , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Christoph Hellwig , Matthew Wilcox , Jeff Layton , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French Subject: [PATCH 07/12] cifs: Add a function to read into an iter from a socket Date: Tue, 31 Jan 2023 18:28:50 +0000 Message-Id: <20230131182855.4027499-8-dhowells@redhat.com> In-Reply-To: <20230131182855.4027499-1-dhowells@redhat.com> References: <20230131182855.4027499-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 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?1756563997047173114?= X-GMAIL-MSGID: =?utf-8?q?1756563997047173114?= 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: Jeff Layton cc: linux-cifs@vger.kernel.org Link: https://lore.kernel.org/r/164928617874.457102.10021662143234315566.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/165211419563.3154751.18431990381145195050.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/165348879662.2106726.16881134187242702351.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/165364826398.3334034.12541600783145647319.stgit@warthog.procyon.org.uk/ # v3 Link: https://lore.kernel.org/r/166126395495.708021.12328677373159554478.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/166697258876.61150.3530237818849429372.stgit@warthog.procyon.org.uk/ # rfc Link: https://lore.kernel.org/r/166732031039.3186319.10691316510079412635.stgit@warthog.procyon.org.uk/ # rfc --- fs/cifs/cifsproto.h | 3 +++ fs/cifs/connect.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 1207b39686fb..cb7a3fe89278 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -244,6 +244,9 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page, unsigned int page_offset, unsigned int to_read); +int cifs_read_iter_from_socket(struct TCP_Server_Info *server, + struct iov_iter *iter, + unsigned int to_read); extern int cifs_setup_cifs_sb(struct cifs_sb_info *cifs_sb); void cifs_mount_put_conns(struct cifs_mount_ctx *mnt_ctx); int cifs_mount_get_session(struct cifs_mount_ctx *mnt_ctx); diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index b2a04b4e89a5..152b457b849f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -765,6 +765,20 @@ 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 = { .msg_iter = *iter }; + int ret; + + iov_iter_truncate(&smb_msg.msg_iter, 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) {