From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5411D3BA24E for ; Mon, 18 May 2026 22:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779143558; cv=none; b=aMbhJ9RDQvK0qwBMCYWGMQ3lcJk5T1XBfVthAMoO1YiOuQsAtJ0TK5/3egBPuqzbcKU225F2lgTt+zEhIDYXEjPvKgQ5UvJbm8Upw9lnCuMlH4OjYPtEE8Bh7whUIqcQYxFCJOt5RMqHwby5UMEAVhYFqJnNYS/MhmjejSJ0+xY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779143558; c=relaxed/simple; bh=3Up+gMHFhETQ2bAHM7fbeYKi9N+C2mVZ3p56GFx2j2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=g3LGnup1VMYV7mnFzPGQARp8kKVmiR71dmPskJVm2LdiYDPLtqxTvtzb+xX8O8cYfbJaF8HQFy5lw3ekEJJnYj2drOYtlvnVpxOFN3CG/C9zjIKAlyzjFS126H+S9smHwgu+OQuLg7V+m9eIPbbaRYbgF8nfnq77dd0cW1hu9Fg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Nw+WRb3X; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Nw+WRb3X" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779143556; 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=dDpeP38QOsfxeIaJNWSXWtmDpOF3Fp9FCzxzSp2z87g=; b=Nw+WRb3XVl1Si2JjYvxztQbuOI3jfQDxv5IK1bdknIch6l/MYKFZ49njWX54oDcQP7gbqK tYpf9zf4C08pRX+LNqssSR5yiCnjF7ottwH6Wyz1MtpgrJBOSTbCC5rXA6DKVlAbBoWXtN KvcYTT96MwJdfWPITOS7Bh7paI2Lmbs= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-43-brn1cdqUMFeJu1NB6nTX_g-1; Mon, 18 May 2026 18:32:31 -0400 X-MC-Unique: brn1cdqUMFeJu1NB6nTX_g-1 X-Mimecast-MFC-AGG-ID: brn1cdqUMFeJu1NB6nTX_g_1779143548 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41C7D19560AA; Mon, 18 May 2026 22:32:28 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.48.33]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3334B180058A; Mon, 18 May 2026 22:32:21 +0000 (UTC) From: David Howells To: Christian Brauner , Matthew Wilcox , Christoph Hellwig Cc: David Howells , Paulo Alcantara , Jens Axboe , Leon Romanovsky , Steve French , ChenXiaoSong , Marc Dionne , Eric Van Hensbergen , Dominique Martinet , Ilya Dryomov , Trond Myklebust , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 16/21] netfs: Remove netfs_extract_user_iter() Date: Mon, 18 May 2026 23:29:48 +0100 Message-ID: <20260518222959.488126-17-dhowells@redhat.com> In-Reply-To: <20260518222959.488126-1-dhowells@redhat.com> References: <20260518222959.488126-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: netfs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-MFC-PROC-ID: X4H8Fc5sOx7k2rSYaXPYLLuAtcne8REeRdkbtKzqmp8_1779143548 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Remove netfs_extract_user_iter() as it has been replaced with netfs_extract_iter(). Signed-off-by: David Howells cc: Paulo Alcantara cc: Matthew Wilcox cc: Christoph Hellwig cc: Steve French cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/iterator.c | 104 ------------------------------------------ include/linux/netfs.h | 3 -- 2 files changed, 107 deletions(-) diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c index 10a25a618712..566693ac47ef 100644 --- a/fs/netfs/iterator.c +++ b/fs/netfs/iterator.c @@ -141,110 +141,6 @@ ssize_t netfs_extract_iter(struct iov_iter *orig, size_t max_len, size_t max_pag EXPORT_SYMBOL_GPL(netfs_extract_iter); #if 0 -/** - * netfs_extract_user_iter - Extract the pages from a user iterator into a bvec - * @orig: The original iterator - * @orig_len: The amount of iterator to copy - * @new: The iterator to be set up - * @extraction_flags: Flags to qualify the request - * - * Extract the page fragments from the given amount of the source iterator and - * build up a second iterator that refers to all of those bits. This allows - * the original iterator to be disposed of. - * - * @extraction_flags can have ITER_ALLOW_P2PDMA set to request peer-to-peer DMA be - * allowed on the pages extracted. - * - * On success, the number of elements in the bvec is returned, the original - * iterator will have been advanced by the amount extracted. - * - * The iov_iter_extract_mode() function should be used to query how cleanup - * should be performed. - */ -ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, - struct iov_iter *new, - iov_iter_extraction_t extraction_flags) -{ - struct bio_vec *bv = NULL; - struct page **pages; - unsigned int cur_npages; - unsigned int max_pages; - unsigned int npages = 0; - unsigned int i; - ssize_t ret = 0; - size_t count = orig_len, offset, len; - size_t bv_size, pg_size; - - if (WARN_ON_ONCE(!iter_is_ubuf(orig) && !iter_is_iovec(orig))) - return -EIO; - - max_pages = iov_iter_npages(orig, INT_MAX); - bv_size = array_size(max_pages, sizeof(*bv)); - bv = kvmalloc(bv_size, GFP_KERNEL); - if (!bv) - return -ENOMEM; - - /* Put the page list at the end of the bvec list storage. bvec - * elements are larger than page pointers, so as long as we work - * 0->last, we should be fine. - */ - pg_size = array_size(max_pages, sizeof(*pages)); - pages = (void *)bv + bv_size - pg_size; - - while (count && npages < max_pages) { - ret = iov_iter_extract_pages(orig, &pages, count, - max_pages - npages, extraction_flags, - &offset); - if (unlikely(ret <= 0)) { - ret = ret ?: -EIO; - break; - } - - if (WARN(ret > count, - "%s: extract_pages overrun %zd > %zu bytes\n", - __func__, ret, count)) { - ret = -EIO; - break; - } - - cur_npages = DIV_ROUND_UP(offset + ret, PAGE_SIZE); - if (WARN(cur_npages > max_pages - npages, - "%s: extract_pages overrun %u > %u pages\n", - __func__, npages + cur_npages, max_pages)) { - ret = -EIO; - break; - } - - count -= ret; - ret += offset; - - for (i = 0; i < cur_npages; i++) { - len = ret > PAGE_SIZE ? PAGE_SIZE : ret; - bvec_set_page(bv + npages + i, *pages++, len - offset, offset); - ret -= len; - offset = 0; - } - - npages += cur_npages; - } - - /* Note: Don't try to clean up after EIO. Either we got no pages, so - * nothing to clean up, or we got a buffer overrun, memory corruption - * and can't trust the stuff in the buffer (a WARN was emitted). - */ - - if (ret < 0 && (ret == -ENOMEM || npages == 0)) { - for (i = 0; i < npages; i++) - unpin_user_page(bv[i].bv_page); - kvfree(bv); - return ret; - } - - iov_iter_bvec(new, orig->data_source, bv, npages, orig_len - count); - return npages; -} -EXPORT_SYMBOL_GPL(netfs_extract_user_iter); - /* * Select the span of a bvec iterator we're going to use. Limit it by both maximum * size and maximum number of segments. Returns the size of the span in bytes. diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 9e551e09054f..d0b1408bd02f 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -464,9 +464,6 @@ void netfs_put_subrequest(struct netfs_io_subrequest *subreq, ssize_t netfs_extract_iter(struct iov_iter *orig, size_t max_len, size_t max_pages, unsigned long long fpos, struct bvecq **_bvecq_head, iov_iter_extraction_t extraction_flags); -ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, - struct iov_iter *new, - iov_iter_extraction_t extraction_flags); size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset, size_t max_size, size_t max_segs); void netfs_prepare_write_failed(struct netfs_io_subrequest *subreq);