From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B584EE7FF4 for ; Mon, 11 Sep 2023 15:07:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31E4D6B02B6; Mon, 11 Sep 2023 11:07:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CE096B02B7; Mon, 11 Sep 2023 11:07:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 196556B02B8; Mon, 11 Sep 2023 11:07:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0818E6B02B6 for ; Mon, 11 Sep 2023 11:07:23 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C53B0140A8D for ; Mon, 11 Sep 2023 15:07:22 +0000 (UTC) X-FDA: 81224645124.17.D54C40A Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf05.hostedemail.com (Postfix) with ESMTP id E28F610000F for ; Mon, 11 Sep 2023 15:07:20 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=bdrXJSCj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=elver@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694444841; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dOpTUAby7ZVIO6+YPrYOI97+9Zg13vBp8MSTW+q41J4=; b=0TDUtbApt6X4v0Dv6R0NAPMA4Xr1PA+VgroG3n5YDwqTqJW5CRHMzveqa1MW3UUcxTiRLK KIgU+BYh7wDBV+++oHX0RAo5kgvOQ7E/GkOAK0af8cscf1YVqcdx1ZkoOd3ng+OC3Hrwya khuILHzpAudv12cNLpOwuzX5MaNioBk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=bdrXJSCj; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=elver@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694444841; a=rsa-sha256; cv=none; b=AMC+fSgkTKFtyDr8xUWhNjShytrL40cZFH6hzdc3cG07O2qtFxWw+Zv6YBSnLyH0ik05Bg AMviXV/TgtZc4HuHxmKDXxi0imy0tLW12Wh32dTC5997Tx90HqY6rjgmeY77UvYRZwPGKJ +wP0XrqFOCFFr4d8TEnv4PvUXIgBlOc= Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-402d499580dso48735005e9.1 for ; Mon, 11 Sep 2023 08:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1694444839; x=1695049639; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=dOpTUAby7ZVIO6+YPrYOI97+9Zg13vBp8MSTW+q41J4=; b=bdrXJSCjeigrhKo5crvgxFFxd1KwWUkUEckEJBmcpfHJbwkd+kWhZzoqkyaGajpxLA 5xQcx0U6fP1MIaKRP8xKiAnSOR3/4MxjZPGgVslJZBzLIW4iPkv1WPt2hNuOC3r4cD+X bB2s+hC/+HIDjI1hBqECWBiVzDREcJTdEy5u2x806qddranV4Beh56pfQdmPA/mRdHs1 89LdHU0DccZ8EPBrUTiKtkGZGk6BidaYqNF4/KiBB9s1jOEfVSm5R7dQeUcGsLEEGJlL tWSYA+1FGnpCtmD/JDDmZyACIu5bPL4TxvH+xpmtBxfrRsYSORhsT9gKd15Dt5s9sGyB ii1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694444839; x=1695049639; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dOpTUAby7ZVIO6+YPrYOI97+9Zg13vBp8MSTW+q41J4=; b=NOpsLI4Oh8pso/Cb0lSAsb8CupDk1o3gDQ5PzC3xW61n8KsbJrmLx9k2+nZc+C400j rJd3LzpT6HJBL5XZ/hQ9dhreR5zq11rcvOj7lbBZXSUVUoNk1gbscdPLjQB3PsYaGVMv pb3yQEz5MOyg7tPHbVHdnygrV8DKfuTL++pCr0HiSsqSZM40K54kzF/9M7O0V8z3JvEe qNtG5zHAv5wEuovc8oKCnfpz+C8iY+WWt5Xs8DrtJoFEukbqG9G7zJgJ6/bR4987VRUr LrJO7z0NfctRpFtluaMd3mWaYcIQSsrKIIlhSYq/kgmk+MEbIo3IV+oKRWcKxpQuq6Go 29tA== X-Gm-Message-State: AOJu0YxqTl0lLLK5FdbJAUkJ/2rfqkTO/iWPzfdBc1lre436npdDkQjR qb1QKglV+UXQW9glI5dpB4Z1R3RP8BOPuzzlbLJ0Dg== X-Google-Smtp-Source: AGHT+IFkSM8rCd+Ax4dNRpcacBlnBuDTSYOCnAOBXnLUsAtz+uztZOZO0zxzP7ZTobe3xjzx0Qi8LQI0Q9NOMxwQj/A= X-Received: by 2002:a05:600c:b44:b0:401:dc7c:2488 with SMTP id k4-20020a05600c0b4400b00401dc7c2488mr8666846wmr.11.1694444839305; Mon, 11 Sep 2023 08:07:19 -0700 (PDT) MIME-Version: 1.0 References: <20230911145702.2663753-1-glider@google.com> <20230911145702.2663753-3-glider@google.com> In-Reply-To: <20230911145702.2663753-3-glider@google.com> From: Marco Elver Date: Mon, 11 Sep 2023 17:06:42 +0200 Message-ID: Subject: Re: [PATCH v2 3/4] kmsan: merge test_memcpy_aligned_to_unaligned{,2}() together To: Alexander Potapenko Cc: dvyukov@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E28F610000F X-Stat-Signature: jxuac884qbo9nnx7991fub6xgqnd8yoa X-HE-Tag: 1694444840-330578 X-HE-Meta: U2FsdGVkX19BhnyBQ8pD7i5HoJuq3LLDyt/n9eN/a/rw7T6nZV0mi/0OcTEZgy4b5CZ4hFImWvD/Yr59zycd4QLSyGo5Vyq+Q2cZln1iePELbjnjWHa1vlb2uhBuZKBT18mNJEqZe4scn0wnG2lmqJEGk64ISfIYYszHrgJ5AmZFNWYxVjRDzbiFz7pW4qMUmjet1e7jx5hlmIO+A7T8zzaEaLgOBQCEg480yQqA2unVAwcVcN2zKCcA86w6eH2BvA5v2MjHV0Ew3zG9mYtjn0hid2CQ6g+wd4Xe/rnuUfrG9XH5yL5ZY3r7/HVaw/jLr9CWziEcNE2rVNjVHf8Fcv9BWkU/5DBX7nMRxPPHh2LjOvEAxOtk5SgSy1cqi5+NySn5WkdlO6BeLDdYPCi9Snnu6ggaM00qSUIIN4GqERA8HBLz0IE0Z2LGHBCD5J8bas1TsDGseHFdHLrIeT2+KClyupcPUMfpblo435DwdZZrCM06vJMGMG4M9YzO9dDU28YN9fKV/k9nGAQt1+7Oh4TLibOF7pWO5jkaDoh/XDDhN955VsGtdv4nQ899WnRXzRu9cV8WoLjeKFEktovWkftbEjwc7nsRRVafRPFmqTFod6nTPENkoFb6QBscgjCUJBoZxxbL21bL1uuZNOpDbUu/d8R07mVx0jPPkjD2B5pXqeveJb8qqmLI7YzEUMtlz8ySY2iHOiU5j4sWMJMPdTKiskJieQbxlCHAQ/mrx2HnO5kHt8Gw6ClwsBrqxeA7Ye4KtS2LsHCDVRGAou6BzvpkKaSruDqugxA3rOegGDr0KFZZG6JwgQT9Jkifez8UtNSwR+7bdvb9XFq2mgRns2ap0mxGH4OLcI5yWnVD6nUmsa4QXqqQLI/jgWc3spX4C9i5/bpmun/Jzsb2oWEML13znp7m2OfFgVCzZsmKBR7IBh1D2eA/Y/2/03GrKmNRv5jlk2o5k+4S6b9z1Jg G/lV1hZl NSdgzHSRFbIX3AqgsdLw0csQEUp28PBdi3/4VO36ZGjN7KN76Twi2/OzOOATWu+Iz85jQwMfA9mPAEpgJ/mCgQoWMc3jWGJ5nE6pGYTNpGneVlm0G6K+GG+AY5QeC8aTI8JOhN1nvD0rxTC+C5bvWu2oHyVJmtc5nMbefFVhnEK46Ex9KLNzYsfUU8IcbevXm7E22AJzh0lWUgBgmdMOmbvzZ8qeicmJ/cLhZdDSWGaAeJZ6IcIKe58ltgfJmAktXa9i/W6ZBNPs7nBkULJJlvUrIKmPH2rdkrSWs X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, 11 Sept 2023 at 16:57, Alexander Potapenko wrote: > > Introduce report_reset() that allows checking for more than one KMSAN > report per testcase. > Fold test_memcpy_aligned_to_unaligned2() into > test_memcpy_aligned_to_unaligned(), so that they share the setup phase > and check the behavior of a single memcpy() call. > > Signed-off-by: Alexander Potapenko Acked-by: Marco Elver > --- > mm/kmsan/kmsan_test.c | 37 +++++++++++++------------------------ > 1 file changed, 13 insertions(+), 24 deletions(-) > > diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c > index a8d4ca4a1066d..6eb1e1a4d08f9 100644 > --- a/mm/kmsan/kmsan_test.c > +++ b/mm/kmsan/kmsan_test.c > @@ -67,6 +67,17 @@ static bool report_available(void) > return READ_ONCE(observed.available); > } > > +/* Reset observed.available, so that the test can trigger another report. */ > +static void report_reset(void) > +{ > + unsigned long flags; > + > + spin_lock_irqsave(&observed.lock, flags); > + WRITE_ONCE(observed.available, false); > + observed.ignore = false; > + spin_unlock_irqrestore(&observed.lock, flags); > +} > + > /* Information we expect in a report. */ > struct expect_report { > const char *error_type; /* Error type. */ > @@ -454,7 +465,7 @@ static void test_memcpy_aligned_to_aligned(struct kunit *test) > * > * Copying aligned 4-byte value to an unaligned one leads to touching two > * aligned 4-byte values. This test case checks that KMSAN correctly reports an > - * error on the first of the two values. > + * error on the mentioned two values. > */ > static void test_memcpy_aligned_to_unaligned(struct kunit *test) > { > @@ -470,28 +481,7 @@ static void test_memcpy_aligned_to_unaligned(struct kunit *test) > sizeof(uninit_src)); > kmsan_check_memory((void *)dst, 4); > KUNIT_EXPECT_TRUE(test, report_matches(&expect)); > -} > - > -/* > - * Test case: ensure that memcpy() correctly copies uninitialized values between > - * aligned `src` and unaligned `dst`. > - * > - * Copying aligned 4-byte value to an unaligned one leads to touching two > - * aligned 4-byte values. This test case checks that KMSAN correctly reports an > - * error on the second of the two values. > - */ > -static void test_memcpy_aligned_to_unaligned2(struct kunit *test) > -{ > - EXPECTATION_UNINIT_VALUE_FN(expect, > - "test_memcpy_aligned_to_unaligned2"); > - volatile int uninit_src; > - volatile char dst[8] = { 0 }; > - > - kunit_info( > - test, > - "memcpy()ing aligned uninit src to unaligned dst - part 2 (UMR report)\n"); > - memcpy_noinline((void *)&dst[1], (void *)&uninit_src, > - sizeof(uninit_src)); > + report_reset(); > kmsan_check_memory((void *)&dst[4], sizeof(uninit_src)); > KUNIT_EXPECT_TRUE(test, report_matches(&expect)); > } > @@ -589,7 +579,6 @@ static struct kunit_case kmsan_test_cases[] = { > KUNIT_CASE(test_init_memcpy), > 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), > -- > 2.42.0.283.g2d96d420d3-goog >