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.4 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, URIBL_BLOCKED,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 CD0D6C63699 for ; Fri, 13 Nov 2020 22:18:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96D2C22255 for ; Fri, 13 Nov 2020 22:18:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TaaWdO3Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726678AbgKMWSI (ORCPT ); Fri, 13 Nov 2020 17:18:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726598AbgKMWRx (ORCPT ); Fri, 13 Nov 2020 17:17:53 -0500 Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D167C061A47 for ; Fri, 13 Nov 2020 14:17:40 -0800 (PST) Received: by mail-wm1-x349.google.com with SMTP id 3so4704997wms.9 for ; Fri, 13 Nov 2020 14:17:40 -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=oVadbN3NqpY7ZnHAx+kB6EDsExDJuzGfxhHAguhdwUM=; b=TaaWdO3Z9oElGMBNzh2f8+qtMVn40dx3CM2RnB9fmkRdKPAllpul9uP+B32dnclVVF 8/Zpl1FFBQh6z6jDC/k81W7Xdlj6R5ZrfiqxiwoaM9xeTVsK1rT4uxOCTksOmNutwZsA ijDa3E8QiM/rulDyo8dTHKe5hm3rRPEvYK2x/W0N73k8uYOu8pQswUBQ0yaPS8w/vnbB N17YiOLHtltDhgW2D11PD98jyYMMcPIOB8DaqqU2uS0fp9CxHxhMATEZF0VlzhAOFpqA 3tDLWDc5OqE1pLZwrlfbhlFSPhp9K8JduDafIEohgehd1y1wboXqhLj13OzmTdupGO8/ mxog== 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=oVadbN3NqpY7ZnHAx+kB6EDsExDJuzGfxhHAguhdwUM=; b=eV7tLfIvMDMQ5wEFpoqBFR3++m9RZ+QYJ5RQEtSeKP9GAHNw7gmuDsuatElsxxlq5P 4fe8m9hbnsIvtbYc5gGnwSiF+aMKJdo2a7c5njYmd8p+iLsLv9wAbRcffAHxRN5eaGju L3NKO0eH/d4AlCUuKQW4UaIzl48Ohs6ZIWQoXo7KOaCsPKR6EEz1ZZQ013rvDMzix8fx LJZScV52Rq9RejTrSWrUHOamhVWF0YKcuYWC7cInvjZZAkbrASFrhq/tttSLoKEE5AoE u/xydsPdzigHUwu6iXyS/fTrogQ5eXx+cIexGxbKqVVNd0gEYhzTVVnXaYyGs0AoY1Ct CE4w== X-Gm-Message-State: AOAM532eOw7coEZNH5pYR/06AGrtuLHpYWY1X/ZlZAZtCKv1+dKDbjzx Od8sUqQL++lt/cNGexreDIpwXWvo581ek9jq X-Google-Smtp-Source: ABdhPJwqa2plxzr+Xp6G01BlGars3fgz6BXNB4ELLA3Omf5LGJf2NJmzLu0GLN2zQNArzOvU2iCXktUucOZGgNs+ Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:ebc6:: with SMTP id v6mr5701672wrn.427.1605305859268; Fri, 13 Nov 2020 14:17:39 -0800 (PST) Date: Fri, 13 Nov 2020 23:16:03 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 35/42] kasan, x86, s390: update undef CONFIG_KASAN 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 , Vasily Gorbik Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Acked-by: Vasily Gorbik Reviewed-by: Alexander Potapenko --- 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 d9a631c5973c..901ea5ebec22 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.29.2.299.gdc1121823c-goog