From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270AbdHNRoP (ORCPT ); Mon, 14 Aug 2017 13:44:15 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:43066 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751548AbdHNRoN (ORCPT ); Mon, 14 Aug 2017 13:44:13 -0400 Date: Mon, 14 Aug 2017 18:42:59 +0100 From: Mark Rutland To: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org, keescook@chromium.org, ard.biesheuvel@linaro.org, matt@codeblueprint.co.uk, kernel-hardening@lists.openwall.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, luto@amacapital.net, james.morse@arm.com, labbott@redhat.com Subject: Re: [PATCH 10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer Message-ID: <20170814174259.GA25890@leverpostej> References: <1502130965-18710-1-git-send-email-mark.rutland@arm.com> <1502130965-18710-11-git-send-email-mark.rutland@arm.com> <20170814171338.gvtn76awussgxctn@armageddon.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170814171338.gvtn76awussgxctn@armageddon.cambridge.arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 14, 2017 at 06:13:39PM +0100, Catalin Marinas wrote: > On Mon, Aug 07, 2017 at 07:36:01PM +0100, Mark Rutland wrote: > > .macro adr_this_cpu, dst, sym, tmp > > - adr_l \dst, \sym > > + adrp \tmp, \sym > > + add \dst, \tmp, #:lo12:\sym > > mrs \tmp, tpidr_el1 > > add \dst, \dst, \tmp > > .endm > > Nitpick: it may be worth adding an #ifndef MODULE around these macros, > together with a comment, just in case. There are other macros in this > file like adr_l which are used in modules (crypto). I've folded in the below, in keeping with the other MODULE fallbacks. Thanks, Mark. ---->8---- diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 4775af5..50c5592 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -230,13 +230,18 @@ .endm /* - * @dst: Result of per_cpu(sym, smp_processor_id()) + * @dst: Result of per_cpu(sym, smp_processor_id()), can be SP for + * non-module code * @sym: The name of the per-cpu variable * @tmp: scratch register */ .macro adr_this_cpu, dst, sym, tmp +#ifndef MODULE adrp \tmp, \sym add \dst, \tmp, #:lo12:\sym +#else + adr_l \tmp, \sym +#endif mrs \tmp, tpidr_el1 add \dst, \dst, \tmp .endm