From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: julien.grall@linaro.org, tim@xen.org,
Ian Campbell <ian.campbell@citrix.com>,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v4 5/6] xen: arm: relax barriers in tlb flushes
Date: Thu, 3 Apr 2014 09:59:44 +0100 [thread overview]
Message-ID: <1396515585-5737-5-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1396515560.4211.33.camel@kazak.uk.xensource.com>
Flushing the local TLB only requires a local barrier.
Flushing the TLB of all processors in the inner-shareable domain only requires
an inner-shareable barrier.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v4: new patch
---
xen/include/asm-arm/arm32/flushtlb.h | 16 ++++++++--------
xen/include/asm-arm/arm32/page.h | 10 +++++-----
xen/include/asm-arm/arm64/flushtlb.h | 16 ++++++++--------
xen/include/asm-arm/arm64/page.h | 10 +++++-----
xen/include/asm-arm/page.h | 8 ++++----
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/xen/include/asm-arm/arm32/flushtlb.h b/xen/include/asm-arm/arm32/flushtlb.h
index bbcc82f..621c5d3 100644
--- a/xen/include/asm-arm/arm32/flushtlb.h
+++ b/xen/include/asm-arm/arm32/flushtlb.h
@@ -4,44 +4,44 @@
/* Flush local TLBs, current VMID only */
static inline void flush_tlb_local(void)
{
- dsb(sy);
+ dsb(nsh);
WRITE_CP32((uint32_t) 0, TLBIALL);
- dsb(sy);
+ dsb(nsh);
isb();
}
/* Flush inner shareable TLBs, current VMID only */
static inline void flush_tlb(void)
{
- dsb(sy);
+ dsb(ish);
WRITE_CP32((uint32_t) 0, TLBIALLIS);
- dsb(sy);
+ dsb(ish);
isb();
}
/* Flush local TLBs, all VMIDs, non-hypervisor mode */
static inline void flush_tlb_all_local(void)
{
- dsb(sy);
+ dsb(nsh);
WRITE_CP32((uint32_t) 0, TLBIALLNSNH);
- dsb(sy);
+ dsb(nsh);
isb();
}
/* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */
static inline void flush_tlb_all(void)
{
- dsb(sy);
+ dsb(ish);
WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS);
- dsb(sy);
+ dsb(ish);
isb();
}
diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h
index 3f2bdc9..0de3395 100644
--- a/xen/include/asm-arm/arm32/page.h
+++ b/xen/include/asm-arm/arm32/page.h
@@ -12,10 +12,10 @@ static inline void write_pte(lpae_t *p, lpae_t pte)
{
asm volatile (
/* Ensure any writes have completed with the old mappings. */
- "dsb;"
+ "dsb ish;"
/* Safely write the entry (STRD is atomic on CPUs that support LPAE) */
"strd %0, %H0, [%1];"
- "dsb;"
+ "dsb ish;"
: : "r" (pte.bits), "r" (p) : "memory");
}
@@ -42,7 +42,7 @@ static inline void flush_xen_text_tlb_local(void)
CMD_CP32(TLBIALLH) /* Flush hypervisor TLB */
CMD_CP32(ICIALLU) /* Flush I-cache */
CMD_CP32(BPIALL) /* Flush branch predictor */
- "dsb;" /* Ensure completion of TLB+BP flush */
+ "dsb nsh;" /* Ensure completion of TLB+BP flush */
"isb;"
: : : "memory");
}
@@ -54,9 +54,9 @@ static inline void flush_xen_text_tlb_local(void)
*/
static inline void flush_xen_data_tlb_local(void)
{
- asm volatile("dsb;" /* Ensure preceding are visible */
+ asm volatile("dsb nsh;" /* Ensure preceding are visible */
CMD_CP32(TLBIALLH)
- "dsb;" /* Ensure completion of the TLB flush */
+ "dsb nsh;" /* Ensure completion of the TLB flush */
"isb;"
: : : "memory");
}
diff --git a/xen/include/asm-arm/arm64/flushtlb.h b/xen/include/asm-arm/arm64/flushtlb.h
index a73df92..ba7059a 100644
--- a/xen/include/asm-arm/arm64/flushtlb.h
+++ b/xen/include/asm-arm/arm64/flushtlb.h
@@ -5,9 +5,9 @@
static inline void flush_tlb_local(void)
{
asm volatile(
- "dsb sy;"
+ "dsb nsh;"
"tlbi vmalle1;"
- "dsb sy;"
+ "dsb nsh;"
"isb;"
: : : "memory");
}
@@ -16,9 +16,9 @@ static inline void flush_tlb_local(void)
static inline void flush_tlb(void)
{
asm volatile(
- "dsb sy;"
+ "dsb ish;"
"tlbi vmalle1is;"
- "dsb sy;"
+ "dsb ish;"
"isb;"
: : : "memory");
}
@@ -27,9 +27,9 @@ static inline void flush_tlb(void)
static inline void flush_tlb_all_local(void)
{
asm volatile(
- "dsb sy;"
+ "dsb nsh;"
"tlbi alle1;"
- "dsb sy;"
+ "dsb nsh;"
"isb;"
: : : "memory");
}
@@ -38,9 +38,9 @@ static inline void flush_tlb_all_local(void)
static inline void flush_tlb_all(void)
{
asm volatile(
- "dsb sy;"
+ "dsb ish;"
"tlbi alle1is;"
- "dsb sy;"
+ "dsb ish;"
"isb;"
: : : "memory");
}
diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h
index d7ee2fc..c680f47 100644
--- a/xen/include/asm-arm/arm64/page.h
+++ b/xen/include/asm-arm/arm64/page.h
@@ -8,9 +8,9 @@ static inline void write_pte(lpae_t *p, lpae_t pte)
{
asm volatile (
/* Ensure any writes have completed with the old mappings. */
- "dsb sy;"
+ "dsb ish;"
"str %0, [%1];" /* Write the entry */
- "dsb sy;"
+ "dsb ish;"
: : "r" (pte.bits), "r" (p) : "memory");
}
@@ -35,7 +35,7 @@ static inline void flush_xen_text_tlb_local(void)
"isb;" /* Ensure synchronization with previous changes to text */
"tlbi alle2;" /* Flush hypervisor TLB */
"ic iallu;" /* Flush I-cache */
- "dsb sy;" /* Ensure completion of TLB flush */
+ "dsb nsh;" /* Ensure completion of TLB flush */
"isb;"
: : : "memory");
}
@@ -48,9 +48,9 @@ static inline void flush_xen_text_tlb_local(void)
static inline void flush_xen_data_tlb_local(void)
{
asm volatile (
- "dsb sy;" /* Ensure visibility of PTE writes */
+ "dsb nsh;" /* Ensure visibility of PTE writes */
"tlbi alle2;" /* Flush hypervisor TLB */
- "dsb sy;" /* Ensure completion of TLB flush */
+ "dsb nsh;" /* Ensure completion of TLB flush */
"isb;"
: : : "memory");
}
diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h
index a8eeb73..a96e40b 100644
--- a/xen/include/asm-arm/page.h
+++ b/xen/include/asm-arm/page.h
@@ -315,12 +315,12 @@ static inline void flush_xen_data_tlb_range_va_local(unsigned long va,
unsigned long size)
{
unsigned long end = va + size;
- dsb(sy); /* Ensure preceding are visible */
+ dsb(nsh); /* Ensure preceding are visible */
while ( va < end ) {
__flush_xen_data_tlb_one_local(va);
va += PAGE_SIZE;
}
- dsb(sy); /* Ensure completion of the TLB flush */
+ dsb(nsh); /* Ensure completion of the TLB flush */
isb();
}
@@ -333,12 +333,12 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va,
unsigned long size)
{
unsigned long end = va + size;
- dsb(sy); /* Ensure preceding are visible */
+ dsb(ish); /* Ensure preceding are visible */
while ( va < end ) {
__flush_xen_data_tlb_one(va);
va += PAGE_SIZE;
}
- dsb(sy); /* Ensure completion of the TLB flush */
+ dsb(ish); /* Ensure completion of the TLB flush */
isb();
}
--
1.7.10.4
next prev parent reply other threads:[~2014-04-03 8:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-03 8:59 [PATCH v4 0/6 ] xen: arm: smp & tlb cleanups Ian Campbell
2014-04-03 8:59 ` [PATCH v4 1/6] xen: arm: clarify naming of the Xen TLB flushing functions Ian Campbell
2014-04-03 8:59 ` [PATCH v4 2/6] xen: arm: consolidate body of flush_xen_data_tlb_range_va_local Ian Campbell
2014-04-03 10:56 ` Julien Grall
2014-04-03 8:59 ` [PATCH v4 3/6] xen: arm: flush TLB on all CPUs when setting or clearing fixmaps Ian Campbell
2014-04-03 10:58 ` Julien Grall
2014-04-03 8:59 ` [PATCH v4 4/6] xen: arm32: don't force the compiler to allocate a dummy register Ian Campbell
2014-04-03 8:59 ` Ian Campbell [this message]
2014-04-03 11:12 ` [PATCH v4 5/6] xen: arm: relax barriers in tlb flushes Julien Grall
2014-04-03 12:18 ` Ian Campbell
2014-04-03 12:42 ` Julien Grall
2014-04-03 8:59 ` [PATCH v4 6/6] xen: arm: relax barriers when flushing caches Ian Campbell
2014-04-03 12:55 ` Tim Deegan
2014-04-03 13:00 ` Ian Campbell
2014-04-03 16:29 ` [PATCH v4 0/6 ] xen: arm: smp & tlb cleanups Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396515585-5737-5-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=julien.grall@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).