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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 89548C32753 for ; Wed, 14 Aug 2019 16:03:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CBE1208C2 for ; Wed, 14 Aug 2019 16:03:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="braYK5mw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CBE1208C2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y+sw9+lWu+NP0QetUUQtOlwqRIpqM9iHSfrLT54vLeQ=; b=braYK5mwG6aH0f +qhrI2VB0cH1zG/ZZ+Lnr6VRv9nWxUuJ4oaQ6AcLxuzmUC+7aUFA6iLzqJyTy8aQDH2GFikw1+dnr Ym3rGutiGyti5GH82GG/QdP+VOGENWzUE37HAEHKTbWOnZfWwJVgnSDJ1dqx3z1qg+9ire6bzKvhp GwOaaH4L9QD3b6nFAGXnwEBxwJzXijXC6l06j9ud3JC7kPAWRmqWgFInjiOikwynVw7E+G08Ws46i MMYdg+aUQtMyf+03Vpeyjsl7pS+AIE1HZJoWHGPgE+CrMRGeWJEgHhwPsEVJ+i54kz5+Wz2QKiVmz e885tbqKmAJ+ggqdoIzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxvkO-0000HI-1b; Wed, 14 Aug 2019 16:03:36 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxvkJ-0000Gp-Le for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2019 16:03:34 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 307D628; Wed, 14 Aug 2019 09:03:28 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EB5313F694; Wed, 14 Aug 2019 09:03:26 -0700 (PDT) Date: Wed, 14 Aug 2019 17:03:24 +0100 From: Mark Rutland To: Will Deacon , Andrey Ryabinin Subject: Re: [PATCH] arm64: fix CONFIG_KASAN_SW_TAGS && CONFIG_KASAN_INLINE (was: Re: [PATCH V5 03/12] arm64: kasan: Switch to using) KASAN_SHADOW_OFFSET Message-ID: <20190814160324.GE51963@lakrids.cambridge.arm.com> References: <20190807155524.5112-1-steve.capper@arm.com> <20190807155524.5112-4-steve.capper@arm.com> <20190814152017.GD51963@lakrids.cambridge.arm.com> <20190814155711.ldwot7ezrrqjlswc@willie-the-truck> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190814155711.ldwot7ezrrqjlswc@willie-the-truck> User-Agent: Mutt/1.11.1+11 (2f07cb52) (2018-12-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190814_090331_794341_12FB5286 X-CRM114-Status: GOOD ( 21.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: crecklin@redhat.com, ard.biesheuvel@linaro.org, catalin.marinas@arm.com, bhsharma@redhat.com, Steve Capper , maz@kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Aug 14, 2019 at 04:57:11PM +0100, Will Deacon wrote: > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > index b2400f9c1213..2b7db0d41498 100644 > > > --- a/arch/arm64/Makefile > > > +++ b/arch/arm64/Makefile > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > -# in 32-bit arithmetic > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > - > > > export TEXT_OFFSET GZFLAGS > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > regardless. > > > > I think that's by accident rather than by design, but to > > minimize/localize the fixup, how about the below? I can send a cleanup > > patch for scripts/Makefile.kasan later. > > How much work is that? I've dropped this stuff from -next for now, so we > have time to fix it properly as long as it's not going to take weeks. I wrote it first, so no effort; patch below. Andrey, would you be happy with this? Thanks, Mark. ---->8---- >From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Wed, 14 Aug 2019 15:31:57 +0100 Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. Since commit: 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time splats due to KASAN_SHADOW_OFFSET not being set: | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang | scripts/kconfig/conf --syncconfig Kconfig | CC scripts/mod/empty.o | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed | make[1]: *** [scripts/mod/empty.o] Error 1 | Makefile:1123: recipe for target 'prepare0' failed | make: *** [prepare0] Error 2 Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing common definition of +CFLAGS_KASAN_NOSANITIZE to the top of Makefile.kasan. Signed-off-by: Mark Rutland Cc: Andrey Ryabinin Cc: Catalin Marinas Cc: Steve Capper Cc: Will Deacon --- scripts/Makefile.kasan | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 6410bd22fe38..03757cc60e06 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -1,4 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 +ifdef CONFIG_KASAN +CFLAGS_KASAN_NOSANITIZE := -fno-builtin +KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) +endif + ifdef CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_INLINE @@ -7,8 +12,6 @@ else call_threshold := 0 endif -KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) - CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) @@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ $(instrumentation_flags) endif # CONFIG_KASAN_SW_TAGS - -ifdef CONFIG_KASAN -CFLAGS_KASAN_NOSANITIZE := -fno-builtin -endif -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel