[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/31] target-i386: introduce cpu_get_mem_attrs
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 02/31] target-i386: introduce cpu_get_mem_attrs |
Date: |
Mon, 11 May 2015 15:48:48 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/memattrs.h | 4 +++-
target-i386/cpu.h | 5 +++++
target-i386/helper.c | 3 ++-
target-i386/kvm.c | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h
index 1389b4b..6bbf9aa 100644
--- a/include/exec/memattrs.h
+++ b/include/exec/memattrs.h
@@ -29,7 +29,9 @@ typedef struct MemTxAttrs {
* "didn't specify" if necessary.
*/
unsigned int unspecified:1;
- /* ARM/AMBA TrustZone Secure access */
+ /* ARM/AMBA: TrustZone Secure access
+ * x86: System Management Mode access
+ */
unsigned int secure:1;
/* Memory access is usermode (unprivileged) */
unsigned int user:1;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 4ee12ca..64c2783 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1292,6 +1292,11 @@ static inline void cpu_load_efer(CPUX86State *env,
uint64_t val)
}
}
+static inline MemTxAttrs cpu_get_mem_attrs(CPUX86State *env)
+{
+ return ((MemTxAttrs) { .secure = (env->hflags & HF_SMM_MASK) != 0 });
+}
+
/* fpu_helper.c */
void cpu_set_mxcsr(CPUX86State *env, uint32_t val);
void cpu_set_fpuc(CPUX86State *env, uint16_t val);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 4f1ddf7..62e801b 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -771,7 +771,8 @@ do_check_protect_pse36:
page_offset = vaddr & (page_size - 1);
paddr = pte + page_offset;
- tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, page_size);
+ tlb_set_page_with_attrs(cs, vaddr, paddr, cpu_get_mem_attrs(env),
+ prot, mmu_idx, page_size);
return 0;
do_fault_rsvd:
error_code |= PG_ERROR_RSVD_MASK;
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index a26d25a..009bf74 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -2259,7 +2259,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cpu, struct
kvm_run *run)
}
cpu_set_apic_tpr(x86_cpu->apic_state, run->cr8);
cpu_set_apic_base(x86_cpu->apic_state, run->apic_base);
- return MEMTXATTRS_UNSPECIFIED;
+ return cpu_get_mem_attrs(env);
}
int kvm_arch_process_async_events(CPUState *cs)
--
1.8.3.1
- [Qemu-devel] [PATCH 00/31] target-i386: SMM improvements and partial support under KVM, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 01/31] pc: add 2.4 machine types, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 02/31] target-i386: introduce cpu_get_mem_attrs,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/31] target-i386: mask NMIs on entry to SMM, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 06/31] target-i386: set G=1 in SMM big real mode selectors, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 07/31] pflash_cfi01: change big-endian property to BIT type, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 04/31] target-i386: Use correct memory attributes for ioport accesses, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 08/31] pflash_cfi01: change to new-style MMIO accessors, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 03/31] target-i386: Use correct memory attributes for memory accesses, Paolo Bonzini, 2015/05/11
- [Qemu-devel] [PATCH 10/31] vl: allow full-blown QemuOpts syntax for -global, Paolo Bonzini, 2015/05/11