From patchwork Mon Oct 12 20:44:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11834035 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 EB755697 for ; Mon, 12 Oct 2020 20:46:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9C3582074F for ; Mon, 12 Oct 2020 20:46:15 +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="P9NNpy9d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C3582074F 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 A5A8F940023; Mon, 12 Oct 2020 16:46:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9680B900002; Mon, 12 Oct 2020 16:46:13 -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 88308940023; Mon, 12 Oct 2020 16:46:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id 51008900002 for ; Mon, 12 Oct 2020 16:46:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E9EE28249980 for ; Mon, 12 Oct 2020 20:46:12 +0000 (UTC) X-FDA: 77364455784.24.join21_3d0e0a2271fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id C67F81A4A7 for ; Mon, 12 Oct 2020 20:46:12 +0000 (UTC) X-Spam-Summary: 1,0,0,516795501d317012,d41d8cd98f00b204,3k8cexwokccogtjxkeqtbrmuumrk.iusrotad-ssqbgiq.uxm@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.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfcxy38jx4zcdgcxpey9dzqmuy9opji41r768xurhgwcrktegewdckjmoafam.xf4btg7y56fsjydgw4b76twzprhjkuqwiuenbthxhoe9gy8bqw6rsfcf5w6stsa.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: join21_3d0e0a2271fd X-Filterd-Recvd-Size: 4974 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 20:46:12 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id l8so6299061qvz.2 for ; Mon, 12 Oct 2020 13:46:12 -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=QMRURAaMFQl/CzDo5NoSwFSCteuYRIa0KhgbLBzuHxFrt4MIeEeg8XhdqDLokXPVJ7 /Bawj2WMHNp3BB90NipYPyYdW7xPupLArA+nYZ592fpf+VXaYo76ujrazVMfR1csS8wt F7Ufh/QYuiSqDRag4eBeiBY8n/7UXLG6YUKNXeWeNHLYuB0oW2rK+ANTEYoQR4PEDZSB oA6J0MuaGCcW94dFbcNeYy1XBKvrd2PRIQUlMfQ6Tllcji8vwX7Fv0yFuVl2VrUZmdsv TAOjf0mANgkk0jGjyldwPEkZ0ATl2CVWo16g5SYhfFZKsf/YRhBU0HcbTyQY2+rtZlLC KcZg== X-Gm-Message-State: AOAM532+V+Cgm+Fudb+RzSfsQ8rp3QyBS4SDt8HbCsQJZddHa4MprmlE LXkYP0oniXMly2TMXKTYzUylDaRwhLc/gzf9 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 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 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