Commit 4f4af841 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-ppc-next-5.7-1' of... 

Merge tag 'kvm-ppc-next-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD

KVM PPC update for 5.7

* Add a capability for enabling secure guests under the Protected
  Execution Framework ultravisor

* Various bug fixes and cleanups.
parents cf39d375 9a5788c6

Documentation/virt/kvm/api.rst

+17 −0
Original line number Diff line number Diff line
@@ -5785,6 +5785,23 @@ it hard or impossible to use it correctly. The availability of 
KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 signals that those bugs are fixed.

Userspace should not try to use KVM_CAP_MANUAL_DIRTY_LOG_PROTECT.



7.19 KVM_CAP_PPC_SECURE_GUEST

------------------------------



:Architectures: ppc



This capability indicates that KVM is running on a host that has

ultravisor firmware and thus can support a secure guest.  On such a

system, a guest can ask the ultravisor to make it a secure guest,

one whose memory is inaccessible to the host except for pages which

are explicitly requested to be shared with the host.  The ultravisor

notifies KVM when a guest requests to become a secure guest, and KVM

has the opportunity to veto the transition.



If present, this capability can be enabled for a VM, meaning that KVM

will allow the transition to secure guest mode.  Otherwise KVM will

veto the transition.



8. Other capabilities.

======================

arch/powerpc/include/asm/kvm_asm.h

+3 −0
Original line number Diff line number Diff line
@@ -150,4 +150,7 @@ 


#define KVM_INST_FETCH_FAILED	-1



/* Extract PO and XOP opcode fields */

#define PO_XOP_OPCODE_MASK 0xfc0007fe



#endif /* __POWERPC_KVM_ASM_H__ */

arch/powerpc/include/asm/kvm_book3s_uvmem.h

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#ifdef CONFIG_PPC_UV

int kvmppc_uvmem_init(void);

void kvmppc_uvmem_free(void);

bool kvmppc_uvmem_available(void);

int kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot);

void kvmppc_uvmem_slot_free(struct kvm *kvm,

			    const struct kvm_memory_slot *slot);
@@ -30,6 +31,11 @@ static inline int kvmppc_uvmem_init(void) 


static inline void kvmppc_uvmem_free(void) { }



static inline bool kvmppc_uvmem_available(void)

{

	return false;

}



static inline int

kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot)

{

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ struct kvm_arch { 
	u8 radix;

	u8 fwnmi_enabled;

	u8 secure_guest;

	u8 svm_enabled;

	bool threads_indep;

	bool nested_enable;

	pgd_t *pgtable;

arch/powerpc/include/asm/kvm_ppc.h

+1 −3
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, 
                           unsigned int gtlb_idx);

extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);

extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);

extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_init(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
@@ -289,7 +287,6 @@ struct kvmppc_ops { 
	int (*age_hva)(struct kvm *kvm, unsigned long start, unsigned long end);

	int (*test_age_hva)(struct kvm *kvm, unsigned long hva);

	void (*set_spte_hva)(struct kvm *kvm, unsigned long hva, pte_t pte);

	void (*mmu_destroy)(struct kvm_vcpu *vcpu);

	void (*free_memslot)(struct kvm_memory_slot *slot);

	int (*init_vm)(struct kvm *kvm);

	void (*destroy_vm)(struct kvm *kvm);
@@ -316,6 +313,7 @@ struct kvmppc_ops { 
			       int size);

	int (*store_to_eaddr)(struct kvm_vcpu *vcpu, ulong *eaddr, void *ptr,

			      int size);

	int (*enable_svm)(struct kvm *kvm);

	int (*svm_off)(struct kvm *kvm);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE