From patchwork Tue Mar 24 14:49:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Ryabinin X-Patchwork-Id: 6080181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E3BC9F2A9 for ; Tue, 24 Mar 2015 14:52:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88A8020149 for ; Tue, 24 Mar 2015 14:52:37 +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 A70CC20165 for ; Tue, 24 Mar 2015 14:52:36 +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 1YaQA1-0007Tl-75; Tue, 24 Mar 2015 14:50:29 +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 1YaQ9K-00060p-Sr for linux-arm-kernel@lists.infradead.org; Tue, 24 Mar 2015 14:49:50 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NLQ00M9Z1D1DO60@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 24 Mar 2015 14:53:25 +0000 (GMT) X-AuditID: cbfec7f5-b7fc86d0000066b7-a4-5511796fcf89 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id CA.41.26295.F6971155; Tue, 24 Mar 2015 14:49:19 +0000 (GMT) Received: from localhost.localdomain ([106.109.129.143]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NLQ00C1D15YIE60@eusync1.samsung.com>; Tue, 24 Mar 2015 14:49:19 +0000 (GMT) From: Andrey Ryabinin To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] kasan, x86: move KASAN_SHADOW_OFFSET to the arch Kconfig Date: Tue, 24 Mar 2015 17:49:03 +0300 Message-id: <1427208544-8232-2-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.3.3 In-reply-to: <1427208544-8232-1-git-send-email-a.ryabinin@samsung.com> References: <1427208544-8232-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsVy+t/xy7r5lYKhBrfXSlps+/WIzWLO+jVs Fu+X9TBabHp8jdXi8q45bBb31vxntXj58QSLA7vHmnlrGD02fZrE7nFixm8Wj81L6j36tqxi 9Pi8SS6ALYrLJiU1J7MstUjfLoEr48fHt2wFnZwVM6b9ZG1g3MXexcjJISFgInG35zgjhC0m ceHeerYuRi4OIYGljBJ/5rdBOX1MEktO97KAVLEJ6En8m7WdDcQWEdCQmNL1mB2kiFngLqPE t1nfwYqEBXwldnWcYe5i5OBgEVCVuLrADyTMK+AqsfbgBXaQsISAnMTC9+IgYU4BN4mPj18x g9hCQCUbth1gnsDIu4CRYRWjaGppckFxUnqukV5xYm5xaV66XnJ+7iZGSHB93cG49JjVIUYB DkYlHt6Iev5QIdbEsuLK3EOMEhzMSiK8G4oFQ4V4UxIrq1KL8uOLSnNSiw8xMnFwSjUwWi+r C7V5d5DBpDz81EN349aFdzVXi/J8iYjZv2QjO+d7z1m2Bk+deT2+blgmxTjVvE0jkq9atOi2 0GLWC5reWmGqMyad0XphPCtwbeKfmRXHizLlWTUf6i99dnPDD1b2+Xr3Q5Z5rNZ9uqcgdeW6 E2fZU0I3duSGR1TzTlo/6XroPiOt98duKrEUZyQaajEXFScCAJlNVYIMAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150324_074947_099239_48D2A831 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: Andrey Ryabinin , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton 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 cb23206..66ee917 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -247,6 +247,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 4fecaedc..ba31b8c 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -15,10 +15,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