From patchwork Mon Jan 16 23:11:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 44385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1460757wrn; Mon, 16 Jan 2023 15:52:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXtp9+jMOlLeUhZ5kR9OVWTiMN5nySg9Vu335GuIu9xkfLxfOHK0IYEHUOVxuoKWjqXLdlUS X-Received: by 2002:a17:906:9605:b0:86d:bf67:a1c5 with SMTP id s5-20020a170906960500b0086dbf67a1c5mr706925ejx.22.1673913179080; Mon, 16 Jan 2023 15:52:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673913179; cv=none; d=google.com; s=arc-20160816; b=jTx0PTmJa3TqHTXMLv/Df1fZyJzUins108LHQ44/QudR2UKrvhsgpNkhcnemVFfmX5 GsiJYkZEjn67SDAkFb2yhkYzq1BcekHeS8jGBelNYxtWlCGSBOhuwN3c/3LyDpeUGfXl Ym2bjbPVHLkBo7bdn5o6hOG4TLHzUuyLXweNRTktXMhB6HwE0MwBB0k4b1p+iwY+tLGt dCqQqZiPaL5Ibq9EXvy6U7mZBeOYil1nRck/5Hrbesm05ZMjGTtAChu/utM4G62/x1fc ArDfM6htVq5CsKzRnoO2PEfhzicokgjTHmGTGOJGLcxVzdtA8tipx4EfJO0dS0T1dH72 DtgA== 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=ntGo6rTYFCYIHyffDu5aqHQltoEFdTWJMIOs9Lz75sM=; b=Qk2Do+JPxYsg1ecDCz+Kvq3EEPFXV/arIe6zUvFHA6HekZTLSewM3ubBR37cbAqcNl iqP6tmkOL/PcJOyCwAwaGGQnblSOnLsR0/sO5AWB/xYANBTAjXdZ8EwtN+pyWd2DH/2p HKMwqiFuds13UVWo3GvAuBk8GKWHtAA9pDylPSwcmIqU0jyiUgRvzMDIutZouvmhVsx5 xsUtUQhGjgsECEIAIMNRNi0stIdF29LenP1eoKwYYTmSkd6bVMyiV3ZoQqzQd0x4nXLd cGunXMeKZgVA9S2MTwzAKZjhmEg2UrFhxeTjw6UySZvkwYcmSsL2cWUi+wIjZ7p8y6mZ zNaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JKYERWeM; 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 g6-20020a1709065d0600b008718d601cfesi2039832ejt.474.2023.01.16.15.52.34; Mon, 16 Jan 2023 15:52:59 -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=JKYERWeM; 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 S235462AbjAPXUo (ORCPT + 99 others); Mon, 16 Jan 2023 18:20:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235861AbjAPXUG (ORCPT ); Mon, 16 Jan 2023 18:20:06 -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 8C01133475 for ; Mon, 16 Jan 2023 15:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673910721; 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=ntGo6rTYFCYIHyffDu5aqHQltoEFdTWJMIOs9Lz75sM=; b=JKYERWeMzbv+h9xUfONsU4poTFERs2fcsBQ/xZVbfvGtCDCWBTkwGhrb4ZxkVTVaotyqYF aR8xmW+agIRWGpe42URj3l9gWXWoWubmoy8yDVSDC+4ods1zUZnO4EqCZp3CWdxvizkFva uyQ4d5iV8rWI23GyroZqdseT/7aj9qM= 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-259-ab7qPHtTPKW5GI6TkEaaVA-1; Mon, 16 Jan 2023 18:11:57 -0500 X-MC-Unique: ab7qPHtTPKW5GI6TkEaaVA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6A10811E6E; Mon, 16 Jan 2023 23:11:56 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EF9E1415108; Mon, 16 Jan 2023 23:11:55 +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: [PATCH v6 32/34] cifs: DIO to/from KVEC-type iterators should now work From: David Howells To: Al Viro Cc: Steve French , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Jeff Layton , linux-cifs@vger.kernel.org, dhowells@redhat.com, Christoph Hellwig , Matthew Wilcox , Jens Axboe , Jan Kara , Jeff Layton , Logan Gunthorpe , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 16 Jan 2023 23:11:54 +0000 Message-ID: <167391071464.2311931.14722270915404689054.stgit@warthog.procyon.org.uk> In-Reply-To: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> References: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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?1755225185656255183?= X-GMAIL-MSGID: =?utf-8?q?1755225185656255183?= 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 6baf591f63a3..7f1e01cee83d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3545,16 +3545,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; @@ -4090,16 +4080,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;