From patchwork Fri Feb 10 23:32:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 55637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1234493wrn; Fri, 10 Feb 2023 15:39:00 -0800 (PST) X-Google-Smtp-Source: AK7set+gwoh4iOpEk+c/DWVVHz3KETcaca3eu2MXLe749LEd+LalPDZKgpQE7yN3J+7EWKngqNJM X-Received: by 2002:a50:c05b:0:b0:4ab:2033:8c55 with SMTP id u27-20020a50c05b000000b004ab20338c55mr7179342edd.33.1676072340273; Fri, 10 Feb 2023 15:39:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676072340; cv=none; d=google.com; s=arc-20160816; b=GYQxKAf7Rqb4EU3K1prQWJYRDACxKXAzybhhrtvqVe/JkjboOoClsVw+Pi45sAFM2O CyeGFAd+02gvY6lGHgTT2o7JNADNyanQdAKWBqRMCtYVAq/pAmZMzavjK1yEBf9mQ5FE qsP73faHPdIXgDJ1h4rbMNDJM9pUSx6CW0neDGAWDCF6taz+DQFUk3bhLlRQDOM0gONg 7HoU0q+ycoHnxUYV7H66NP5LUhPVRBwZXpk/dGt4S/Ome7jT9OuP72x3EdqwhzJYeVD3 1cdDOKoST6VrFm33NtMqdLgIpyiHX5fSNqkCib3Sa4+TKXgTC7+kgCRskFfDD/IJG7dN NRHg== 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=nghgmX+bncPINiD3wsT1CpIOvgAN1XoBCxD2UY2cfe0=; b=YQT0448C1GsbZSJ/MTjjQ5heOeJVyyv354gq5eMjSX7+0//tevT+Y5AcIMgKok4yOo pOXepNeb9eLV4bXItHlYWDETsY+7Ezon//5fHFsC3runPqgBfj2PtJA8x2/IMdWvqvie c8sjnmaycknjGZn+WL+IS6bFuxyjWi8mg2qbu5sY/ZxQVUqyS0FlG7DnlKylVkLXVaYf hCxZJj0CsUUx71xW6i8URYGvvcNW1qhhfG62jjS5RlC5EJ767Ot/G4hf0DyXmiKJze8G /rJ7Ug0J4zMqpbq87ggIMq521/fSDxrvMmNfD6Sux7l2+hdpd0ZH3EFiDOZ4kkv6j3SM Xjxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JRR9BoHJ; 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 q11-20020aa7d44b000000b00486c1b099d5si6594102edr.3.2023.02.10.15.38.37; Fri, 10 Feb 2023 15:39:00 -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=JRR9BoHJ; 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 S229896AbjBJXfl (ORCPT + 99 others); Fri, 10 Feb 2023 18:35:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229866AbjBJXep (ORCPT ); Fri, 10 Feb 2023 18:34:45 -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 159CB7E3F9 for ; Fri, 10 Feb 2023 15:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676071960; 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=nghgmX+bncPINiD3wsT1CpIOvgAN1XoBCxD2UY2cfe0=; b=JRR9BoHJFgkN8eZUt3KufHI98+nLQhX1LxME6RYjZ2qyrX8fCW8lyBo/UJcTAhPV/W9eCc xp2mE02pF4UNFhO4TOWQt1D2ZpTgYNL2YtLuAa/jKBMyglC86ICsQ6hRaiWTRXPZr+D+oi xgME4xCqH6HHTMMUi+18Rw6/oUKEYZU= 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-444-vDZId1jcMpaD_5ERbR-ZKQ-1; Fri, 10 Feb 2023 18:32:34 -0500 X-MC-Unique: vDZId1jcMpaD_5ERbR-ZKQ-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 97A6585A588; Fri, 10 Feb 2023 23:32:33 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09F322026D68; Fri, 10 Feb 2023 23:32:31 +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 10/11] cifs: DIO to/from KVEC-type iterators should now work Date: Fri, 10 Feb 2023 23:32:04 +0000 Message-Id: <20230210233205.1517459-11-dhowells@redhat.com> In-Reply-To: <20230210233205.1517459-1-dhowells@redhat.com> References: <20230210233205.1517459-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?1757489230149560325?= X-GMAIL-MSGID: =?utf-8?q?1757489230149560325?= 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 f3cedec9d22a..a5d54ae6aaa6 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;