Skip to content

Commit 2526cff

Browse files
committed
xen: assume XENFEAT_mmu_pt_update_preserve_ad being set for pv guests
XENFEAT_mmu_pt_update_preserve_ad is always set in Xen 4.0 and newer. Remove coding assuming it might be zero. Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Link: https://lore.kernel.org/r/20210730071804.4302-3-jgross@suse.com Signed-off-by: Juergen Gross <jgross@suse.com>
1 parent ac4c403 commit 2526cff

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

arch/x86/xen/enlighten_pv.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ static void __init xen_banner(void)
116116
HYPERVISOR_xen_version(XENVER_extraversion, &extra);
117117

118118
pr_info("Booting paravirtualized kernel on %s\n", pv_info.name);
119-
printk(KERN_INFO "Xen version: %d.%d%s%s\n",
120-
version >> 16, version & 0xffff, extra.extraversion,
121-
xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
119+
pr_info("Xen version: %d.%d%s (preserve-AD)\n",
120+
version >> 16, version & 0xffff, extra.extraversion);
122121
}
123122

124123
static void __init xen_pv_init_platform(void)
@@ -1302,13 +1301,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
13021301
xen_init_apic();
13031302
#endif
13041303

1305-
if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {
1306-
pv_ops.mmu.ptep_modify_prot_start =
1307-
xen_ptep_modify_prot_start;
1308-
pv_ops.mmu.ptep_modify_prot_commit =
1309-
xen_ptep_modify_prot_commit;
1310-
}
1311-
13121304
machine_ops = xen_machine_ops;
13131305

13141306
/*

arch/x86/xen/mmu_pv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2099,8 +2099,8 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
20992099
.set_pte = xen_set_pte_init,
21002100
.set_pmd = xen_set_pmd_hyper,
21012101

2102-
.ptep_modify_prot_start = __ptep_modify_prot_start,
2103-
.ptep_modify_prot_commit = __ptep_modify_prot_commit,
2102+
.ptep_modify_prot_start = xen_ptep_modify_prot_start,
2103+
.ptep_modify_prot_commit = xen_ptep_modify_prot_commit,
21042104

21052105
.pte_val = PV_CALLEE_SAVE(xen_pte_val),
21062106
.pgd_val = PV_CALLEE_SAVE(xen_pgd_val),

0 commit comments

Comments
 (0)