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 214FEEE57DF for ; Mon, 11 Sep 2023 14:57:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F6686B02AD; Mon, 11 Sep 2023 10:57:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97FC36B02AE; Mon, 11 Sep 2023 10:57:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 820C66B02AF; Mon, 11 Sep 2023 10:57:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6A6C06B02AD for ; Mon, 11 Sep 2023 10:57:21 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3CD1F1A0A24 for ; Mon, 11 Sep 2023 14:57:21 +0000 (UTC) X-FDA: 81224619882.09.72F9BC2 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf12.hostedemail.com (Postfix) with ESMTP id 8334F4001F for ; Mon, 11 Sep 2023 14:57:19 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=NmUvxcoX; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3zir_ZAYKCE8x2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3zir_ZAYKCE8x2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694444239; 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=35Wzlz8R5vpRX3Qc5T9eOyq5a0RR6jvjL1w5jIKVlmg=; b=6kyAb6de9pyZ0d9uPiuUxHkarNe6x3ZzkQ+ES07cbsVwn8VlAh49H95SmY5JrHfMKm1wZM pNvXbfbXmxMnf55rm+Djt3KVSQQDWcxWWJ/J/2HT1aoxIVGsL6dEbnY51mckVs1u9ytjug CDUZPqoPPFaxOHejGlYb7hbyUHQpOM4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=NmUvxcoX; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf12.hostedemail.com: domain of 3zir_ZAYKCE8x2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3zir_ZAYKCE8x2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694444239; a=rsa-sha256; cv=none; b=AFOU8t8Q878uCEXjue59V8hrQukAChTVuMj6vgaLV1tNyN/B+Ag4JFLx338Abf/sHQbRTj PlztkdRNW+X+5fa8FRVZ22I06lbN9paXXliyJf2yNTseHSyqpm7xm/Q2SS8/wGBIxGC02a xrOSlOkrwfsf8rYHyX+IrWppEHej9yk= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-59204757627so46675487b3.1 for ; Mon, 11 Sep 2023 07:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1694444238; x=1695049038; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=35Wzlz8R5vpRX3Qc5T9eOyq5a0RR6jvjL1w5jIKVlmg=; b=NmUvxcoXfGtbSte144IX2O5sWwjj7Bq2oLezOiMxr848rX11h60CZ9heftn7hTo7dt UtVXHPNFW6W+YZ209k98a0JHWEyNYkH16beAsZL6aPAjPxQ6bBbXl5qu9C7QiKfMg0Kn C1e9EFp3FXjuptYalz+GsEM3EcRKYc+Tta+qAvhjDecdwPhWdZn+S/wD0Qpf8BkZcaup oZGNFGnnVgXyf+vIFAup/nIkfFGu1TVO40EzZ9F1YhK7RCWTnDxQwJ0aRHeQQviK6OEf H1fjL3ftFo29U7G/Q7Y3vT+vaRcsCeuXspSb76SR4oIjw4uxdfrpTGqM4g7RDCvZky+K wm6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694444238; x=1695049038; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=35Wzlz8R5vpRX3Qc5T9eOyq5a0RR6jvjL1w5jIKVlmg=; b=uq2bXFnH2nE5WMA3ieLukZB0yqjWV6+3fNi4l0TYZypnuR3d0nvqYGM/oD1pSzmB2n rfMO4nFaBWqh6+tbldI2SEyKvBW6oLLmNCLcBphrrQyS7Flgv3lV2207HmLysRjEC/y4 HxnnVpZYh/K4SMSishL0m2lTH9clhaO4tTtNa5lVrynxaXFqTsoKXCEb5nzTZbx0w8wX qcMPVJJCmyHYu+cK7+7VYQzAcY+M4cwRQMxG/il3ePl+kDiV9mYPJ3Mw4+oxA9PjbV9c YLXN7j+NEO1Grh8OOF+w59q2C8ydbL1wlQOzoVRaRe1QDQ0NoDNCWJrJiiEsukD1mcVw imeQ== X-Gm-Message-State: AOJu0YzC7betAf9kPQhyyiPSLGYfGxoxBpxk6ymXNikHg0zeVZOQVpxC EPYBY3nTqg33Lh5eqAotMigf+ZXsZWI= X-Google-Smtp-Source: AGHT+IFbDjXsFCpFPMP4O6untSuU2SDiFHSQUeHMJpN9MUJc//PbV795sAl5SlWWtJvTh2d0prjfDsssd4U= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:62e7:6658:cb4:b858]) (user=glider job=sendgmr) by 2002:a81:7647:0:b0:57a:e0b:f66 with SMTP id j7-20020a817647000000b0057a0e0b0f66mr249145ywk.7.1694444238744; Mon, 11 Sep 2023 07:57:18 -0700 (PDT) Date: Mon, 11 Sep 2023 16:57:01 +0200 In-Reply-To: <20230911145702.2663753-1-glider@google.com> Mime-Version: 1.0 References: <20230911145702.2663753-1-glider@google.com> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230911145702.2663753-3-glider@google.com> Subject: [PATCH v2 3/4] kmsan: merge test_memcpy_aligned_to_unaligned{,2}() together From: Alexander Potapenko To: glider@google.com, dvyukov@google.com, elver@google.com, akpm@linux-foundation.org, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 8334F4001F X-Stat-Signature: nowsgabkrc77ofmm9xj4b3az51bcwrc7 X-Rspam-User: X-HE-Tag: 1694444239-338242 X-HE-Meta: U2FsdGVkX18lzwmvRgIs+J+B1Rjoow9ZkFYF1VfTceHt6NfMgtuodkcL3L7lEA9o0gwM53f3C2B7d0nayjBmabEgw5ZSGN16Vyxqu3FQATMG/MyKzYVXDtEAfKabht3KUbhgvetR67/iymX1iSpjsG6Zyc1X7MwI95+Jczi1aMyTT6lNKSRdAIIUJn+7ZVS299bOqy1EoXmP+TqkWJ4vxms9tclU65Q5yy4dL1KEpbeo/oe3nla09A+7jfihpKO42oZC/3rsgfpa84Jz9h+9ekRA0WHLwFuxCVWDcA0raXgu9a5nPV8V/yqhTWkH44wXR6akF7tHvX+spaJqpnjgyPrRcnlTL7aMLR5T23HUPsAxcyWKEoA3Qnz3AcmfEckftXenPzwb0QaqLRryCFrttc930NM5bKYyA8zql9GYIWFS6F6exYr4pvpkKyoTjwbdQOWOu5wduxZSUTofnzI4ZANzaKMKa6AtovmUiiW/rP1msonUnIGeQ+BaTkjRhrO2TXjoa87X8sXZ+ZirfubPO1gwxfVithi4FiszwDvz8FBt+dNImcZz2Ik27sf5DQ1zKu01qSgZD/C+ozLP2fstkhNNUDtz+co4Eaxf10/74LbaFsgalIdf8PqbcaLQ2APxXAzYHHBRqlj7IDIJ6IQQI8feSR0hb4r7cr8RoiFczEj0P2g/Uj5G4dMC73XxfTPJFe56HVdaPEeeK+qsH4wBZiJ+W0/ZlmpzNBFu5Tvo9vmEUnO1nYT8AsvqIP+kyoMMAok0VUoUW+SrjE0w1SBi3LhIGfzE0FI3ZhUjelCv2tEIfl2Sx5oofgwWfFbEKioy9AhBSFIK0dHGrEnAHxgveawt6uUx9QSBI/PCnCEmvsMblkTibCqGFDlWAaHydELJMRQAVqYNap5KNPOSOyVnKWMPj+xI9AKSny5epUX03SSAhhuKizaq/KS4UiQh6dNlSU9YSEP2aPVWFo7dHUx t5gJ0KrC Kop8LTsKjp0Rgt7WxsjRMtkXlgmpV/8SOGOXsPxZVR+fJEPZqQXB7uoAGW/QgHBobzrOGj0yTes8LDkLA0GsMCNcMS1YcilJitxyQ5tHzkOz1RBHuIvuZqjYZc7iUj407Ujbpc092DQPldYI5vp8kb6Zx2kIbiJ7P1cOT9KS4pZp1e9w/CqEDl/kqhAZl+F4IDQiFQzuzpYAvfZY8pN9v43QUTjgjSCLILM0oNzC6tGC7umj6VkSx22UA0MJTDQwHhgLWjJ+FLBhV2GQgwnl0aYI0cfZYo8S6WuuXk8QyvvU99QJMCWuNIuniKR/e/n8a1484pl0LgF3NuiTeTWpVnvnD3HnKLshG87jWyUBelggdlPIyFx+I5D+nSErbK1SiYZbXYrh+CtX34y5Tu7I1PrqnrBHB/QmFUGKHsNa7JMBuPBpiXSNhXg+8FkvlUS+3cCYgZCuKc9jchmHdsocVBIJozhRfMMDQew3iIUcrTSpyrVCa2gvywsTEeySh28/cXj+MeHA3rIusAP5wIy5i3ehb4ZVTR9IjqfqE1jMcMIoitFWnqIRqwR90BPe1ASNtSEfmUYwNIV0tuE0I7+2DwfeEtMy0Vng6z4dFRVmql1bLDt6oWlXCgBtxcT3XjdmAxsB71Ev/mhG7a4cMZ8k4pZD85w== 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: 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 --- 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