From patchwork Fri May 15 13:59:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Ryabinin X-Patchwork-Id: 6414331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 74222C0432 for ; Fri, 15 May 2015 14:02:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EF8920513 for ; Fri, 15 May 2015 14:02:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B166120503 for ; Fri, 15 May 2015 14:02:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YtG9f-0000bB-TO; Fri, 15 May 2015 13:59:59 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YtG9N-0000NM-4t for linux-arm-kernel@lists.infradead.org; Fri, 15 May 2015 13:59:42 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NOE00A4J9IQF380@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 15 May 2015 14:59:15 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-22-5555fbb2e284 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id CD.06.05269.2BBF5555; Fri, 15 May 2015 14:59:14 +0100 (BST) Received: from localhost.localdomain ([106.109.129.143]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NOE00IC69IMHU60@eusync2.samsung.com>; Fri, 15 May 2015 14:59:14 +0100 (BST) From: Andrey Ryabinin To: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] kasan, x86: move KASAN_SHADOW_OFFSET to the arch Kconfig Date: Fri, 15 May 2015 16:59:00 +0300 Message-id: <1431698344-28054-2-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.4.0 In-reply-to: <1431698344-28054-1-git-send-email-a.ryabinin@samsung.com> References: <1431698344-28054-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsVy+t/xK7qbfoeGGkzoMbbY9usRm8Wc9WvY LP5OOsZu8X5ZD6PF7kvPmC0mPGxjt2j/uJfZYtpGcYtNj6+xWlzeNYfN4t6a/6wWlw4sYLLY vGkqs8XLjydYLH5seMzqwO+xZt4aRo/fvyYxelzu62XyWLCp1GPTqk42j02fJrF7vDt3jt3j xIzfLB6bl9R7vN93lc2jb8sqRo/Pm+Q8TrR8YQ3gjeKySUnNySxLLdK3S+DKaFh+i6mgg7Ni cXM3cwPjTvYuRg4OCQETie37WboYOYFMMYkL99azdTFycQgJLGWUuDp5HiNIQkigiUli0fIA EJtNQE/i36ztbCC2iICCxObeZ6wgDcwCc1kkGuZcYwVJCAsESGzd+5IdxGYRUJXou/sLrIFX wE1izo9DUNvkJM5OWgC2gFPAXWJuz3F2iGVuEvf2TGOcwMi7gJFhFaNoamlyQXFSeq6RXnFi bnFpXrpecn7uJkZIuH/dwbj0mNUhRgEORiUe3hOsoaFCrIllxZW5hxglOJiVRHh/vQAK8aYk VlalFuXHF5XmpBYfYpTmYFES5525632IkEB6YklqdmpqQWoRTJaJg1OqgTFDLZzpodvddw/C q2qUlftTpsT4H/qddNaR9aLYC7P8ByumVmSmdK6xOMaZX9clfFfh+LlJ+j3/2ave+u0JdV2p mzvhgOSRni9Zp276RKok3pu94ZlUzTrHC77RPn4d+2QXLXczv/z47cvT534frpjMvajngUHF ZF1Vtl8ir5+4JEgftj9j3qDEUpyRaKjFXFScCAAi5QPRcwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150515_065941_407287_F0567E34 X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: -5.0 (-----) Cc: Arnd Bergmann , linux-mm@kvack.org, Andrey Ryabinin , Catalin Marinas , "maintainer:X86 ARCHITECTURE..." , Will Deacon , David Keitel , Ingo Molnar , Alexander Potapenko , linux-arm-kernel@lists.infradead.org, "H. Peter Anvin" , Andrew Morton , Thomas Gleixner , Dmitry Vyukov X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KASAN_SHADOW_OFFSET is purely arch specific setting, so it should be in arch's Kconfig file. This simplifies porting KASan to other architectures and maintenance of it. Signed-off-by: Andrey Ryabinin --- arch/x86/Kconfig | 4 ++++ lib/Kconfig.kasan | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c92fdcc..b530967 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -251,6 +251,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y +config KASAN_SHADOW_OFFSET + hex + default 0xdffffc0000000000 + config HAVE_INTEL_TXT def_bool y depends on INTEL_IOMMU && ACPI diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 777eda7..39f24d6 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -18,10 +18,6 @@ config KASAN For better error detection enable CONFIG_STACKTRACE, and add slub_debug=U to boot cmdline. -config KASAN_SHADOW_OFFSET - hex - default 0xdffffc0000000000 if X86_64 - choice prompt "Instrumentation type" depends on KASAN