From patchwork Tue Jan 31 18:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 51010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp63827wrn; Tue, 31 Jan 2023 10:33:43 -0800 (PST) X-Google-Smtp-Source: AK7set+BgRftBsYJIcJEOsUGjrjT0dvDdlWW/1Zg2MmZD6SQHcfSAI5CmUWBBcIrDDBQ3P07hSxb X-Received: by 2002:a17:90a:35d:b0:22c:7e4d:caeb with SMTP id 29-20020a17090a035d00b0022c7e4dcaebmr12133474pjf.22.1675190022775; Tue, 31 Jan 2023 10:33:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675190022; cv=none; d=google.com; s=arc-20160816; b=uQ9E5ppVcsL2PlTObgve7tcljIxc7w1JdNTR8OGAm819MpHqAa4RXJUmuZCJCRTV+z nvVwW9HIUcSz2MQat3HszerB0s46OJmrvQUQDkO1wNL3k5DCVyqZs1wQ7mK2PulN9mrQ m/q2YO/96y8Kel1nkESMnz/JnoY8lwT/AleFOossmZWsDziToxU/KN8NMfXOEIGDdID4 1ZWKnh0fEuxcvmDQNSmFacV5vv195BktDHJ2ZKB98I+gFHBIcAgeXxofFanZYj/XQ+UM znlNfh6RNMYd9QqQwe83OVZCfemab02+s3BOjw7KGh+JW40oPfJbtMs9bXrqReoKjlcs YMkw== 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=vs8FDvoSHno0Q4Sw3oLMb7GUY7XZQhcAIOewFeDot/o=; b=q7bgG15rxkk3nKJwY04IwrlIUr6w6VbIlUYfw47fzqw3hxVZ8caAGtyF3c/VOQG8JZ HlOM8KGxqSHk6tWLsWuivdv6BIdd3zMy0v/gPTiFYWB6kWI6L0OhPS6FzEfK/aV46zsH e36Za2bNeM1Hf9IXECP+Pt1k7B8psK7AaZDTjpQNctWjbnyGfhHXAUAp/zb6Tejbe7PG i5dHV/piyY9ebSaoW3eZe2gm67u8hRqWWTq8LhG6cJT74oT3MiVywPHbzZsx8TFj4EoA nixibRMKzbIItMBeyaR5TVGxcXr0g2UqwzEhZiqVJbJsLK9wZzq2CWSFNENDWw4m+9VB 9uQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fQV3ttOW; 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 u186-20020a6385c3000000b004de9822d1a3si17080215pgd.70.2023.01.31.10.33.27; Tue, 31 Jan 2023 10:33:42 -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=fQV3ttOW; 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 S231815AbjAaSbd (ORCPT + 99 others); Tue, 31 Jan 2023 13:31:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231714AbjAaSaz (ORCPT ); Tue, 31 Jan 2023 13:30:55 -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 BBCF359277 for ; Tue, 31 Jan 2023 10:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675189800; 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=vs8FDvoSHno0Q4Sw3oLMb7GUY7XZQhcAIOewFeDot/o=; b=fQV3ttOW7f15LB0rmUUwDg5FkD2bN7oifQPTvq/GZcf+ZJ5yVv7b+qgedPcCitK3KIumXI bShSHkym02nPSE9P/lAOFhr+l4kzyPQtnQTuCipUIMyCu/LMTlF+eWbUIl2grQWEc/GDZk bnWbRr8G0pxifYishSsnF7G8R3mU09M= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-126-SfSno0hGNAWEYq9ylek_Gg-1; Tue, 31 Jan 2023 13:29:56 -0500 X-MC-Unique: SfSno0hGNAWEYq9ylek_Gg-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 254B22808D65; Tue, 31 Jan 2023 18:29:29 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85DD52026D4B; Tue, 31 Jan 2023 18:29:27 +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 12/12] cifs: DIO to/from KVEC-type iterators should now work Date: Tue, 31 Jan 2023 18:28:55 +0000 Message-Id: <20230131182855.4027499-13-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?1756564053722200284?= X-GMAIL-MSGID: =?utf-8?q?1756564053722200284?= DIO to/from KVEC-type iterators should now work as the iterator is passed down to the socket in non-RDMA/non-crypto mode and in RDMA or crypto mode care is taken to handle vmap/vmalloc correctly and not take page refs when building a scatterlist. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: Tom Talpey cc: Jeff Layton cc: linux-cifs@vger.kernel.org --- fs/cifs/file.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ed84104b669d..11875224a917 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3546,16 +3546,6 @@ static ssize_t __cifs_writev( struct cifs_aio_ctx *ctx; int rc; - /* - * iov_iter_get_pages_alloc doesn't work with ITER_KVEC. - * In this case, fall back to non-direct write function. - * this could be improved by getting pages directly in ITER_KVEC - */ - if (direct && iov_iter_is_kvec(from)) { - cifs_dbg(FYI, "use non-direct cifs_writev for kvec I/O\n"); - direct = false; - } - rc = generic_write_checks(iocb, from); if (rc <= 0) return rc; @@ -4089,16 +4079,6 @@ static ssize_t __cifs_readv( loff_t offset = iocb->ki_pos; struct cifs_aio_ctx *ctx; - /* - * iov_iter_get_pages_alloc() doesn't work with ITER_KVEC, - * fall back to data copy read path - * this could be improved by getting pages directly in ITER_KVEC - */ - if (direct && iov_iter_is_kvec(to)) { - cifs_dbg(FYI, "use non-direct cifs_user_readv for kvec I/O\n"); - direct = false; - } - len = iov_iter_count(to); if (!len) return 0;