From patchwork Fri Oct 18 09:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 11197995 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3630418A6 for ; Fri, 18 Oct 2019 09:44:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DCC8B222C5 for ; Fri, 18 Oct 2019 09:44:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="aWDVsodl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCC8B222C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EE5338E002A; Fri, 18 Oct 2019 05:43:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EBFAB8E0003; Fri, 18 Oct 2019 05:43:59 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D85F28E002A; Fri, 18 Oct 2019 05:43:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0220.hostedemail.com [216.40.44.220]) by kanga.kvack.org (Postfix) with ESMTP id AA83E8E0003 for ; Fri, 18 Oct 2019 05:43:59 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 5234BEFB1 for ; Fri, 18 Oct 2019 09:43:59 +0000 (UTC) X-FDA: 76056418998.13.bat80_7a0d31c771a0e X-Spam-Summary: 2,0,0,0d33b859f55e6920,d41d8cd98f00b204,3xympxqykcaoqvsno1qyyqvo.mywvsx47-wwu5kmu.y1q@flex--glider.bounces.google.com,:glider@google.com:herbert@gondor.apana.org.au:harry.wentland@amd.com:vegard.nossum@oracle.com:dvyukov@google.com:,RULES_HIT:1:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1437:1516:1518:1593:1594:1605:1730:1747:1777:1792:1801:2393:2525:2559:2564:2636:2682:2685:2693:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3865:3866:3867:3868:3870:3871:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4605:5007:6120:6261:6609:6653:7875:7901:7903:8957:9025:9969:10004:11026:11232:11473:11657:11658:11914:12043:12291:12296:12297:12438:12555:12895:12986:13141:13161:13229:13230:13255:13846:14096:14097:14394:14659:21063:21080:21325:21365:21444:21451:21627:30003:30054:30055:30062:30064,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNS BL:neutr X-HE-Tag: bat80_7a0d31c771a0e X-Filterd-Recvd-Size: 12938 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 18 Oct 2019 09:43:58 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id 7so2369447wrl.2 for ; Fri, 18 Oct 2019 02:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=16iSBNChTS//BwkKZiXK7QkCvle7X7xoItbrk/YSKlw=; b=aWDVsodlEc8wd0V5eWM4Im7yWXkzQ1UnnMbvBGVw9KzHsmpfPzr11qyzSsc0hcoGSr mTPZFmbXICkYyssiW0VnXx0UuzlLXL/8BAzZOdOySXjWRVyZ2p2c3ab1zrjQChtaEyGn jJzNBX3hadbyajEe/OkYdh/mYYgciGcji2AgN7AiMKZ9b8eJ01vXKhyPIPIhuusVSns9 Bgtr1vpesa5b0QszRB5euX03mAZYEfZwsutIcWQ0DY1Yd/t+EFQDUICAS88IjUJPynCb rZC+x4qSpF7ktaVJXCMpx1HpqGre/nXP5dU6MFN6ncUIYLh+Uk7Sy75xXyW57zIyda2+ McSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=16iSBNChTS//BwkKZiXK7QkCvle7X7xoItbrk/YSKlw=; b=o6wMv7gnQpBK/tt5LeNulKxHvFEzlZpBHmLVqN0uBuwfUfyw95cVJVvxTgdaBR3In/ UBttSHobAG38ekFYZCphQb74vILxF7JxsiXpUod0lXcpqZB/xiIHCihxzl5qLiQteN2b TUzNOuYehxp8mxo2lE9CgzjLhkn1rJKKtr21yY2Dc7eHej+a+3/gGcJoZD/uEcG6Uba9 cVlWRjZjiSGkQcXnLR5Eq/luh/hS5zhv6x8a9fNSQdqhCdWkkkJUsOe5dIhHiwzvVbtl xao53NJ04o4MMduqBcd/rcnIICRB0c/4rsOx2bR4p0w/+yCmOT6/mQ0I19RJAK/HQq8R GnEA== X-Gm-Message-State: APjAAAVaehlXtnhtbQtWf7RXGqjasSz+9cKy24Eb3KbJ+EfSKdgn1K4E D+3C1ItHt9E81dU4mymXYbELpTdfhEg= X-Google-Smtp-Source: APXvYqwT0iZb6l0M2+johcjxTo0JAB6JKQjy96s8fyMtBFI9cGGk32b7lSceiI+K/eg6TDC0W8kzC4VCAZk= X-Received: by 2002:adf:de85:: with SMTP id w5mr6766740wrl.278.1571391837470; Fri, 18 Oct 2019 02:43:57 -0700 (PDT) Date: Fri, 18 Oct 2019 11:42:53 +0200 In-Reply-To: <20191018094304.37056-1-glider@google.com> Message-Id: <20191018094304.37056-16-glider@google.com> Mime-Version: 1.0 References: <20191018094304.37056-1-glider@google.com> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH RFC v1 15/26] kmsan: Kconfig changes to disable options incompatible with KMSAN From: glider@google.com To: Alexander Potapenko Cc: Herbert Xu , Harry Wentland , Vegard Nossum , Dmitry Vyukov , linux-mm@kvack.org 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: Certain config options are currently incompatible with KMSAN, disable them. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Herbert Xu Cc: Harry Wentland Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: linux-mm@kvack.org Acked-by: Harry Wentland --- Change-Id: I4521f5c764cfaeba2fae79c954925c302c5e3bc0 --- arch/Kconfig | 2 +- arch/x86/Kconfig | 1 + arch/x86/Kconfig.debug | 3 +++ crypto/Kconfig | 26 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/display/Kconfig | 2 +- lib/Kconfig.debug | 3 +++ 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 5f8a5d84dbbe..d5ca838ae8ad 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -843,7 +843,7 @@ config HAVE_ARCH_VMAP_STACK config VMAP_STACK default y bool "Use a virtually-mapped stack" - depends on HAVE_ARCH_VMAP_STACK && !KASAN + depends on HAVE_ARCH_VMAP_STACK && !KASAN && !KMSAN ---help--- Enable this if you want the use virtually-mapped kernel stacks with guard pages. This causes kernel stack overflows to be diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3f83a5c53808..6d2b0fb3a871 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2143,6 +2143,7 @@ config RELOCATABLE config RANDOMIZE_BASE bool "Randomize the address of the kernel image (KASLR)" depends on RELOCATABLE + depends on !KMSAN default y ---help--- In support of Kernel Address Space Layout Randomization (KASLR), diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index bf9cd83de777..db3cd6147829 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -292,6 +292,9 @@ choice config UNWINDER_ORC bool "ORC unwinder" depends on X86_64 + # KMSAN doesn't support UNWINDER_ORC yet, + # see https://github.com/google/kmsan/issues/48. + depends on !KMSAN select STACK_VALIDATION ---help--- This option enables the ORC (Oops Rewind Capability) unwinder for diff --git a/crypto/Kconfig b/crypto/Kconfig index 9e524044d312..37a22711012c 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -309,11 +309,13 @@ config CRYPTO_AEGIS128 config CRYPTO_AEGIS128_SIMD bool "Support SIMD acceleration for AEGIS-128" depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON) + depends on !KMSAN default y config CRYPTO_AEGIS128_AESNI_SSE2 tristate "AEGIS-128 AEAD algorithm (x86_64 AESNI+SSE2 implementation)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_AEAD select CRYPTO_SIMD help @@ -571,6 +573,7 @@ config CRYPTO_CRC32C config CRYPTO_CRC32C_INTEL tristate "CRC32c INTEL hardware acceleration" depends on X86 + depends on !KMSAN select CRYPTO_HASH help In Intel processor with SSE4.2 supported, the processor will @@ -611,6 +614,7 @@ config CRYPTO_CRC32 config CRYPTO_CRC32_PCLMUL tristate "CRC32 PCLMULQDQ hardware acceleration" depends on X86 + depends on !KMSAN select CRYPTO_HASH select CRC32 help @@ -649,6 +653,7 @@ config CRYPTO_CRCT10DIF config CRYPTO_CRCT10DIF_PCLMUL tristate "CRCT10DIF PCLMULQDQ hardware acceleration" depends on X86 && 64BIT && CRC_T10DIF + depends on !KMSAN select CRYPTO_HASH help For x86_64 processors with SSE4.2 and PCLMULQDQ supported, @@ -695,6 +700,7 @@ config CRYPTO_POLY1305 config CRYPTO_POLY1305_X86_64 tristate "Poly1305 authenticator algorithm (x86_64/SSE2/AVX2)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_POLY1305 help Poly1305 authenticator algorithm, RFC7539. @@ -814,6 +820,7 @@ config CRYPTO_SHA1 config CRYPTO_SHA1_SSSE3 tristate "SHA1 digest algorithm (SSSE3/AVX/AVX2/SHA-NI)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_SHA1 select CRYPTO_HASH help @@ -825,6 +832,7 @@ config CRYPTO_SHA1_SSSE3 config CRYPTO_SHA256_SSSE3 tristate "SHA256 digest algorithm (SSSE3/AVX/AVX2/SHA-NI)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_SHA256 select CRYPTO_HASH help @@ -837,6 +845,7 @@ config CRYPTO_SHA256_SSSE3 config CRYPTO_SHA512_SSSE3 tristate "SHA512 digest algorithm (SSSE3/AVX/AVX2)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_SHA512 select CRYPTO_HASH help @@ -1011,6 +1020,7 @@ config CRYPTO_WP512 config CRYPTO_GHASH_CLMUL_NI_INTEL tristate "GHASH hash function (CLMUL-NI accelerated)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_CRYPTD help This is the x86_64 CLMUL-NI accelerated implementation of @@ -1064,6 +1074,7 @@ config CRYPTO_AES_TI config CRYPTO_AES_NI_INTEL tristate "AES cipher algorithms (AES-NI)" depends on X86 + depends on !KMSAN select CRYPTO_AEAD select CRYPTO_LIB_AES select CRYPTO_ALGAPI @@ -1190,6 +1201,7 @@ config CRYPTO_BLOWFISH_COMMON config CRYPTO_BLOWFISH_X86_64 tristate "Blowfish cipher algorithm (x86_64)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_BLOWFISH_COMMON help @@ -1221,6 +1233,7 @@ config CRYPTO_CAMELLIA_X86_64 tristate "Camellia cipher algorithm (x86_64)" depends on X86 && 64BIT depends on CRYPTO + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_GLUE_HELPER_X86 help @@ -1238,6 +1251,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)" depends on X86 && 64BIT depends on CRYPTO + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_CAMELLIA_X86_64 select CRYPTO_GLUE_HELPER_X86 @@ -1258,6 +1272,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)" depends on X86 && 64BIT depends on CRYPTO + depends on !KMSAN select CRYPTO_CAMELLIA_AESNI_AVX_X86_64 help Camellia cipher algorithm module (x86_64/AES-NI/AVX2). @@ -1303,6 +1318,7 @@ config CRYPTO_CAST5 config CRYPTO_CAST5_AVX_X86_64 tristate "CAST5 (CAST-128) cipher algorithm (x86_64/AVX)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_CAST5 select CRYPTO_CAST_COMMON @@ -1325,6 +1341,7 @@ config CRYPTO_CAST6 config CRYPTO_CAST6_AVX_X86_64 tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_CAST6 select CRYPTO_CAST_COMMON @@ -1360,6 +1377,7 @@ config CRYPTO_DES_SPARC64 config CRYPTO_DES3_EDE_X86_64 tristate "Triple DES EDE cipher algorithm (x86-64)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_LIB_DES help @@ -1426,6 +1444,7 @@ config CRYPTO_CHACHA20 config CRYPTO_CHACHA20_X86_64 tristate "ChaCha stream cipher algorithms (x86_64/SSSE3/AVX2/AVX-512VL)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_CHACHA20 help @@ -1462,6 +1481,7 @@ config CRYPTO_SERPENT config CRYPTO_SERPENT_SSE2_X86_64 tristate "Serpent cipher algorithm (x86_64/SSE2)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_GLUE_HELPER_X86 select CRYPTO_SERPENT @@ -1481,6 +1501,7 @@ config CRYPTO_SERPENT_SSE2_X86_64 config CRYPTO_SERPENT_SSE2_586 tristate "Serpent cipher algorithm (i586/SSE2)" depends on X86 && !64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_GLUE_HELPER_X86 select CRYPTO_SERPENT @@ -1500,6 +1521,7 @@ config CRYPTO_SERPENT_SSE2_586 config CRYPTO_SERPENT_AVX_X86_64 tristate "Serpent cipher algorithm (x86_64/AVX)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_GLUE_HELPER_X86 select CRYPTO_SERPENT @@ -1520,6 +1542,7 @@ config CRYPTO_SERPENT_AVX_X86_64 config CRYPTO_SERPENT_AVX2_X86_64 tristate "Serpent cipher algorithm (x86_64/AVX2)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_SERPENT_AVX_X86_64 help Serpent cipher algorithm, by Anderson, Biham & Knudsen. @@ -1615,6 +1638,7 @@ config CRYPTO_TWOFISH_586 config CRYPTO_TWOFISH_X86_64 tristate "Twofish cipher algorithm (x86_64)" depends on (X86 || UML_X86) && 64BIT + depends on !KMSAN select CRYPTO_ALGAPI select CRYPTO_TWOFISH_COMMON help @@ -1631,6 +1655,7 @@ config CRYPTO_TWOFISH_X86_64 config CRYPTO_TWOFISH_X86_64_3WAY tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_TWOFISH_COMMON select CRYPTO_TWOFISH_X86_64 @@ -1652,6 +1677,7 @@ config CRYPTO_TWOFISH_X86_64_3WAY config CRYPTO_TWOFISH_AVX_X86_64 tristate "Twofish cipher algorithm (x86_64/AVX)" depends on X86 && 64BIT + depends on !KMSAN select CRYPTO_BLKCIPHER select CRYPTO_GLUE_HELPER_X86 select CRYPTO_SIMD diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig index 71991a28a775..99585eaf4dd0 100644 --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@ -6,7 +6,7 @@ config DRM_AMD_DC bool "AMD DC - Enable new display engine" default y select SND_HDA_COMPONENT if SND_HDA_CORE - select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) + select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) && !KMSAN help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 75c36318943d..a3f6f5d68593 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1068,6 +1068,9 @@ menu "Lock Debugging (spinlocks, mutexes, etc...)" config LOCK_DEBUGGING_SUPPORT bool depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT + # KMSAN is incompatible with lockdep, + # see https://github.com/google/kmsan/issues/57. + depends on !KMSAN default y config PROVE_LOCKING