2022-07-22 17:17:26

by Daniel Latypov

Subject: [PATCH v2 2/5] kunit: drop test pointer in string_stream_fragment

We already store the `struct kunit *test` in the string_stream object
itself, so we need don't need to store a copy of this pointer in every
fragment in the stream.

Drop it, getting string_stream_fragment down the bare minimum: a
list_head and the `char *` with the actual fragment.

Signed-off-by: Daniel Latypov <[email protected]>
Reviewed-by: David Gow <[email protected]>
---
v1 -> v2: no changes
---
lib/kunit/string-stream.c | 10 +++++-----
lib/kunit/string-stream.h | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
index a2496abef152..f5ae79c37400 100644
--- a/lib/kunit/string-stream.c
+++ b/lib/kunit/string-stream.c
@@ -22,7 +22,6 @@ static struct string_stream_fragment *alloc_string_stream_fragment(
if (!frag)
return ERR_PTR(-ENOMEM);

- frag->test = test;
frag->fragment = kunit_kmalloc(test, len, gfp);
if (!frag->fragment)
return ERR_PTR(-ENOMEM);
@@ -30,11 +29,12 @@ static struct string_stream_fragment *alloc_string_stream_fragment(
return frag;
}

-static void string_stream_fragment_destroy(struct string_stream_fragment *frag)
+static void string_stream_fragment_destroy(struct kunit *test,
+ struct string_stream_fragment *frag)
{
list_del(&frag->node);
- kunit_kfree(frag->test, frag->fragment);
- kunit_kfree(frag->test, frag);
+ kunit_kfree(test, frag->fragment);
+ kunit_kfree(test, frag);
}

int string_stream_vadd(struct string_stream *stream,
@@ -89,7 +89,7 @@ static void string_stream_clear(struct string_stream *stream)
frag_container_safe,
&stream->fragments,
node) {
- string_stream_fragment_destroy(frag_container);
+ string_stream_fragment_destroy(stream->test, frag_container);
}
stream->length = 0;
spin_unlock(&stream->lock);
diff --git a/lib/kunit/string-stream.h b/lib/kunit/string-stream.h
index 494dee0f24bd..b669f9a75a94 100644
--- a/lib/kunit/string-stream.h
+++ b/lib/kunit/string-stream.h
@@ -14,7 +14,6 @@
#include <linux/stdarg.h>

struct string_stream_fragment {
- struct kunit *test;
struct list_head node;
char *fragment;
};
--
2.37.1.359.gd136c6c3e2-goog

2022-10-05 20:52:38

by Brendan Higgins

Subject: Re: [PATCH v2 2/5] kunit: drop test pointer in string_stream_fragment

On Fri, Jul 22, 2022 at 1:15 PM Daniel Latypov <[email protected]> wrote:
>
> We already store the `struct kunit *test` in the string_stream object
> itself, so we need don't need to store a copy of this pointer in every
> fragment in the stream.
>
> Drop it, getting string_stream_fragment down the bare minimum: a
> list_head and the `char *` with the actual fragment.
>
> Signed-off-by: Daniel Latypov <[email protected]>
> Reviewed-by: David Gow <[email protected]>

Reviewed-by: Brendan Higgins <[email protected]>