Skip to content

Commit ba6d8ef

Browse files
mpempe
committed
Merge branch 'topic/ppc-kvm' into next
2 parents 27aef93 + 590d2f9 commit ba6d8ef

8 files changed

Lines changed: 44 additions & 54 deletions

File tree

‎arch/powerpc/include/asm/cputable.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ static inline void cpu_feature_keys_init(void) { }
193193
#define CPU_FTR_ARCH_31 LONG_ASM_CONST(0x0004000000000000)
194194
#define CPU_FTR_DAWR1 LONG_ASM_CONST(0x0008000000000000)
195195
#define CPU_FTR_DEXCR_NPHIE LONG_ASM_CONST(0x0010000000000000)
196+
#define CPU_FTR_P11_PVR LONG_ASM_CONST(0x0020000000000000)
196197

197198
#ifndef __ASSEMBLY__
198199

@@ -454,7 +455,7 @@ static inline void cpu_feature_keys_init(void) { }
454455
CPU_FTR_DAWR | CPU_FTR_DAWR1 | \
455456
CPU_FTR_DEXCR_NPHIE)
456457

457-
#define CPU_FTRS_POWER11 CPU_FTRS_POWER10
458+
#define CPU_FTRS_POWER11 (CPU_FTRS_POWER10 | CPU_FTR_P11_PVR)
458459

459460
#define CPU_FTRS_CELL (CPU_FTR_LWSYNC | \
460461
CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
@@ -475,15 +476,15 @@ static inline void cpu_feature_keys_init(void) { }
475476
(CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | CPU_FTRS_POWER8 | \
476477
CPU_FTR_ALTIVEC_COMP | CPU_FTR_VSX_COMP | CPU_FTRS_POWER9 | \
477478
CPU_FTRS_POWER9_DD2_1 | CPU_FTRS_POWER9_DD2_2 | \
478-
CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10)
479+
CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11)
479480
#else
480481
#define CPU_FTRS_POSSIBLE \
481482
(CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \
482483
CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \
483484
CPU_FTRS_POWER8 | CPU_FTRS_CELL | CPU_FTRS_PA6T | \
484485
CPU_FTR_VSX_COMP | CPU_FTR_ALTIVEC_COMP | CPU_FTRS_POWER9 | \
485486
CPU_FTRS_POWER9_DD2_1 | CPU_FTRS_POWER9_DD2_2 | \
486-
CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10)
487+
CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11)
487488
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
488489
#endif
489490
#else
@@ -547,15 +548,15 @@ enum {
547548
(CPU_FTRS_POSSIBLE & ~CPU_FTR_HVMODE & ~CPU_FTR_DBELL & \
548549
CPU_FTRS_POWER7 & CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & \
549550
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
550-
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
551+
CPU_FTRS_POWER10 & CPU_FTRS_POWER11 & CPU_FTRS_DT_CPU_BASE)
551552
#else
552553
#define CPU_FTRS_ALWAYS \
553554
(CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
554555
CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
555556
CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
556557
~CPU_FTR_HVMODE & ~CPU_FTR_DBELL & CPU_FTRS_POSSIBLE & \
557558
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
558-
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
559+
CPU_FTRS_POWER10 & CPU_FTRS_POWER11 & CPU_FTRS_DT_CPU_BASE)
559560
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
560561
#endif
561562
#else

‎arch/powerpc/include/asm/hvcall.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@
495495
#define H_GUEST_CAP_COPY_MEM (1UL<<(63-0))
496496
#define H_GUEST_CAP_POWER9 (1UL<<(63-1))
497497
#define H_GUEST_CAP_POWER10 (1UL<<(63-2))
498+
#define H_GUEST_CAP_POWER11 (1UL<<(63-3))
498499
#define H_GUEST_CAP_BITMAP2 (1UL<<(63-63))
499500

500501
#ifndef __ASSEMBLY__

‎arch/powerpc/include/asm/kvm_book3s_64.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,8 @@ int kvmhv_nestedv2_set_ptbl_entry(unsigned long lpid, u64 dw0, u64 dw1);
684684
int kvmhv_nestedv2_parse_output(struct kvm_vcpu *vcpu);
685685
int kvmhv_nestedv2_set_vpa(struct kvm_vcpu *vcpu, unsigned long vpa);
686686

687-
int kmvhv_counters_tracepoint_regfunc(void);
688-
void kmvhv_counters_tracepoint_unregfunc(void);
687+
int kvmhv_counters_tracepoint_regfunc(void);
688+
void kvmhv_counters_tracepoint_unregfunc(void);
689689
int kvmhv_get_l2_counters_status(void);
690690
void kvmhv_set_l2_counters_status(int cpu, bool status);
691691

‎arch/powerpc/kvm/book3s_hv.c‎

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,10 @@ static inline unsigned long map_pcr_to_cap(unsigned long pcr)
400400
cap = H_GUEST_CAP_POWER9;
401401
break;
402402
case PCR_ARCH_31:
403-
cap = H_GUEST_CAP_POWER10;
403+
if (cpu_has_feature(CPU_FTR_P11_PVR))
404+
cap = H_GUEST_CAP_POWER11;
405+
else
406+
cap = H_GUEST_CAP_POWER10;
404407
break;
405408
default:
406409
break;
@@ -415,7 +418,7 @@ static int kvmppc_set_arch_compat(struct kvm_vcpu *vcpu, u32 arch_compat)
415418
struct kvmppc_vcore *vc = vcpu->arch.vcore;
416419

417420
/* We can (emulate) our own architecture version and anything older */
418-
if (cpu_has_feature(CPU_FTR_ARCH_31))
421+
if (cpu_has_feature(CPU_FTR_P11_PVR) || cpu_has_feature(CPU_FTR_ARCH_31))
419422
host_pcr_bit = PCR_ARCH_31;
420423
else if (cpu_has_feature(CPU_FTR_ARCH_300))
421424
host_pcr_bit = PCR_ARCH_300;
@@ -2060,36 +2063,9 @@ static int kvmppc_handle_nested_exit(struct kvm_vcpu *vcpu)
20602063
fallthrough; /* go to facility unavailable handler */
20612064
#endif
20622065

2063-
case BOOK3S_INTERRUPT_H_FAC_UNAVAIL: {
2064-
u64 cause = vcpu->arch.hfscr >> 56;
2065-
2066-
/*
2067-
* Only pass HFU interrupts to the L1 if the facility is
2068-
* permitted but disabled by the L1's HFSCR, otherwise
2069-
* the interrupt does not make sense to the L1 so turn
2070-
* it into a HEAI.
2071-
*/
2072-
if (!(vcpu->arch.hfscr_permitted & (1UL << cause)) ||
2073-
(vcpu->arch.nested_hfscr & (1UL << cause))) {
2074-
ppc_inst_t pinst;
2075-
vcpu->arch.trap = BOOK3S_INTERRUPT_H_EMUL_ASSIST;
2076-
2077-
/*
2078-
* If the fetch failed, return to guest and
2079-
* try executing it again.
2080-
*/
2081-
r = kvmppc_get_last_inst(vcpu, INST_GENERIC, &pinst);
2082-
vcpu->arch.emul_inst = ppc_inst_val(pinst);
2083-
if (r != EMULATE_DONE)
2084-
r = RESUME_GUEST;
2085-
else
2086-
r = RESUME_HOST;
2087-
} else {
2088-
r = RESUME_HOST;
2089-
}
2090-
2066+
case BOOK3S_INTERRUPT_H_FAC_UNAVAIL:
2067+
r = RESUME_HOST;
20912068
break;
2092-
}
20932069

20942070
case BOOK3S_INTERRUPT_HV_RM_HARD:
20952071
vcpu->arch.trap = 0;
@@ -4154,7 +4130,7 @@ void kvmhv_set_l2_counters_status(int cpu, bool status)
41544130
lppaca_of(cpu).l2_counters_enable = 0;
41554131
}
41564132

