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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 26335C433E7 for ; Mon, 12 Oct 2020 21:02:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AC9D206DC for ; Mon, 12 Oct 2020 21:02:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nG5UuwS9"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="P9NNpy9d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AC9D206DC Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MzscnfH9mVtMhY1st2EhfGLIcYi9Vew8L/UQqR75g24=; b=nG5UuwS9M5M8lt12+2TuXRG5n K1G1R0HMYMCuqQg1gPalLrSap4ygQkMcM2gWmgT+V1ApjFBkqFTiozG1SO0z/LP4BPVQkzcRbVblz gVhdod1jANJI6S/IOYN+oDisyRPrAso8p7pS61IG3afzilFRyQ3Vr7v34v3Es2bQR7bqvdNYskjJ/ DTwDDwpHE2llPXYRcdZ4xF42trJyAc9bCqGqgLyk4GPm8++KFf1OrTIBLqHoIH8/7msFg1eQFvr1m FCN1IITQAbUWZgVcns9FdvbSorqSFCzeLJ9Z2j/Lj4GzDQJtLFoGniHFE3t66nrsyNNQe82Rm//nK LtSdevN9A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kS4va-0001Uz-AD; Mon, 12 Oct 2020 21:00:18 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kS4i1-0003AD-0H for linux-arm-kernel@lists.infradead.org; Mon, 12 Oct 2020 20:46:28 +0000 Received: by mail-qt1-x84a.google.com with SMTP id 7so13438705qtp.18 for ; Mon, 12 Oct 2020 13:46:13 -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=l835kVUvCOUPQzymSXPKbaJ+1+IzaMSz+0eMBwoZxjg=; b=P9NNpy9dyG4xgSS3UXXQBW6aomwI9fWyu0eoy9UP6zW6edmATRzRQPiYWtxkQ1l3nL YiUXzZDo5KcnWkhKyEOHWbIMctd4vIZ/eYRDGuekSGkWe9tRFYscf6bvBMaUMh6IgdI4 ov1Y1sqML/XKYdhGtHSlgWS2uoMFqII+xXJnht6Ysozqzoxz2bo7UsmspHLtKGeEH8kl DULV+fpDAePsEtAtC/yJI36x0Ajlxoz/YUnj7EJEIEc/1hY7rFU6V8yJrKkbOHan/Lqy q0PmBAbwia9t3ZJFgHRfs9ybZaBaZJTDTh8Bwq760eSbLDiBgpAtSjsqB6TrWZJeCE/x g1qQ== 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=l835kVUvCOUPQzymSXPKbaJ+1+IzaMSz+0eMBwoZxjg=; b=NVErq+9nD9DWSEzuFEXzfP/51CPQjzuCTxSRsaPq1y8LCRI56B+vcFemFHp2ATzAkz Hv8tR79pvby9GlrIkYg80thIhffiabMevsyGkuBiMyp0zCAxTkCWo0Y6xTEs+U3S4q2t EpyXRR6/AVVsczQxKaDC7RcSVjorEXd4LtX8wvEnnPkLDWaYQQMDDvwLWWALJKEn91RK gKxpXTFewwYJGrC29gm5UpHbTHbA120b5sPA9OGAir/MrFwNPyluFQKiD5cPVefB7idQ ywCTip77M4RbJOzIv2pPXTMhKsgOsXB0Dk+i9/iYPRY11gD4wzLfve2HOhkcA1ZdT/se hiGQ== X-Gm-Message-State: AOAM531MPEaR8HKOCskbC6hacUi3qxGX7k8RnZGrZAVcL1enG3Ac5B95 Hx8L4BWY5nItwjp6nMP4NBX2WyBkUEwu543/ X-Google-Smtp-Source: ABdhPJzriFS55L6xKMv/Xyq/Kc3KnRkr2c32tQ9gtgqYtff5vp7Fhn5x5/DQY3yF4qx+DQMd3X0jDXvhaZFiU0V+ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:b308:: with SMTP id s8mr27714655qve.31.1602535571727; Mon, 12 Oct 2020 13:46:11 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:39 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 33/40] kasan, x86, s390: update undef CONFIG_KASAN From: Andrey Konovalov To: Catalin Marinas , Will Deacon X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201012_164617_223045_F6CA4A95 X-CRM114-Status: GOOD ( 13.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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.1011.ga647a8990f-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel