From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933083AbcIFGgI (ORCPT ); Tue, 6 Sep 2016 02:36:08 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:37991 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932802AbcIFGgD (ORCPT ); Tue, 6 Sep 2016 02:36:03 -0400 Date: Tue, 6 Sep 2016 08:38:30 +0200 From: Christoffer Dall To: Punit Agrawal Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mark Rutland , Marc Zyngier , Steven Rostedt , Ingo Molnar , Will Deacon , Catalin Marinas Subject: Re: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro Message-ID: <20160906063830.GC30513@cbox> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@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, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can in preference to these? > + * be used to avoid asm() boilerplate. 'these' seem to be a bit overloaded in this commentary. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) > + > +/* > * TLB Management > * ============== > * > @@ -66,7 +81,7 @@ > static inline void local_flush_tlb_all(void) > { > dsb(nshst); > - asm("tlbi vmalle1"); > + __tlbi(vmalle1); > dsb(nsh); > isb(); > } > @@ -74,7 +89,7 @@ static inline void local_flush_tlb_all(void) > static inline void flush_tlb_all(void) > { > dsb(ishst); > - asm("tlbi vmalle1is"); > + __tlbi(vmalle1is); > dsb(ish); > isb(); > } > @@ -84,7 +99,7 @@ static inline void flush_tlb_mm(struct mm_struct *mm) > unsigned long asid = ASID(mm) << 48; > > dsb(ishst); > - asm("tlbi aside1is, %0" : : "r" (asid)); > + __tlbi(aside1is, asid); > dsb(ish); > } > > @@ -94,7 +109,7 @@ static inline void flush_tlb_page(struct vm_area_struct *vma, > unsigned long addr = uaddr >> 12 | (ASID(vma->vm_mm) << 48); > > dsb(ishst); > - asm("tlbi vale1is, %0" : : "r" (addr)); > + __tlbi(vale1is, addr); > dsb(ish); > } > > @@ -122,9 +137,9 @@ static inline void __flush_tlb_range(struct vm_area_struct *vma, > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) { > if (last_level) > - asm("tlbi vale1is, %0" : : "r"(addr)); > + __tlbi(vale1is, addr); > else > - asm("tlbi vae1is, %0" : : "r"(addr)); > + __tlbi(vae1is, addr); > } > dsb(ish); > } > @@ -149,7 +164,7 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end > > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) > - asm("tlbi vaae1is, %0" : : "r"(addr)); > + __tlbi(vaae1is, addr); > dsb(ish); > isb(); > } > @@ -163,7 +178,7 @@ static inline void __flush_tlb_pgtable(struct mm_struct *mm, > { > unsigned long addr = uaddr >> 12 | (ASID(mm) << 48); > > - asm("tlbi vae1is, %0" : : "r" (addr)); > + __tlbi(vae1is, addr); > dsb(ish); > } > > -- > 2.8.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro Date: Tue, 6 Sep 2016 08:38:30 +0200 Message-ID: <20160906063830.GC30513@cbox> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Marc Zyngier , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Ingo Molnar , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org To: Punit Agrawal Return-path: Content-Disposition: inline In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org On Mon, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can in preference to these? > + * be used to avoid asm() boilerplate. 'these' seem to be a bit overloaded in this commentary. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) > + > +/* > * TLB Management > * ============== > * > @@ -66,7 +81,7 @@ > static inline void local_flush_tlb_all(void) > { > dsb(nshst); > - asm("tlbi vmalle1"); > + __tlbi(vmalle1); > dsb(nsh); > isb(); > } > @@ -74,7 +89,7 @@ static inline void local_flush_tlb_all(void) > static inline void flush_tlb_all(void) > { > dsb(ishst); > - asm("tlbi vmalle1is"); > + __tlbi(vmalle1is); > dsb(ish); > isb(); > } > @@ -84,7 +99,7 @@ static inline void flush_tlb_mm(struct mm_struct *mm) > unsigned long asid = ASID(mm) << 48; > > dsb(ishst); > - asm("tlbi aside1is, %0" : : "r" (asid)); > + __tlbi(aside1is, asid); > dsb(ish); > } > > @@ -94,7 +109,7 @@ static inline void flush_tlb_page(struct vm_area_struct *vma, > unsigned long addr = uaddr >> 12 | (ASID(vma->vm_mm) << 48); > > dsb(ishst); > - asm("tlbi vale1is, %0" : : "r" (addr)); > + __tlbi(vale1is, addr); > dsb(ish); > } > > @@ -122,9 +137,9 @@ static inline void __flush_tlb_range(struct vm_area_struct *vma, > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) { > if (last_level) > - asm("tlbi vale1is, %0" : : "r"(addr)); > + __tlbi(vale1is, addr); > else > - asm("tlbi vae1is, %0" : : "r"(addr)); > + __tlbi(vae1is, addr); > } > dsb(ish); > } > @@ -149,7 +164,7 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end > > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) > - asm("tlbi vaae1is, %0" : : "r"(addr)); > + __tlbi(vaae1is, addr); > dsb(ish); > isb(); > } > @@ -163,7 +178,7 @@ static inline void __flush_tlb_pgtable(struct mm_struct *mm, > { > unsigned long addr = uaddr >> 12 | (ASID(mm) << 48); > > - asm("tlbi vae1is, %0" : : "r" (addr)); > + __tlbi(vae1is, addr); > dsb(ish); > } > > -- > 2.8.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: christoffer.dall@linaro.org (Christoffer Dall) Date: Tue, 6 Sep 2016 08:38:30 +0200 Subject: [RFC v2 PATCH 4/7] arm64: tlbflush.h: add __tlbi() macro In-Reply-To: <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> References: <1473093097-30932-1-git-send-email-punit.agrawal@arm.com> <1473093097-30932-5-git-send-email-punit.agrawal@arm.com> Message-ID: <20160906063830.GC30513@cbox> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Sep 05, 2016 at 05:31:34PM +0100, Punit Agrawal wrote: > From: Mark Rutland > > As with dsb() and isb(), add a __tlbi() helper so that we can avoid > distracting asm boilerplate every time we want a TLBI. As some TLBI > operations take an argument while others do not, some pre-processor is > used to handle these two cases with different assembly blocks. > > The existing tlbflush.h code is moved over to use the helper. > > Signed-off-by: Mark Rutland > Cc: Catalin Marinas > Cc: Marc Zyngier > Cc: Will Deacon > [ rename helper to __tlbi, update commit log ] > Signed-off-by: Punit Agrawal > --- > arch/arm64/include/asm/tlbflush.h | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index b460ae2..e9e42a7 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -25,6 +25,21 @@ > #include > > /* > + * Raw TLBI operations. Drivers and most kernel code should use the TLB > + * management routines below in preference to these. Where necessary, these can in preference to these? > + * be used to avoid asm() boilerplate. 'these' seem to be a bit overloaded in this commentary. > + * > + * Can be used as __tlbi(op) or __tlbi(op, arg), depending on whether a > + * particular TLBI op takes an argument or not. The macros below handle invoking > + * the asm with or without the register argument as appropriate. > + */ > +#define __TLBI_0(op, arg) asm ("tlbi " #op) > +#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0" : : "r" (arg)) > +#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg) > + > +#define __tlbi(op, ...) __TLBI_N(op, ##__VA_ARGS__, 1, 0) > + > +/* > * TLB Management > * ============== > * > @@ -66,7 +81,7 @@ > static inline void local_flush_tlb_all(void) > { > dsb(nshst); > - asm("tlbi vmalle1"); > + __tlbi(vmalle1); > dsb(nsh); > isb(); > } > @@ -74,7 +89,7 @@ static inline void local_flush_tlb_all(void) > static inline void flush_tlb_all(void) > { > dsb(ishst); > - asm("tlbi vmalle1is"); > + __tlbi(vmalle1is); > dsb(ish); > isb(); > } > @@ -84,7 +99,7 @@ static inline void flush_tlb_mm(struct mm_struct *mm) > unsigned long asid = ASID(mm) << 48; > > dsb(ishst); > - asm("tlbi aside1is, %0" : : "r" (asid)); > + __tlbi(aside1is, asid); > dsb(ish); > } > > @@ -94,7 +109,7 @@ static inline void flush_tlb_page(struct vm_area_struct *vma, > unsigned long addr = uaddr >> 12 | (ASID(vma->vm_mm) << 48); > > dsb(ishst); > - asm("tlbi vale1is, %0" : : "r" (addr)); > + __tlbi(vale1is, addr); > dsb(ish); > } > > @@ -122,9 +137,9 @@ static inline void __flush_tlb_range(struct vm_area_struct *vma, > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) { > if (last_level) > - asm("tlbi vale1is, %0" : : "r"(addr)); > + __tlbi(vale1is, addr); > else > - asm("tlbi vae1is, %0" : : "r"(addr)); > + __tlbi(vae1is, addr); > } > dsb(ish); > } > @@ -149,7 +164,7 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end > > dsb(ishst); > for (addr = start; addr < end; addr += 1 << (PAGE_SHIFT - 12)) > - asm("tlbi vaae1is, %0" : : "r"(addr)); > + __tlbi(vaae1is, addr); > dsb(ish); > isb(); > } > @@ -163,7 +178,7 @@ static inline void __flush_tlb_pgtable(struct mm_struct *mm, > { > unsigned long addr = uaddr >> 12 | (ASID(mm) << 48); > > - asm("tlbi vae1is, %0" : : "r" (addr)); > + __tlbi(vae1is, addr); > dsb(ish); > } > > -- > 2.8.1 >