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=-6.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 C3F26C2D0A3 for ; Fri, 6 Nov 2020 18:10:46 +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 39D8A206FA for ; Fri, 6 Nov 2020 18:10:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MI65GUYH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O88uSA+p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39D8A206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=wdiERghdJC9+LfcQSOp8Nx3KDGkLjjbCSSA0298T7kE=; b=MI65GUYHYVzsBiMjDTS6WVaBU /D3fI02UuwnUbfUfjuLYdlSC8xSWTLhwuvhpi1Zm/JgmWeizOtDMBCUvhBC23UpOdaxMMIDH5IkPr W4Dsv07Dd++/ZTsaMh5BFxcCVdad2kP62e03NWjlD+sM6JOW60pRZ/W3gRVNgEuIw3hDTGP7aRwKc 3j/FYEhmlevvzTIhGqcg9GaL+5FdESwAS6ahxgb4zZ9yB+Pj+1KR9I9TWS9plKvnl5fKRqMp8H/tp qc6Ws00dVrdFVT4c5NKTk5EIeg48EgaFma9n8jCcyFM9X6PUO7S648bMctPlRVS9ES4qs0D693ELG 8obRMcpkw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb6B5-0004Iz-UY; Fri, 06 Nov 2020 18:09:35 +0000 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb6B3-0004Hy-1V for linux-arm-kernel@lists.infradead.org; Fri, 06 Nov 2020 18:09:34 +0000 Received: by mail-qt1-x841.google.com with SMTP id v11so1004266qtq.12 for ; Fri, 06 Nov 2020 10:09:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xthdb0sB+nBkUrNgfEbY4fZLBO1/mKnLmjZCET3QDvM=; b=O88uSA+pp+wnNHXd1L6+BaP369KYxI1ylNhjSYsjk6Tx+qrZWWBV8q/Nk5ekbOS8uF 7ciLey03KSdT7DJ4GDoBu+l2XkewwNpqaw8TAn4QzLBu5/fZ2a83g0+zc1m2/7P7CWSq RkWZPvMxeiLjT9wFrVQUfRLJbMspkDtrmv5h2/eIIR7gXjgANttZtoVs85xzQbvi2RQz AUzIuMmL4KT52NPCuGWGmRdd0krfmlypmlJI51ScJqa5TZCiZFO3O04637FFrVHAnMGN KcTKQ+S1xqK+YK/8sQ2IJL78f/bx7vshje/aHDPfU4M1Krbs4SL9yqS0G3h2K0vICvKU nhoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xthdb0sB+nBkUrNgfEbY4fZLBO1/mKnLmjZCET3QDvM=; b=pq00rV/VbFZqd86ZbMDlk037ifUcFJNM39nH5ybKOhaD2/UYQRSTNDhJ2Qt2Z58m1l bykakj7COmiP43PbsLMql9+qHHEzjch2tN+OaqUC5yl0uQC1tQHzyg65F4RDYKlJ1x3g fGtBtp/NN86zO9Z19dv1+NEZ5MEuyPoJKLJQ0E2yyFtC4fxGXBT57zGmRVAwkqoexWe2 DL7Wj7BTWYs/2EAqWKHFFB4jTsWiZEaMQ1YFXlaohHhFsMTK1QqdvVTcTeNoCIwhoBF4 J/dD7UN2OwUGD/lLThRHkhcy6czW/fEUqqBn2zzmCMdnEPvUl2B5on3NNMwTyzU+G4wP 43UA== X-Gm-Message-State: AOAM530GO9K0fsxQH3n3mdrl+2YyPnGns/E3mzpcTdEX6ezTqBERUK4Y uIjcsntiaqPS0k3tZEaSUrM= X-Google-Smtp-Source: ABdhPJy/Y+6whoSViluhA3jbaewBq1iXBrn7f4S1sA1vE26Ctd28vMW0KfzLn98A+1+5qnQWuE2qtQ== X-Received: by 2002:aed:32c7:: with SMTP id z65mr2713718qtd.266.1604686171309; Fri, 06 Nov 2020 10:09:31 -0800 (PST) Received: from ubuntu-m3-large-x86 ([2604:1380:45f1:1d00::1]) by smtp.gmail.com with ESMTPSA id p8sm1067648qtc.37.2020.11.06.10.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 10:09:30 -0800 (PST) Date: Fri, 6 Nov 2020 11:09:29 -0700 From: Nathan Chancellor To: Russell King - ARM Linux admin Subject: Re: [PATCH 2/5 v16] ARM: Replace string mem* functions for KASan Message-ID: <20201106180929.GD2959494@ubuntu-m3-large-x86> References: <20201019084140.4532-1-linus.walleij@linaro.org> <20201019084140.4532-3-linus.walleij@linaro.org> <20201106094434.GA3268933@ubuntu-m3-large-x86> <20201106151554.GU1551@shell.armlinux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201106151554.GU1551@shell.armlinux.org.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201106_130933_292937_512BC1C7 X-CRM114-Status: GOOD ( 26.64 ) 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 , Ard Biesheuvel , Abbott Liu , Linus Walleij , kasan-dev , Mike Rapoport , Linux-Next Mailing List , Alexander Potapenko , Linux ARM , Andrey Ryabinin , Naresh Kamboju , 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 03:15:54PM +0000, Russell King - ARM Linux admin wrote: > 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? Yeah, I do not think that you can apply that diff to Russell's tree without the patch from -mm. > > 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? I believe so, I do not think Stephen has any issues with carrying that diff to keep everything building properly (although I won't speak for him heh). > 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? That could certainly work but as far as I am aware, that is really the only breakage. In theory, Andrew could just hold off on sending that patch until after yours is merged into Linus' tree so that it could be added to that patch and everything stays building properly. Requires a minor amount of coordination but that would avoid delaying KASAN enablement for three months. I do not have any preference since this is not my code. Cheers, Nathan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel