From nobody Thu Apr 2 23:53:32 2026 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 3DD6C3F7A8D for ; Thu, 26 Mar 2026 10:49:23 +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=1774522165; cv=none; b=F6gykP0tk3FdQRnMw6ld6sj7B9hrA9aYjH0w+ovK8TsN6efkgLSiP7Lp1QLRCVs2UImk1GR29coE2S5XLTUyGn1Jj6eIJ3op6athjj/YS6YHUFNAJk93Zha+Utmm5Hnk770dD6oJ07OwwbP1E3OVxrSwWBlzBOCVnP19993+MKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774522165; c=relaxed/simple; bh=0h/ucvwbdQ4HuvZye+TLcKW5WsMaII7mlDDanLFe43g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAve7OowPQFujh0ZaYBuaLB0fQZV2ilDqu9CIignH9ov/Xd5RVX/ph+vmqqxyrIIn5FnaCiaIkLQuw56JxsRzNn6HWLjW2mo3ALQ8yGm063gEZGxbATQYlpBLOEnLaRtpT/M9uFwiGaT8aWUE9skHrecBlXB1lOShymR+3xFsGs= 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=NTyhZCFk; 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="NTyhZCFk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774522162; 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=UvlRTZm0obpKkxMoTaD0ISQlMHUM843URYI2Lsaunes=; b=NTyhZCFkkE5rzLHexUd14UR6Daks6PdIt6E9L/kkJOSxFVk0clSspViUKvYqcivBP2AOIh OoNJ7p7eoYB5xCr8/wj9X82vGYg72l8Iyhr+3AUJV0MR1AcWMeOHepODOnoXerv4mndJQ0 9jnTnGnBbuMTzqrBlujQx0qR5/ML7Z0= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-bwxa7MIHOcWmKjsr45PuDQ-1; Thu, 26 Mar 2026 06:49:20 -0400 X-MC-Unique: bwxa7MIHOcWmKjsr45PuDQ-1 X-Mimecast-MFC-AGG-ID: bwxa7MIHOcWmKjsr45PuDQ_1774522158 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E677A180047F; Thu, 26 Mar 2026 10:49:17 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.33.121]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 97E5D1800361; Thu, 26 Mar 2026 10:49:11 +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, Paulo Alcantara Subject: [PATCH 22/26] iov_iter: Remove ITER_FOLIOQ Date: Thu, 26 Mar 2026 10:45:37 +0000 Message-ID: <20260326104544.509518-23-dhowells@redhat.com> In-Reply-To: <20260326104544.509518-1-dhowells@redhat.com> References: <20260326104544.509518-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Remove ITER_FOLIOQ as it's no longer used. 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 --- include/linux/iov_iter.h | 65 +--------- include/linux/uio.h | 12 -- lib/iov_iter.c | 235 +-------------------------------- lib/scatterlist.c | 67 +--------- lib/tests/kunit_iov_iter.c | 257 ------------------------------------- 5 files changed, 5 insertions(+), 631 deletions(-) diff --git a/include/linux/iov_iter.h b/include/linux/iov_iter.h index 309642b3901f..9f3a4497c5c3 100644 --- a/include/linux/iov_iter.h +++ b/include/linux/iov_iter.h @@ -10,7 +10,6 @@ =20 #include #include -#include =20 typedef size_t (*iov_step_f)(void *iter_base, size_t progress, size_t len, void *priv, void *priv2); @@ -194,62 +193,6 @@ size_t iterate_bvecq(struct iov_iter *iter, size_t len= , void *priv, void *priv2, return progress; } =20 -/* - * Handle ITER_FOLIOQ. - */ -static __always_inline -size_t iterate_folioq(struct iov_iter *iter, size_t len, void *priv, void = *priv2, - iov_step_f step) -{ - const struct folio_queue *folioq =3D iter->folioq; - unsigned int slot =3D iter->folioq_slot; - size_t progress =3D 0, skip =3D iter->iov_offset; - - if (slot =3D=3D folioq_nr_slots(folioq)) { - /* The iterator may have been extended. */ - folioq =3D folioq->next; - slot =3D 0; - } - - do { - struct folio *folio =3D folioq_folio(folioq, slot); - size_t part, remain =3D 0, consumed; - size_t fsize; - void *base; - - if (!folio) - break; - - fsize =3D folioq_folio_size(folioq, slot); - if (skip < fsize) { - base =3D kmap_local_folio(folio, skip); - part =3D umin(len, PAGE_SIZE - skip % PAGE_SIZE); - remain =3D step(base, progress, part, priv, priv2); - kunmap_local(base); - consumed =3D part - remain; - len -=3D consumed; - progress +=3D consumed; - skip +=3D consumed; - } - if (skip >=3D fsize) { - skip =3D 0; - slot++; - if (slot =3D=3D folioq_nr_slots(folioq) && folioq->next) { - folioq =3D folioq->next; - slot =3D 0; - } - } - if (remain) - break; - } while (len); - - iter->folioq_slot =3D slot; - iter->folioq =3D folioq; - iter->iov_offset =3D skip; - iter->count -=3D progress; - return progress; -} - /* * Handle ITER_XARRAY. */ @@ -361,8 +304,6 @@ size_t iterate_and_advance2(struct iov_iter *iter, size= _t len, void *priv, return iterate_kvec(iter, len, priv, priv2, step); if (iov_iter_is_bvecq(iter)) return iterate_bvecq(iter, len, priv, priv2, step); - if (iov_iter_is_folioq(iter)) - return iterate_folioq(iter, len, priv, priv2, step); if (iov_iter_is_xarray(iter)) return iterate_xarray(iter, len, priv, priv2, step); return iterate_discard(iter, len, priv, priv2, step); @@ -397,8 +338,8 @@ size_t iterate_and_advance(struct iov_iter *iter, size_= t len, void *priv, * buffer is presented in segments, which for kernel iteration are broken = up by * physical pages and mapped, with the mapped address being presented. * - * [!] Note This will only handle BVEC, KVEC, BVECQ, FOLIOQ, XARRAY and - * DISCARD-type iterators; it will not handle UBUF or IOVEC-type iterators. + * [!] Note This will only handle BVEC, KVEC, BVECQ, XARRAY and DISCARD-ty= pe + * iterators; it will not handle UBUF or IOVEC-type iterators. * * A step functions, @step, must be provided, one for handling mapped kern= el * addresses and the other is given user addresses which have the potentia= l to @@ -427,8 +368,6 @@ size_t iterate_and_advance_kernel(struct iov_iter *iter= , size_t len, void *priv, return iterate_kvec(iter, len, priv, priv2, step); if (iov_iter_is_bvecq(iter)) return iterate_bvecq(iter, len, priv, priv2, step); - if (iov_iter_is_folioq(iter)) - return iterate_folioq(iter, len, priv, priv2, step); if (iov_iter_is_xarray(iter)) return iterate_xarray(iter, len, priv, priv2, step); return iterate_discard(iter, len, priv, priv2, step); diff --git a/include/linux/uio.h b/include/linux/uio.h index aa50d348dfcc..e84a0c4f28c6 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -11,7 +11,6 @@ #include =20 struct page; -struct folio_queue; =20 typedef unsigned int __bitwise iov_iter_extraction_t; =20 @@ -26,7 +25,6 @@ enum iter_type { ITER_IOVEC, ITER_BVEC, ITER_KVEC, - ITER_FOLIOQ, ITER_BVECQ, ITER_XARRAY, ITER_DISCARD, @@ -69,7 +67,6 @@ struct iov_iter { const struct iovec *__iov; const struct kvec *kvec; const struct bio_vec *bvec; - const struct folio_queue *folioq; const struct bvecq *bvecq; struct xarray *xarray; void __user *ubuf; @@ -79,7 +76,6 @@ struct iov_iter { }; union { unsigned long nr_segs; - u8 folioq_slot; u16 bvecq_slot; loff_t xarray_start; }; @@ -148,11 +144,6 @@ static inline bool iov_iter_is_discard(const struct io= v_iter *i) return iov_iter_type(i) =3D=3D ITER_DISCARD; } =20 -static inline bool iov_iter_is_folioq(const struct iov_iter *i) -{ - return iov_iter_type(i) =3D=3D ITER_FOLIOQ; -} - static inline bool iov_iter_is_bvecq(const struct iov_iter *i) { return iov_iter_type(i) =3D=3D ITER_BVECQ; @@ -303,9 +294,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int dir= ection, const struct kvec void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struc= t bio_vec *bvec, unsigned long nr_segs, size_t count); void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t c= ount); -void iov_iter_folio_queue(struct iov_iter *i, unsigned int direction, - const struct folio_queue *folioq, - unsigned int first_slot, unsigned int offset, size_t count); void iov_iter_bvec_queue(struct iov_iter *i, unsigned int direction, const struct bvecq *bvecq, unsigned int first_slot, unsigned int offset, size_t count); diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 4f091e6d4a22..d203088dbf5a 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -538,39 +538,6 @@ static void iov_iter_iovec_advance(struct iov_iter *i,= size_t size) i->__iov =3D iov; } =20 -static void iov_iter_folioq_advance(struct iov_iter *i, size_t size) -{ - const struct folio_queue *folioq =3D i->folioq; - unsigned int slot =3D i->folioq_slot; - - if (!i->count) - return; - i->count -=3D size; - - if (slot >=3D folioq_nr_slots(folioq)) { - folioq =3D folioq->next; - slot =3D 0; - } - - size +=3D i->iov_offset; /* From beginning of current segment. */ - do { - size_t fsize =3D folioq_folio_size(folioq, slot); - - if (likely(size < fsize)) - break; - size -=3D fsize; - slot++; - if (slot >=3D folioq_nr_slots(folioq) && folioq->next) { - folioq =3D folioq->next; - slot =3D 0; - } - } while (size); - - i->iov_offset =3D size; - i->folioq_slot =3D slot; - i->folioq =3D folioq; -} - static void iov_iter_bvecq_advance(struct iov_iter *i, size_t by) { const struct bvecq *bq =3D i->bvecq; @@ -616,8 +583,6 @@ void iov_iter_advance(struct iov_iter *i, size_t size) iov_iter_iovec_advance(i, size); } else if (iov_iter_is_bvec(i)) { iov_iter_bvec_advance(i, size); - } else if (iov_iter_is_folioq(i)) { - iov_iter_folioq_advance(i, size); } else if (iov_iter_is_bvecq(i)) { iov_iter_bvecq_advance(i, size); } else if (iov_iter_is_discard(i)) { @@ -626,32 +591,6 @@ void iov_iter_advance(struct iov_iter *i, size_t size) } EXPORT_SYMBOL(iov_iter_advance); =20 -static void iov_iter_folioq_revert(struct iov_iter *i, size_t unroll) -{ - const struct folio_queue *folioq =3D i->folioq; - unsigned int slot =3D i->folioq_slot; - - for (;;) { - size_t fsize; - - if (slot =3D=3D 0) { - folioq =3D folioq->prev; - slot =3D folioq_nr_slots(folioq); - } - slot--; - - fsize =3D folioq_folio_size(folioq, slot); - if (unroll <=3D fsize) { - i->iov_offset =3D fsize - unroll; - break; - } - unroll -=3D fsize; - } - - i->folioq_slot =3D slot; - i->folioq =3D folioq; -} - static void iov_iter_bvecq_revert(struct iov_iter *i, size_t unroll) { const struct bvecq *bq =3D i->bvecq; @@ -709,9 +648,6 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) } unroll -=3D n; } - } else if (iov_iter_is_folioq(i)) { - i->iov_offset =3D 0; - iov_iter_folioq_revert(i, unroll); } else if (iov_iter_is_bvecq(i)) { i->iov_offset =3D 0; iov_iter_bvecq_revert(i, unroll); @@ -744,8 +680,6 @@ size_t iov_iter_single_seg_count(const struct iov_iter = *i) } if (!i->count) return 0; - if (unlikely(iov_iter_is_folioq(i))) - return umin(folioq_folio_size(i->folioq, i->folioq_slot), i->count); if (unlikely(iov_iter_is_bvecq(i))) return min(i->count, i->bvecq->bv[i->bvecq_slot].bv_len - i->iov_offset); return i->count; @@ -784,36 +718,6 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int di= rection, } EXPORT_SYMBOL(iov_iter_bvec); =20 -/** - * iov_iter_folio_queue - Initialise an I/O iterator to use the folios in = a folio queue - * @i: The iterator to initialise. - * @direction: The direction of the transfer. - * @folioq: The starting point in the folio queue. - * @first_slot: The first slot in the folio queue to use - * @offset: The offset into the folio in the first slot to start at - * @count: The size of the I/O buffer in bytes. - * - * Set up an I/O iterator to either draw data out of the pages attached to= an - * inode or to inject data into those pages. The pages *must* be prevented - * from evaporation, either by taking a ref on them or locking them by the - * caller. - */ -void iov_iter_folio_queue(struct iov_iter *i, unsigned int direction, - const struct folio_queue *folioq, unsigned int first_slot, - unsigned int offset, size_t count) -{ - BUG_ON(direction & ~1); - *i =3D (struct iov_iter) { - .iter_type =3D ITER_FOLIOQ, - .data_source =3D direction, - .folioq =3D folioq, - .folioq_slot =3D first_slot, - .count =3D count, - .iov_offset =3D offset, - }; -} -EXPORT_SYMBOL(iov_iter_folio_queue); - /** * iov_iter_bvec_queue - Initialise an I/O iterator to use a segmented bve= c queue * @i: The iterator to initialise. @@ -982,9 +886,6 @@ unsigned long iov_iter_alignment(const struct iov_iter = *i) if (iov_iter_is_bvec(i)) return iov_iter_alignment_bvec(i); =20 - /* With both xarray and folioq types, we're dealing with whole folios. */ - if (iov_iter_is_folioq(i)) - return i->iov_offset | i->count; if (iov_iter_is_bvecq(i)) return iov_iter_alignment_bvecq(i); if (iov_iter_is_xarray(i)) @@ -1039,65 +940,6 @@ static int want_pages_array(struct page ***res, size_= t size, return count; } =20 -static ssize_t iter_folioq_get_pages(struct iov_iter *iter, - struct page ***ppages, size_t maxsize, - unsigned maxpages, size_t *_start_offset) -{ - const struct folio_queue *folioq =3D iter->folioq; - struct page **pages; - unsigned int slot =3D iter->folioq_slot; - size_t extracted =3D 0, count =3D iter->count, iov_offset =3D iter->iov_o= ffset; - - if (slot >=3D folioq_nr_slots(folioq)) { - folioq =3D folioq->next; - slot =3D 0; - if (WARN_ON(iov_offset !=3D 0)) - return -EIO; - } - - maxpages =3D want_pages_array(ppages, maxsize, iov_offset & ~PAGE_MASK, m= axpages); - if (!maxpages) - return -ENOMEM; - *_start_offset =3D iov_offset & ~PAGE_MASK; - pages =3D *ppages; - - for (;;) { - struct folio *folio =3D folioq_folio(folioq, slot); - size_t offset =3D iov_offset, fsize =3D folioq_folio_size(folioq, slot); - size_t part =3D PAGE_SIZE - offset % PAGE_SIZE; - - if (offset < fsize) { - part =3D umin(part, umin(maxsize - extracted, fsize - offset)); - count -=3D part; - iov_offset +=3D part; - extracted +=3D part; - - *pages =3D folio_page(folio, offset / PAGE_SIZE); - get_page(*pages); - pages++; - maxpages--; - } - - if (maxpages =3D=3D 0 || extracted >=3D maxsize) - break; - - if (iov_offset >=3D fsize) { - iov_offset =3D 0; - slot++; - if (slot =3D=3D folioq_nr_slots(folioq) && folioq->next) { - folioq =3D folioq->next; - slot =3D 0; - } - } - } - - iter->count =3D count; - iter->iov_offset =3D iov_offset; - iter->folioq =3D folioq; - iter->folioq_slot =3D slot; - return extracted; -} - static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarr= ay *xa, pgoff_t index, unsigned int nr_pages) { @@ -1249,8 +1091,6 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_= iter *i, } return maxsize; } - if (iov_iter_is_folioq(i)) - return iter_folioq_get_pages(i, pages, maxsize, maxpages, start); if (iov_iter_is_xarray(i)) return iter_xarray_get_pages(i, pages, maxsize, maxpages, start); WARN_ON_ONCE(iov_iter_is_bvecq(i)); @@ -1366,11 +1206,6 @@ int iov_iter_npages(const struct iov_iter *i, int ma= xpages) return iov_npages(i, maxpages); if (iov_iter_is_bvec(i)) return bvec_npages(i, maxpages); - if (iov_iter_is_folioq(i)) { - unsigned offset =3D i->iov_offset % PAGE_SIZE; - int npages =3D DIV_ROUND_UP(offset + i->count, PAGE_SIZE); - return min(npages, maxpages); - } if (iov_iter_is_bvecq(i)) return iov_npages_bvecq(i, maxpages); if (iov_iter_is_xarray(i)) { @@ -1654,68 +1489,6 @@ void iov_iter_restore(struct iov_iter *i, struct iov= _iter_state *state) i->nr_segs =3D state->nr_segs; } =20 -/* - * Extract a list of contiguous pages from an ITER_FOLIOQ iterator. This = does - * not get references on the pages, nor does it get a pin on them. - */ -static ssize_t iov_iter_extract_folioq_pages(struct iov_iter *i, - struct page ***pages, size_t maxsize, - unsigned int maxpages, - iov_iter_extraction_t extraction_flags, - size_t *offset0) -{ - const struct folio_queue *folioq =3D i->folioq; - struct page **p; - unsigned int nr =3D 0; - size_t extracted =3D 0, offset, slot =3D i->folioq_slot; - - if (slot >=3D folioq_nr_slots(folioq)) { - folioq =3D folioq->next; - slot =3D 0; - if (WARN_ON(i->iov_offset !=3D 0)) - return -EIO; - } - - offset =3D i->iov_offset & ~PAGE_MASK; - *offset0 =3D offset; - - maxpages =3D want_pages_array(pages, maxsize, offset, maxpages); - if (!maxpages) - return -ENOMEM; - p =3D *pages; - - for (;;) { - struct folio *folio =3D folioq_folio(folioq, slot); - size_t offset =3D i->iov_offset, fsize =3D folioq_folio_size(folioq, slo= t); - size_t part =3D PAGE_SIZE - offset % PAGE_SIZE; - - if (offset < fsize) { - part =3D umin(part, umin(maxsize - extracted, fsize - offset)); - i->count -=3D part; - i->iov_offset +=3D part; - extracted +=3D part; - - p[nr++] =3D folio_page(folio, offset / PAGE_SIZE); - } - - if (nr >=3D maxpages || extracted >=3D maxsize) - break; - - if (i->iov_offset >=3D fsize) { - i->iov_offset =3D 0; - slot++; - if (slot =3D=3D folioq_nr_slots(folioq) && folioq->next) { - folioq =3D folioq->next; - slot =3D 0; - } - } - } - - i->folioq =3D folioq; - i->folioq_slot =3D slot; - return extracted; -} - /* * Extract a list of virtually contiguous pages from an ITER_BVECQ iterato= r. * This does not get references on the pages, nor does it get a pin on the= m. @@ -2078,8 +1851,8 @@ static ssize_t iov_iter_extract_user_pages(struct iov= _iter *i, * added to the pages, but refs will not be taken. * iov_iter_extract_will_pin() will return true. * - * (*) If the iterator is ITER_KVEC, ITER_BVEC, ITER_FOLIOQ or ITER_XARRA= Y, the - * pages are merely listed; no extra refs or pins are obtained. + * (*) If the iterator is ITER_KVEC, ITER_BVEC, ITER_XARRAY, the pages are + * merely listed; no extra refs or pins are obtained. * iov_iter_extract_will_pin() will return 0. * * Note also: @@ -2114,10 +1887,6 @@ ssize_t iov_iter_extract_pages(struct iov_iter *i, return iov_iter_extract_bvec_pages(i, pages, maxsize, maxpages, extraction_flags, offset0); - if (iov_iter_is_folioq(i)) - return iov_iter_extract_folioq_pages(i, pages, maxsize, - maxpages, extraction_flags, - offset0); if (iov_iter_is_bvecq(i)) return iov_iter_extract_bvecq_pages(i, pages, maxsize, maxpages, extraction_flags, diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 93a3d194a914..25f64272839e 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -12,7 +12,6 @@ #include #include #include -#include =20 /** * sg_nents - return total count of entries in scatterlist @@ -1268,67 +1267,6 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *i= ter, return ret; } =20 -/* - * Extract up to sg_max folios from an FOLIOQ-type iterator and add them to - * the scatterlist. The pages are not pinned. - */ -static ssize_t extract_folioq_to_sg(struct iov_iter *iter, - ssize_t maxsize, - struct sg_table *sgtable, - unsigned int sg_max, - iov_iter_extraction_t extraction_flags) -{ - const struct folio_queue *folioq =3D iter->folioq; - struct scatterlist *sg =3D sgtable->sgl + sgtable->nents; - unsigned int slot =3D iter->folioq_slot; - ssize_t ret =3D 0; - size_t offset =3D iter->iov_offset; - - BUG_ON(!folioq); - - if (slot >=3D folioq_nr_slots(folioq)) { - folioq =3D folioq->next; - if (WARN_ON_ONCE(!folioq)) - return 0; - slot =3D 0; - } - - do { - struct folio *folio =3D folioq_folio(folioq, slot); - size_t fsize =3D folioq_folio_size(folioq, slot); - - if (offset < fsize) { - size_t part =3D umin(maxsize - ret, fsize - offset); - - sg_set_page(sg, folio_page(folio, 0), part, offset); - sgtable->nents++; - sg++; - sg_max--; - offset +=3D part; - ret +=3D part; - } - - if (offset >=3D fsize) { - offset =3D 0; - slot++; - if (slot >=3D folioq_nr_slots(folioq)) { - if (!folioq->next) { - WARN_ON_ONCE(ret < iter->count); - break; - } - folioq =3D folioq->next; - slot =3D 0; - } - } - } while (sg_max > 0 && ret < maxsize); - - iter->folioq =3D folioq; - iter->folioq_slot =3D slot; - iter->iov_offset =3D offset; - iter->count -=3D ret; - return ret; -} - /* * Extract up to sg_max folios from an BVECQ-type iterator and add them to * the scatterlist. The pages are not pinned. @@ -1453,7 +1391,7 @@ static ssize_t extract_xarray_to_sg(struct iov_iter *= iter, * addition of @sg_max elements. * * The pages referred to by UBUF- and IOVEC-type iterators are extracted a= nd - * pinned; BVEC-, KVEC-, FOLIOQ- and XARRAY-type are extracted but aren't + * pinned; BVEC-, KVEC-, BVECQ- and XARRAY-type are extracted but aren't * pinned; DISCARD-type is not supported. * * No end mark is placed on the scatterlist; that's left to the caller. @@ -1486,9 +1424,6 @@ ssize_t extract_iter_to_sg(struct iov_iter *iter, siz= e_t maxsize, case ITER_KVEC: return extract_kvec_to_sg(iter, maxsize, sgtable, sg_max, extraction_flags); - case ITER_FOLIOQ: - return extract_folioq_to_sg(iter, maxsize, sgtable, sg_max, - extraction_flags); case ITER_BVECQ: return extract_bvecq_to_sg(iter, maxsize, sgtable, sg_max, extraction_flags); diff --git a/lib/tests/kunit_iov_iter.c b/lib/tests/kunit_iov_iter.c index ff0621636ff1..7011f0ff7396 100644 --- a/lib/tests/kunit_iov_iter.c +++ b/lib/tests/kunit_iov_iter.c @@ -11,9 +11,7 @@ #include #include #include -#include #include -#include #include =20 MODULE_DESCRIPTION("iov_iter testing"); @@ -364,179 +362,6 @@ static void __init iov_kunit_copy_from_bvec(struct ku= nit *test) KUNIT_SUCCEED(test); } =20 -static void iov_kunit_destroy_folioq(void *data) -{ - struct folio_queue *folioq, *next; - - for (folioq =3D data; folioq; folioq =3D next) { - next =3D folioq->next; - for (int i =3D 0; i < folioq_nr_slots(folioq); i++) - if (folioq_folio(folioq, i)) - folio_put(folioq_folio(folioq, i)); - kfree(folioq); - } -} - -static void __init iov_kunit_load_folioq(struct kunit *test, - struct iov_iter *iter, int dir, - struct folio_queue *folioq, - struct page **pages, size_t npages) -{ - struct folio_queue *p =3D folioq; - size_t size =3D 0; - int i; - - for (i =3D 0; i < npages; i++) { - if (folioq_full(p)) { - p->next =3D kzalloc_obj(struct folio_queue); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, p->next); - folioq_init(p->next, 0); - p->next->prev =3D p; - p =3D p->next; - } - folioq_append(p, page_folio(pages[i])); - size +=3D PAGE_SIZE; - } - iov_iter_folio_queue(iter, dir, folioq, 0, 0, size); -} - -static struct folio_queue *iov_kunit_create_folioq(struct kunit *test) -{ - struct folio_queue *folioq; - - folioq =3D kzalloc_obj(struct folio_queue); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, folioq); - kunit_add_action_or_reset(test, iov_kunit_destroy_folioq, folioq); - folioq_init(folioq, 0); - return folioq; -} - -/* - * Test copying to a ITER_FOLIOQ-type iterator. - */ -static void __init iov_kunit_copy_to_folioq(struct kunit *test) -{ - const struct kvec_test_range *pr; - struct iov_iter iter; - struct folio_queue *folioq; - struct page **spages, **bpages; - u8 *scratch, *buffer; - size_t bufsize, npages, size, copied; - int i, patt; - - bufsize =3D 0x100000; - npages =3D bufsize / PAGE_SIZE; - - folioq =3D iov_kunit_create_folioq(test); - - scratch =3D iov_kunit_create_buffer(test, &spages, npages); - for (i =3D 0; i < bufsize; i++) - scratch[i] =3D pattern(i); - - buffer =3D iov_kunit_create_buffer(test, &bpages, npages); - memset(buffer, 0, bufsize); - - iov_kunit_load_folioq(test, &iter, READ, folioq, bpages, npages); - - i =3D 0; - for (pr =3D kvec_test_ranges; pr->from >=3D 0; pr++) { - size =3D pr->to - pr->from; - KUNIT_ASSERT_LE(test, pr->to, bufsize); - - iov_iter_folio_queue(&iter, READ, folioq, 0, 0, pr->to); - iov_iter_advance(&iter, pr->from); - copied =3D copy_to_iter(scratch + i, size, &iter); - - KUNIT_EXPECT_EQ(test, copied, size); - KUNIT_EXPECT_EQ(test, iter.count, 0); - KUNIT_EXPECT_EQ(test, iter.iov_offset, pr->to % PAGE_SIZE); - i +=3D size; - if (test->status =3D=3D KUNIT_FAILURE) - goto stop; - } - - /* Build the expected image in the scratch buffer. */ - patt =3D 0; - memset(scratch, 0, bufsize); - for (pr =3D kvec_test_ranges; pr->from >=3D 0; pr++) - for (i =3D pr->from; i < pr->to; i++) - scratch[i] =3D pattern(patt++); - - /* Compare the images */ - for (i =3D 0; i < bufsize; i++) { - KUNIT_EXPECT_EQ_MSG(test, buffer[i], scratch[i], "at i=3D%x", i); - if (buffer[i] !=3D scratch[i]) - return; - } - -stop: - KUNIT_SUCCEED(test); -} - -/* - * Test copying from a ITER_FOLIOQ-type iterator. - */ -static void __init iov_kunit_copy_from_folioq(struct kunit *test) -{ - const struct kvec_test_range *pr; - struct iov_iter iter; - struct folio_queue *folioq; - struct page **spages, **bpages; - u8 *scratch, *buffer; - size_t bufsize, npages, size, copied; - int i, j; - - bufsize =3D 0x100000; - npages =3D bufsize / PAGE_SIZE; - - folioq =3D iov_kunit_create_folioq(test); - - buffer =3D iov_kunit_create_buffer(test, &bpages, npages); - for (i =3D 0; i < bufsize; i++) - buffer[i] =3D pattern(i); - - scratch =3D iov_kunit_create_buffer(test, &spages, npages); - memset(scratch, 0, bufsize); - - iov_kunit_load_folioq(test, &iter, READ, folioq, bpages, npages); - - i =3D 0; - for (pr =3D kvec_test_ranges; pr->from >=3D 0; pr++) { - size =3D pr->to - pr->from; - KUNIT_ASSERT_LE(test, pr->to, bufsize); - - iov_iter_folio_queue(&iter, WRITE, folioq, 0, 0, pr->to); - iov_iter_advance(&iter, pr->from); - copied =3D copy_from_iter(scratch + i, size, &iter); - - KUNIT_EXPECT_EQ(test, copied, size); - KUNIT_EXPECT_EQ(test, iter.count, 0); - KUNIT_EXPECT_EQ(test, iter.iov_offset, pr->to % PAGE_SIZE); - i +=3D size; - } - - /* Build the expected image in the main buffer. */ - i =3D 0; - memset(buffer, 0, bufsize); - for (pr =3D kvec_test_ranges; pr->from >=3D 0; pr++) { - for (j =3D pr->from; j < pr->to; j++) { - buffer[i++] =3D pattern(j); - if (i >=3D bufsize) - goto stop; - } - } -stop: - - /* Compare the images */ - for (i =3D 0; i < bufsize; i++) { - KUNIT_EXPECT_EQ_MSG(test, scratch[i], buffer[i], "at i=3D%x", i); - if (scratch[i] !=3D buffer[i]) - return; - } - - KUNIT_SUCCEED(test); -} - static void iov_kunit_destroy_bvecq(void *data) { struct bvecq *bq, *next; @@ -1029,85 +854,6 @@ static void __init iov_kunit_extract_pages_bvec(struc= t kunit *test) KUNIT_SUCCEED(test); } =20 -/* - * Test the extraction of ITER_FOLIOQ-type iterators. - */ -static void __init iov_kunit_extract_pages_folioq(struct kunit *test) -{ - const struct kvec_test_range *pr; - struct folio_queue *folioq; - struct iov_iter iter; - struct page **bpages, *pagelist[8], **pages =3D pagelist; - ssize_t len; - size_t bufsize, size =3D 0, npages; - int i, from; - - bufsize =3D 0x100000; - npages =3D bufsize / PAGE_SIZE; - - folioq =3D iov_kunit_create_folioq(test); - - iov_kunit_create_buffer(test, &bpages, npages); - iov_kunit_load_folioq(test, &iter, READ, folioq, bpages, npages); - - for (pr =3D kvec_test_ranges; pr->from >=3D 0; pr++) { - from =3D pr->from; - size =3D pr->to - from; - KUNIT_ASSERT_LE(test, pr->to, bufsize); - - iov_iter_folio_queue(&iter, WRITE, folioq, 0, 0, pr->to); - iov_iter_advance(&iter, from); - - do { - size_t offset0 =3D LONG_MAX; - - for (i =3D 0; i < ARRAY_SIZE(pagelist); i++) - pagelist[i] =3D (void *)(unsigned long)0xaa55aa55aa55aa55ULL; - - len =3D iov_iter_extract_pages(&iter, &pages, 100 * 1024, - ARRAY_SIZE(pagelist), 0, &offset0); - KUNIT_EXPECT_GE(test, len, 0); - if (len < 0) - break; - KUNIT_EXPECT_LE(test, len, size); - KUNIT_EXPECT_EQ(test, iter.count, size - len); - if (len =3D=3D 0) - break; - size -=3D len; - KUNIT_EXPECT_GE(test, (ssize_t)offset0, 0); - KUNIT_EXPECT_LT(test, offset0, PAGE_SIZE); - - for (i =3D 0; i < ARRAY_SIZE(pagelist); i++) { - struct page *p; - ssize_t part =3D min_t(ssize_t, len, PAGE_SIZE - offset0); - int ix; - - KUNIT_ASSERT_GE(test, part, 0); - ix =3D from / PAGE_SIZE; - KUNIT_ASSERT_LT(test, ix, npages); - p =3D bpages[ix]; - KUNIT_EXPECT_PTR_EQ(test, pagelist[i], p); - KUNIT_EXPECT_EQ(test, offset0, from % PAGE_SIZE); - from +=3D part; - len -=3D part; - KUNIT_ASSERT_GE(test, len, 0); - if (len =3D=3D 0) - break; - offset0 =3D 0; - } - - if (test->status =3D=3D KUNIT_FAILURE) - goto stop; - } while (iov_iter_count(&iter) > 0); - - KUNIT_EXPECT_EQ(test, size, 0); - KUNIT_EXPECT_EQ(test, iter.count, 0); - } - -stop: - KUNIT_SUCCEED(test); -} - /* * Test the extraction of ITER_XARRAY-type iterators. */ @@ -1192,15 +938,12 @@ static struct kunit_case __refdata iov_kunit_cases[]= =3D { KUNIT_CASE(iov_kunit_copy_from_kvec), KUNIT_CASE(iov_kunit_copy_to_bvec), KUNIT_CASE(iov_kunit_copy_from_bvec), - KUNIT_CASE(iov_kunit_copy_to_folioq), - KUNIT_CASE(iov_kunit_copy_from_folioq), KUNIT_CASE(iov_kunit_copy_to_bvecq), KUNIT_CASE(iov_kunit_copy_from_bvecq), KUNIT_CASE(iov_kunit_copy_to_xarray), KUNIT_CASE(iov_kunit_copy_from_xarray), KUNIT_CASE(iov_kunit_extract_pages_kvec), KUNIT_CASE(iov_kunit_extract_pages_bvec), - KUNIT_CASE(iov_kunit_extract_pages_folioq), KUNIT_CASE(iov_kunit_extract_pages_xarray), {} };