From patchwork Fri Mar 3 14:14: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: 63941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp432012wrd; Fri, 3 Mar 2023 06:16:05 -0800 (PST) X-Google-Smtp-Source: AK7set+QZhLBziPxFuZWcA9qCMT0o2mxGPE1pJXOOfLSsZ4EbsnlmErZzPLMy3+cHXbCtl/am6L0 X-Received: by 2002:a05:6a20:8403:b0:cc:76ec:70dc with SMTP id c3-20020a056a20840300b000cc76ec70dcmr3127757pzd.26.1677852965313; Fri, 03 Mar 2023 06:16:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677852965; cv=none; d=google.com; s=arc-20160816; b=flAsPDp7vniXllNn0yaQwuzhzRDa1ZhKK6VTrPHYGmOTiTzAK1H5+oM2nNQHhztWg3 c3wHP9uLz1Tq2xyFZHgZ3BRKuFiiTl2l39+maL8oR7duixLjzsV6sM/U9m3KhvMMBqm5 UzchS02wQaxyAr4/DfDlemhfPqsfGEuDX3RiQDgcgNHsO2S7xNFzJAG2Yo/2Ut8RybHZ 6We6PUdXynQojEIYVnq/0xIsRUadWxO73fooA2nYQY753O6OUyNwtAaOj16i+MJrRMCS VDEH55Z3LUO0pG4jQGTt+JeIRHcQ3xwpVUrn0XoNtCy/BYD4EEoQKtWbSzvY4ohuBap1 axJw== 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=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=n2d+/luSOLU7BRsCHcCNwNIEZh9k/cvGRpQctyP/uQl6PsWQzaT/KVSi2/Rn6FFWyW DHbRNYLGarf211T8DhrpFGLm7Yx9ILngKuzrcw0MTeisyopOCx9f4e3aDvETVZ2XUVDF ognzZ4gvmaAWCULz1prR/bFTWxUHD8jPCwrkXk3+iJjFwxnCO8sVSnxQw6KKZLvZynBw moC2TXtkUsvm4GMXipTzKiVqN916OBLqUEN57/q+ygV0lANEQu/hh6M+KaU6BoPEoaAx 0eE80ztxI4dsNvj5YyySOzxBuDH4OiZlBF+NHI6Y15qwLn5G57hmUjhzzzz3xRmTCc/e 9uSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=hMY2yJzs; 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 k124-20020a632482000000b004fb165e159bsi2339171pgk.794.2023.03.03.06.15.51; Fri, 03 Mar 2023 06:16:05 -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=hMY2yJzs; 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 S230510AbjCCOOn (ORCPT + 99 others); Fri, 3 Mar 2023 09:14:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjCCOOm (ORCPT ); Fri, 3 Mar 2023 09:14:42 -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 68B0913DEB for ; Fri, 3 Mar 2023 06:14:41 -0800 (PST) Received: by mail-ed1-x54a.google.com with SMTP id q13-20020a5085cd000000b004af50de0bcfso4216239edh.15 for ; Fri, 03 Mar 2023 06:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677852880; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=hMY2yJzsPf2YWJ9SnaLFMvgZa7mnCcGkPNLMoITa/8FWMXegqQl7kIJo/qWbFtv42K JUF3gcDP0cfK67S+1mdFC2TbAWAnhoc3q+tRpdXFcLyhBGTf0Opvr/qYA8Z6Oj+oe1PO azhktU12eLJhoB1eKldndx4jeQwB0Xkm5Yro83Pn9TkvQpP34l1jQU1wvOMFDuojTwoy nr3zYZv12m4lPIMp4NLUZBH3EtP7QEL/MlNPFBicPOgSwAROS0En6PD9ETZi/dZ8EYZt S93zuhDgiY/Zn126O3o8Vab4eMVHJMeE2Mpw/mURlt/0t2gHwSJCXA5K1fqYu1PAdxYy lHZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677852880; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=Hva06/fizgI2iSmW2KN/XPfcg72zGgBLrruXTjIYh6H/Oc+RPnQmGm+lfN+4OeouDJ zSWlmb9Dscktf6lMiBd9kDSp3hKhk88wg7Ulr+A0VVpJ4k77b7TCbAIWH0Tjx5plLAz8 C/lEnykxUIlSL5kSEZIdtjDVDLGJFZ8E8w7UKG8SemgwGxfOvV6tsbiT0FcN6EXfzhMC PA/mCLwIbppreM+bdRZecwmfmaerRfyOoPuiHVOI3sgzEoJDPWyDdRBToJq8eDy7ZyFb hiZtEcAutxVWD9mEtaoaizgU+kQl7/BxlXEQ3rCTF2k+qnO4QmKA3Au05fTQCmI/SvYe gCbg== X-Gm-Message-State: AO0yUKWBAyyKgkNfYo9TWICWHOYWjYLoP1444YMvzWOe7Y3EoMLGdFUi M37klHPImJI4mb897nbmCeFHD0QMjUk= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:f11e:2fac:5069:a04d]) (user=glider job=sendgmr) by 2002:a50:ab1e:0:b0:4ab:4933:225b with SMTP id s30-20020a50ab1e000000b004ab4933225bmr1157914edc.6.1677852879922; Fri, 03 Mar 2023 06:14:39 -0800 (PST) Date: Fri, 3 Mar 2023 15:14:30 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230303141433.3422671-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?1759356350916549299?= X-GMAIL-MSGID: =?utf-8?q?1759356350916549299?= clang -fsanitize=kernel-memory already replaces calls to memset/memcpy/memmove and their __builtin_ versions with __msan_memset/__msan_memcpy/__msan_memmove 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 --- v2: - updated patch description --- 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 Fri Mar 3 14:14: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: 63942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp432038wrd; Fri, 3 Mar 2023 06:16:06 -0800 (PST) X-Google-Smtp-Source: AK7set90G3XZOlkMTkcIIwoOsjUKD0uksFdeO1iFvAc7JAS6NVSqiq0/rd+6SO/1rRaXPfk2jMk/ X-Received: by 2002:a17:903:492:b0:19e:773b:2215 with SMTP id jj18-20020a170903049200b0019e773b2215mr1906954plb.36.1677852966081; Fri, 03 Mar 2023 06:16:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677852966; cv=none; d=google.com; s=arc-20160816; b=YeRht9A4pUoFHxo4SYzvXQ886nqHTTMY2qqUqf4ajv3oiJ2uapoCaFbPo0Ewp5RaFG LErlGwu3rsdXx8bd7WanFjkPHh+K8BhK1ObnGniTOpQrkzZSQMZm7y5+3tFP2UmwZn8g I6T8ewRwoZNaHtdLiDFIZRuKyllBDZ7qvv9Q6AUPDrFDM3tGq62zUxJV1BU3CDjoxvEQ l8r4ApB+igTSDJ0z4SAJUNyGhq/eV38OVLzOYFfZfN7hkJFeEiFruHO9gtihC7HZfz67 rs49yY0ucQv3ElwmbenVVzRUQCiTe1a8CP1QVGUafvQAtCGpFSBHVvwBocb3yUwNXN1c Yrlw== 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=NzrUAKqOf4lIqj2sXdyqoZ2Q8eXyDe5JYgJyXOtPsCY=; b=cJ+gS2kgukImIXQfIqY5ligOsDrfv3R68Icoj4ZKssdr8+C0ciTRk4OCjJizaOM9bA dY/wWFLQYmoINiEOQd8SRSHGdlxQWOWu+sB/j8Abyp2ecsGU6h+zvYNyjgoDnl/RZyvE 8qMpUCEYJIomz4kJK81yI42fvg/GwG+TOPXfpuWo7s6oQ3FBfAPQB7K01d5YErMK9iy0 n8A1njDVuOyfDfeUG714GGk4YxXhlkLTkkdzpzaxIqYByImpccRgUdiIom41OH/LSDgp GtfAJBRIihRMZm16AWJ8el+suP27VEN4jqynymIkZfduS0RYAI1PHp52Oo33heXp0v+y P3Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ZfSfmqBM; 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 g3-20020a170902740300b001926b288ae9si2368468pll.82.2023.03.03.06.15.52; Fri, 03 Mar 2023 06:16:06 -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=ZfSfmqBM; 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 S231177AbjCCOO5 (ORCPT + 99 others); Fri, 3 Mar 2023 09:14:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231207AbjCCOOq (ORCPT ); Fri, 3 Mar 2023 09:14:46 -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 694AD17152 for ; Fri, 3 Mar 2023 06:14:45 -0800 (PST) Received: by mail-ed1-x54a.google.com with SMTP id cf11-20020a0564020b8b00b0049ec3a108beso4159524edb.7 for ; Fri, 03 Mar 2023 06:14:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677852884; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NzrUAKqOf4lIqj2sXdyqoZ2Q8eXyDe5JYgJyXOtPsCY=; b=ZfSfmqBMuJ+vwMDxG5i4+5C+tNEglr4loWmKR6Z0RkZfjr+jAbJCKs+E8HdnY+/484 U4Tnah/k4Gjd5sm2yqp/0nKmTL54cbtEXdkKAgXSe42PIyTbE0SRGadQQmam3JIAUfvC a5ouWadlWnMykwg3du4wr7YFd0UA4Nmn97zesSEosU4X3DChC2nSvSKQyOpTfHECBKv7 gZXhfuN9a1gIdRxhqPU3dNXM0LfelTB/RT1xvfB+vRM3dNsvbeS0WfFdt8jqYekhXOzi 337mBrnvoEXkOMuKAADUY1doomtGT8K8uQlYbbOdXMj9ai3/IQ/6zMJlcrmOBZHFmz/Z uWtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677852884; 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=NzrUAKqOf4lIqj2sXdyqoZ2Q8eXyDe5JYgJyXOtPsCY=; b=BRe31E6W1tfSDDjtXdl1S6Bf/Un5oUtiqT/gSYCwC8Ldxv6lJ17MvfMwdmK6/sxoY8 h8GHCanmiG4FJJNKK/k3WnT9rVruYDZJY80U2eE/l4W4EYiIx0E1vYQCtvm5ae6fYGMD AD8msGNgQOLFU/J1S4C7AEG0xWhA0yHcf3hIvZik5tXHKpWjM172lGF9Mucy5Efikgly U6QZR4rTxS2U7UpWz8XJTZQktDbGfvkJNWRCNPBTr0x5NONgxy1mND9gGkg5TrHpwPwR HIQh5OkHdRcr7/y3hYdKKdCikQnF8f83d4rX5iUsT590uIEXEQKAmDwXX6arcYV2tF/b 6ghA== X-Gm-Message-State: AO0yUKUy6ih5OraAX6o8+ohAfnroRzVrOfyYPUN9wWAbvU9YHACWlRrk fOItoNuWjNx64SFBlqtKys9YbWXd/08= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:f11e:2fac:5069:a04d]) (user=glider job=sendgmr) by 2002:a17:906:d041:b0:8bf:e82a:2988 with SMTP id bo1-20020a170906d04100b008bfe82a2988mr938462ejb.4.1677852883928; Fri, 03 Mar 2023 06:14:43 -0800 (PST) Date: Fri, 3 Mar 2023 15:14:31 +0100 In-Reply-To: <20230303141433.3422671-1-glider@google.com> Mime-Version: 1.0 References: <20230303141433.3422671-1-glider@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230303141433.3422671-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?1759356351583777452?= X-GMAIL-MSGID: =?utf-8?q?1759356351583777452?= commit 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 macro that just clobbers the memory with a barrier(), 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 Reviewed-by: Marco Elver --- v2: - replace inline assembly with a barrier(), update comments --- mm/kmsan/kmsan_test.c | 44 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/mm/kmsan/kmsan_test.c b/mm/kmsan/kmsan_test.c index 088e21a48dc4b..aeddfdd4f679f 100644 --- a/mm/kmsan/kmsan_test.c +++ b/mm/kmsan/kmsan_test.c @@ -407,6 +407,37 @@ 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. Same is true for e.g. barrier_data(var). + */ +#define DO_NOT_OPTIMIZE(var) barrier() + +/* + * Test case: ensure that memcpy() correctly copies initialized values. + * Also serves as a regression test to ensure DO_NOT_OPTIMIZE() does not cause + * extra checks. + */ +static void test_init_memcpy(struct kunit *test) +{ + EXPECTATION_NO_REPORT(expect); + volatile int src; + volatile int dst = 0; + + 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 +451,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 +474,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 +498,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 +514,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 +546,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 Fri Mar 3 14:14: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: 63943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp432254wrd; Fri, 3 Mar 2023 06:16:25 -0800 (PST) X-Google-Smtp-Source: AK7set82xaPebczCuZaYsHEjQOmMZ2TOQ9Ue6oFNuxDHXv2rzr47sPhEuAxMsffHwhMhgcogXDRI X-Received: by 2002:a17:902:e5c2:b0:19c:d5c7:e3d5 with SMTP id u2-20020a170902e5c200b0019cd5c7e3d5mr2591125plf.65.1677852984888; Fri, 03 Mar 2023 06:16:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677852984; cv=none; d=google.com; s=arc-20160816; b=GnNwZK1ifw/GmxncdUBABeJiCTbipxHoH8vR2+9/7J9+/L4qP0kj0GtAZp1W+3S5P1 OdcapD3Z7LYLPHyFv85qZQfDF1Z+Ua7PaF+uDxSNWfMZu+VDu4wLFrrezJnUQDnIcXMM VF5Z+HwYH4W/0OKNGFCvkdz3YhOOWIjZgEP6Tr5Qa0KSt48U3l3ATjaHVHAcR4xf2Him f8tUX7HIOPUd102JJNq3n3Kzm7BGGiiDTKhTBgRVaWtcy6ln1JzKSD3dPJvqT6sGDFkw eE4+ew9PGWpLPnd3u6YK+lL+CBZUxM3M5cequInHaD2uOBM5nIrziKfkKNh1bScIerrH 83GA== 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=NAtSFGVTwhm/tX8WamH/Zd7xaJyhhcixand9gS9KqOo=; b=mwy6YA0I9izsW5lLRzh/9simQG530U9WWvzOcswxram4lidK8FUPCBCQwCFaxefsxn TbeUytmUje0xf41k0N94bVypzaO9Ec+3hbs0x3N+D3yQNOewO6J40y91hdc7DldOSDL+ axFoX9Ki7r6zl82r7u5qf+s0yMqk02J7ZzKFxMR/lgtndhdSKV0Spx8pZSyBcdHo7AWn 7vUt6iV1+TJ1W6hUK0V800tP//q3HVUlVD8K5XCRGLJ85rScgTeQIoVHhv82yJs0lTCw eaKFfVg3gVq4NaRQtuXK93Zrr5mHV8HhfmMBCJjts2WfaVS/wH8wJ0Ej7gqofqWmNb3r ezaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=edrPhHR+; 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 kl7-20020a170903074700b0019a9d99f1b1si2174519plb.43.2023.03.03.06.16.11; Fri, 03 Mar 2023 06:16:24 -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=edrPhHR+; 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 S231171AbjCCOO6 (ORCPT + 99 others); Fri, 3 Mar 2023 09:14:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231265AbjCCOOt (ORCPT ); Fri, 3 Mar 2023 09:14: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 E7A9417152 for ; Fri, 3 Mar 2023 06:14:47 -0800 (PST) Received: by mail-ed1-x54a.google.com with SMTP id c1-20020a0564021f8100b004acbe232c03so4116918edc.9 for ; Fri, 03 Mar 2023 06:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677852886; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NAtSFGVTwhm/tX8WamH/Zd7xaJyhhcixand9gS9KqOo=; b=edrPhHR+hbvuZmCRmiXvtdzInq+2KrUPIrtLGbBOYAz18C6kJWS+/nki4keZBHrSjX Q9nhw9CS30Klrqx9/BvqlHeAniJuoR/QNhoB9W5oFpeRTdTaYW3kcWOLgRPD6NXZIP6n mCC7IOqMEor1717d+03PnfDDyrDEXtVYpKT9TFFypjlnzs0nyAZ2rNe3l77D9LG/LFF9 P4H7KTzZSBM8OobRFBApQihuTwjuD3mWpkS7Dxkd8mvYiL/+iGj/yGknBW2a+RQL7LA8 Cp1I4cW2uNEf7myQDdk6wGuhupp71e5j4QbfcEgLzB44ot+O6Uamh2nuy8Dt05VbcIci r4yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677852886; 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=NAtSFGVTwhm/tX8WamH/Zd7xaJyhhcixand9gS9KqOo=; b=c+2QPPc4HWY3Vu2gjP7Yu1hZNFZv/pQNec4k30F8KPp0VNaOmHWlEPl1atQsSsbXld YHJJTR4zocFoLqVSYevHsNPa8V04otKYNyqxU1SFSiLCRkIYwI60jGdcAOVcoc8IPtSa fBh4JCa6YheNDFIUf8dYiTGiJZzD1qxVJsL8Y8AjYS4JRAQzQvnoNTdC4ZU7Xznni8qB FK91odEokb0EE2Z0sxdeHrZpuDjzKYX66Tu1BE4COXxiNsel3dRxw24g/g3QZfdVlD50 fIP3z1ZUJL6Q14PcRAqUIWL7jQBOuZE3qZXK6HnaztlmImSRdqLyKSeXsVeqoY6B4TOm 4djw== X-Gm-Message-State: AO0yUKXvYCcVI9dkv/HFnKBLWh4I4jNFsLQDxnKErFNiKKJwuZvhetsr kofEAtawE0iZnvNJQNx0xBKpISayHVk= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:f11e:2fac:5069:a04d]) (user=glider job=sendgmr) by 2002:a50:d581:0:b0:4bf:7914:98c5 with SMTP id v1-20020a50d581000000b004bf791498c5mr1171964edi.4.1677852886570; Fri, 03 Mar 2023 06:14:46 -0800 (PST) Date: Fri, 3 Mar 2023 15:14:32 +0100 In-Reply-To: <20230303141433.3422671-1-glider@google.com> Mime-Version: 1.0 References: <20230303141433.3422671-1-glider@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230303141433.3422671-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?1759356371478674251?= X-GMAIL-MSGID: =?utf-8?q?1759356371478674251?= 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 Fri Mar 3 14:14: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: 63944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp439225wrd; Fri, 3 Mar 2023 06:30:30 -0800 (PST) X-Google-Smtp-Source: AK7set8R7OLrJ65hsLsl8arUHOwJuMN6gQUKOZShOQ49ajwGP7D3HxiUERL/GFoChvqY/t6ARly5 X-Received: by 2002:a17:90a:18e:b0:232:fa13:4453 with SMTP id 14-20020a17090a018e00b00232fa134453mr1912752pjc.13.1677853829970; Fri, 03 Mar 2023 06:30:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677853829; cv=none; d=google.com; s=arc-20160816; b=oaak5RfIhUu3Yu5pavRlTNV7SpMi8gbYz7Gu43yieDUBdfqpzs7dP89UVLA38bMMlC elzcJAc4d7AaEnHgT63k0y6XknFunJ5+sEN/m5yAoarfmx+Qm7Zli2F91TZ966SqGQiN xm+ZXFm3muq/DhGAdWfGfZiw1NNf7xLCNdPkQqIQ/BCuNorT9pTCaLncCk8GRdLhYlNz x7wzGBBB2K5q8ZaE1Ltc4DtcZ+6lwH1bsCzHkBiyUNEDwzwpiFS4bbWv2bt1EJMRZXMb GQmmQN5R1xrg0weNtYm4/4hG11pgCo9KdIX2vy13NzQxwu7T7/wa+aUAeK2C9zuJlOqa XBUQ== 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=rwOqGFiMpxVm/Yf2TCVg/tAOnz+fk0oI0q2ct+QMnRo=; b=wPUDO6xGT3quKZY+c6qYCRAJyJC11LZUIXD4ilPL1w4Qshi4TMKF0AMKa7Z0VQ1czF e1h/ShJZSPXQDC/kfGg/Gn1G5+YxkGB2hLc2vqQIj2WJ3Lz8C//M/nOIn1nqQL9KfFPq HTc3xJYXJ1aThFnDkS54juhCPcdn9xNRhPF3B7O67p8pBRBQycZwNP/drfnZA4d2O+u4 eA0KwGia4BIgzYq8kvSHK4kOuGjNHV90CxT7eoXFuEW4J3+dzCVw7hs+Ejm4PZiNSPB7 nYJmZQmcpT4qz6IpiVWjY3Eed+BhI05Z8dkBptRsomgF+QGooP7XNUcfiZES4cWZngbu araQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=XZGeQDWe; 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 z18-20020a17090ad79200b0022c5a147e9fsi2293673pju.115.2023.03.03.06.30.16; Fri, 03 Mar 2023 06:30:29 -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=XZGeQDWe; 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 S231272AbjCCOPC (ORCPT + 99 others); Fri, 3 Mar 2023 09:15:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbjCCOOv (ORCPT ); Fri, 3 Mar 2023 09:14:51 -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 8A8DF16AF2 for ; Fri, 3 Mar 2023 06:14:50 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id ev6-20020a056402540600b004bc2358ac04so4178159edb.21 for ; Fri, 03 Mar 2023 06:14:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677852889; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rwOqGFiMpxVm/Yf2TCVg/tAOnz+fk0oI0q2ct+QMnRo=; b=XZGeQDWe4Pd5npHcAau0EzkvzHXKKNrGOH18yXzhEAmcYUZLbneOiYfhArq3rRCAZy GBbL3GsmlGQfzQ5SfxzKMgTFZEUEozH+Or/E60HwnODlceqj0C3HRmJbt7oN2LKCfPJB WhsQRvh03bRnXHE23IhTee0WmZOV7wI6BD1JQHMUVMgPFTpIWoulVpH3dQbdsiw8/T9J 5TcP4NGjzxEa/ZJAP3crz6HfyNfIP1dIzC/ax7dquihg4zVwhhLGbI8jCGiV7Fd5VKtM dPhh1sc5W7VFazYm2ehiDohwqAS/RO0qdmBIFJm84GXSSdH9KLss/voUPFZtPSSBR+Ew t8/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677852889; 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=rwOqGFiMpxVm/Yf2TCVg/tAOnz+fk0oI0q2ct+QMnRo=; b=buRr3hcwgiUSUfMdDhf1Uy4SlIHvVw/+3ofDDz41XwDhkom2w8ssjurCxtJhJ0XPkX v4iYVmYVMudD6m7Oelc+foVDyqK19OgLm64LbilKj55ejKVHrXGdKGQ6sOeojNKRScR1 hgWMOcdVoVY+8kEzSadXiAFAZijej/rFqJtXAnF/rcGvGNSYehFQCCDxekt00ZTkeWH0 vS7VV4tdPuBop1drr9XPt0efTw1vpzvodsMutaIL5ecHgtf83J2dIYCLm4B7kGvNmJac GEVfNcbKRqxzKPQIYvNP8JngbBnghQCCp7bDeMipvkInvADNCk6RGBZBsncIPl7XW0eM JBew== X-Gm-Message-State: AO0yUKXaUQg/I6DOPGn33xCHxfYwjiA3bdToUDVc/uVLYlxMrViGLSNO Z5YMyKVnmGtYok08v3eDPn5Tz0Ce+LU= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:f11e:2fac:5069:a04d]) (user=glider job=sendgmr) by 2002:a50:cd81:0:b0:4af:6e08:30c with SMTP id p1-20020a50cd81000000b004af6e08030cmr962152edi.4.1677852889146; Fri, 03 Mar 2023 06:14:49 -0800 (PST) Date: Fri, 3 Mar 2023 15:14:33 +0100 In-Reply-To: <20230303141433.3422671-1-glider@google.com> Mime-Version: 1.0 References: <20230303141433.3422671-1-glider@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230303141433.3422671-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?1759357093685470904?= X-GMAIL-MSGID: =?utf-8?q?1759357257753477617?= Add tests ensuring that memset16()/memset32()/memset64() are instrumented by KMSAN and correctly initialize the memory. Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver --- v2: - drop a redundant parameter of DEFINE_TEST_MEMSETXX() --- 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 aeddfdd4f679f..7095d3fbb23ac 100644 --- a/mm/kmsan/kmsan_test.c +++ b/mm/kmsan/kmsan_test.c @@ -504,6 +504,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) \ + static void test_memset##size(struct kunit *test) \ + { \ + EXPECTATION_NO_REPORT(expect); \ + volatile uint##size##_t uninit; \ + \ + kunit_info(test, \ + "memset" #size "() should initialize memory\n"); \ + DO_NOT_OPTIMIZE(uninit); \ + memset##size((uint##size##_t *)&uninit, 0, 1); \ + kmsan_check_memory((void *)&uninit, sizeof(uninit)); \ + KUNIT_EXPECT_TRUE(test, report_matches(&expect)); \ + } + +DEFINE_TEST_MEMSETXX(16) +DEFINE_TEST_MEMSETXX(32) +DEFINE_TEST_MEMSETXX(64) + static noinline void fibonacci(int *array, int size, int start) { if (start < 2 || (start == size)) @@ -550,6 +569,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), {}, };