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.5 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,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 EF305C433E0 for ; Wed, 1 Jul 2020 17:02:51 +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 A2DC420781 for ; Wed, 1 Jul 2020 17:02:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="arV/pEOq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2DC420781 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+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=zrloqu2cxRitawFBlAMpjwZZjiLdNd0/2jqSKamFOXk=; b=arV/pEOq+5hwvqTIFbUAZbe41 xLXUTMcgSLKpFxefexqp54AE0tsimnSHJ00WXjoyAh7rSzn+HdfTV5/0KzUhJn9ko5WPn8RdcsaAb 0br4mDbsGM/kINypb3TkwoawoqbT97d1V+APa+HrSXmT9wCmqx14Wl+dLDLS2vp9YepPvTCw+fNHi pv+J1k8L2+Qj+RmiaIneEqzHIg6EsA8ie5MljOdPcEjZSChAY1NQZAWRrqBvCJaIN14aaCWa4M3xu iT+Uvae1rqqazKD2I5xNOWTBwZnf64FEu6+cvkJzjly47sD+QE3b0SpxebVqJnEwWAoCdo3hAxATI 8UDR93OWA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqg6n-00061l-CG; Wed, 01 Jul 2020 17:01:17 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqg6k-00061M-3a for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2020 17:01:15 +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 C82BA31B; Wed, 1 Jul 2020 10:01:08 -0700 (PDT) Received: from bakewell.cambridge.arm.com (unknown [10.37.8.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B35DC3F73C; Wed, 1 Jul 2020 10:01:05 -0700 (PDT) Date: Wed, 1 Jul 2020 18:00:58 +0100 From: Dave P Martin To: Ard Biesheuvel Subject: Re: [PATCH] arm64/alternatives: use subsections for replacement sequences Message-ID: <20200701170055.v5xufbjjkjknnkuc@bakewell.cambridge.arm.com> References: <20200630081921.13443-1-ardb@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200630081921.13443-1-ardb@kernel.org> User-Agent: NeoMutt/20170113 (1.7.2) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_130114_209900_9943155F X-CRM114-Status: GOOD ( 33.36 ) 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: mark.rutland@arm.com, anders.roxell@linaro.org, arnd@arndb.de, Suzuki K Poulose , catalin.marinas@arm.com, Mark Brown , James Morse , Andre Przywara , will@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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jun 30, 2020 at 10:19:21AM +0200, Ard Biesheuvel wrote: > When building very large kernels, the logic that emits replacement > sequences for alternatives fails when relative branches are present > in the code that is emitted into the .altinstr_replacement section > and patched in at the original site and fixed up. The reason is that > the linker will insert veneers if relative branches go out of range, > and due to the relative distance of the .altinstr_replacement from > the .text section where its branch targets usually live, veneers > may be emitted at the end of the .altinstr_replacement section, with > the relative branches in the sequence pointed at the veneers instead > of the actual target. > > The alternatives patching logic will attempt to fix up the branch to > point to its original target, which will be the veneer in this case, > but given that the patch site is likely to be far away as well, it > will be out of range and so patching will fail. There are other cases > where these veneers are problematic, e.g., when the target of the > branch is in .text while the patch site is in .init.text, in which > case putting the replacement sequence inside .text may not help either. > > So let's use subsections to emit the replacement code as closely as > possible to the patch site, to ensure that veneers are only likely to > be emitted if they are required at the patch site as well, in which > case they will be in range for the replacement sequence both before > and after it is transported to the patch site. > > This will prevent alternative sequences in non-init code from being > released from memory after boot, but this is tolerable given that the > entire section is only 512 KB on an allyesconfig build (which weighs in > at 500+ MB for the entire Image). Also, note that modules today carry > the replacement sequences in non-init sections as well, and any of > those that target init code will be emitted into init sections after > this change. > > This fixes an early crash when booting an allyesconfig kernel on a > system where any of the alternatives sequences containing relative > branches are activated at boot (e.g., ARM64_HAS_PAN on TX2) > > Cc: Suzuki K Poulose > Cc: James Morse > Cc: Andre Przywara > Cc: Dave P Martin > Signed-off-by: Ard Biesheuvel > --- > arch/arm64/include/asm/alternative.h | 16 ++++++++-------- > arch/arm64/kernel/vmlinux.lds.S | 3 --- > 2 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h > index 5e5dc05d63a0..12f0eb56a1cc 100644 > --- a/arch/arm64/include/asm/alternative.h > +++ b/arch/arm64/include/asm/alternative.h > @@ -73,11 +73,11 @@ static inline void apply_alternatives_module(void *start, size_t length) { } > ".pushsection .altinstructions,\"a\"\n" \ > ALTINSTR_ENTRY(feature) \ > ".popsection\n" \ > - ".pushsection .altinstr_replacement, \"a\"\n" \ > + ".subsection 1\n" \ This uses subsections in existing sections. Could that interfere with existing (or future) uses of subsections? (I've not checked whether there actually are such uses. I'm also assuming that clobbering the invoker's idea of what section is .previous doesn't matter.) Another wrinkle: the replacement code now becomes executable, whereas I think it was previously in rodata. I'm not sure how much this matters, but it might be a source of gadgets. A different option would be to add an explicitly veneered branch macro for use in alternatives, maybe adrp+add+br. For BTI compatility, we'd need a bti j or equivalent at the destination, which might or might not be easy to achieve -- mind you, I think we theoretically need that anyway for veneers to work properly in all cases. Because we would define the exact instruction sequence, the alternatives code could probably replace it with a direct branch if the actual destination is close enough. The downside is that it wouldn't be a single instruction any more, and there would be some overhead for conditional branches if we replace the unneeded insns with NOPs. [...] Cheers ---Dave _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel