mirror of
				https://github.com/kata-containers/kata-containers.git
				synced 2025-10-31 09:26:52 +00:00 
			
		
		
		
	tools: update QEMU to 6.2
bring Intel SGX support Changes tha may impact in Kata Containers Arm: The 'virt' machine now supports an emulated ITS The 'virt' machine now supports more than 123 CPUs in TCG emulation mode The pl031 real-time clock device now supports sending RTC_CHANGE QMP events PowerPC: Improved POWER10 support for the 'powernv' machine Initial support for POWER10 DD2.0 CPU added Added support for FORM2 PAPR NUMA descriptions in the "pseries" machine type s390x: Improved storage key emulation (e.g. fixed address handling, lazy storage key enablement for TCG, ...) New gen16 CPU features are now enabled automatically in the latest machine type KVM: Support for SGX in the virtual machine, using the /dev/sgx_vepc device on the host and the "memory-backend-epc" backend in QEMU. New "hv-apicv" CPU property (aliased to "hv-avic") sets the HV_DEPRECATING_AEOI_RECOMMENDED bit in CPUID[0x40000004].EAX. virtio-mem: QEMU now fully supports guest memory dumps with virtio-mem. QEMU now cleanly supports precopy migration, postcopy migration and background snapshots with virtio-mem. fixes #3902 Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
		| @@ -0,0 +1,81 @@ | |||||||
