From: "Christian A. Ehrhardt" <lk@c--e.de>
To: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
David Howells <dhowells@redhat.com>
Cc: "Christian A. Ehrhardt" <lk@c--e.de>, Kees Cook <kees@kernel.org>,
Petr Mladek <pmladek@suse.com>, David Gow <davidgow@google.com>
Subject: [PATCH RESEND 2/3] lib: kunit_iov_iter: Add tests for extract_iter_to_sg
Date: Mon, 23 Mar 2026 22:23:49 +0100 [thread overview]
Message-ID: <20260323212350.807118-3-lk@c--e.de> (raw)
In-Reply-To: <20260323212350.807118-1-lk@c--e.de>
Add test cases that test extract_iter_to_sg.
For each iterator type an iterator is loaded with a kernel
buffer. The iterator is then extracted to a scatterlist and
the scatterlist is copied into a scratch buffer.
The test passes if the scratch buffer compares equal to the
original buffer.
The new tests demostrate a bug in extract_iter_to_sg
for kvec iterators and one of the tests will fail. This
is fixed in the next commit.
Cc: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
---
lib/tests/kunit_iov_iter.c | 140 +++++++++++++++++++++++++++++++++++++
1 file changed, 140 insertions(+)
diff --git a/lib/tests/kunit_iov_iter.c b/lib/tests/kunit_iov_iter.c
index c32fbdbb2544..aa6a19ca6dad 100644
--- a/lib/tests/kunit_iov_iter.c
+++ b/lib/tests/kunit_iov_iter.c
@@ -13,6 +13,7 @@
#include <linux/uio.h>
#include <linux/bvec.h>
#include <linux/folio_queue.h>
+#include <linux/scatterlist.h>
#include <linux/minmax.h>
#include <kunit/test.h>
@@ -1014,6 +1015,141 @@ static void __init iov_kunit_extract_pages_xarray(struct kunit *test)
KUNIT_SUCCEED(test);
}
+struct iov_kunit_iter_to_sg_data {
+ struct sg_table sgt;
+ u8 *buffer, *scratch;
+ struct page **pages;
+ size_t npages;
+};
+
+static void __init
+iov_kunit_iter_to_sg_init(struct kunit *test, size_t bufsize,
+ struct iov_kunit_iter_to_sg_data *data)
+{
+ struct page **spages;
+ struct scatterlist *sg;
+ size_t i;
+
+ data->npages = bufsize / PAGE_SIZE;
+ sg = kunit_kmalloc_array(test, data->npages, sizeof(*sg), GFP_KERNEL);
+ sg_init_table(sg, data->npages);
+ memset(&data->sgt, 0, sizeof(data->sgt));
+ data->sgt.orig_nents = data->npages;
+ data->sgt.sgl = sg;
+
+ data->buffer = iov_kunit_create_buffer(test, &data->pages,
+ data->npages);
+ data->scratch = iov_kunit_create_buffer(test, &spages, data->npages);
+ for (i = 0; i < bufsize; ++i)
+ data->buffer[i] = pattern(i);
+ memset(data->scratch, 0, bufsize);
+}
+
+static void __init
+iov_kunit_iter_to_sg_check(struct kunit *test, struct iov_iter *iter,
+ size_t bufsize,
+ struct iov_kunit_iter_to_sg_data *data)
+{
+ size_t i;
+
+ i = extract_iter_to_sg(iter, bufsize, &data->sgt,
+ data->npages, 0);
+
+ KUNIT_EXPECT_EQ(test, i, bufsize);
+ KUNIT_EXPECT_LE(test, data->sgt.nents, data->npages);
+
+ i = sg_copy_to_buffer(data->sgt.sgl, data->sgt.nents,
+ data->scratch, bufsize);
+ KUNIT_EXPECT_EQ(test, i, bufsize);
+
+ for (i = 0; i < bufsize; ++i) {
+ KUNIT_EXPECT_EQ_MSG(test, data->buffer[i], data->scratch[i],
+ "at i=%zx", i);
+ if (data->buffer[i] != data->scratch[i])
+ break;
+ }
+
+ KUNIT_EXPECT_EQ(test, i, bufsize);
+}
+
+static void __init iov_kunit_iter_to_sg_kvec(struct kunit *test)
+{
+ struct iov_kunit_iter_to_sg_data data;
+ struct iov_iter iter;
+ struct kvec kvec;
+ size_t bufsize;
+
+ bufsize = 0x100000;
+ iov_kunit_iter_to_sg_init(test, bufsize, &data);
+
+ kvec.iov_base = data.buffer;
+ kvec.iov_len = bufsize;
+ iov_iter_kvec(&iter, READ, &kvec, 1, bufsize);
+
+ iov_kunit_iter_to_sg_check(test, &iter, bufsize, &data);
+}
+
+static void __init iov_kunit_iter_to_sg_bvec(struct kunit *test)
+{
+ struct iov_kunit_iter_to_sg_data data;
+ struct page *p, *can_merge = NULL;
+ size_t i, k, bufsize;
+ struct bio_vec *bvec;
+ struct iov_iter iter;
+
+ bufsize = 0x100000;
+ iov_kunit_iter_to_sg_init(test, bufsize, &data);
+
+ bvec = kunit_kmalloc_array(test, data.npages, sizeof(*bvec),
+ GFP_KERNEL);
+ k = 0;
+ for (i = 0; i < data.npages; ++i) {
+ p = data.pages[i];
+ if (p == can_merge)
+ bvec[k-1].bv_len += PAGE_SIZE;
+ else
+ bvec_set_page(&bvec[k++], p, PAGE_SIZE, 0);
+ can_merge = p + 1;
+ }
+ iov_iter_bvec(&iter, READ, bvec, k, bufsize);
+
+ iov_kunit_iter_to_sg_check(test, &iter, bufsize, &data);
+}
+
+static void __init iov_kunit_iter_to_sg_folioq(struct kunit *test)
+{
+ struct iov_kunit_iter_to_sg_data data;
+ struct folio_queue *folioq;
+ struct iov_iter iter;
+ size_t bufsize;
+
+ bufsize = 0x100000;
+ iov_kunit_iter_to_sg_init(test, bufsize, &data);
+
+ folioq = iov_kunit_create_folioq(test);
+ iov_kunit_load_folioq(test, &iter, READ, folioq, data.pages,
+ data.npages);
+
+ iov_kunit_iter_to_sg_check(test, &iter, bufsize, &data);
+}
+
+static void __init iov_kunit_iter_to_sg_xarray(struct kunit *test)
+{
+ struct iov_kunit_iter_to_sg_data data;
+ struct xarray *xarray;
+ struct iov_iter iter;
+ size_t bufsize;
+
+ bufsize = 0x100000;
+ iov_kunit_iter_to_sg_init(test, bufsize, &data);
+
+ xarray = iov_kunit_create_xarray(test);
+ iov_kunit_load_xarray(test, &iter, READ, xarray, data.pages,
+ data.npages);
+
+ iov_kunit_iter_to_sg_check(test, &iter, bufsize, &data);
+}
+
static struct kunit_case __refdata iov_kunit_cases[] = {
KUNIT_CASE(iov_kunit_copy_to_kvec),
KUNIT_CASE(iov_kunit_copy_from_kvec),
@@ -1027,6 +1163,10 @@ static struct kunit_case __refdata iov_kunit_cases[] = {
KUNIT_CASE(iov_kunit_extract_pages_bvec),
KUNIT_CASE(iov_kunit_extract_pages_folioq),
KUNIT_CASE(iov_kunit_extract_pages_xarray),
+ KUNIT_CASE(iov_kunit_iter_to_sg_kvec),
+ KUNIT_CASE(iov_kunit_iter_to_sg_bvec),
+ KUNIT_CASE(iov_kunit_iter_to_sg_folioq),
+ KUNIT_CASE(iov_kunit_iter_to_sg_xarray),
{}
};
--
2.43.0
next prev parent reply other threads:[~2026-03-23 21:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-23 21:23 [PATCH RESEND 0/3] Fix length calculation bug in extract_kvec_to_sg Christian A. Ehrhardt
2026-03-23 21:23 ` [PATCH RESEND 1/3] lib: kunit_iov_iter: Improve error detection Christian A. Ehrhardt
2026-03-23 21:23 ` Christian A. Ehrhardt [this message]
2026-03-23 21:23 ` [PATCH RESEND 3/3] lib: Fix length calculation in extract_kvec_to_sg Christian A. Ehrhardt
2026-03-24 19:12 ` Andrew Morton
2026-03-24 19:39 ` Christian A. Ehrhardt
2026-03-24 19:15 ` Andrew Morton
2026-03-24 19:47 ` Christian A. Ehrhardt
2026-03-24 20:08 ` Andrew Morton
2026-03-24 0:03 ` [PATCH RESEND 0/3] Fix length calculation bug " Josh Law
2026-03-24 16:38 ` Josh Law
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260323212350.807118-3-lk@c--e.de \
--to=lk@c--e.de \
--cc=akpm@linux-foundation.org \
--cc=davidgow@google.com \
--cc=dhowells@redhat.com \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®