4157-
int kmvhv_counters_tracepoint_regfunc(void)
4133+
int kvmhv_counters_tracepoint_regfunc(void)
41584134
{
41594135
int cpu;
41604136

@@ -4164,7 +4140,7 @@ int kmvhv_counters_tracepoint_regfunc(void)
41644140
return 0;
41654141
}
41664142

4167-
void kmvhv_counters_tracepoint_unregfunc(void)
4143+
void kvmhv_counters_tracepoint_unregfunc(void)
41684144
{
41694145
int cpu;
41704146

@@ -4309,6 +4285,15 @@ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, uns
43094285
}
43104286
hvregs.hdec_expiry = time_limit;
43114287

4288+
/*
4289+
* hvregs has the doorbell status, so zero it here which
4290+
* enables us to receive doorbells when H_ENTER_NESTED is
4291+
* in progress for this vCPU
4292+
*/
4293+
4294+
if (vcpu->arch.doorbell_request)
4295+
vcpu->arch.doorbell_request = 0;
4296+
43124297
/*
43134298
* When setting DEC, we must always deal with irq_work_raise
43144299
* via NMI vs setting DEC. The problem occurs right as we
@@ -4900,7 +4885,6 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
49004885
lpcr |= LPCR_MER;
49014886
}
49024887
} else if (vcpu->arch.pending_exceptions ||
4903-
vcpu->arch.doorbell_request ||
49044888
xive_interrupt_pending(vcpu)) {
49054889
vcpu->arch.ret = RESUME_HOST;
49064890
goto out;

‎arch/powerpc/kvm/book3s_hv_nested.c‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void kvmhv_save_hv_regs(struct kvm_vcpu *vcpu, struct hv_guest_state *hr)
3232
struct kvmppc_vcore *vc = vcpu->arch.vcore;
3333

3434
hr->pcr = vc->pcr | PCR_MASK;
35-
hr->dpdes = vc->dpdes;
35+
hr->dpdes = vcpu->arch.doorbell_request;
3636
hr->hfscr = vcpu->arch.hfscr;
3737
hr->tb_offset = vc->tb_offset;
3838
hr->dawr0 = vcpu->arch.dawr0;
@@ -105,7 +105,7 @@ static void save_hv_return_state(struct kvm_vcpu *vcpu,
105105
{
106106
struct kvmppc_vcore *vc = vcpu->arch.vcore;
107107

108-
hr->dpdes = vc->dpdes;
108+
hr->dpdes = vcpu->arch.doorbell_request;
109109
hr->purr = vcpu->arch.purr;
110110
hr->spurr = vcpu->arch.spurr;
111111
hr->ic = vcpu->arch.ic;
@@ -143,7 +143,7 @@ static void restore_hv_regs(struct kvm_vcpu *vcpu, const struct hv_guest_state *
143143
struct kvmppc_vcore *vc = vcpu->arch.vcore;
144144

145145
vc->pcr = hr->pcr | PCR_MASK;
146-
vc->dpdes = hr->dpdes;
146+
vcpu->arch.doorbell_request = hr->dpdes;
147147
vcpu->arch.hfscr = hr->hfscr;
148148
vcpu->arch.dawr0 = hr->dawr0;
149149
vcpu->arch.dawrx0 = hr->dawrx0;
@@ -170,7 +170,13 @@ void kvmhv_restore_hv_return_state(struct kvm_vcpu *vcpu,
170170
{
171171
struct kvmppc_vcore *vc = vcpu->arch.vcore;
172172

173-
vc->dpdes = hr->dpdes;
173+
/*
174+
* This L2 vCPU might have received a doorbell while H_ENTER_NESTED was being handled.
175+
* Make sure we preserve the doorbell if it was either:
176+
* a) Sent after H_ENTER_NESTED was called on this vCPU (arch.doorbell_request would be 1)
177+
* b) Doorbell was not handled and L2 exited for some other reason (hr->dpdes would be 1)
178+
*/
179+
vcpu->arch.doorbell_request = vcpu->arch.doorbell_request | hr->dpdes;
174180
vcpu->arch.hfscr = hr->hfscr;
175181
vcpu->arch.purr = hr->purr;
176182
vcpu->arch.spurr = hr->spurr;
@@ -445,6 +451,8 @@ long kvmhv_nested_init(void)
445451
if (rc == H_SUCCESS) {
446452
unsigned long capabilities = 0;
447453

454+
if (cpu_has_feature(CPU_FTR_P11_PVR))
455+
capabilities |= H_GUEST_CAP_POWER11;
448456
if (cpu_has_feature(CPU_FTR_ARCH_31))
449457
capabilities |= H_GUEST_CAP_POWER10;
450458
if (cpu_has_feature(CPU_FTR_ARCH_300))

‎arch/powerpc/kvm/book3s_hv_nestedv2.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,9 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb,
370370
* default to L1's PVR.
371371
*/
372372
if (!vcpu->arch.vcore->arch_compat) {
373-
if (cpu_has_feature(CPU_FTR_ARCH_31))
373+
if (cpu_has_feature(CPU_FTR_P11_PVR))
374+
arch_compat = PVR_ARCH_31_P11;
375+
else if (cpu_has_feature(CPU_FTR_ARCH_31))
374376
arch_compat = PVR_ARCH_31;
375377
else if (cpu_has_feature(CPU_FTR_ARCH_300))
376378
arch_compat = PVR_ARCH_300;

‎arch/powerpc/kvm/book3s_mmu_hpte.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@ void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
9292
spin_unlock(&vcpu3s->mmu_lock);
9393
}
9494

95-
static void free_pte_rcu(struct rcu_head *head)
96-
{
97-
struct hpte_cache *pte = container_of(head, struct hpte_cache, rcu_head);
98-
kmem_cache_free(hpte_cache, pte);
99-
}
100-
10195
static void invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
10296
{
10397
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
@@ -126,7 +120,7 @@ static void invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
126120

127121
spin_unlock(&vcpu3s->mmu_lock);
128122

129-
call_rcu(&pte->rcu_head, free_pte_rcu);
123+
kfree_rcu(pte, rcu_head);
130124
}
131125

132126
static void kvmppc_mmu_pte_flush_all(struct kvm_vcpu *vcpu)

‎arch/powerpc/kvm/trace_hv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ TRACE_EVENT_FN_COND(kvmppc_vcpu_stats,
538538
TP_printk("VCPU %d: l1_to_l2_cs_time=%llu ns l2_to_l1_cs_time=%llu ns l2_runtime=%llu ns",
539539
__entry->vcpu_id, __entry->l1_to_l2_cs,
540540
__entry->l2_to_l1_cs, __entry->l2_runtime),
541-
kmvhv_counters_tracepoint_regfunc, kmvhv_counters_tracepoint_unregfunc
541+
kvmhv_counters_tracepoint_regfunc, kvmhv_counters_tracepoint_unregfunc
542542
);
543543
#endif
544544
#endif /* _TRACE_KVM_HV_H */

0 commit comments

Comments
 (0)