binder: Add copyright notice to new kunit files
PATCH v2 1/2 binder: Add copyright notice to new kunit files
Clean up for the binder_alloc kunit test series. Add a copyright notice to new files, as suggested by Carlos [1].
[1] https://lore.kernel.org/all/CAFuZdDLD=3CBOLSWw3VxCf7Nkf884SSNmt1wresQgxgBwED=eQ@mail.gmail.com/
---
This patch is based on top of char-misc-next.
--- drivers/android/tests/.kunitconfig | 4 ++++ drivers/android/tests/Makefile | 3 +++ drivers/android/tests/binder_alloc_kunit.c | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/android/tests/.kunitconfig +4 -0
@@ -1,3 +1,7 @@ +# +# Copyright 2025 Google LLC. +# + CONFIG_KUNIT=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_ALLOC_KUNIT_TEST=y
drivers/android/tests/Makefile +3 -0
@@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +# +# Copyright 2025 Google LLC. +# obj-$(CONFIG_ANDROID_BINDER_ALLOC_KUNIT_TEST) += binder_alloc_kunit.o
drivers/android/tests/binder_alloc_kunit.c +4 -1
@@ -1,6 +1,9 @@// SPDX-License-Identifier: GPL-2.0 /* -* Test cases for binder allocator code +* Test cases for binder allocator code. +* +* Copyright 2025 Google LLC. +* Author: Tiffany Yang <[email protected]> */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
PATCH v2 2/2 binder: Use seq_buf in binder_alloc kunit tests
Replace instances of snprintf with seq_buf functions, as suggested by Kees [1].
[1] https://lore.kernel.org/all/202507160743.15E8044@keescook/
---
This patch is based on top of char-misc-next.
--- drivers/android/tests/binder_alloc_kunit.c | 46 ++++++++++------------ 1 file changed, 21 insertions(+), 25 deletions(-)
drivers/android/tests/binder_alloc_kunit.c +21 -25
@@ -15,6 +15,7 @@#include <linux/fs.h> #include <linux/mm.h> #include <linux/mman.h> +#include <linux/seq_buf.h> #include <linux/sizes.h> #include "../binder_alloc.h"
@@ -107,40 +108,33 @@ static const char *const buf_end_align_type_strs[LOOP_END] = { };struct binder_alloc_test_case_info { +char alignments[ALIGNMENTS_BUFLEN ]; +struct seq_buf alignments_sb;size_t *buffer_sizes;int *free_sequence; -char alignments[ALIGNMENTS_BUFLEN ];bool front_pages; }; -static void stringify_free_seq (struct kunit *test,int *seq,char *buf, -size_t buf_len) +static void stringify_free_seq (struct kunit *test,int *seq,struct seq_buf *sb) { -size_t bytes =0 ;int i; -for (i =0 ; i <BUFFER_NUM ; i++) { - bytes +=snprintf (buf + bytes, buf_len - bytes,"[%d]" , seq[i]); -if (bytes >= buf_len) -break ; - } -KUNIT_EXPECT_LT (test, bytes, buf_len); +for (i =0 ; i <BUFFER_NUM ; i++) +seq_buf_printf (sb,"[%d]" , seq[i]); + +KUNIT_EXPECT_FALSE (test,seq_buf_has_overflowed (sb)); }static void stringify_alignments (struct kunit *test,int *alignments, -char *buf,size_t buf_len) +struct seq_buf *sb) { -size_t bytes =0 ;int i; -for (i =0 ; i <BUFFER_NUM ; i++) { - bytes +=snprintf (buf + bytes, buf_len - bytes,"[ %d:%s ]" , i, - buf_end_align_type_strs[alignments[i]]); -if (bytes >= buf_len) -break ; - } +for (i =0 ; i <BUFFER_NUM ; i++) +seq_buf_printf (sb,"[ %d:%s ]" , i, + buf_end_align_type_strs[alignments[i]]); -KUNIT_EXPECT_LT (test, bytes, buf_len); +KUNIT_EXPECT_FALSE (test,seq_buf_has_overflowed (sb)); } static bool check_buffer_pages_allocated(struct kunit *test,
@@ -311,19 +305,20 @@ static void permute_frees(struct kunit *test, struct binder_alloc *alloc,int i;if (index ==BUFFER_NUM ) { -char freeseq_buf[FREESEQ_BUFLEN ]; +DECLARE_SEQ_BUF (freeseq_sb,FREESEQ_BUFLEN ); case_failed =binder_alloc_test_alloc_free (test, alloc, tc, end); *runs +=1 ; *failures += case_failed;if (case_failed ||PRINT_ALL_CASES ) { -stringify_free_seq (test, tc->free_sequence, freeseq_buf, -FREESEQ_BUFLEN ); +stringify_free_seq (test, tc->free_sequence, + &freeseq_sb);kunit_err (test,"case %lu: [%s] | %s - %s - %s" , *runs, case_failed ?"FAILED" :"PASSED" , tc->front_pages ?"front" :"back " , - tc->alignments, freeseq_buf); +seq_buf_str (&tc->alignments_sb), +seq_buf_str (&freeseq_sb)); }return ;
@@ -383,8 +378,9 @@ static void gen_buf_offsets(struct kunit *test, struct binder_alloc *alloc,if (index ==BUFFER_NUM ) {struct binder_alloc_test_case_info tc = {0 }; -stringify_alignments (test, alignments, tc.alignments, -ALIGNMENTS_BUFLEN ); +seq_buf_init (&tc.alignments_sb, tc.alignments, +ALIGNMENTS_BUFLEN ); +stringify_alignments (test, alignments, &tc.alignments_sb);gen_buf_sizes (test, alloc, &tc, end_offset, runs, failures);return ;
Signature · 1 line
2.50.0.727.gbf7dc18ff4-goog
Re: [PATCH v2 2/2] binder: Use seq_buf in binder_alloc kunit tests
Quoted 9 lines · Tiffany Yang
Replace instances of snprintf with
seq_buffunctions, as suggested by Kees [1].[1] https://lore.kernel.org/all/202507160743.15E8044@keescook/
Fixes d1934ed9803c ("binder: encapsulate individual alloc test cases")Suggested-by Kees Cook <[email protected]>Cc Joel Fernandes <[email protected]>Signed-off-by Tiffany Yang <[email protected]>
Quoted 5 lines
---
This patch is based on top of char-misc-next.--- drivers/android/tests/binder_alloc_kunit.c | 46 ++++++++++------------ 1 file changed, 21 insertions(+), 25 deletions(-)
Yay, always nice to see using an alternative API results in fewer lines! :)
Signature · 1 line
Kees Cook
Re: [PATCH v2 2/2] binder: Use seq_buf in binder_alloc kunit tests
In reply to Tiffany YangQuoted 10 lines · Tiffany Yang
Replace instances of snprintf with
seq_buffunctions, as suggested by Kees [1].[1] https://lore.kernel.org/all/202507160743.15E8044@keescook/
Fixes d1934ed9803c ("binder: encapsulate individual alloc test cases")Suggested-by Kees Cook <[email protected]>Cc Joel Fernandes <[email protected]>Signed-off-by Tiffany Yang <[email protected]>---
Quoted 10 lines · Tiffany Yang
Clean up for the
binder_allockunit test series. Add a copyright notice to new files, as suggested by Carlos [1].[1] https://lore.kernel.org/all/CAFuZdDLD=3CBOLSWw3VxCf7Nkf884SSNmt1wresQgxgBwED=eQ@mail.gmail.com/
Fixes 5e024582f494 ("binder: Scaffolding for binder_alloc KUnit tests")Suggested-by Carlos Llamas <[email protected]>Cc Joel Fernandes <[email protected]>Signed-off-by Tiffany Yang <[email protected]>---
It looks like Greg has picked up this patch already. fwiw: