|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] x86/mm: Rename l{1,2,3,4}e_read_atomic()
commit 2ba11c33b51d18a480e509876a815b59342ad487
Author: Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Fri Jul 26 17:21:46 2024 +0200
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jul 30 17:36:51 2024 +0100
x86/mm: Rename l{1,2,3,4}e_read_atomic()
There's no l{1,2,3,4}e_read() implementation, so drop the _atomic suffix
from
the read helpers. This allows unifying the naming with the write helpers,
which are also atomic but don't have the suffix already:
l{1,2,3,4}e_write().
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
xen/arch/x86/include/asm/page.h | 16 ++++++++--------
xen/arch/x86/include/asm/x86_64/page.h | 2 --
xen/arch/x86/mm.c | 12 ++++++------
xen/arch/x86/traps.c | 8 ++++----
4 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/page.h
index 3d20ee507a..e48571de93 100644
--- a/xen/arch/x86/include/asm/page.h
+++ b/xen/arch/x86/include/asm/page.h
@@ -16,14 +16,14 @@
#include <asm/x86_64/page.h>
/* Read a pte atomically from memory. */
-#define l1e_read_atomic(l1ep) \
- l1e_from_intpte(pte_read_atomic(&l1e_get_intpte(*(l1ep))))
-#define l2e_read_atomic(l2ep) \
- l2e_from_intpte(pte_read_atomic(&l2e_get_intpte(*(l2ep))))
-#define l3e_read_atomic(l3ep) \
- l3e_from_intpte(pte_read_atomic(&l3e_get_intpte(*(l3ep))))
-#define l4e_read_atomic(l4ep) \
- l4e_from_intpte(pte_read_atomic(&l4e_get_intpte(*(l4ep))))
+#define l1e_read(l1ep) \
+ l1e_from_intpte(read_atomic(&l1e_get_intpte(*(l1ep))))
+#define l2e_read(l2ep) \
+ l2e_from_intpte(read_atomic(&l2e_get_intpte(*(l2ep))))
+#define l3e_read(l3ep) \
+ l3e_from_intpte(read_atomic(&l3e_get_intpte(*(l3ep))))
+#define l4e_read(l4ep) \
+ l4e_from_intpte(read_atomic(&l4e_get_intpte(*(l4ep))))
/* Write a pte atomically to memory. */
#define l1e_write(l1ep, l1e) \
diff --git a/xen/arch/x86/include/asm/x86_64/page.h
b/xen/arch/x86/include/asm/x86_64/page.h
index 03fcce61c0..465a707312 100644
--- a/xen/arch/x86/include/asm/x86_64/page.h
+++ b/xen/arch/x86/include/asm/x86_64/page.h
@@ -69,8 +69,6 @@ typedef l4_pgentry_t root_pgentry_t;
#endif /* !__ASSEMBLY__ */
-#define pte_read_atomic(ptep) read_atomic(ptep)
-
/* Given a virtual address, get an entry offset into a linear page table. */
#define l1_linear_offset(_a) (((_a) & VADDR_MASK) >> L1_PAGETABLE_SHIFT)
#define l2_linear_offset(_a) (((_a) & VADDR_MASK) >> L2_PAGETABLE_SHIFT)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index fab2de5fae..6ffacab341 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2147,7 +2147,7 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t
nl1e,
struct vcpu *pt_vcpu, struct domain *pg_dom)
{
bool preserve_ad = (cmd == MMU_PT_UPDATE_PRESERVE_AD);
- l1_pgentry_t ol1e = l1e_read_atomic(pl1e);
+ l1_pgentry_t ol1e = l1e_read(pl1e);
struct domain *pt_dom = pt_vcpu->domain;
int rc = 0;
@@ -2270,7 +2270,7 @@ static int mod_l2_entry(l2_pgentry_t *pl2e,
return -EPERM;
}
- ol2e = l2e_read_atomic(pl2e);
+ ol2e = l2e_read(pl2e);
if ( l2e_get_flags(nl2e) & _PAGE_PRESENT )
{
@@ -2332,7 +2332,7 @@ static int mod_l3_entry(l3_pgentry_t *pl3e,
if ( pgentry_ptr_to_slot(pl3e) >= 3 && is_pv_32bit_domain(d) )
return -EINVAL;
- ol3e = l3e_read_atomic(pl3e);
+ ol3e = l3e_read(pl3e);
if ( l3e_get_flags(nl3e) & _PAGE_PRESENT )
{
@@ -2394,7 +2394,7 @@ static int mod_l4_entry(l4_pgentry_t *pl4e,
return -EINVAL;
}
- ol4e = l4e_read_atomic(pl4e);
+ ol4e = l4e_read(pl4e);
if ( l4e_get_flags(nl4e) & _PAGE_PRESENT )
{
@@ -5925,7 +5925,7 @@ void init_or_livepatch modify_xen_mappings_lite(
while ( v < e )
{
l2_pgentry_t *pl2e = &l2_xenmap[l2_table_offset(v)];
- l2_pgentry_t l2e = l2e_read_atomic(pl2e);
+ l2_pgentry_t l2e = l2e_read(pl2e);
unsigned int l2f = l2e_get_flags(l2e);
ASSERT(l2f & _PAGE_PRESENT);
@@ -5947,7 +5947,7 @@ void init_or_livepatch modify_xen_mappings_lite(
while ( v < e )
{
l1_pgentry_t *pl1e = &pl1t[l1_table_offset(v)];
- l1_pgentry_t l1e = l1e_read_atomic(pl1e);
+ l1_pgentry_t l1e = l1e_read(pl1e);
unsigned int l1f = l1e_get_flags(l1e);
ASSERT(l1f & _PAGE_PRESENT);
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 7a9299ae6c..a981b6c2e8 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1451,7 +1451,7 @@ static enum pf_type __page_fault_type(unsigned long addr,
mfn = cr3 >> PAGE_SHIFT;
l4t = map_domain_page(_mfn(mfn));
- l4e = l4e_read_atomic(&l4t[l4_table_offset(addr)]);
+ l4e = l4e_read(&l4t[l4_table_offset(addr)]);
mfn = l4e_get_pfn(l4e);
unmap_domain_page(l4t);
if ( ((l4e_get_flags(l4e) & required_flags) != required_flags) ||
@@ -1460,7 +1460,7 @@ static enum pf_type __page_fault_type(unsigned long addr,
page_user &= l4e_get_flags(l4e);
l3t = map_domain_page(_mfn(mfn));
- l3e = l3e_read_atomic(&l3t[l3_table_offset(addr)]);
+ l3e = l3e_read(&l3t[l3_table_offset(addr)]);
mfn = l3e_get_pfn(l3e);
unmap_domain_page(l3t);
if ( ((l3e_get_flags(l3e) & required_flags) != required_flags) ||
@@ -1471,7 +1471,7 @@ static enum pf_type __page_fault_type(unsigned long addr,
goto leaf;
l2t = map_domain_page(_mfn(mfn));
- l2e = l2e_read_atomic(&l2t[l2_table_offset(addr)]);
+ l2e = l2e_read(&l2t[l2_table_offset(addr)]);
mfn = l2e_get_pfn(l2e);
unmap_domain_page(l2t);
if ( ((l2e_get_flags(l2e) & required_flags) != required_flags) ||
@@ -1482,7 +1482,7 @@ static enum pf_type __page_fault_type(unsigned long addr,
goto leaf;
l1t = map_domain_page(_mfn(mfn));
- l1e = l1e_read_atomic(&l1t[l1_table_offset(addr)]);
+ l1e = l1e_read(&l1t[l1_table_offset(addr)]);
mfn = l1e_get_pfn(l1e);
unmap_domain_page(l1t);
if ( ((l1e_get_flags(l1e) & required_flags) != required_flags) ||
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |