From patchwork Thu Oct 29 19:25:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867243 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 642E1697 for ; Thu, 29 Oct 2020 19:27:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 123D620838 for ; Thu, 29 Oct 2020 19:27:32 +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="uX8trozf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 123D620838 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 0EB886B00B3; Thu, 29 Oct 2020 15:27:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 075946B00B4; Thu, 29 Oct 2020 15:27:29 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E321F6B00B5; Thu, 29 Oct 2020 15:27:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id B0EC46B00B3 for ; Thu, 29 Oct 2020 15:27:29 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 67968180AD807 for ; Thu, 29 Oct 2020 19:27:29 +0000 (UTC) X-FDA: 77425947018.23.spot96_010e5722728f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 4B16337604 for ; Thu, 29 Oct 2020 19:27:29 +0000 (UTC) X-Spam-Summary: 1,0,0,e1ac9871b093a84f,d41d8cd98f00b204,3obebxwokcd8boesfzlowmhpphmf.dpnmjovy-nnlwbdl.psh@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2559:2562:2693:2895:3138:3139:3140:3141:3142:3152:3352:3865:3866:3867:3868:3874:4250:4321:4605:5007:6261:6653:6742:9969:10004:10400:11026:11232:11473:11657:11658:11914:12043:12296:12297:12438:12555:12895:12986:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:30012:30054:30070,0,RBL:209.85.219.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y81qbjmthqx3ikkir55k81h7rkaopji41r768xurhgwcrktegewdckjmoafam.xf4btg7y56fsjydgw4b76twzprwqy54an7mnbthxhoe9gy8bqw6rsfcf5w6stsa.e-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral ,Custom_ X-HE-Tag: spot96_010e5722728f X-Filterd-Recvd-Size: 4979 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:27:28 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id c6so2384023qvo.8 for ; Thu, 29 Oct 2020 12:27:28 -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=NNmCWg3uUJkm97N9bODpJVOfWoCAwpfkACCfjKkMoC0=; b=uX8trozfZ5T/PGKXw+5x9UYvkHItGS8lAIvxwjEC1OzF0iJZxYGFlTJkftTEGo39Jr bX8rwz1SCcCkMeOcwT9ZrfQjWHfjewz8bPk+if6Zb1lbLZjvRP/biDCGqGOgJssqFG8l mNUUJEJbTijY6g9aAOf6Q8LWD9eZQfcfsbI9c1QRSvFf8QB1c2AfbZHWDw6LzLggUuFu NU8tEbKnJZdRX9Fh8Fzh8eSct3kGrMR78tZqyQh1jpkwDWijw+7TLtIhyPmoeYbM54pc w4vWUGoYY9771MF8570mZTCUieeGJRLcmcaS4Rc07WvlPFoognulhQRLYd11YI8Za7aC GGsQ== 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=NNmCWg3uUJkm97N9bODpJVOfWoCAwpfkACCfjKkMoC0=; b=IvXdiSEk3O5PzroT+p1JXAxey4eLeXq/BRQujROCgvEYuiAqTyyGdq4SkcB3XtO2Aa fOt1FaLEvT2KIoWQBVqlZSiKSXg82IkX4t/d+FTmVpTDk7/3wegS5fkMypMAoY+hdZAO kvJZXALHW+qvAb5hHzB3JsEvnfv6Hm/vw1x8ES8ovvkOQQr0HNw+s0WLtxBLl2fPIpm8 ll14NH5g+msc0+ZN7q4r4zCzQ1//a+7R5jmO1L8vB2rTq0NfM9rqECLr+rZ8OyOK4Gnp v2x4h8HgqtKs3lbYrQcHpwF+BvVXXBzDqwe+f8Ta2QJkQwKMd3E01rC0QKbE+ybOr9rq vmHQ== X-Gm-Message-State: AOAM533ngQJzDO0FrAQu+6aICS8AUcp/VHcwNFQlmbJK5Je7xh/o9R/t RkTouum+qnwgsOI4eBNQ6/ewiPT4CQCcFMpM X-Google-Smtp-Source: ABdhPJztzgvJEe8ecNJNOfrwAfwDcd7c90KXuyblNpcKlM6b4rjPG+XlMfOAQ2Bom0xxwAtTzK4au4p0jllT6/w1 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:1192:: with SMTP id t18mr5862530qvv.49.1603999648113; Thu, 29 Oct 2020 12:27:28 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:54 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 33/40] kasan, x86, s390: update undef CONFIG_KASAN From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , 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: 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 6d31f1b4c4d1..652decd6c4fc 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