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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,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 25E40C4741F for ; Fri, 6 Nov 2020 15:17:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 7F0DC22203 for ; Fri, 6 Nov 2020 15:17:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Q26Jn9nG"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="AxiQ/QXc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F0DC22203 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=Xu+HcpW6K0p+lVcEKZuUtLFRgb30uHalpuV0+dibRbE=; b=Q26Jn9nGx27KY03txcbVGnWdz FGWNY9FCNMfkYqOr7u5Zr+j+gy0x+T8xtowi0VwdTKShtw4yEINaLFYJ9ZJY1+tLqTVbVy5xw20B3 lv7jQH566TFDD2rikRyYsXddhs2xu/PMG4b3Lrj914QfypS002anP6RhrYOCHnVyGQIKXWwILYsjW W+uwb3SiDDtp8CjynYu5gmZ4nNESbUIQ569uTjL8Bsup2tHC6OtyWsgUQSAtGRjMVhFoifh6p7kHf 44InFdfMF7MQmgLhmowd9TRa+zz/9k9C1hdBXcSiTDIj1i6vNiV9Q1QA7Tfil5RqjkdKkl/+nbOMt hwW3/6hKA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb3Tc-0003dr-Nt; Fri, 06 Nov 2020 15:16:32 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb3TV-0003aO-7h for linux-arm-kernel@lists.infradead.org; Fri, 06 Nov 2020 15:16:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4+WYl4Y99KMcpnDUmq0xOppvJ/gI1EBjcZfq0apHMtk=; b=AxiQ/QXcwbWI7fi+50Spmng50 CTgriDdYt54GeVF601/d4JZyywA1Xn2/vmw+Uodmq2HSkwzBWAn8PTpf9O/CHTAOjZ+WeN2znu2wN AJTNtzMT/WZ7z9X/2M83oxX1mBeM805Ck5k9ZFmiIA/HJAltPnKFs+RKnKlfn5tdgfRLrLxIL+kXW xcl1DNaCmJyQSb3hDRAbEKiltG5MjbUlGx4cqsezMxRWDxWKIuYbRok67+L6ppMd7i28fEtx7cqQK hEMlV8kpH1bWntTHtaYCZ6WHHvZ4jT8qcg+xkkfQYkLjtD3PIE5cWh5FepZCfnPJSn+6/5JhYkE3L RndANvIfQ==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:55826) by pandora.armlinux.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kb3T6-0005zp-J7; Fri, 06 Nov 2020 15:16:00 +0000 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1kb3T0-0005vX-OG; Fri, 06 Nov 2020 15:15:54 +0000 Date: Fri, 6 Nov 2020 15:15:54 +0000 From: Russell King - ARM Linux admin To: Linus Walleij Subject: Re: [PATCH 2/5 v16] ARM: Replace string mem* functions for KASan Message-ID: <20201106151554.GU1551@shell.armlinux.org.uk> References: <20201019084140.4532-1-linus.walleij@linaro.org> <20201019084140.4532-3-linus.walleij@linaro.org> <20201106094434.GA3268933@ubuntu-m3-large-x86> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201106_101625_403623_ED73F548 X-CRM114-Status: GOOD ( 21.61 ) 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: Stephen Rothwell , Florian Fainelli , Ahmad Fatoum , Arnd Bergmann , Abbott Liu , Naresh Kamboju , kasan-dev , Mike Rapoport , Linux-Next Mailing List , Alexander Potapenko , Linux ARM , Andrey Ryabinin , Nathan Chancellor , Ard Biesheuvel , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 06, 2020 at 02:37:21PM +0100, Linus Walleij wrote: > On Fri, Nov 6, 2020 at 10:44 AM Nathan Chancellor > wrote: > > On Fri, Nov 06, 2020 at 09:28:09AM +0100, Ard Biesheuvel wrote: > > > > AFAIK there is an incompatible change in -next to change the > > > definition of the __alias() macro > > > > Indeed. The following diff needs to be applied as a fixup to > > treewide-remove-stringification-from-__alias-macro-definition.patch in > > mmotm. > > > > Cheers, > > Nathan > > > > diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c > > index 8c0fa276d994..cc6198f8a348 100644 > > --- a/arch/arm/boot/compressed/string.c > > +++ b/arch/arm/boot/compressed/string.c > > @@ -21,9 +21,9 @@ > > #undef memcpy > > #undef memmove > > #undef memset > > -void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias(memcpy); > > -void *__memmove(void *__dest, __const void *__src, size_t count) __alias(memmove); > > -void *__memset(void *s, int c, size_t count) __alias(memset); > > +void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias("memcpy"); > > +void *__memmove(void *__dest, __const void *__src, size_t count) __alias("memmove"); > > +void *__memset(void *s, int c, size_t count) __alias("memset"); > > #endif > > > > void *memcpy(void *__dest, __const void *__src, size_t __n) > > Aha. So shall we submit this to Russell? I figure that his git will not > build *without* the changes from mmotm? > > That tree isn't using git either is it? > > Is this one of those cases where we should ask Stephen R > to carry this patch on top of -next until the merge window? Another solution would be to drop 9017/2 ("Enable KASan for ARM") until the following merge window, and queue up the non-conflicing ARM KASan fixes in my "misc" branch along with the rest of KASan, and the conflicting patches along with 9017/2 in the following merge window. That means delaying KASan enablement another three months or so, but should result in less headaches about how to avoid build breakage with different bits going through different trees. Comments? -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel