From patchwork Mon Nov 23 20:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11926379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21D58C63697 for ; Mon, 23 Nov 2020 20:08:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9A2BC20717 for ; Mon, 23 Nov 2020 20:08:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="uY5LZg+U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A2BC20717 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 CF93B6B0092; Mon, 23 Nov 2020 15:08:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C33AD6B0093; Mon, 23 Nov 2020 15:08:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5DBF6B0095; Mon, 23 Nov 2020 15:08:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0250.hostedemail.com [216.40.44.250]) by kanga.kvack.org (Postfix) with ESMTP id 61CF86B0092 for ; Mon, 23 Nov 2020 15:08:46 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 13FD582499A8 for ; Mon, 23 Nov 2020 20:08:46 +0000 (UTC) X-FDA: 77516771052.07.money69_3d04f7527368 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id E8B1F1803F9A1 for ; Mon, 23 Nov 2020 20:08:45 +0000 (UTC) X-HE-Tag: money69_3d04f7527368 X-Filterd-Recvd-Size: 5013 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Nov 2020 20:08:45 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id 202so15534007qkl.9 for ; Mon, 23 Nov 2020 12:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=OXazw0I6oeLRK+aCYmOjFIB4MLt2eUKUeL0RxFWmIM8=; b=uY5LZg+UwdiqaGPDeNSvDU26KQ8vIKer+TEuj37rMjsEmiRCRkqQ6q6tYpGMekWxVt Kz6Ti1mxjCfJY6wtwnDD1Ynm8jH43l4mZBVPvIbqoOa3ciRd3Qx3HtxGE3GV1o2hYR+o 3zo4KBsUptvfOKheP5TEUNfl5HEaMCmgD8d7zS2cJV4qndA7qtsuV3jUNgAAAMQLxTnU Eiky53BjqPsH0zvqdNSb0Z3ogXlXsLpkyxdfyEZ+7Puw7dJY0N9H8pbTMLwMAmkkexnn r4/Y1FyXS6JYPzpnC6Cd3mI3RzL/L2r+oEHHexFPuB40z/9uz2N3kiEN52Qq0t4hfFRR kw0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=OXazw0I6oeLRK+aCYmOjFIB4MLt2eUKUeL0RxFWmIM8=; b=fEdYZ4qzwjy9ouVmaVxhClVAQJgZRfzSEaGpqVvm795acCgx3UOSHbB0xJy88dvvh1 9mBfJfK13tfggo4qD1DniVUvJ7S+eew28urmbGaSTkoKp/ECFYj/0b1jtkD6IQwx41wB xTHnK4lWM+CuBWIPOgFiovYaMhJAl2spImNLB3s6Gvc6/jhdMisuaLqo5FZ/xA+oW9en 3Sc5lxI1dcIvDUOFoeG8bQsFj72G9WAYIUJTjEHGFIYAK7yT3+SxCD5SdmdzAQBwi0lv IQmhYrRGBBACvIAwdTq+D6G+YvRVDzZlmnxWM6L6vjANbyqGYnQ2VOdSVYDmoDNgyYak Ur3w== X-Gm-Message-State: AOAM5305WGXb2aI2IiqBc2TUqvpIALWVr05FwudWLJxXFnapjFvVEdOG t6+5uUoUWGDtotw4NWjp2MJet/XdaFto+CCX X-Google-Smtp-Source: ABdhPJz22ud/PXO8phnLko2cHn56ep4euY5DeHkzZKbHlVpubcW966v4DWRQqWNvzlvRK9Fagsf98npD01lzyt6/ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:366:: with SMTP id t6mr1124442qvu.58.1606162124786; Mon, 23 Nov 2020 12:08:44 -0800 (PST) Date: Mon, 23 Nov 2020 21:07:35 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v11 11/42] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Both KASAN_GENERIC and KASAN_SW_TAGS have common dependencies, move those to KASAN. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko --- Change-Id: I77e475802e8f1750b9154fe4a6e6da4456054fcd --- lib/Kconfig.kasan | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 58dd3b86ef84..c0e9e7874122 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -24,6 +24,8 @@ menuconfig KASAN (HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS) depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) depends on CC_HAS_WORKING_NOSANITIZE_ADDRESS + select CONSTRUCTORS + select STACKDEPOT help Enables KASAN (KernelAddressSANitizer) - runtime memory debugger, designed to find out-of-bounds accesses and use-after-free bugs. @@ -46,10 +48,7 @@ choice config KASAN_GENERIC bool "Generic mode" depends on HAVE_ARCH_KASAN && CC_HAS_KASAN_GENERIC - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB - select CONSTRUCTORS - select STACKDEPOT help Enables generic KASAN mode. @@ -70,10 +69,7 @@ config KASAN_GENERIC config KASAN_SW_TAGS bool "Software tag-based mode" depends on HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB - select CONSTRUCTORS - select STACKDEPOT help Enables software tag-based KASAN mode.