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 X-Spam-Level: X-Spam-Status: No, score=-20.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 484E1C433E1 for ; Fri, 14 Aug 2020 17:28:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0D31A20708 for ; Fri, 14 Aug 2020 17:28:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="B++G553D" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D31A20708 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 2E3916B007E; Fri, 14 Aug 2020 13:28:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26BC06B0083; Fri, 14 Aug 2020 13:28:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 070316B0085; Fri, 14 Aug 2020 13:28:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id DD1796B007E for ; Fri, 14 Aug 2020 13:28:33 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A5C5B181AEF23 for ; Fri, 14 Aug 2020 17:28:33 +0000 (UTC) X-FDA: 77149858506.01.band07_3602c4226ffe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 799631004C78A for ; Fri, 14 Aug 2020 17:28:33 +0000 (UTC) X-HE-Tag: band07_3602c4226ffe X-Filterd-Recvd-Size: 4602 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Fri, 14 Aug 2020 17:28:32 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id q4so6489298qvu.6 for ; Fri, 14 Aug 2020 10:28:32 -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=lhqV5mQvN7E+6IRby7TSffIB2FjRKGUNLHJKKPPYQHw=; b=B++G553D5YRfzBibD52/YbmLsetWRzAA+mz8eYde400Dt3AEX/vseByvilgBu/RIty m11Xpzhzd4fCTyIgDM3Aczj2BOJayGGNmGHctNqvXNTkecsq8v3oeABP2jnHSM5Sy/oT TRlXjAJ0TBbepqTIGEs3YLtgZQZ77lzQJPQ/C8eCHyjGN8okRpzyZYmC+oSiUmjgSH8d GO69c6LHJqVmLxayxM0kpmxCGfm+uXZCCzh2zdglLXW4JcO9BNFJdnkCs9ihI/YbjeUt PY221wPX7nEb3zD22xIzTFeLGFYldtf8rkWyhu3EMaLFbGQb1pdI0FM0lUdnMNysOTrI Ochg== 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=lhqV5mQvN7E+6IRby7TSffIB2FjRKGUNLHJKKPPYQHw=; b=kwaghQaGghvKUKwWBUStsH/L62p7X7m97GOBn57pkWXL6ZtckiBPGMOYdbqCNzQSI8 T6JCLuLejOWjvaccb4U8pcQpLER5TPUPSMyPrsQUFwwIaOrGTJV7D9Hnh6Kk8iBg9p+n IRNyVhlUMM6ah5GJpX282aQyn//0SMVAigHnUZ2nw8cDf4z8+Yt4K0Fp3r5btkypvVUb rZu9DG6q/1Dv1iJmLD/OpwPFdanCedww/rAHfbl2GfEaTdDKhLvkEEc3rJq1tu7S+fFs zwBdapj8RkeyAibbKEIsk8mmWNiI6BK/L2lrWM8fho7n/lxvq0fH3JQ7Uej5a6ShzbVa gDog== X-Gm-Message-State: AOAM531BmmoKFK1LCrtys685rAnFp/i0n9QS9jzOeUcdrawx3gnm983W X1JFATL0LQR2qei3ENg61vHLSvcrIw2TDw/y X-Google-Smtp-Source: ABdhPJyEB6r3EZb1/dD1PV8DgiQHfViC9Gw1KcFHaQCLBJDygARswv1n+YYRwOw9Yas1PVhHZwOIsetdUJwayE9i X-Received: by 2002:a0c:e00c:: with SMTP id j12mr3697232qvk.127.1597426112116; Fri, 14 Aug 2020 10:28:32 -0700 (PDT) Date: Fri, 14 Aug 2020 19:27:11 +0200 In-Reply-To: Message-Id: <042119d239d929be8d4b479825091fb088c7543a.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 29/35] kasan, x86, s390: update undef CONFIG_KASAN From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 799631004C78A X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: With the intoduction of hardware tag-based KASAN some kernel checks of this kind: ifdef CONFIG_KASAN will be updated to: if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) x86 and s390 use a trick to #undef CONFIG_KASAN for some of the code that isn't linked with KASAN runtime and shouldn't have any KASAN annotations. Also #undef CONFIG_KASAN_GENERIC with CONFIG_KASAN. Signed-off-by: Andrey Konovalov --- arch/s390/boot/string.c | 1 + arch/x86/boot/compressed/misc.h | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c index b11e8108773a..faccb33b462c 100644 --- a/arch/s390/boot/string.c +++ b/arch/s390/boot/string.c @@ -3,6 +3,7 @@ #include #include #undef CONFIG_KASAN +#undef CONFIG_KASAN_GENERIC #include "../lib/string.c" int strncmp(const char *cs, const char *ct, size_t count) diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 726e264410ff..2ac973983a8e 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -12,6 +12,7 @@ #undef CONFIG_PARAVIRT_XXL #undef CONFIG_PARAVIRT_SPINLOCKS #undef CONFIG_KASAN +#undef CONFIG_KASAN_GENERIC /* cpu_feature_enabled() cannot be used this early */ #define USE_EARLY_PGTABLE_L5 -- 2.28.0.220.ged08abb693-goog