|  | From 29c4a3363bf287bb9a7b0342b1bc2dba3661c96c Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Fabiano Rosas <farosas@linux.ibm.com> | ||||||
|  | Date: Fri, 17 Dec 2021 17:57:18 +0100 | ||||||
|  | Subject: [PATCH] Revert "target/ppc: Move SPR_DSISR setting to powerpc_excp" | ||||||
|  | MIME-Version: 1.0 | ||||||
|  | Content-Type: text/plain; charset=UTF-8 | ||||||
|  | Content-Transfer-Encoding: 8bit | ||||||
|  |  | ||||||
|  | This reverts commit 336e91f85332dda0ede4c1d15b87a19a0fb898a2. | ||||||
|  |  | ||||||
|  | It breaks the --disable-tcg build: | ||||||
|  |  | ||||||
|  |  ../target/ppc/excp_helper.c:463:29: error: implicit declaration of | ||||||
|  |  function ‘cpu_ldl_code’ [-Werror=implicit-function-declaration] | ||||||
|  |  | ||||||
|  | We should not have TCG code in powerpc_excp because some kvm-only | ||||||
|  | routines use it indirectly to dispatch interrupts. See | ||||||
|  | kvm_handle_debug, spapr_mce_req_event and | ||||||
|  | spapr_do_system_reset_on_cpu. | ||||||
|  |  | ||||||
|  | We can re-introduce the change once we have split the interrupt | ||||||
|  | injection code between KVM and TCG. | ||||||
|  |  | ||||||
|  | Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> | ||||||
|  | Message-Id: <20211209173323.2166642-1-farosas@linux.ibm.com> | ||||||
|  | Signed-off-by: Cédric Le Goater <clg@kaod.org> | ||||||
|  | --- | ||||||
|  |  target/ppc/excp_helper.c | 21 ++++++++++++--------- | ||||||
|  |  1 file changed, 12 insertions(+), 9 deletions(-) | ||||||
|  |  | ||||||
|  | diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c | ||||||
|  | index feb3fd42e2..6ba0840e99 100644 | ||||||
|  | --- a/target/ppc/excp_helper.c | ||||||
|  | +++ b/target/ppc/excp_helper.c | ||||||
|  | @@ -464,15 +464,13 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) | ||||||
|  |          break; | ||||||
|  |      } | ||||||
|  |      case POWERPC_EXCP_ALIGN:     /* Alignment exception                      */ | ||||||
|  | +        /* Get rS/rD and rA from faulting opcode */ | ||||||
|  |          /* | ||||||
|  | -         * Get rS/rD and rA from faulting opcode. | ||||||
|  | -         * Note: We will only invoke ALIGN for atomic operations, | ||||||
|  | -         * so all instructions are X-form. | ||||||
|  | +         * Note: the opcode fields will not be set properly for a | ||||||
|  | +         * direct store load/store, but nobody cares as nobody | ||||||
|  | +         * actually uses direct store segments. | ||||||
|  |           */ | ||||||
|  | -        { | ||||||
|  | -            uint32_t insn = cpu_ldl_code(env, env->nip); | ||||||
|  | -            env->spr[SPR_DSISR] |= (insn & 0x03FF0000) >> 16; | ||||||
|  | -        } | ||||||
|  | +        env->spr[SPR_DSISR] |= (env->error_code & 0x03FF0000) >> 16; | ||||||
|  |          break; | ||||||
|  |      case POWERPC_EXCP_PROGRAM:   /* Program exception                        */ | ||||||
|  |          switch (env->error_code & ~0xF) { | ||||||
|  | @@ -1441,6 +1439,11 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, | ||||||
|  |                                   int mmu_idx, uintptr_t retaddr) | ||||||
|  |  { | ||||||
|  |      CPUPPCState *env = cs->env_ptr; | ||||||
|  | +    uint32_t insn; | ||||||
|  | + | ||||||
|  | +    /* Restore state and reload the insn we executed, for filling in DSISR.  */ | ||||||
|  | +    cpu_restore_state(cs, retaddr, true); | ||||||
|  | +    insn = cpu_ldl_code(env, env->nip); | ||||||
|  |   | ||||||
|  |      switch (env->mmu_model) { | ||||||
|  |      case POWERPC_MMU_SOFT_4xx: | ||||||
|  | @@ -1456,8 +1459,8 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, | ||||||
|  |      } | ||||||
|  |   | ||||||
|  |      cs->exception_index = POWERPC_EXCP_ALIGN; | ||||||
|  | -    env->error_code = 0; | ||||||
|  | -    cpu_loop_exit_restore(cs, retaddr); | ||||||
|  | +    env->error_code = insn & 0x03FF0000; | ||||||
|  | +    cpu_loop_exit(cs); | ||||||
|  |  } | ||||||
|  |  #endif /* CONFIG_TCG */ | ||||||
|  |  #endif /* !CONFIG_USER_ONLY */ | ||||||
|  | --  | ||||||
|  | GitLab | ||||||
|  |  | ||||||
| @@ -250,7 +250,6 @@ generate_qemu_options() { | |||||||
| 	qemu_options+=(size:--disable-auth-pam) | 	qemu_options+=(size:--disable-auth-pam) | ||||||
|  |  | ||||||
| 	# Disable unused filesystem support | 	# Disable unused filesystem support | ||||||
| 	[ "$arch" == x86_64 ] && qemu_options+=(size:--disable-fdt) |  | ||||||
| 	qemu_options+=(size:--disable-glusterfs) | 	qemu_options+=(size:--disable-glusterfs) | ||||||
| 	qemu_options+=(size:--disable-libiscsi) | 	qemu_options+=(size:--disable-libiscsi) | ||||||
| 	qemu_options+=(size:--disable-libnfs) | 	qemu_options+=(size:--disable-libnfs) | ||||||
| @@ -303,7 +302,6 @@ generate_qemu_options() { | |||||||
| 		;; | 		;; | ||||||
| 	esac | 	esac | ||||||
| 	qemu_options+=(size:--disable-qom-cast-debug) | 	qemu_options+=(size:--disable-qom-cast-debug) | ||||||
| 	qemu_options+=(size:--disable-tcmalloc) |  | ||||||
|  |  | ||||||
| 	# Disable libudev since it is only needed for qemu-pr-helper and USB, | 	# Disable libudev since it is only needed for qemu-pr-helper and USB, | ||||||
| 	# none of which are used with Kata | 	# none of which are used with Kata | ||||||
|   | |||||||
| @@ -88,8 +88,8 @@ assets: | |||||||
|     qemu: |     qemu: | ||||||
|       description: "VMM that uses KVM" |       description: "VMM that uses KVM" | ||||||
|       url: "https://github.com/qemu/qemu" |       url: "https://github.com/qemu/qemu" | ||||||
|       version: "v6.1.0" |       version: "v6.2.0" | ||||||
|       tag: "v6.1.0" |       tag: "v6.2.0" | ||||||
|       # Do not include any non-full release versions |       # Do not include any non-full release versions | ||||||
|       # Break the line *without CR or space being appended*, to appease |       # Break the line *without CR or space being appended*, to appease | ||||||
|       # yamllint, and note the deliberate ' ' at the end of the expression. |       # yamllint, and note the deliberate ' ' at the end of the expression. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user