From patchwork Wed Mar 1 14:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 62942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3673896wrd; Wed, 1 Mar 2023 06:54:16 -0800 (PST) X-Google-Smtp-Source: AK7set9z4EY4L+hMU8Je0XGVNNlDayQXwSK1kEsuLlYMTePBXWePGwtCsc/oCeiWNedImkYky/XJ X-Received: by 2002:a17:903:687:b0:19c:bbd3:84b7 with SMTP id ki7-20020a170903068700b0019cbbd384b7mr5206515plb.65.1677682455769; Wed, 01 Mar 2023 06:54:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677682455; cv=none; d=google.com; s=arc-20160816; b=MOu8JIXpYNpsqDQQtQLSwbIhqGzIdPttmP8TfuWsEckNvt/1OxWXaOk9cJX1BBEYxR KVUU4RAX/O1qY9cx6sv9UGaprNH7LeZBdIDbXoOrkN1IaGMM+2ZVx7EQFNUo+o8vS/Ct 2bfo/rCfTTjuzClEEUT/tUwJkIdf3dlsQaW02sCK8fi/DAU06tdVGG3FmcXGlvd0np6k T02qBDqCLw0cU7E1s1H0jMRLA0xVf2fTSdPe+goDFtxorfe++KNbVVo4czint9B16IvJ BOFfKiwMSh2UeGYG1uBLrOYAKDsRGCCY58kVRuIbOrUAdC4GiFfpAYvCz3QK+RowtVoB Ubgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=g89Lt9yUxe6IVilEIibkK1mFDBhT6XbkcHdEUWIZzy+hdte3e+XghE09t1SmQz1q8Z KKU6j9STml8BTuNnVC7/yDsIVWwVm/U0yrJ38Tu3Tlm+wP+SaryX8gfprgHuRC6oREZl 6wk5yI6c/625tdM18PVkrwrVw8JGdlJcWfjo7rcRzcmJCPuOMW7a7BfIXSGameNg2SsS qo0nwdbd6BpVn7vq6Wfgw8YkpQ3tk45eSQH4IYZGnTRhVLF4ptLPwxBXZGSJUUBQ7YnU KUGj5qG+VErR4zNdsFru3JOoSHVcT5eXY6hcLcoF0QA7/3MccI79R06U++1UpolwG5MA dM4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=hwwsMSyO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q132-20020a632a8a000000b004fb73b9a406si7508714pgq.636.2023.03.01.06.54.02; Wed, 01 Mar 2023 06:54:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=hwwsMSyO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230030AbjCAOjl (ORCPT + 99 others); Wed, 1 Mar 2023 09:39:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjCAOjj (ORCPT ); Wed, 1 Mar 2023 09:39:39 -0500 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DED36B479 for ; Wed, 1 Mar 2023 06:39:38 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id cf11-20020a0564020b8b00b0049ec3a108beso19362631edb.7 for ; Wed, 01 Mar 2023 06:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=hwwsMSyOzkoBWayzQKOdFKIZfN+8rn6K+uZRqXexu7jTOCYjQq9ACST/vXXGgUa8CT 9PbkYANDhENEWpCTAac5mNG7ZIAElA8E4TlfoSG2z+sTpCuZtWZwUNcme6Nz5ZOi8bmI WuyGwo5xiOk2ylqXeLH4a6J07LtGg7Ap91k/9Mcx8NUjgjoD00YVOtKBU9sHuoMA8yE3 Onih1jNZmnQe2nEJA1yFuRFt5+jQMY1R2GMyNKX1qCR4BhaJrAA/7d3oi5VEphgCi5fm cZRBWCikluD1F4OG5qcDUFzHLUwgyg0Swg3+bo7tCkfOYvarkHR+O8quNjT/Nzoz7/3D eJkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=jkiL3nqI4kmv3dz6C1eCIsfHZfByWaDTsM4ixpH9IsTmreI4AHfnuzuVy8mc04kT7B m+9+afdXi4ZkhR+2bGin+oqOBndBGaCLnOpLBptSNyPbAT4FmIlWIvOe+udRSbztAvur u1BFcHwBz0LQBdzqJK2b7IF9hzAM1RvNU+cr5dttpfIOOxs+mV+/WTg0KiPM0z8tnVnV cBu/NvCSPETkr/q1Fw7i+I72+K0Vx9eDeVhdr3oRigRIiDMI4eisvuO5MTGOeTUzLMTN YNCHV2Ofj2x4rfffGhB4m7Sk+jAp8f3NH/6AOOS0TTxSuMtGApODcW2e7MNGKG7jqWk0 FuSw== X-Gm-Message-State: AO0yUKUY356y/odlxgMECtOvENI9XXs+KlMfLu8sMvUY9Rcy0iwDaUjP DFuF8OSg2pgOtdiD+F1hVg1LxJq1Gkw= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:3c31:b0cf:1498:e916]) (user=glider job=sendgmr) by 2002:a17:907:9491:b0:8ee:babc:d3f8 with SMTP id dm17-20020a170907949100b008eebabcd3f8mr5683794ejc.3.1677681577396; Wed, 01 Mar 2023 06:39:37 -0800 (PST) Date: Wed, 1 Mar 2023 15:39:30 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301143933.2374658-1-glider@google.com> Subject: [PATCH 1/4] x86: kmsan: Don't rename memintrinsics in uninstrumented files From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, akpm@linux-foundation.org, elver@google.com, dvyukov@google.com, nathan@kernel.org, ndesaulniers@google.com, kasan-dev@googlegroups.com, Kees Cook X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759177558957373515?= X-GMAIL-MSGID: =?utf-8?q?1759177558957373515?= KMSAN should be overriding calls to memset/memcpy/memmove and their __builtin_ versions in instrumented files, so there is no need to override them. In non-instrumented versions we are now required to leave memset() and friends intact, so we cannot replace them with __msan_XXX() functions. Cc: Kees Cook Suggested-by: Marco Elver Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver --- arch/x86/include/asm/string_64.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h index 888731ccf1f67..9be401d971a99 100644 --- a/arch/x86/include/asm/string_64.h +++ b/arch/x86/include/asm/string_64.h @@ -15,22 +15,11 @@ #endif #define __HAVE_ARCH_MEMCPY 1 -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) -#undef memcpy -#define memcpy __msan_memcpy -#else extern void *memcpy(void *to, const void *from, size_t len); -#endif extern void *__memcpy(void *to, const void *from, size_t len); #define __HAVE_ARCH_MEMSET -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) -extern void *__msan_memset(void *s, int c, size_t n); -#undef memset -#define memset __msan_memset -#else void *memset(void *s, int c, size_t n); -#endif void *__memset(void *s, int c, size_t n); #define __HAVE_ARCH_MEMSET16 @@ -70,13 +59,7 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t n) } #define __HAVE_ARCH_MEMMOVE -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) -#undef memmove -void *__msan_memmove(void *dest, const void *src, size_t len); -#define memmove __msan_memmove -#else void *memmove(void *dest, const void *src, size_t count); -#endif void *__memmove(void *dest, const void *src, size_t count); int memcmp(const void *cs, const void *ct, size_t count); From patchwork Wed Mar 1 14:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 62943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3673951wrd; Wed, 1 Mar 2023 06:54:22 -0800 (PST) X-Google-Smtp-Source: AK7set8HMLL1pkC1Zs9PKoGupZlUJhyMwE+XbO3iThlVrbf3WWkWCdttnxcNKubfqG/gPZO6XSkS X-Received: by 2002:a17:902:cec7:b0:19e:61cc:6793 with SMTP id d7-20020a170902cec700b0019e61cc6793mr146343plg.48.1677682462129; Wed, 01 Mar 2023 06:54:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677682462; cv=none; d=google.com; s=arc-20160816; b=i5MevllbKf8oub8QMpNFUvLC5cy20LuaR1DVPNaq60HMEdCmD0N0kOTX+THumI0mT/ dpRwXpkmaFewCBoBnyxnunvmKA12xedjfN+DodTUCM8RgbWjpROwyrskuA+m30Nhd/w0 XQRlfpIZjY2SKZg+4Y+GYbeB/llPk1+FDICMW3gQ7zqS/L+Zc6MiEU0gbs9giffXDveS LksTbDOQK31KsPOUsr86o7aMc9syFLMTX9z0YJD4gTSr14nqTanss4zGnYYFnmWZhwdX Pu37SyyvSyK0zda4cJBVURvfJ800zNXo5A2Wm1W+RZub6Q3rarxFnQ7vlvBV1SF/70o0 lg5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=GvEmc+TQ/70wBv4c0+3F8h651+3YM9ltVwHdaJENm+0=; b=Y4fJxWoBfZdfLGuiBH2/D5SiXRcwDeeajrLyllS/6exPbQo9KEI35dlDoT4kUGVHDr HEr1B8R/E/9EtytKC1iY36PhAbFz7tOlcQtqj00vX/tqqnWbhY4tFZGBD7TeTV5PLX3l Tdg5g5W0rHfBA9LrfqjSHtv0k5cPye1FKcWmEwLxgJmlHFuG5SLIHHcfnZ946s0fuWpk v9Z/xfFc2uYj2I9fhyA1nxWVrylTyDK5xI12+SWl3DSzWfgszKEP3B7qZ9rpT4nzycwi Ks34ySpi5o86cjpjFJ+DcEfCid011AJy5koIrj3qAYtvW8ccJMHkrrh9GwfRQrGhRVAL CBzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=TZbcESbs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kf5-20020a17090305c500b0019cf7f260afsi11127942plb.37.2023.03.01.06.54.08; Wed, 01 Mar 2023 06:54:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=TZbcESbs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjCAOjt (ORCPT + 99 others); Wed, 1 Mar 2023 09:39:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230055AbjCAOjl (ORCPT ); Wed, 1 Mar 2023 09:39:41 -0500 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7688CB479 for ; Wed, 1 Mar 2023 06:39:40 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id cf11-20020a0564020b8b00b0049ec3a108beso19362796edb.7 for ; Wed, 01 Mar 2023 06:39:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GvEmc+TQ/70wBv4c0+3F8h651+3YM9ltVwHdaJENm+0=; b=TZbcESbsWwNX7ITUi/aZMlklXQLIxXSFS8qC4CBgfWLzgdWV4sw7TnmemklpH6W7Bc A7y93ECEz75USteW8FD3Y1XqRtJk5z3dpdOjwx44G2Jjuz+Z4hitvfk4TnGhEpzcwscE ecg0YS6TcupDfdmQ4FiWgzFt1XEr6a7zKBTWdlnNhV5j7eNaBRDBF61cN2PiP+iE5mTh 91+plLrvqvm2QV627pn0K767iy62E8FL4Syt1zWC06tG2/CxQdIgC4GhP+p/aeN6q3xd 8FPlln8dfQ68QkVsu4QnH0TBtMDPHUtGDPr6mhY3CY6Efu84yLWgr+mHbxwvH+VHgIa6 MHVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GvEmc+TQ/70wBv4c0+3F8h651+3YM9ltVwHdaJENm+0=; b=lU8YQNB72+bQx63FO2imjXTNGIHfZSNxtcsI8Gu5KCiOabTvqBYpV1gzrrrLM6A3bT 1qX/TcELFo6yyKdhIiiLN45UzfyGQuB6i3EJMcKxfBkrkXVGo9GZW/5VK+eRAWLWGWvb VQuhyxWXcMF1reAk/Y0Gic7XAjc1uDwL85XRbRfzzCtze8yEXxuO7i6GRODGWMqXOFfU HNMkfrO3UJIcfYdxDHE50yKLNXLcPurslZ/Hr0FSzl0ImQ4WzU6d2G5b8oLbW0hWSKYf MQ+GA0oUWSYUGiLMDo58zFbFJVs01HbP3cW3hBkY263vVpfbfmSU4XlhdRAc84Wftc9E DYJw== X-Gm-Message-State: AO0yUKUb4EXzN4W1FE37Ae2GAv5+0UZkdt43cygsFgVLd3g37i/F7xg9 gzdQHxFFspqiPtUNYbKVqb/UniwYm3Y= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:3c31:b0cf:1498:e916]) (user=glider job=sendgmr) by 2002:a50:d6db:0:b0:4aa:a4df:23fc with SMTP id l27-20020a50d6db000000b004aaa4df23fcmr4014799edj.1.1677681579977; Wed, 01 Mar 2023 06:39:39 -0800 (PST) Date: Wed, 1 Mar 2023 15:39:31 +0100 In-Reply-To: <20230301143933.2374658-1-glider@google.com> Mime-Version: 1.0 References: <20230301143933.2374658-1-glider@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301143933.2374658-2-glider@google.com> Subject: [PATCH 2/4] kmsan: another take at fixing memcpy tests From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, akpm@linux-foundation.org, elver@google.com, dvyukov@google.com, nathan@kernel.org, ndesaulniers@google.com, kasan-dev@googlegroups.com X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759177565184302032?= X-GMAIL-MSGID: =?utf-8?q?1759177565184302032?= 5478afc55a21 ("kmsan: fix memcpy tests") uses OPTIMIZER_HIDE_VAR() to hide the uninitialized var from the compiler optimizations. However OPTIMIZER_HIDE_VAR(uninit) enforces an immediate check of @uninit, so memcpy tests did not actually check the behavior of memcpy(), because they always contained a KMSAN report. Replace OPTIMIZER_HIDE_VAR() with a file-local asm macro that just clobbers the memory, and add a test case for memcpy() that does not expect an error report. Also reflow kmsan_test.c with clang-format. Signed-off-by: Alexander Potapenko --- mm/kmsan/kmsan_test.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c index 088e21a48dc4b..cc98a3f4e0899 100644 --- a/mm/kmsan/kmsan_test.c +++ b/mm/kmsan/kmsan_test.c @@ -407,6 +407,36 @@ static void test_printk(struct kunit *test) KUNIT_EXPECT_TRUE(test, report_matches(&expect)); } +/* + * Prevent the compiler from optimizing @var away. Without this, Clang may + * notice that @var is uninitialized and drop memcpy() calls that use it. + * + * There is OPTIMIZER_HIDE_VAR() in linux/compier.h that we cannot use here, + * because it is implemented as inline assembly receiving @var as a parameter + * and will enforce a KMSAN check. + */ +#define DO_NOT_OPTIMIZE(var) asm("" ::: "memory") + +/* + * Test case: ensure that memcpy() correctly copies initialized values. + */ +static void test_init_memcpy(struct kunit *test) +{ + EXPECTATION_NO_REPORT(expect); + volatile int src; + volatile int dst = 0; + + // Ensure DO_NOT_OPTIMIZE() does not cause extra checks. + DO_NOT_OPTIMIZE(src); + src = 1; + kunit_info( + test, + "memcpy()ing aligned initialized src to aligned dst (no reports)\n"); + memcpy((void *)&dst, (void *)&src, sizeof(src)); + kmsan_check_memory((void *)&dst, sizeof(dst)); + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); +} + /* * Test case: ensure that memcpy() correctly copies uninitialized values between * aligned `src` and `dst`. @@ -420,7 +450,7 @@ static void test_memcpy_aligned_to_aligned(struct kunit *test) kunit_info( test, "memcpy()ing aligned uninit src to aligned dst (UMR report)\n"); - OPTIMIZER_HIDE_VAR(uninit_src); + DO_NOT_OPTIMIZE(uninit_src); memcpy((void *)&dst, (void *)&uninit_src, sizeof(uninit_src)); kmsan_check_memory((void *)&dst, sizeof(dst)); KUNIT_EXPECT_TRUE(test, report_matches(&expect)); @@ -443,7 +473,7 @@ static void test_memcpy_aligned_to_unaligned(struct kunit *test) kunit_info( test, "memcpy()ing aligned uninit src to unaligned dst (UMR report)\n"); - OPTIMIZER_HIDE_VAR(uninit_src); + DO_NOT_OPTIMIZE(uninit_src); memcpy((void *)&dst[1], (void *)&uninit_src, sizeof(uninit_src)); kmsan_check_memory((void *)dst, 4); KUNIT_EXPECT_TRUE(test, report_matches(&expect)); @@ -467,13 +497,14 @@ static void test_memcpy_aligned_to_unaligned2(struct kunit *test) kunit_info( test, "memcpy()ing aligned uninit src to unaligned dst - part 2 (UMR report)\n"); - OPTIMIZER_HIDE_VAR(uninit_src); + DO_NOT_OPTIMIZE(uninit_src); memcpy((void *)&dst[1], (void *)&uninit_src, sizeof(uninit_src)); kmsan_check_memory((void *)&dst[4], sizeof(uninit_src)); KUNIT_EXPECT_TRUE(test, report_matches(&expect)); } -static noinline void fibonacci(int *array, int size, int start) { +static noinline void fibonacci(int *array, int size, int start) +{ if (start < 2 || (start == size)) return; array[start] = array[start - 1] + array[start - 2]; @@ -482,8 +513,7 @@ static noinline void fibonacci(int *array, int size, int start) { static void test_long_origin_chain(struct kunit *test) { - EXPECTATION_UNINIT_VALUE_FN(expect, - "test_long_origin_chain"); + EXPECTATION_UNINIT_VALUE_FN(expect, "test_long_origin_chain"); /* (KMSAN_MAX_ORIGIN_DEPTH * 2) recursive calls to fibonacci(). */ volatile int accum[KMSAN_MAX_ORIGIN_DEPTH * 2 + 2]; int last = ARRAY_SIZE(accum) - 1; @@ -515,6 +545,7 @@ static struct kunit_case kmsan_test_cases[] = { KUNIT_CASE(test_uaf), KUNIT_CASE(test_percpu_propagate), KUNIT_CASE(test_printk), + 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), From patchwork Wed Mar 1 14:39:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 62945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3674063wrd; Wed, 1 Mar 2023 06:54:38 -0800 (PST) X-Google-Smtp-Source: AK7set8ZsTEILe2KoyCVXAC/KkBAMZd+u1pBQIpWT2RSfpRNA247mZWuv0ryQTOYGOFXqxEmPXwo X-Received: by 2002:a05:6a20:9389:b0:cb:2a12:b5bc with SMTP id x9-20020a056a20938900b000cb2a12b5bcmr8998323pzh.28.1677682477794; Wed, 01 Mar 2023 06:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677682477; cv=none; d=google.com; s=arc-20160816; b=HrXLL78sFdOYc1Y80LtUsyuD9fnObkx2j0EZggTtnMk75/jgNHfPPjlM3cm7LyDPbz WDQBfBw/BaRHpTqOV5iv3+tF24vO5RRrA8SjpsT7ZV9M5PPNt11I6vfp7S3uOnIqPb9T SxmOzEJSmFyMRvqOXRlnA/qYNJ1we77bCgzo90H9bPgRZwrewVS41yCD14X1JtUWwbhP QeYmgRGl7Xe3fkSfxqkzN3uppg/tH8O3UO6ucra9KXi0G+kCPOr2IzVnyFqBHdTiNw8b HYD4gYus02pEUCQqXsFVXxpqwyc0RUj+6DbT9mtGwEweluQYrF1aSnU1DuXRE0Z2TtuV CaYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=h2FIkUEqU6YxkmcIL1AtVszo9ZqqtqhQ8yghIzSXGmA=; b=IJWG9FQ2y2GWnp9vS9+9JsjhUBKhyMojTFpfQd8KlhvIYF5SrElJ/8sf1j1z/FATNX LX09mao5+iqcIK6S0f9D9wDyIuGZfWGds17225YPKqzkj46pR2jJZ1N9evtDFi4l+82Y DuOMM9535tuHbKw1SRqy6uinzgu3D2eamFCLObTu8Y7ZAmwxTbwO0iM1WIShBmQEaPPB OT3KoFXopOyJLdGmWFqlx/DjUMGL4YpoqDgv9ND8iyyj9GTwBTnRShcF4M5k2O5wJSaj V5DKRxQIrN/828CE2YQLVzcw8UitebTLeyXBvOL677pvsOSTJeFkoCnZF70F2zn6umKa G1wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DcQhFeZ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c192-20020a6335c9000000b005002c1ba48dsi12111978pga.498.2023.03.01.06.54.24; Wed, 01 Mar 2023 06:54:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DcQhFeZ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230240AbjCAOjx (ORCPT + 99 others); Wed, 1 Mar 2023 09:39:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbjCAOjp (ORCPT ); Wed, 1 Mar 2023 09:39:45 -0500 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3942938677 for ; Wed, 1 Mar 2023 06:39:44 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id t9-20020a056402524900b004af59c073abso19424888edd.6 for ; Wed, 01 Mar 2023 06:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=h2FIkUEqU6YxkmcIL1AtVszo9ZqqtqhQ8yghIzSXGmA=; b=DcQhFeZ5qGp+AKIQFJAYw7mSn3Y3zdJdiwbFpjR09nWHgumpyTqJ77smBudhJx90b2 +of4MO5DstJZPnWALbM1Of06Za2o7NytkJzXNNFiETyWdzrdaTvwzeqjQvfk8WKO4zWX nZ+35n8p65W1JWEwmllJK+DRCas7pBVJAabnp3AlbmD9fL442oIjUjwwK9Aw0IVzmE4G LaCLGdq2wBlsOXftBi7owZAHb13CKHLWbeuJyMfJKrGq7rXdtXxsVCEBJ1eC4cyZayTC p0+kMXLSlqoFuK/nAnKUEN/l83vYbnRP2DpS/RVn8EjMzruu3T02ZPom1pnLs708E3j1 cpHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=h2FIkUEqU6YxkmcIL1AtVszo9ZqqtqhQ8yghIzSXGmA=; b=K6ioeON/ftlmD7bt63y3rL6VaO3i9RGSJ3IafG//bfdf5DueatsGhrI9Gw5xRJNHta wTOfBRF1uUEIZc9oLiki0QgTEPdiHLx2XhdQMxJhIXz9QJmfAtIluBu6eZtltZxLwXki SMCxMl4U+vWEBQ5Ykd1QLx77fYu9E5Ft/3IlmwCxWK0V1GI91zABtgH08HvCeaKDq/C7 CUoiR7oPM0fhymGSMiUPBI+yh3FF1kH7DWkop/klc5pbs37IiVGVB4y8bDph7UIqJ9nC C9XD0+ppGICCNXp6AxfG2F2sgY4RxUJRU+PRoc06Yr+nBLV2FTgxleBVP+SHYQCn2/Vq ltpg== X-Gm-Message-State: AO0yUKVCg5SaG9QlFqoK6WnrFuUAFzUDw/trMmldAD+n3E0H+Kwbcafp ACDtEu7ApMZXx+VoK9WtnIjvJJ4FlhY= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:3c31:b0cf:1498:e916]) (user=glider job=sendgmr) by 2002:a50:aa8b:0:b0:4ae:f648:950b with SMTP id q11-20020a50aa8b000000b004aef648950bmr3893580edc.7.1677681582665; Wed, 01 Mar 2023 06:39:42 -0800 (PST) Date: Wed, 1 Mar 2023 15:39:32 +0100 In-Reply-To: <20230301143933.2374658-1-glider@google.com> Mime-Version: 1.0 References: <20230301143933.2374658-1-glider@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301143933.2374658-3-glider@google.com> Subject: [PATCH 3/4] x86: kmsan: use C versions of memset16/memset32/memset64 From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, akpm@linux-foundation.org, elver@google.com, dvyukov@google.com, nathan@kernel.org, ndesaulniers@google.com, kasan-dev@googlegroups.com, Geert Uytterhoeven , Daniel Vetter , Helge Deller , Tetsuo Handa X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759177581741812765?= X-GMAIL-MSGID: =?utf-8?q?1759177581741812765?= KMSAN must see as many memory accesses as possible to prevent false positive reports. Fall back to versions of memset16()/memset32()/memset64() implemented in lib/string.c instead of those written in assembly. Cc: Geert Uytterhoeven Cc: Daniel Vetter Cc: Helge Deller Suggested-by: Tetsuo Handa Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver --- arch/x86/include/asm/string_64.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h index 9be401d971a99..e9c736f4686f5 100644 --- a/arch/x86/include/asm/string_64.h +++ b/arch/x86/include/asm/string_64.h @@ -22,6 +22,11 @@ extern void *__memcpy(void *to, const void *from, size_t len); void *memset(void *s, int c, size_t n); void *__memset(void *s, int c, size_t n); +/* + * KMSAN needs to instrument as much code as possible. Use C versions of + * memsetXX() from lib/string.c under KMSAN. + */ +#if !defined(CONFIG_KMSAN) #define __HAVE_ARCH_MEMSET16 static inline void *memset16(uint16_t *s, uint16_t v, size_t n) { @@ -57,6 +62,7 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t n) : "memory"); return s; } +#endif #define __HAVE_ARCH_MEMMOVE void *memmove(void *dest, const void *src, size_t count); From patchwork Wed Mar 1 14:39:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 62946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3674302wrd; Wed, 1 Mar 2023 06:55:15 -0800 (PST) X-Google-Smtp-Source: AK7set+dEtwXi5DB2/6vrGejY/FLNdTuGa5VD5wohU+7XdcooB72jZtyiqizIx38D+HWmcpLZ0SL X-Received: by 2002:a17:90a:190d:b0:233:76bd:9faa with SMTP id 13-20020a17090a190d00b0023376bd9faamr7804671pjg.47.1677682514601; Wed, 01 Mar 2023 06:55:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677682514; cv=none; d=google.com; s=arc-20160816; b=04KjrQH4T/WcOIGq/9wysBxosUZrkGfDJHSHp9KdoJCCxE94cAKQYXMKAKiTpEf96t sxHpj3zISgygnhfTjpTvKH8U5DDVm42JtfRAWS0PeeAgdMTO92R9PzgbYuyj9z0x3b7Q bWWepi4f45q5VdLaBJorjOYYEe7tStIL7P/iLrf1Wivg9TGWVFj06Ce/Fj1ZP8yHrOOx XurtVYHtw1cELwHM3stVbq4QVQ9Pc8E2+pUu92gCyrCESehRVzCLh0Y81vvRFIoxzl3j 2aw/sDrErn97Z5HMPqvbZaSv8ggjrCoWE+VIDB6tKObYg+1/5PyBn5XcCAHEAUbmzLuv cU5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=nI6aPFa9WKtq8ZRbJBabpyygWI3BetO7s5boeToCFf4=; b=lVpRMR6eymYQYUX/FJtlmvV5/IShwXdJWVndCkg9oax7XyH/tkqVHv1TEr3RI0Uhs+ QH7yIHZkWw3NSQvFxJgaQrF4SoZPG+JIvnlTuQa1fr7jipgUtM9yRCcdMRh7XDEjlTTn g8AmV4REi2scrLncDKI5XcdBVVRq9sJq0zEglEoYkOTCPJGiqSClxKcKtxGH4/TRPUeo TgATGVbJecOzroW8Kam2fpZt6T8AKBO8xm1hwLFRGsQ8TCgVFP0xj7tASG/m3GePECzj 6Zf68e1iJ7ybEJaur6HEhqmwEziafrNlBxzbzItraellO5irYujoX8EIS7/gis2Iyvlb kTiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=cATkgsuo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v23-20020a17090abb9700b00233e0d29cbbsi15145768pjr.102.2023.03.01.06.55.01; Wed, 01 Mar 2023 06:55:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=cATkgsuo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229951AbjCAOkH (ORCPT + 99 others); Wed, 1 Mar 2023 09:40:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjCAOjt (ORCPT ); Wed, 1 Mar 2023 09:39:49 -0500 Received: from mail-ed1-x54a.google.com (mail-ed1-x54a.google.com [IPv6:2a00:1450:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9247B3403A for ; Wed, 1 Mar 2023 06:39:46 -0800 (PST) Received: by mail-ed1-x54a.google.com with SMTP id ck7-20020a0564021c0700b004a25d8d7593so19492296edb.0 for ; Wed, 01 Mar 2023 06:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nI6aPFa9WKtq8ZRbJBabpyygWI3BetO7s5boeToCFf4=; b=cATkgsuouPJkBNjeAYA9+s1iR8apIqRMfi4XOoGeFHMEhEog2NEsq1DeNYIGai5Ak0 S3QmO80XpPCdudI8YFrtI32Eypmi77dH6qEyo+Fn16KbadIvqPWwzVb1NhC+Ap8tLi1Z 7/6EVmJlQHOY5Zxc9ILO9G3PR5FLohvlv81MJ6rJ/QZUcZOrNn3i34tb9JgkpYewI1U7 WRP+37VMuNFxMMT77lhKdJzvbMo5ZiHyh7h6ub9R8P004bZq0qY3Jl/0n2yOj+DeB2iO PbgCdp3Zi+2+zhfH98j+JOYUrHnfzL9wjwB4dlavlx2rz6xKg4yx7lSVUSBcOjrrNuc7 lAjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=nI6aPFa9WKtq8ZRbJBabpyygWI3BetO7s5boeToCFf4=; b=fope5Ct5WegPQiDXZqS51ndUDg6/tFj6GdC1EFRmxn8kamPSjT4dh1mMWtfdD5ixhQ jPdCPWIQ8PuJ8xdkaZg6liqPimwYfKNh7O1d7SJPQJw4TmkSGFwwqIyjzPDJRKV9PFfu AA+Y75WH+77Pf/b6zMRK9pQG97RPAFvSihuwv3YYkradf0PlQqUd1BAatYyySwUdLET6 BcQwpe43u9yB0N8b02CrsyinWeai49fDzEofEEx0NnW/zCD7mBQ6fN744zGtRlvVZBhr xeAxtmm5hHg6pg7fon+1rBiZnNphxGaIufKRDHxohrqu9sskAeQ9+OXzU7g1mUq6rlCq +gYw== X-Gm-Message-State: AO0yUKUDJgI+ENROysO/emFUmf1adU+dd33gDllaGokJoAu9RA4ayu0c RBvSGaD8QrjAB9hjCUGn9qThTVxHo5s= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:3c31:b0cf:1498:e916]) (user=glider job=sendgmr) by 2002:a17:906:ce59:b0:888:b471:8e18 with SMTP id se25-20020a170906ce5900b00888b4718e18mr3181793ejb.8.1677681585154; Wed, 01 Mar 2023 06:39:45 -0800 (PST) Date: Wed, 1 Mar 2023 15:39:33 +0100 In-Reply-To: <20230301143933.2374658-1-glider@google.com> Mime-Version: 1.0 References: <20230301143933.2374658-1-glider@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301143933.2374658-4-glider@google.com> Subject: [PATCH 4/4] kmsan: add memsetXX tests From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, akpm@linux-foundation.org, elver@google.com, dvyukov@google.com, nathan@kernel.org, ndesaulniers@google.com, kasan-dev@googlegroups.com X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759177620497449528?= X-GMAIL-MSGID: =?utf-8?q?1759177620497449528?= Add tests ensuring that memset16()/memset32()/memset64() are instrumented by KMSAN and correctly initialize the memory. Signed-off-by: Alexander Potapenko --- 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; \ + \ + 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), {}, };