Commit 1e79a9e3 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-6.2-1' of... 

Merge tag 'kvm-s390-next-6.2-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

- Second batch of the lazy destroy patches
- First batch of KVM changes for kernel virtual != physical address support
- Removal of a unused function
parents 29c46979 99b63f55

Documentation/virt/kvm/api.rst

+37 −4
Original line number Diff line number Diff line
@@ -5163,10 +5163,13 @@ KVM_PV_ENABLE 
  =====      =============================



KVM_PV_DISABLE

  Deregister the VM from the Ultravisor and reclaim the memory that

  had been donated to the Ultravisor, making it usable by the kernel

  again.  All registered VCPUs are converted back to non-protected

  ones.

  Deregister the VM from the Ultravisor and reclaim the memory that had

  been donated to the Ultravisor, making it usable by the kernel again.

  All registered VCPUs are converted back to non-protected ones. If a

  previous protected VM had been prepared for asynchonous teardown with

  KVM_PV_ASYNC_CLEANUP_PREPARE and not subsequently torn down with

  KVM_PV_ASYNC_CLEANUP_PERFORM, it will be torn down in this call

  together with the current protected VM.



KVM_PV_VM_SET_SEC_PARMS

  Pass the image header from VM memory to the Ultravisor in
@@ -5289,6 +5292,36 @@ KVM_PV_DUMP 
    authentication tag all of which are needed to decrypt the dump at a

    later time.



KVM_PV_ASYNC_CLEANUP_PREPARE

  :Capability: KVM_CAP_S390_PROTECTED_ASYNC_DISABLE



  Prepare the current protected VM for asynchronous teardown. Most

  resources used by the current protected VM will be set aside for a

  subsequent asynchronous teardown. The current protected VM will then

  resume execution immediately as non-protected. There can be at most

  one protected VM prepared for asynchronous teardown at any time. If

  a protected VM had already been prepared for teardown without

  subsequently calling KVM_PV_ASYNC_CLEANUP_PERFORM, this call will

  fail. In that case, the userspace process should issue a normal

  KVM_PV_DISABLE. The resources set aside with this call will need to

  be cleaned up with a subsequent call to KVM_PV_ASYNC_CLEANUP_PERFORM

  or KVM_PV_DISABLE, otherwise they will be cleaned up when KVM

  terminates. KVM_PV_ASYNC_CLEANUP_PREPARE can be called again as soon

  as cleanup starts, i.e. before KVM_PV_ASYNC_CLEANUP_PERFORM finishes.



KVM_PV_ASYNC_CLEANUP_PERFORM

  :Capability: KVM_CAP_S390_PROTECTED_ASYNC_DISABLE



  Tear down the protected VM previously prepared for teardown with

  KVM_PV_ASYNC_CLEANUP_PREPARE. The resources that had been set aside

  will be freed during the execution of this command. This PV command

  should ideally be issued by userspace from a separate thread. If a

  fatal signal is received (or the process terminates naturally), the

  command will terminate immediately without completing, and the normal

  KVM shutdown procedure will take care of cleaning up all remaining

  protected VMs, including the ones whose teardown was interrupted by

  process termination.



4.126 KVM_XEN_HVM_SET_ATTR

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

arch/s390/include/asm/kvm_host.h

+11 −3
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ struct mcck_volatile_info { 
			   CR14_EXTERNAL_DAMAGE_SUBMASK)



#define SIDAD_SIZE_MASK		0xff

#define sida_origin(sie_block) \

	((sie_block)->sidad & PAGE_MASK)

#define sida_addr(sie_block) phys_to_virt((sie_block)->sidad & PAGE_MASK)

#define sida_size(sie_block) \

	((((sie_block)->sidad & SIDAD_SIZE_MASK) + 1) * PAGE_SIZE)
@@ -276,6 +275,7 @@ struct kvm_s390_sie_block { 
#define ECB3_AES 0x04

#define ECB3_RI  0x01

	__u8    ecb3;			/* 0x0063 */

#define ESCA_SCAOL_MASK ~0x3fU

	__u32	scaol;			/* 0x0064 */

	__u8	sdf;			/* 0x0068 */

	__u8    epdx;			/* 0x0069 */
@@ -942,6 +942,8 @@ struct kvm_s390_pv { 
	unsigned long stor_base;

	void *stor_var;

	bool dumping;

	void *set_aside;

	struct list_head need_cleanup;

	struct mmu_notifier mmu_notifier;

};
@@ -1017,7 +1019,13 @@ void kvm_arch_crypto_clear_masks(struct kvm *kvm); 
void kvm_arch_crypto_set_masks(struct kvm *kvm, unsigned long *apm,

			       unsigned long *aqm, unsigned long *adm);



extern int sie64a(struct kvm_s390_sie_block *, u64 *);

int __sie64a(phys_addr_t sie_block_phys, struct kvm_s390_sie_block *sie_block, u64 *rsa);



static inline int sie64a(struct kvm_s390_sie_block *sie_block, u64 *rsa)

{

	return __sie64a(virt_to_phys(sie_block), sie_block, rsa);

}



extern char sie_exit;



extern int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc);

arch/s390/include/asm/mem_encrypt.h

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


#ifndef __ASSEMBLY__



int set_memory_encrypted(unsigned long addr, int numpages);

int set_memory_decrypted(unsigned long addr, int numpages);

int set_memory_encrypted(unsigned long vaddr, int numpages);

int set_memory_decrypted(unsigned long vaddr, int numpages);



#endif	/* __ASSEMBLY__ */

arch/s390/include/asm/stacktrace.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct stack_frame { 
			unsigned long sie_savearea;

			unsigned long sie_reason;

			unsigned long sie_flags;

			unsigned long sie_control_block_phys;

		};

	};

	unsigned long gprs[10];

arch/s390/include/asm/uv.h

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define UVC_CMD_INIT_UV			0x000f

#define UVC_CMD_CREATE_SEC_CONF		0x0100

#define UVC_CMD_DESTROY_SEC_CONF	0x0101

#define UVC_CMD_DESTROY_SEC_CONF_FAST	0x0102

#define UVC_CMD_CREATE_SEC_CPU		0x0120

#define UVC_CMD_DESTROY_SEC_CPU		0x0121

#define UVC_CMD_CONV_TO_SEC_STOR	0x0200
@@ -81,6 +82,7 @@ enum uv_cmds_inst { 
	BIT_UVC_CMD_UNSHARE_ALL = 20,

	BIT_UVC_CMD_PIN_PAGE_SHARED = 21,

	BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22,

	BIT_UVC_CMD_DESTROY_SEC_CONF_FAST = 23,

	BIT_UVC_CMD_DUMP_INIT = 24,

	BIT_UVC_CMD_DUMP_CONFIG_STOR_STATE = 25,

	BIT_UVC_CMD_DUMP_CPU = 26,
@@ -230,6 +232,14 @@ struct uv_cb_nodata { 
	u64 reserved20[4];

} __packed __aligned(8);



/* Destroy Configuration Fast */

struct uv_cb_destroy_fast {

	struct uv_cb_header header;

	u64 reserved08[2];

	u64 handle;

	u64 reserved20[5];

} __packed __aligned(8);



/* Set Shared Access */

struct uv_cb_share {

	struct uv_cb_header header;