From patchwork Fri Feb 10 23:31: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: 13136595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0DECC05027 for ; Fri, 10 Feb 2023 23:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229773AbjBJXdC (ORCPT ); Fri, 10 Feb 2023 18:33:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbjBJXdB (ORCPT ); Fri, 10 Feb 2023 18:33:01 -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 CE35972897 for ; Fri, 10 Feb 2023 15:32:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676071934; 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; bh=kINgCyFPa8FFEBF8Sa5+s5KKQnM9ZQ2yQXK9PAz54lo=; b=PsQKPhx678V+XE+CsXwg9yyThpg7Xp0eZsFQBrt9/aJcS5kDKphi9VQADPiSq4RUq+zdyU 0UGfHJaJlWSArE8sbG1DQz8g6j1cddnZgIKQW6U8SH3aRliVB485Yx3ntqjpsVLv09DeCw Is9xfUHo358n4S/Fflz9vQdiiKaAD9g= 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-387-jquFFklbMi-TXFc8D0Wuyg-1; Fri, 10 Feb 2023 18:32:10 -0500 X-MC-Unique: jquFFklbMi-TXFc8D0Wuyg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E661B85D180; Fri, 10 Feb 2023 23:32:09 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1272492C3F; Fri, 10 Feb 2023 23:32:07 +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 Subject: [PATCH 00/11] smb3: Use iov_iters down to the network transport and fix DIO page pinning Date: Fri, 10 Feb 2023 23:31:54 +0000 Message-Id: <20230210233205.1517459-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Hi Steve, Here's an updated version of my patchset to make the cifs/smb3 driver pass iov_iters down to the lowest layers where they can be passed directly to the network transport rather than passing lists of pages around. I've dropped the patch Stefan Metzmacher objected to and the splice patch and rebased on top of a merge of part of my iov-extract branch onto your for-next branch. The merge is so that the same commits are used as are in the linux-block tree. At the iov-extract-base tag point my branch makes the following changes: (1) Change how file read-splices are done, using ITER_BVEC (DIO read) or page cache extraction (buffered read). ITER_PIPE is then removed. (2) Add a function to replace iov_iter_get_pages*() that uses FOLL_PIN on user pages (IOVEC, UBUF) and doesn't pin kernel pages (BVEC, KVEC, XARRAY). The series also deals with some other issues: (*) By pinning pages, it fixes the race between concurrent DIO read and fork, whereby the pages containing the DIO read buffer may end up belonging to the child process and not the parent - with the result that the parent might not see the retrieved data. (*) cifs shouldn't take refs on pages extracted from non-user-backed iterators (eg. KVEC). With these changes, cifs will apply the appropriate cleanup. Note that there is the possibility the network transport might, but that's beyond the scope of this patchset. (*) Making it easier to transition to using folios in cifs rather than pages by dealing with them through BVEC and XARRAY iterators. The series starts with a couple of patches that add stuff to netfslib that I want to use there as well as in cifs: (1) Add a netfslib function to extract and pin pages from an ITER_IOBUF or ITER_UBUF iterator into an ITER_BVEC iterator. (2) Add a netfslib function to extract pages from an iterator that's of type ITER_UBUF/IOVEC/BVEC/KVEC/XARRAY and add them to a scatterlist. The cleanup will need to be done as for iov_iter_extract_pages(). BVEC, KVEC and XARRAY iterators can be rendered into elements that span multiple pages. Then a fix: (3) Fix oops due to uncleared server->smbd_conn in reconnect Then there are some cifs helpers that work with iterators: (4) Add a function to walk through an ITER_BVEC/KVEC/XARRAY iterator and add elements to an RDMA SGE list. Only the DMA addresses are stored, and an element may span multiple pages (say if an xarray contains a multipage folio). (5) Add a function to walk through an ITER_BVEC/KVEC/XARRAY iterator and pass the contents into a shash function. (6) Add functions to walk through an ITER_XARRAY iterator and perform various sorts of cleanup on the folios held therein, to be used on I/O completion. (7) Add a function to read from the transport TCP socket directly into an iterator. Then come the patches that actually do the work of iteratorising cifs: (8) The main patch. Replace page lists with iterators. It extracts the pages from ITER_UBUF and ITER_IOVEC iterators to an ITER_BVEC iterator, pinning or getting refs on them, before passing them down as the I/O may be done from a worker thread. The iterator is extracted into a scatterlist in order to talk to the crypto interface or to do RDMA. (9) In the cifs RDMA code, extract the iterator into an RDMA SGE[] list, removing the scatterlist intermediate - at least for smbd_send(). There appear to be other ways for cifs to talk to the RDMA layer that don't go through that that I haven't managed to work out. (10) Remove a chunk of now-unused code. (11) Allow DIO to/from KVEC-type iterators. I've pushed the patches here also: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=iov-cifs David Link: https://lore.kernel.org/r/166697254399.61150.1256557652599252121.stgit@warthog.procyon.org.uk/ Link: https://lore.kernel.org/r/20230131182855.4027499-1-dhowells@redhat.com/ # v1 David Howells (11): netfs: Add a function to extract a UBUF or IOVEC into a BVEC iterator netfs: Add a function to extract an iterator into a scatterlist cifs: Add a function to build an RDMA SGE list from an iterator cifs: Add a function to Hash the contents of an iterator cifs: Add some helper functions cifs: Add a function to read into an iter from a socket cifs: Change the I/O paths to use an iterator rather than a page list cifs: Build the RDMA SGE list directly from an iterator cifs: Remove unused code cifs: DIO to/from KVEC-type iterators should now work cifs: Fix problem with encrypted RDMA data read fs/cifs/Kconfig | 1 + fs/cifs/cifsencrypt.c | 172 +++- fs/cifs/cifsfs.h | 3 + fs/cifs/cifsglob.h | 66 +- fs/cifs/cifsproto.h | 11 +- fs/cifs/cifssmb.c | 15 +- fs/cifs/connect.c | 14 + fs/cifs/file.c | 1750 ++++++++++++++++++----------------------- fs/cifs/fscache.c | 22 +- fs/cifs/fscache.h | 10 +- fs/cifs/misc.c | 128 +-- fs/cifs/smb2ops.c | 365 ++++----- fs/cifs/smb2pdu.c | 53 +- fs/cifs/smbdirect.c | 535 ++++++++----- fs/cifs/smbdirect.h | 7 +- fs/cifs/transport.c | 54 +- fs/netfs/Makefile | 1 + fs/netfs/iterator.c | 372 +++++++++ include/linux/netfs.h | 8 + mm/vmalloc.c | 1 + 20 files changed, 1914 insertions(+), 1674 deletions(-) create mode 100644 fs/netfs/iterator.c