| Message ID | 20230301143933.2374658-4-glider@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] x86: kmsan: Don't rename memintrinsics in uninstrumented files | expand |
On Wed, 1 Mar 2023 at 15:39, Alexander Potapenko <glider@google.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> > --- > 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 cc98a3f4e0899..e450a000441fb 100644 > --- a/mm/kmsan/kmsan_test.c > +++ b/mm/kmsan/kmsan_test.c > @@ -503,6 +503,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, var_ty) \ > + static void test_memset##size(struct kunit *test) \ > + { \ > + EXPECTATION_NO_REPORT(expect); \ > + volatile var_ty uninit; \ This could just be 'uint##size##_t' and you can drop 'var_ty'. > + \ > + kunit_info(test, \ > + "memset" #size "() should initialize memory\n"); \ > + DO_NOT_OPTIMIZE(uninit); \ > + memset##size((var_ty *)&uninit, 0, 1); \ > + kmsan_check_memory((void *)&uninit, sizeof(uninit)); \ > + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); \ > + } > + > +DEFINE_TEST_MEMSETXX(16, uint16_t) > +DEFINE_TEST_MEMSETXX(32, uint32_t) > +DEFINE_TEST_MEMSETXX(64, uint64_t) > + > static noinline void fibonacci(int *array, int size, int start) > { > if (start < 2 || (start == size)) > @@ -549,6 +568,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.39.2.722.g9855ee24e9-goog >
On Thu, Mar 2, 2023 at 12:23 PM Marco Elver <elver@google.com> wrote: > > On Wed, 1 Mar 2023 at 15:39, Alexander Potapenko <glider@google.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> > > --- > > 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 cc98a3f4e0899..e450a000441fb 100644 > > --- a/mm/kmsan/kmsan_test.c > > +++ b/mm/kmsan/kmsan_test.c > > @@ -503,6 +503,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, var_ty) \ > > + static void test_memset##size(struct kunit *test) \ > > + { \ > > + EXPECTATION_NO_REPORT(expect); \ > > + volatile var_ty uninit; \ > > This could just be 'uint##size##_t' and you can drop 'var_ty'. Indeed, thanks!
diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c index cc98a3f4e0899..e450a000441fb 100644 --- a/mm/kmsan/kmsan_test.c +++ b/mm/kmsan/kmsan_test.c @@ -503,6 +503,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, var_ty) \ + static void test_memset##size(struct kunit *test) \ + { \ + EXPECTATION_NO_REPORT(expect); \ + volatile var_ty uninit; \ + \ + kunit_info(test, \ + "memset" #size "() should initialize memory\n"); \ + DO_NOT_OPTIMIZE(uninit); \ + memset##size((var_ty *)&uninit, 0, 1); \ + kmsan_check_memory((void *)&uninit, sizeof(uninit)); \ + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); \ + } + +DEFINE_TEST_MEMSETXX(16, uint16_t) +DEFINE_TEST_MEMSETXX(32, uint32_t) +DEFINE_TEST_MEMSETXX(64, uint64_t) + static noinline void fibonacci(int *array, int size, int start) { if (start < 2 || (start == size)) @@ -549,6 +568,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> --- mm/kmsan/kmsan_test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)