From patchwork Fri Feb 3 20:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 52649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1056981wrn; Fri, 3 Feb 2023 13:04:57 -0800 (PST) X-Google-Smtp-Source: AK7set/5mxzLIdPcjfhLLCUjalw4YCDgywJQQ2ZqRY3nww+UkYOVXliMzdurJ0/Ggg+WTA8xEwll X-Received: by 2002:a05:6402:3589:b0:4a4:d49b:34a6 with SMTP id y9-20020a056402358900b004a4d49b34a6mr13066228edc.9.1675458297144; Fri, 03 Feb 2023 13:04:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675458297; cv=none; d=google.com; s=arc-20160816; b=TACm7nJI4AxukJSb71Pk7mbc/ZA9miB5b6WQwZ3JYEZGMTlvv6Yqs9ISSS2BN2Ex1B 1PBx5A6Y2smgkuy3MgJveOtRLt2R1jyksqTQ+kAbzxJpFQ+vFCy+Fng8iTYKAdQOYzzl 6Cd/ppDswE+ScEv33F8mugVFB/RbRV18cPMRuLvn6bFR5QnxsizWeZ4bTdSOvo2OdnSy 8q1RfKeGdnTPRKTqE7T+u/0L+snn9oM9g4hIaNxvuvkA3zIvrhrhJsyU/bdBaqViyW58 i7PxfkKDjaclBj9gnKA1wO5f3CjZ1V3h8PD4sDaYPt8KJQCcmuASUxnfs8Qypxs707Bh +K0Q== 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=OYvfx0hhutEHe+EOeLBejoXAuhzNUPyMMy80QYhL+dmNE1t4352YHP53UqtvLSbdv2 EJinLlO7+rpZ5KdwrpVB43Sv3aoMPlv/zT2KONKmSm2YKDS0xaImWvUDtBAuwVGSxoQi RDpY8NaJ5WBV/BQrh8qYO8uEe0vgLqJNJjrXsKwFH9yQkghc3VmWSZN00DO2IJxLaUJ8 GWGFCC04cJPGM8JQTQlgwfxl6rzTOgeZbgLvSoMn9BJxZjJBmStv1LKVkKWDdnrQqOR8 TADVmxiIsP2JiqqJOGgJdneC56C0TDprz5Mze0sbtXennkP7mIbrgwau2wSJjKNgKQq/ RT3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QeR1RcCT; 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 ek18-20020a056402371200b004a0a7c80997si3829234edb.191.2023.02.03.13.04.32; Fri, 03 Feb 2023 13:04:57 -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=QeR1RcCT; 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 S232611AbjBCVDa (ORCPT + 99 others); Fri, 3 Feb 2023 16:03:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233093AbjBCVCR (ORCPT ); Fri, 3 Feb 2023 16:02:17 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17EB0A146A for ; Fri, 3 Feb 2023 13:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675458006; 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=QeR1RcCTwt5pZkMIzIQhGEqCFVIRJbFDpND3BdDeFgU3CtYvIEMBRBsvNaCABfudv69loI Y3tU60tltxlBYUcaQ/7YnKUwFSU8JeedYFCsnFwSEVF96WmVB1QFrQ9LjdmZMC0JVkPLnW mlCwLSvojoag1qbS+YNVhXkZqJd+Juw= 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-519-XqmJn28SMoyNfM_YxvRYVg-1; Fri, 03 Feb 2023 16:00:01 -0500 X-MC-Unique: XqmJn28SMoyNfM_YxvRYVg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9CE7B29AA39C; Fri, 3 Feb 2023 21:00:00 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07FFCC15BA0; Fri, 3 Feb 2023 20:59:58 +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 11/11] cifs: DIO to/from KVEC-type iterators should now work Date: Fri, 3 Feb 2023 20:59:29 +0000 Message-Id: <20230203205929.2126634-12-dhowells@redhat.com> In-Reply-To: <20230203205929.2126634-1-dhowells@redhat.com> References: <20230203205929.2126634-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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?1756845359372188755?= X-GMAIL-MSGID: =?utf-8?q?1756845359372188755?= 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;