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 9B2DAC636D4 for ; Fri, 17 Feb 2023 11:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3092E6B0074; Fri, 17 Feb 2023 06:07:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 292086B0075; Fri, 17 Feb 2023 06:07:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10BE36B0078; Fri, 17 Feb 2023 06:07:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id F41D66B0074 for ; Fri, 17 Feb 2023 06:07:42 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A9343160D3E for ; Fri, 17 Feb 2023 11:07:42 +0000 (UTC) X-FDA: 80476508364.06.BF0ECB9 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf26.hostedemail.com (Postfix) with ESMTP id DF5EE14000B for ; Fri, 17 Feb 2023 11:07:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=G5719LGs; spf=pass (imf26.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676632060; 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=F6OARyIkWKx6vJWW66deXzKz0d7MrJOxrFV4HQAbnVY=; b=erhIUabjxcE84vU3m4WnITW95FaD9sdUlSJELKo1bA0qHyo1zFrm2q2ujPIau63XA40kvZ 4QEFM6AamNTC8Y1G743SLo6QqX3Yek2wy6KHoSYmU/wQd2+6h2yuUYN9avXQP1IXELfbt8 uxqC423+vYIYjbnlWZnw85wqqrqX2lM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=G5719LGs; spf=pass (imf26.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676632060; a=rsa-sha256; cv=none; b=4dyguv4KJ7YdBcOknAYXkKIO0yR2+CKetJJB/zEXIyzVL6ST9kFyHefpezsjE52nCM07TR LsnrY8tqiuYV3mEjwjUMtJoOJ/oFMik/mxztvkQaxOmBbzDX90W2fPQHnFXaogXeHG+zzD 6WgTCrgt/9YcZGvUfropWsDKn1c3CiQ= Received: by mail-pf1-f182.google.com with SMTP id a7so428386pfx.7 for ; Fri, 17 Feb 2023 03:07:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=F6OARyIkWKx6vJWW66deXzKz0d7MrJOxrFV4HQAbnVY=; b=G5719LGs7IEAbHMfcATHoXsEMKBorQVayLPlVTxXcSIXDsNpJsf1lFpXYEBTrjXAWS dzMyjBVcT8Sr8JR4KCMS9H0Hvs4vndlMY3puCh+lkXmoohJmVHaEvQeTG3/FqeS/PK4Z DS3GCJ3d4s7bp5R8SOMWfVKSz5SXkylFRlT9tiv42XiRwbGfQ0oRbBjRARLA4p8MhCnl noOICmrMWnb2Ow+4WaBlZf0/+8G1zf4GOM0LpElwoB9InBNnDh3mZGR6EPqR9pLqaFVo siNSMrqX231aLRisjnqTKzwj1KSdZ15quiOFF3zy7CiKhCeemNW3NLjqpiyFiNwV09MO siaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=F6OARyIkWKx6vJWW66deXzKz0d7MrJOxrFV4HQAbnVY=; b=0LE/X6cpGC4SEkMwkrvYZZIQxDNRAWqnM4QGl9CHWlgASsglR4HUex6I5SD+3K8mkG jSoQO24wFwjI8ZNxbl1QQ0ePVj5PqJ/gDFXm0MPeokjN2ao/fyd4JtWSzFMIeLUVR4Oc PfzOenruUHxAwB9FUmz8XB0S07dfTMKAB6F2jm7o3InXKTprKJH42+EILLcgQOyvYKYj AdGezhpic82ju2WJ8+cG2dhsu/Y+++22ZJz2Fd7WNtvtO3lQ2kdS2tLtfpCPzYFYc8pq PPaBRsiXMMhlyqcdF00XzoxNBJ++nK+6Csa7UqLwsj3Y7DJIBvglQzavYnbOmnHVXgbH pWwA== X-Gm-Message-State: AO0yUKUy3kgL6/oBzMjfuYUbI/2g/42gRkoFPdOe0m8vtYlhJAZ9Ac2/ 9apcdERolvf7nemRgIMONZgjc++MuHOp8aj+jM4= X-Google-Smtp-Source: AK7set8IyTOPVdJ0YgCP8kRvR8GDnZO4IFniF640kKrZ8oFaXpTMTUV6YpOuhdXoBmiiiIpDMZ3oyFO0CXM24opVnGM= X-Received: by 2002:a62:8282:0:b0:5a9:c954:563e with SMTP id w124-20020a628282000000b005a9c954563emr240181pfd.6.1676632059648; Fri, 17 Feb 2023 03:07:39 -0800 (PST) MIME-Version: 1.0 References: <20230216234522.3757369-1-elver@google.com> <20230216234522.3757369-3-elver@google.com> In-Reply-To: <20230216234522.3757369-3-elver@google.com> From: Andrey Konovalov Date: Fri, 17 Feb 2023 12:07:28 +0100 Message-ID: Subject: Re: [PATCH -tip v4 3/3] kasan: test: Fix test for new meminstrinsic instrumentation To: Marco Elver Cc: Peter Zijlstra , Ingo Molnar , Jakub Jelinek , linux-toolchains@vger.kernel.org, Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Andrew Morton , Nathan Chancellor , Nick Desaulniers , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org, Linux Kernel Functional Testing Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: m469nzis6oewi5ahkgn8wrwki9m4atw5 X-Rspam-User: X-Rspamd-Queue-Id: DF5EE14000B X-Rspamd-Server: rspam06 X-HE-Tag: 1676632060-139830 X-HE-Meta: U2FsdGVkX18b8+khPiLNTl/LX5whGw/DpRjLBNrTuxXevisQr+kRF0tSEFElHlp5zAimDreyw/ro43SB7N6JRLeQkWWWwj93Of3be28Vks0ykrOlk7y+mu8oHMDsczI5Od3z+4Aswkcj8HHe7/eRU7CzoYp5mjQXyd5ze3X5VjFo8vvTpSbJomSzSlCQSxDEKJgii8PBJ2HIwTgubOqQwNiKfRAOhbLRNZdwgeMQ5kL6D4nBdq8x0NLFfU7evdEnOHUzRYRJS9vw8nrmtlwQx3vrvRoGCvZm554uqWn0oWMp7uX2aE2PkM8WVsZJHv3UuKHhmrtQqd1qds2iaIVMbabeMs8OVNasizZCpJV+SLJGlCX/18b1U7Q8UU+kPlCyRCPW2IUp2pGbDZo30oXDCw9Az5kPoMRS5FBF/w4p7GTHjlTOkHsZxEKoRCWtxc/MhLrtZ6VVQgZWsrW5ji6SGkqCItHTQ5AQUX35W3X5rjo+A70hfdwzcE6h3jwEblSsPndUbL6Q+HHdwtqDgTMHCKCqlnx7OVe5kGrF8f9GNPmtdU56rARA1FoSRAsV4Ukjy9QP+m9G9Mai75BCGbwnpJ0wpTF7bV4cJ6ABNWQnxJCZqork3JjCPhFRkVFF+ejvumpsNXgO99kMDV82nguDWRdrfy/z6KxNyfbeQ1L1ZLyOr8B/CA0rs3vDU0xowM3C0XjB0ZLFmlrVh9+vTuhjC+1SvLX5HNC5skqp9wYckPl3lNZ/7NqxKzg4WfdPddpiF01IMjZ2aYEIV7ewuNF2aTItAqyK5fT42EegyDT2sKzFJw01p5LcfLe76yiJgZreftOALN3ySFMMAaAo4wgnn2e6jFw7o7o3nM3ECCJ86OZyXJKgkkIrYctpLDa+x0kREmQ5PyMSXgL5GIriIXM/Sx1l2+Y3wOubroR2R/7mmg9qyomuyRYhJxcAFsQlvIOVL51Ta+jSWVRcNRx3DdL cZlXsMPe sVb9givsNS/lHV8/27F+p8u4dHAYgO4HoWdivTkVDknfHxsofnt0zWgmMgSta2GbVdYKoGpTmAsefsB1KOzSGbhVPnVeA/zdtcb7379VLvM5WDHOhN6xReUVVgiHQ7u8Hxq8yUmDMsDNdtDRkOnYJRKU2GFzq5R8SZJNRu5URCQHVhuE85dHjW4KSPU246XcTLGQGRfylS/QFd6AgroPcw9U1DLEoCP/zj9FPsMOGnFBrPBTi/YKR1R2cV12mxFwycBEa2gS3FDJSugLtXPdRkpjxriDxehypqryyY4fKlkihE/R/9zZr2aNmrM64WqJf8guSmSqIJL/vtMqtWidkOp2rUEQ62ORDnEZmDWZX84017VZYZonxoczAFvQ+uiAVm+MaaDCQWKApPdfyeJzgXYnzfxCTXqHSc0m3NH/l3aG6IFoIsiO15gBVrgat2/Bv1jofl3H3Buo1clWNPIx/JFdUE6sWjychzEwa5K80cxtXTkn1OfE5FVAdEWs2CQrxczC78awMN9JhMjd3C+p4NZnj9GlHqPkIqkFTZdy0sKGerR8= 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 Fri, Feb 17, 2023 at 12:45 AM Marco Elver wrote: > > The tests for memset/memmove have been failing since they haven't been > instrumented in 69d4c0d32186. > > Fix the test to recognize when memintrinsics aren't instrumented, and > skip test cases accordingly. We also need to conditionally pass > -fno-builtin to the test, otherwise the instrumentation pass won't > recognize memintrinsics and end up not instrumenting them either. > > Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") > Reported-by: Linux Kernel Functional Testing > Signed-off-by: Marco Elver > --- > v4: > * New patch. > --- > mm/kasan/Makefile | 9 ++++++++- > mm/kasan/kasan_test.c | 29 +++++++++++++++++++++++++++++ > 2 files changed, 37 insertions(+), 1 deletion(-) > > diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile > index d4837bff3b60..7634dd2a6128 100644 > --- a/mm/kasan/Makefile > +++ b/mm/kasan/Makefile > @@ -35,7 +35,14 @@ CFLAGS_shadow.o := $(CC_FLAGS_KASAN_RUNTIME) > CFLAGS_hw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) > CFLAGS_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME) > > -CFLAGS_KASAN_TEST := $(CFLAGS_KASAN) -fno-builtin $(call cc-disable-warning, vla) > +CFLAGS_KASAN_TEST := $(CFLAGS_KASAN) $(call cc-disable-warning, vla) > +ifndef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX > +# If compiler instruments memintrinsics by prefixing them with __asan/__hwasan, > +# we need to treat them normally (as builtins), otherwise the compiler won't > +# recognize them as instrumentable. If it doesn't instrument them, we need to > +# pass -fno-builtin, so the compiler doesn't inline them. > +CFLAGS_KASAN_TEST += -fno-builtin > +endif > > CFLAGS_kasan_test.o := $(CFLAGS_KASAN_TEST) > CFLAGS_kasan_test_module.o := $(CFLAGS_KASAN_TEST) > diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c > index 74cd80c12b25..627eaf1ee1db 100644 > --- a/mm/kasan/kasan_test.c > +++ b/mm/kasan/kasan_test.c > @@ -165,6 +165,15 @@ static void kasan_test_exit(struct kunit *test) > kunit_skip((test), "Test requires " #config "=n"); \ > } while (0) > > +#define KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test) do { \ > + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) \ > + break; /* No compiler instrumentation. */ \ > + if (IS_ENABLED(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX)) \ > + break; /* Should always be instrumented! */ \ > + if (IS_ENABLED(CONFIG_GENERIC_ENTRY)) \ > + kunit_skip((test), "Test requires checked mem*()"); \ > +} while (0) > + > static void kmalloc_oob_right(struct kunit *test) > { > char *ptr; > @@ -454,6 +463,8 @@ static void kmalloc_oob_16(struct kunit *test) > u64 words[2]; > } *ptr1, *ptr2; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > /* This test is specifically crafted for the generic mode. */ > KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC); > > @@ -476,6 +487,8 @@ static void kmalloc_uaf_16(struct kunit *test) > u64 words[2]; > } *ptr1, *ptr2; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr1 = kmalloc(sizeof(*ptr1), GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); > > @@ -498,6 +511,8 @@ static void kmalloc_oob_memset_2(struct kunit *test) > char *ptr; > size_t size = 128 - KASAN_GRANULE_SIZE; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -511,6 +526,8 @@ static void kmalloc_oob_memset_4(struct kunit *test) > char *ptr; > size_t size = 128 - KASAN_GRANULE_SIZE; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -524,6 +541,8 @@ static void kmalloc_oob_memset_8(struct kunit *test) > char *ptr; > size_t size = 128 - KASAN_GRANULE_SIZE; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -537,6 +556,8 @@ static void kmalloc_oob_memset_16(struct kunit *test) > char *ptr; > size_t size = 128 - KASAN_GRANULE_SIZE; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -550,6 +571,8 @@ static void kmalloc_oob_in_memset(struct kunit *test) > char *ptr; > size_t size = 128 - KASAN_GRANULE_SIZE; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -566,6 +589,8 @@ static void kmalloc_memmove_negative_size(struct kunit *test) > size_t size = 64; > size_t invalid_size = -2; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > /* > * Hardware tag-based mode doesn't check memmove for negative size. > * As a result, this test introduces a side-effect memory corruption, > @@ -590,6 +615,8 @@ static void kmalloc_memmove_invalid_size(struct kunit *test) > size_t size = 64; > size_t invalid_size = size; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > @@ -618,6 +645,8 @@ static void kmalloc_uaf_memset(struct kunit *test) > char *ptr; > size_t size = 33; > > + KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS(test); > + > /* > * Only generic KASAN uses quarantine, which is required to avoid a > * kernel memory corruption this test causes. > -- > 2.39.2.637.g21b0678d19-goog > Reviewed-by: Andrey Konovalov Thank you for taking care of all of this, Marco!