| Message ID | 20230303141433.3422671-4-glider@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] x86: kmsan: Don't rename memintrinsics in uninstrumented files | expand |
This is the second version of the patch. Sorry for the inconvenience.
On Fri, 3 Mar 2023 at 15:14, 'Alexander Potapenko' via kasan-dev <kasan-dev@googlegroups.com> wrote: > > Add tests ensuring that memset16()/memset32()/memset64() are > instrumented by KMSAN and correctly initialize the memory. > > Signed-off-by: Alexander Potapenko <glider@google.com> > --- > v2: > - drop a redundant parameter of DEFINE_TEST_MEMSETXX() Reviewed-by: Marco Elver <elver@google.com> > --- > mm/kmsan/kmsan_test.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c > index aeddfdd4f679f..7095d3fbb23ac 100644 > --- a/mm/kmsan/kmsan_test.c > +++ b/mm/kmsan/kmsan_test.c > @@ -504,6 +504,25 @@ static void test_memcpy_aligned_to_unaligned2(struct kunit *test) > KUNIT_EXPECT_TRUE(test, report_matches(&expect)); > } > > +/* Generate test cases for memset16(), memset32(), memset64(). */ > +#define DEFINE_TEST_MEMSETXX(size) \ > + static void test_memset##size(struct kunit *test) \ > + { \ > + EXPECTATION_NO_REPORT(expect); \ > + volatile uint##size##_t uninit; \ > + \ > + kunit_info(test, \ > + "memset" #size "() should initialize memory\n"); \ > + DO_NOT_OPTIMIZE(uninit); \ > + memset##size((uint##size##_t *)&uninit, 0, 1); \ > + kmsan_check_memory((void *)&uninit, sizeof(uninit)); \ > + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); \ > + } > + > +DEFINE_TEST_MEMSETXX(16) > +DEFINE_TEST_MEMSETXX(32) > +DEFINE_TEST_MEMSETXX(64) > + > static noinline void fibonacci(int *array, int size, int start) > { > if (start < 2 || (start == size)) > @@ -550,6 +569,9 @@ static struct kunit_case kmsan_test_cases[] = { > KUNIT_CASE(test_memcpy_aligned_to_aligned), > KUNIT_CASE(test_memcpy_aligned_to_unaligned), > KUNIT_CASE(test_memcpy_aligned_to_unaligned2), > + KUNIT_CASE(test_memset16), > + KUNIT_CASE(test_memset32), > + KUNIT_CASE(test_memset64), > KUNIT_CASE(test_long_origin_chain), > {}, > }; > -- > 2.40.0.rc0.216.gc4246ad0f0-goog > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20230303141433.3422671-4-glider%40google.com.
diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c index aeddfdd4f679f..7095d3fbb23ac 100644 --- a/mm/kmsan/kmsan_test.c +++ b/mm/kmsan/kmsan_test.c @@ -504,6 +504,25 @@ static void test_memcpy_aligned_to_unaligned2(struct kunit *test) KUNIT_EXPECT_TRUE(test, report_matches(&expect)); } +/* Generate test cases for memset16(), memset32(), memset64(). */ +#define DEFINE_TEST_MEMSETXX(size) \ + static void test_memset##size(struct kunit *test) \ + { \ + EXPECTATION_NO_REPORT(expect); \ + volatile uint##size##_t uninit; \ + \ + kunit_info(test, \ + "memset" #size "() should initialize memory\n"); \ + DO_NOT_OPTIMIZE(uninit); \ + memset##size((uint##size##_t *)&uninit, 0, 1); \ + kmsan_check_memory((void *)&uninit, sizeof(uninit)); \ + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); \ + } + +DEFINE_TEST_MEMSETXX(16) +DEFINE_TEST_MEMSETXX(32) +DEFINE_TEST_MEMSETXX(64) + static noinline void fibonacci(int *array, int size, int start) { if (start < 2 || (start == size)) @@ -550,6 +569,9 @@ static struct kunit_case kmsan_test_cases[] = { KUNIT_CASE(test_memcpy_aligned_to_aligned), KUNIT_CASE(test_memcpy_aligned_to_unaligned), KUNIT_CASE(test_memcpy_aligned_to_unaligned2), + KUNIT_CASE(test_memset16), + KUNIT_CASE(test_memset32), + KUNIT_CASE(test_memset64), KUNIT_CASE(test_long_origin_chain), {}, };
Add tests ensuring that memset16()/memset32()/memset64() are instrumented by KMSAN and correctly initialize the memory. Signed-off-by: Alexander Potapenko <glider@google.com> --- v2: - drop a redundant parameter of DEFINE_TEST_MEMSETXX() --- mm/kmsan/kmsan_test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)