Support for H_REG_SNS hcall
cover Support for H_REG_SNS hcall
Add support for H_REG_SNS hcall which will be used by the guest to make use of Expropriation/Subvention Notification option aka asynchronous page fault support.
The kernel enablement patches are posted here:
https://lore.kernel.org/linuxppc-dev/[email protected]/T/#t
Bharata B Rao (2):
spapr: Add H_REG_SNS hcall
ppc,spapr: Handle KVM_EXIT_ESN
hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 56 +++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 3 ++ include/hw/ppc/spapr_irq.h | 1 + linux-headers/asm-powerpc/kvm.h | 6 ++++ linux-headers/linux/kvm.h | 2 ++ target/ppc/kvm.c | 30 ++++++++++++++++++ target/ppc/kvm_ppc.h | 10 ++++++ 8 files changed, 111 insertions(+)
Signature · 1 line
2.31.1
RFC PATCH 1/2 spapr: Add H_REG_SNS hcall
Add support for H_REG_SNS hcall so that asynchronous page fault mechanism can be supported on PowerKVM guests.
This hcall essentially issues KVM_PPC_SET_SNS to let the host map and pin the memory containing the Subvention Notification Structure. It also claims SPAPR_IRQ_SNS to be used as subvention notification interrupt.
Note: Updates to linux-headers/linux/kvm.h are temporary pending headers update.
--- hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 56 +++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 3 ++ include/hw/ppc/spapr_irq.h | 1 + linux-headers/asm-powerpc/kvm.h | 6 ++++ linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 14 +++++++++ target/ppc/kvm_ppc.h | 10 ++++++ 8 files changed, 94 insertions(+)
hw/ppc/spapr.c +3 -0
@@ -2830,6 +2830,9 @@ static void spapr_machine_init(MachineState *machine)/* Enable H_PAGE_INIT */ kvmppc_enable_h_page_init (); + +/* Enable H_REG_SNS */ +kvmppc_enable_h_reg_sns (); }/* map RAM */
hw/ppc/spapr_hcall.c +56 -0
68 lines not on this page · raw message
include/hw/ppc/spapr.h +3 -0
@@ -252,6 +252,8 @@ struct SpaprMachineState {uint32_t numa_assoc_array[MAX_NODES +NVGPU_MAX_NUM ][NUMA_ASSOC_SIZE ];Error *fwnmi_migration_blocker; +uint64_t sns_addr; +uint64_t sns_len; };#define H_SUCCESS 0
@@ -549,6 +551,7 @@ struct SpaprMachineState {#define H_SCM_UNBIND_MEM 0x3F0#define H_SCM_UNBIND_ALL 0x3FC#define H_SCM_HEALTH 0x400 +#define H_REG_SNS 0x41C#define H_RPT_INVALIDATE 0x448#define MAX_HCALL_OPCODE H_RPT_INVALIDATE
include/hw/ppc/spapr_irq.h +1 -0
@@ -21,6 +21,7 @@#define SPAPR_XIRQ_BASE XICS_IRQ_BASE/* 0x1000 */ #define SPAPR_IRQ_EPOW (SPAPR_XIRQ_BASE + 0x0000)#define SPAPR_IRQ_HOTPLUG (SPAPR_XIRQ_BASE + 0x0001) +#define SPAPR_IRQ_SNS (SPAPR_XIRQ_BASE + 0x0002)#define SPAPR_IRQ_VIO (SPAPR_XIRQ_BASE + 0x0100)/* 256 VIO devices */ #define SPAPR_IRQ_PCI_LSI (SPAPR_XIRQ_BASE + 0x0200)/* 32+ PHBs devices */
linux-headers/asm-powerpc/kvm.h +6 -0
@@ -470,6 +470,12 @@ struct kvm_ppc_cpu_char {#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58) +/* For KVM_PPC_SET_SNS */ +struct kvm_ppc_sns_reg { +__u64 addr; +__u64 len; +}; +/* Per-vcpu XICS interrupt controller state */ #define KVM_REG_PPC_ICP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)
linux-headers/linux/kvm.h +1 -0
@@ -1458,6 +1458,7 @@ struct kvm_s390_ucas_mapping {#define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter)#define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)#define KVM_ARM_MTE_COPY_TAGS _IOR(KVMIO, 0xb4, struct kvm_arm_copy_mte_tags) +#define KVM_PPC_SET_SNS _IOR(KVMIO, 0xb5, struct kvm_ppc_sns_reg)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
target/ppc/kvm.c +14 -0
@@ -2047,6 +2047,11 @@ void kvmppc_enable_h_rpt_invalidate(void)kvmppc_enable_hcall (kvm_state,H_RPT_INVALIDATE ); } +void kvmppc_enable_h_reg_sns (void ) +{ +kvmppc_enable_hcall (kvm_state,H_REG_SNS ); +} +void kvmppc_set_papr (PowerPCCPU *cpu) {CPUState *cs =CPU (cpu);
@@ -2959,3 +2964,12 @@ bool kvm_arch_cpu_check_are_resettable(void) {return true; } + +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len) +{ +struct kvm_ppc_sns_reg sns_reg; + + sns_reg.addr = addr; + sns_reg.len = len; +return kvm_vm_ioctl (kvm_state,KVM_PPC_SET_SNS , &sns_reg); +}
target/ppc/kvm_ppc.h +10 -0
@@ -25,6 +25,7 @@ void kvmppc_enable_set_mode_hcall(void);void kvmppc_enable_clear_ref_mod_hcalls (void );void kvmppc_enable_h_page_init (void );void kvmppc_enable_h_rpt_invalidate (void ); +void kvmppc_enable_h_reg_sns (void );void kvmppc_set_papr (PowerPCCPU *cpu);int kvmppc_set_compat (PowerPCCPU *cpu,uint32_t compat_pvr);void kvmppc_set_mpic_proxy (PowerPCCPU *cpu,int mpic_proxy);
@@ -87,6 +88,7 @@ void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online);void kvmppc_set_reg_tb_offset (PowerPCCPU *cpu,int64_t tb_offset);int kvm_handle_nmi (PowerPCCPU *cpu,struct kvm_run *run); +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len);#else
@@ -157,6 +159,10 @@ static inline void kvmppc_enable_h_rpt_invalidate(void)g_assert_not_reached (); } +static inline void kvmppc_enable_h_reg_sns (void ) +{ +} +static inline void kvmppc_set_papr (PowerPCCPU *cpu) { }
@@ -430,6 +436,10 @@ static inline bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu) return false; } +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len) +{ +return -ENOSYS ; +}#endif #ifndef CONFIG_KVM
Signature · 1 line
2.31.1
Re: [RFC PATCH v0 1/2] spapr: Add H_REG_SNS hcall
Quoted 12 lines · Bharata B Rao
Add support for
H_REG_SNShcall so that asynchronous page fault mechanism can be supported on PowerKVM guests.This hcall essentially issues
KVM_PPC_SET_SNSto let the host map and pin the memory containing the Subvention Notification Structure. It also claimsSPAPR_IRQ_SNSto be used as subvention notification interrupt.Note: Updates to
linux-headers/linux/kvm.hare temporary pending headers update.Signed-off-by Bharata B Rao <[email protected]>
...
Quoted 7 lines
hw/ppc/spapr_hcall.c +7
-0+static target_ulong h_reg_sns (PowerPCCPU *cpu,SpaprMachineState *spapr, +target_ulong opcode,target_ulong *args) +{ +target_ulong addr = args[0 ]; +target_ulong len = args[1 ]; + +if (addr ==-1 ) {
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1433
Quoted 10 lines
hw/ppc/spapr_hcall.c +10
-0+return deregister_sns (cpu, spapr); + } + +/* +* If SNS area is already registered, can't register again before +* deregistering it first. +*/ +if (spapr->sns_addr ==-1 ) { +return H_PARAMETER ; + }
Don't you mean (spapr->sns_addr != -1) ?
Quoted 26 lines
hw/ppc/spapr_hcall.c +26
-0+ +if (!QEMU_IS_ALIGNED (addr,4096 )) { +return H_PARAMETER ; + } + +if (len <256 ) { +return H_P2 ; + } + +/* TODO: SNS area is not allowed to cross a page boundary */ + +/* KVM_PPC_SET_SNS ioctl */ +if (kvmppc_set_sns_reg (addr, len)) { +return H_PARAMETER ; + } + +/* Record SNS addr and len */ + spapr->sns_addr = addr; + spapr->sns_len = len; + +/* Register irq source for sending ESN notification */ +spapr_irq_claim (spapr,SPAPR_IRQ_SNS , false, &error_fatal); + args[1 ] =SPAPR_IRQ_SNS ;/* irq no in R5 */ + +return H_SUCCESS ; +}
Re: [RFC PATCH v0 1/2] spapr: Add H_REG_SNS hcall
In reply to Bharata B RaoQuoted 59 lines · Bharata B Rao
Add support for
H_REG_SNShcall so that asynchronous page fault mechanism can be supported on PowerKVM guests.This hcall essentially issues
KVM_PPC_SET_SNSto let the host map and pin the memory containing the Subvention Notification Structure. It also claimsSPAPR_IRQ_SNSto be used as subvention notification interrupt.Note: Updates to
linux-headers/linux/kvm.hare temporary pending headers update.Signed-off-by Bharata B Rao <[email protected]>--- hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 56 +++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 3 ++ include/hw/ppc/spapr_irq.h | 1 + linux-headers/asm-powerpc/kvm.h | 6 ++++ linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 14 +++++++++ target/ppc/kvm_ppc.h | 10 ++++++ 8 files changed, 94 insertions(+)hw/ppc/spapr.c +3
-0@@ -2830,6 +2830,9 @@ static void spapr_machine_init(MachineState *machine)/* Enable H_PAGE_INIT */ kvmppc_enable_h_page_init (); + +/* Enable H_REG_SNS */ +kvmppc_enable_h_reg_sns (); }/* map RAM */ hw/ppc/spapr_hcall.c +14
-0@@ -1405,6 +1405,59 @@ static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr,return H_SUCCESS ; } +static target_ulong deregister_sns (PowerPCCPU *cpu,SpaprMachineState *spapr) +{ + spapr->sns_addr =-1 ; + spapr->sns_len =0 ; +spapr_irq_free (spapr,SPAPR_IRQ_SNS ,1 ); + +return H_SUCCESS ; +} + +static target_ulong h_reg_sns (PowerPCCPU *cpu,SpaprMachineState *spapr, +target_ulong opcode,target_ulong *args) +{ +target_ulong addr = args[0 ]; +target_ulong len = args[1 ];
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1431
Quoted 10 lines
hw/ppc/spapr_hcall.c +10
-0+ +if (addr ==-1 ) { +return deregister_sns (cpu, spapr); + } + +/* +* If SNS area is already registered, can't register again before +* deregistering it first. +*/ +if (spapr->sns_addr ==-1 ) {
As Fabiano says, it looks like the logic is reversed here.
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1432
Quoted 1 line
hw/ppc/spapr_hcall.c +1
-0+return H_PARAMETER ;
Also, H_PARAMETER doesn't seem like the right error for this case. H_BUSY, maybe?
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1435
Quoted 3 lines
hw/ppc/spapr_hcall.c +3
-0+ } + +if (!QEMU_IS_ALIGNED (addr,4096 )) {
What's the significance of 4096 here? Should this be one of the page size defines instead?
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1439
Quoted 4 lines
hw/ppc/spapr_hcall.c +4
-0+return H_PARAMETER ; + } + +if (len <256 ) {
A defined constant (SPAPR_MIN_SNS_SIZE?) would be worthwhile here, I think.
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1446
Quoted 7 lines
hw/ppc/spapr_hcall.c +7
-0+return H_P2 ; + } + +/* TODO: SNS area is not allowed to cross a page boundary */ + +/* KVM_PPC_SET_SNS ioctl */ +if (kvmppc_set_sns_reg (addr, len)) {
What will happen if you attempt this on a TCG system?
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1455
Quoted 9 lines
hw/ppc/spapr_hcall.c +9
-0+return H_PARAMETER ; + } + +/* Record SNS addr and len */ + spapr->sns_addr = addr; + spapr->sns_len = len; + +/* Register irq source for sending ESN notification */ +spapr_irq_claim (spapr,SPAPR_IRQ_SNS , false, &error_fatal);
I don't think &error_fatal can be right here. AFAICT this must be one of two cases:
1) This should never fail, no matter what the guest does. If it does fail, that indicates a qemu bug. In that case &error_abort is more appropriate
2) This could fail for certain sequences of guest actions. If that's the case, we shouldn't kill qemu, but should return H_HARDWARE (or something) instead.
Quoted 9 lines
hw/ppc/spapr_hcall.c +5
-0+ args[1 ] =SPAPR_IRQ_SNS ;/* irq no in R5 */ + +return H_SUCCESS ; +} +static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE /4 ) +1 ];static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX -KVMPPC_HCALL_BASE +1 ];static spapr_hcall_fn svm_hypercall_table[(SVM_HCALL_MAX -SVM_HCALL_BASE ) /4 +1 ];
hw/ppc/spapr_hcall.c static void hypercall_register_types(void) · line 1603
Quoted 6 lines
hw/ppc/spapr_hcall.c +3
-0@@ -1545,6 +1598,9 @@ static void hypercall_register_types(void)spapr_register_hypercall (KVMPPC_H_CAS , h_client_architecture_support);spapr_register_hypercall (KVMPPC_H_UPDATE_DT , h_update_dt); + +/* SNS memory area registration */ +spapr_register_hypercall (H_REG_SNS , h_reg_sns);
You definitely need a machine parameter to enable this, and you should only enable it by default for newer machine types. Otherwise you will cause migration breakages.
Quoted 41 lines
hw/ppc/spapr_hcall.c +0
-0}type_init (hypercall_register_types)include/hw/ppc/spapr.h +3
-0@@ -252,6 +252,8 @@ struct SpaprMachineState {uint32_t numa_assoc_array[MAX_NODES +NVGPU_MAX_NUM ][NUMA_ASSOC_SIZE ];Error *fwnmi_migration_blocker; +uint64_t sns_addr; +uint64_t sns_len; };#define H_SUCCESS 0@@ -549,6 +551,7 @@ struct SpaprMachineState {#define H_SCM_UNBIND_MEM 0x3F0#define H_SCM_UNBIND_ALL 0x3FC#define H_SCM_HEALTH 0x400 +#define H_REG_SNS 0x41C#define H_RPT_INVALIDATE 0x448#define MAX_HCALL_OPCODE H_RPT_INVALIDATEinclude/hw/ppc/spapr_irq.h +1
-0@@ -21,6 +21,7 @@#define SPAPR_XIRQ_BASE XICS_IRQ_BASE/* 0x1000 */ #define SPAPR_IRQ_EPOW (SPAPR_XIRQ_BASE + 0x0000)#define SPAPR_IRQ_HOTPLUG (SPAPR_XIRQ_BASE + 0x0001) +#define SPAPR_IRQ_SNS (SPAPR_XIRQ_BASE + 0x0002)#define SPAPR_IRQ_VIO (SPAPR_XIRQ_BASE + 0x0100)/* 256 VIO devices */ #define SPAPR_IRQ_PCI_LSI (SPAPR_XIRQ_BASE + 0x0200)/* 32+ PHBs devices */ linux-headers/asm-powerpc/kvm.h +0
-0
linux-headers/asm-powerpc/kvm.h struct kvm_ppc_cpu_char { · line 478
Quoted 9 lines
linux-headers/asm-powerpc/kvm.h +6
-0@@ -470,6 +470,12 @@ struct kvm_ppc_cpu_char {#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58) +/* For KVM_PPC_SET_SNS */ +struct kvm_ppc_sns_reg { +__u64 addr; +__u64 len; +}; +
Updates to linux-headers/ should be done as a separate preliminary patch, listing the specific kernel commit that you're updating too.
Quoted 86 lines
linux-headers/asm-powerpc/kvm.h +0
-0/* Per-vcpu XICS interrupt controller state */ #define KVM_REG_PPC_ICP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)linux-headers/linux/kvm.h +1
-0@@ -1458,6 +1458,7 @@ struct kvm_s390_ucas_mapping {#define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter)#define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)#define KVM_ARM_MTE_COPY_TAGS _IOR(KVMIO, 0xb4, struct kvm_arm_copy_mte_tags) +#define KVM_PPC_SET_SNS _IOR(KVMIO, 0xb5, struct kvm_ppc_sns_reg)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)target/ppc/kvm.c +14
-0@@ -2047,6 +2047,11 @@ void kvmppc_enable_h_rpt_invalidate(void)kvmppc_enable_hcall (kvm_state,H_RPT_INVALIDATE ); } +void kvmppc_enable_h_reg_sns (void ) +{ +kvmppc_enable_hcall (kvm_state,H_REG_SNS ); +} +void kvmppc_set_papr (PowerPCCPU *cpu) {CPUState *cs =CPU (cpu);@@ -2959,3 +2964,12 @@ bool kvm_arch_cpu_check_are_resettable(void) {return true; } + +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len) +{ +struct kvm_ppc_sns_reg sns_reg; + + sns_reg.addr = addr; + sns_reg.len = len; +return kvm_vm_ioctl (kvm_state,KVM_PPC_SET_SNS , &sns_reg); +}target/ppc/kvm_ppc.h +10
-0@@ -25,6 +25,7 @@ void kvmppc_enable_set_mode_hcall(void);void kvmppc_enable_clear_ref_mod_hcalls (void );void kvmppc_enable_h_page_init (void );void kvmppc_enable_h_rpt_invalidate (void ); +void kvmppc_enable_h_reg_sns (void );void kvmppc_set_papr (PowerPCCPU *cpu);int kvmppc_set_compat (PowerPCCPU *cpu,uint32_t compat_pvr);void kvmppc_set_mpic_proxy (PowerPCCPU *cpu,int mpic_proxy);@@ -87,6 +88,7 @@ void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online);void kvmppc_set_reg_tb_offset (PowerPCCPU *cpu,int64_t tb_offset);int kvm_handle_nmi (PowerPCCPU *cpu,struct kvm_run *run); +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len);#else @@ -157,6 +159,10 @@ static inline void kvmppc_enable_h_rpt_invalidate(void)g_assert_not_reached (); } +static inline void kvmppc_enable_h_reg_sns (void ) +{ +} +static inline void kvmppc_set_papr (PowerPCCPU *cpu) { }@@ -430,6 +436,10 @@ static inline bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu) return false; } +int kvmppc_set_sns_reg (target_ulong addr,target_ulong len) +{ +return -ENOSYS ; +}#endif #ifndef CONFIG_KVM
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [RFC PATCH v0 1/2] spapr: Add H_REG_SNS hcall
Quoted 64 lines · David Gibson
Quoted 63 lines · Bharata B Rao
Add support for
H_REG_SNShcall so that asynchronous page fault mechanism can be supported on PowerKVM guests.This hcall essentially issues
KVM_PPC_SET_SNSto let the host map and pin the memory containing the Subvention Notification Structure. It also claimsSPAPR_IRQ_SNSto be used as subvention notification interrupt.Note: Updates to
linux-headers/linux/kvm.hare temporary pending headers update.Signed-off-by Bharata B Rao <[email protected]>--- hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 56 +++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 3 ++ include/hw/ppc/spapr_irq.h | 1 + linux-headers/asm-powerpc/kvm.h | 6 ++++ linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 14 +++++++++ target/ppc/kvm_ppc.h | 10 ++++++ 8 files changed, 94 insertions(+)hw/ppc/spapr.c +3
-0@@ -2830,6 +2830,9 @@ static void spapr_machine_init(MachineState *machine)/* Enable H_PAGE_INIT */ kvmppc_enable_h_page_init (); + +/* Enable H_REG_SNS */ +kvmppc_enable_h_reg_sns (); }/* map RAM */ hw/ppc/spapr_hcall.c +18
-0@@ -1405,6 +1405,59 @@ static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr,return H_SUCCESS ; } +static target_ulong deregister_sns (PowerPCCPU *cpu,SpaprMachineState *spapr) +{ + spapr->sns_addr =-1 ; + spapr->sns_len =0 ; +spapr_irq_free (spapr,SPAPR_IRQ_SNS ,1 ); + +return H_SUCCESS ; +} + +static target_ulong h_reg_sns (PowerPCCPU *cpu,SpaprMachineState *spapr, +target_ulong opcode,target_ulong *args) +{ +target_ulong addr = args[0 ]; +target_ulong len = args[1 ]; + +if (addr ==-1 ) { +return deregister_sns (cpu, spapr); + }
Quoted 8 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1431
Quoted 6 lines
hw/ppc/spapr_hcall.c +6
-0+ +/* +* If SNS area is already registered, can't register again before +* deregistering it first. +*/ +if (spapr->sns_addr ==-1 ) {As Fabiano says, it looks like the logic is reversed here.
Correct.
Quoted 5 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1432
Quoted 2 lines
hw/ppc/spapr_hcall.c +1
-0+return H_PARAMETER ;Also,
H_PARAMETERdoesn't seem like the right error for this case.H_BUSY, maybe?
Yes we may return H_BUSY.
Quoted 7 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1435
Quoted 4 lines
hw/ppc/spapr_hcall.c +3
-0+ } + +if (!QEMU_IS_ALIGNED (addr,4096 )) {What's the significance of 4096 here? Should this be one of the page size defines instead?
PAPR specifies this alignment.
"If the Address parameter is not 4K aligned in the valid logical address space of the caller, then return H_Parameter."
Quoted 7 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1439
Quoted 5 lines
hw/ppc/spapr_hcall.c +4
-0+return H_PARAMETER ; + } + +if (len <256 ) {A defined constant (
SPAPR_MIN_SNS_SIZE?) would be worthwhile here, I think.
Yes.
Quoted 10 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1446
Quoted 8 lines
hw/ppc/spapr_hcall.c +7
-0+return H_P2 ; + } + +/* TODO: SNS area is not allowed to cross a page boundary */ + +/* KVM_PPC_SET_SNS ioctl */ +if (kvmppc_set_sns_reg (addr, len)) {What will happen if you attempt this on a TCG system?
We should have a variant of kvmppc_set_sns_reg() for TCG that returns error, so that this hcall can fail.
Quoted 11 lines
hw/ppc/spapr_hcall.c static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, · line 1455
Quoted 10 lines
hw/ppc/spapr_hcall.c +9
-0+return H_PARAMETER ; + } + +/* Record SNS addr and len */ + spapr->sns_addr = addr; + spapr->sns_len = len; + +/* Register irq source for sending ESN notification */ +spapr_irq_claim (spapr,SPAPR_IRQ_SNS , false, &error_fatal);
Quoted 8 lines
I don't think
&error_fatalcan be right here. AFAICT this must be one of two cases:
1) This should never fail, no matter what the guest does. If it does fail, that indicates a qemu bug. In that case&error_abortis more appropriate
2) This could fail for certain sequences of guest actions. If that's the case, we shouldn't kill qemu, but should returnH_HARDWARE(or something) instead.
I think we could just check for error and return failure so that the guest wouldn't go ahead and enable async-pf feature.
Quoted 12 lines
Quoted 12 lines
hw/ppc/spapr_hcall.c +5
-0+ args[1 ] =SPAPR_IRQ_SNS ;/* irq no in R5 */ + +return H_SUCCESS ; +} +static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE /4 ) +1 ];static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX -KVMPPC_HCALL_BASE +1 ];static spapr_hcall_fn svm_hypercall_table[(SVM_HCALL_MAX -SVM_HCALL_BASE ) /4 +1 ];@@ -1545,6 +1598,9 @@ static void hypercall_register_types(void)spapr_register_hypercall (KVMPPC_H_CAS , h_client_architecture_support);
Quoted 8 lines
hw/ppc/spapr_hcall.c static void hypercall_register_types(void) · line 1603
Quoted 4 lines
hw/ppc/spapr_hcall.c +3
-0spapr_register_hypercall (KVMPPC_H_UPDATE_DT , h_update_dt); + +/* SNS memory area registration */ +spapr_register_hypercall (H_REG_SNS , h_reg_sns);You definitely need a machine parameter to enable this, and you should only enable it by default for newer machine types. Otherwise you will cause migration breakages.
Sure.
Quoted 45 lines
Quoted 45 lines
hw/ppc/spapr_hcall.c +0
-0}type_init (hypercall_register_types)include/hw/ppc/spapr.h +3
-0@@ -252,6 +252,8 @@ struct SpaprMachineState {uint32_t numa_assoc_array[MAX_NODES +NVGPU_MAX_NUM ][NUMA_ASSOC_SIZE ];Error *fwnmi_migration_blocker; +uint64_t sns_addr; +uint64_t sns_len; };#define H_SUCCESS 0@@ -549,6 +551,7 @@ struct SpaprMachineState {#define H_SCM_UNBIND_MEM 0x3F0#define H_SCM_UNBIND_ALL 0x3FC#define H_SCM_HEALTH 0x400 +#define H_REG_SNS 0x41C#define H_RPT_INVALIDATE 0x448#define MAX_HCALL_OPCODE H_RPT_INVALIDATEinclude/hw/ppc/spapr_irq.h +1
-0@@ -21,6 +21,7 @@#define SPAPR_XIRQ_BASE XICS_IRQ_BASE/* 0x1000 */ #define SPAPR_IRQ_EPOW (SPAPR_XIRQ_BASE + 0x0000)#define SPAPR_IRQ_HOTPLUG (SPAPR_XIRQ_BASE + 0x0001) +#define SPAPR_IRQ_SNS (SPAPR_XIRQ_BASE + 0x0002)#define SPAPR_IRQ_VIO (SPAPR_XIRQ_BASE + 0x0100)/* 256 VIO devices */ #define SPAPR_IRQ_PCI_LSI (SPAPR_XIRQ_BASE + 0x0200)/* 32+ PHBs devices */ linux-headers/asm-powerpc/kvm.h +0
-0@@ -470,6 +470,12 @@ struct kvm_ppc_cpu_char {#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58)
Quoted 9 lines
linux-headers/asm-powerpc/kvm.h struct kvm_ppc_cpu_char { · line 478
Quoted 6 lines
linux-headers/asm-powerpc/kvm.h +6
-0+/* For KVM_PPC_SET_SNS */ +struct kvm_ppc_sns_reg { +__u64 addr; +__u64 len; +}; +Updates to linux-headers/ should be done as a separate preliminary patch, listing the specific kernel commit that you're updating too.
Yes, I am aware of it. Since the kernel patches are still in RFC state, I noted this as a TODO in patch description :-)
Thanks for your review.
Regards,
Bharata.
Re: [RFC PATCH v0 1/2] spapr: Add H_REG_SNS hcall
Quoted 2 lines · Bharata B Rao
Quoted 1 line · David Gibson
On Thu, Aug 05, 2021 at 01:02:27PM +0530, Bharata B Rao wrote:
[snip]
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
linux-headers/asm-powerpc/kvm.h +0
-0@@ -470,6 +470,12 @@ struct kvm_ppc_cpu_char {#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58)Quoted 9 lines
linux-headers/asm-powerpc/kvm.h struct kvm_ppc_cpu_char { · line 478
Quoted 6 lines
linux-headers/asm-powerpc/kvm.h +6
-0+/* For KVM_PPC_SET_SNS */ +struct kvm_ppc_sns_reg { +__u64 addr; +__u64 len; +}; +Updates to linux-headers/ should be done as a separate preliminary patch, listing the specific kernel commit that you're updating too.
Quoted 2 lines
Yes, I am aware of it. Since the kernel patches are still in RFC state, I noted this as a TODO in patch description :-)
Sorry, I missed that. In general, even for draft posts, I'd suggest doing the linux-headers/ updates as a separate patch (but you can construct that ad-hoc).
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
RFC PATCH 2/2 ppc,spapr: Handle KVM_EXIT_ESN
In reply to Bharata B RaoHandle KVM_EXIT_ESN exit by issuing subvention notification interrupt to the guest. Guests supporting async-pf feature will need this interrupt to wake up tasks that are waiting for the expropriated pages to be available.
Note: Updates to linux-headers/linux/kvm.h are temporary pending headers update.
--- linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)
linux-headers/linux/kvm.h +1 -0
@@ -269,6 +269,7 @@ struct kvm_xen_exit {#define KVM_EXIT_AP_RESET_HOLD 32#define KVM_EXIT_X86_BUS_LOCK 33#define KVM_EXIT_XEN 34 +#define KVM_EXIT_ESN 35/* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */
target/ppc/kvm.c +16 -0
@@ -38,6 +38,7 @@#include "hw/ppc/spapr_cpu_core.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" +#include "hw/irq.h" #include "migration/qemu-file-types.h" #include "sysemu/watchdog.h" #include "trace.h"
@@ -1657,6 +1658,16 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)return DEBUG_RETURN_GUEST ; } +#if defined(TARGET_PPC64 ) +static void kvmppc_handle_esn (PowerPCCPU *cpu) +{ +SpaprMachineState *spapr =SPAPR_MACHINE (qdev_get_machine ()); + +fprintf (stderr,"%s: ESN exit\n" , __func__); +qemu_irq_pulse (spapr_qirq (spapr,SPAPR_IRQ_SNS )); +} +#endif +int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run) {PowerPCCPU *cpu =POWERPC_CPU (cs);
@@ -1687,6 +1698,11 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) run->papr_hcall.args); ret =0 ;break ; + +case KVM_EXIT_ESN : +kvmppc_handle_esn (cpu); + ret =0 ; +break ;#endif case KVM_EXIT_EPR :trace_kvm_handle_epr ();
Signature · 1 line
2.31.1
Re: [RFC PATCH v0 2/2] ppc,spapr: Handle KVM_EXIT_ESN
Quoted 13 lines · Bharata B Rao
Handle
KVM_EXIT_ESNexit by issuing subvention notification interrupt to the guest. Guests supporting async-pf feature will need this interrupt to wake up tasks that are waiting for the expropriated pages to be available.Note: Updates to
linux-headers/linux/kvm.hare temporary pending headers update.Signed-off-by Bharata B Rao <[email protected]>--- linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)
...
Quoted 4 lines
target/ppc/kvm.c +0
-0
...
target/ppc/kvm.c static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run) · line 1666
Quoted 10 lines
target/ppc/kvm.c +6
-0@@ -1657,6 +1658,16 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)return DEBUG_RETURN_GUEST ; } +#if defined(TARGET_PPC64 ) +static void kvmppc_handle_esn (PowerPCCPU *cpu) +{ +SpaprMachineState *spapr =SPAPR_MACHINE (qdev_get_machine ()); + +fprintf (stderr,"%s: ESN exit\n" , __func__);
Do you keep this fprintf() on purpose?
You should use trace framework to add debugging traces.
Thanks,
Laurent
Re: [RFC PATCH v0 2/2] ppc,spapr: Handle KVM_EXIT_ESN
Quoted 24 lines · Laurent Vivier
Quoted 13 lines · Bharata B Rao
Handle
KVM_EXIT_ESNexit by issuing subvention notification interrupt to the guest. Guests supporting async-pf feature will need this interrupt to wake up tasks that are waiting for the expropriated pages to be available.Note: Updates to
linux-headers/linux/kvm.hare temporary pending headers update.Signed-off-by Bharata B Rao <[email protected]>--- linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)...
Quoted 4 lines
target/ppc/kvm.c +0
-0...
Quoted 4 lines
target/ppc/kvm.c +0
-0@@ -1657,6 +1658,16 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)return DEBUG_RETURN_GUEST ; }
Quoted 8 lines
target/ppc/kvm.c static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run) · line 1666
Quoted 6 lines
target/ppc/kvm.c +6
-0+#if defined(TARGET_PPC64 ) +static void kvmppc_handle_esn (PowerPCCPU *cpu) +{ +SpaprMachineState *spapr =SPAPR_MACHINE (qdev_get_machine ()); + +fprintf (stderr,"%s: ESN exit\n" , __func__);Do you keep this
fprintf()on purpose?
Not really, just that it survived the pre-post cleanup :-(
Regards,
Bharata.