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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 49DE6C4727F for ; Thu, 1 Oct 2020 23:12:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DBC2B2075F for ; Thu, 1 Oct 2020 23:12:05 +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="KNwdqefk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBC2B2075F 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 5DD9A6B00CE; Thu, 1 Oct 2020 19:12:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58FE36B00CF; Thu, 1 Oct 2020 19:12:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 431E96B00D0; Thu, 1 Oct 2020 19:12:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0A85D6B00CE for ; Thu, 1 Oct 2020 19:12:04 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id AA5081EFD for ; Thu, 1 Oct 2020 23:12:04 +0000 (UTC) X-FDA: 77324906568.30.paper32_05175412719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 8765C180B3C85 for ; Thu, 1 Oct 2020 23:12:04 +0000 (UTC) X-HE-Tag: paper32_05175412719f X-Filterd-Recvd-Size: 4972 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:12:04 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id o14so248462qve.7 for ; Thu, 01 Oct 2020 16:12:04 -0700 (PDT) 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=avhnvpcdCzsaNfGYEey/eQHTKDiaKIA9undXAy55Bw8=; b=KNwdqefk36p2HEpaZfVF5DhKCghwtU0IgELgXy9QnRwa8c+Lnl12IZ6fpscnRyFniv HUGR1zCI6BQ9Q9FRZBzbVWUohRmJbl+7Gpu6TA8NHaqNpUgiiJnEWNMPM74O084V8cXF +au8LuqVHVRxZHwtT6sVCZALTzAClLeqOUNhVjTzXXoHrdYbptMb6fJK6eUTjgvKb9pI Jxg4iir5BfEYC8enud0IzEDMHJ5HNH4nSISa+0do3PtkFOQ+FLMoRAQsezFdK52NtgBD vs3qqdkRaaeVlixCpdnU4AVPV1MMZCVuNmQlX6CAaJnFjA2lyalX/K3uUKwf2/hXJrxE W1yA== 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=avhnvpcdCzsaNfGYEey/eQHTKDiaKIA9undXAy55Bw8=; b=GnUmJLcf7ypftgGnPP38xD74231kGOaGkY2Jj8HG3hP8tYsAp5r2CEdMrvuKNkT9z+ k1ZsdOHWfhIWH34PED5ps4vIy1xOoS44GaoyWQeNDGmVkpi1qSKaft+qbzSv+2fmMAyV 3RrB/uP6msuT+cv5VFgCRs+kcrjxn58tlapjzglrd1AFGYV89f75VJknESASd+fF6Ai8 8X4Uu4+6gUhE5OUOcXc/ETfNzhpk/3Vy1DXmABj1ffUcA7ZSRRHssq2PFtiH9OLWMLZx iQRWpYwtqkvjqGjinDZMPV2UtaOerRKK8rS8G6QrDFQmVZUKG5EwKYtpPImUJ7i+9iOD OVOQ== X-Gm-Message-State: AOAM532YlatN/O0GWoN6SmZb6+vha0jnlC+vbdkYpvjWcZhuP0vnqe1B 0jW8bxomEK6P8PpiqpZz/DQjTInARNum45V7 X-Google-Smtp-Source: ABdhPJyCth9eK0vr0tDXn0cfgf0UsvDJmV1T+GmfvGSUaT4Yj1JF25ThMIrEu6N+Ro1lRthByohDgq2+g6EnxSdi X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:a899:: with SMTP id x25mr9459301qva.46.1601593923500; Thu, 01 Oct 2020 16:12:03 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:34 +0200 In-Reply-To: Message-Id: <21a9da4e730050d421eed7fcefda2db508c730a4.1601593784.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 33/39] 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-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 Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I2a622db0cb86a8feb60c30d8cb09190075be2a90 --- 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.709.gb0816b6eb0-goog