kvm: selftests: hide vcpu_setup in processor code (837ec79b) · Commits · 戴 / test

tools/testing/selftests/kvm/include/kvm_util.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -88,8 +88,7 @@ int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
		void *arg);
		void vm_ioctl(struct kvm_vm vm, unsigned long ioctl, void arg);
		void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);
		void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot,
		int gdt_memslot);
		void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid);
		vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,
		uint32_t data_memslot, uint32_t pgd_memslot);
		void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

+17 −15

Original line number	Diff line number	Diff line
		@@ -235,21 +235,7 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,
		return vm;
		}

		void vm_vcpu_add_default(struct kvm_vm vm, uint32_t vcpuid, void guest_code)
		{
		size_t stack_size = vm->page_size == 4096 ?
		DEFAULT_STACK_PGS * vm->page_size :
		vm->page_size;
		uint64_t stack_vaddr = vm_vaddr_alloc(vm, stack_size,
		DEFAULT_ARM64_GUEST_STACK_VADDR_MIN, 0, 0);

		vm_vcpu_add(vm, vcpuid, 0, 0);

		set_reg(vm, vcpuid, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size);
		set_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code);
		}

		void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)
		static void vcpu_setup(struct kvm_vm *vm, int vcpuid)
		{
		struct kvm_vcpu_init init;
		uint64_t sctlr_el1, tcr_el1;
		@@ -316,3 +302,19 @@ void vcpu_dump(FILE stream, struct kvm_vm vm, uint32_t vcpuid, uint8_t indent)
		fprintf(stream, "%*spstate: 0x%.16lx pc: 0x%.16lx\n",
		indent, "", pstate, pc);
		}

		void vm_vcpu_add_default(struct kvm_vm vm, uint32_t vcpuid, void guest_code)
		{
		size_t stack_size = vm->page_size == 4096 ?
		DEFAULT_STACK_PGS * vm->page_size :
		vm->page_size;
		uint64_t stack_vaddr = vm_vaddr_alloc(vm, stack_size,
		DEFAULT_ARM64_GUEST_STACK_VADDR_MIN, 0, 0);

		vm_vcpu_add(vm, vcpuid);
		vcpu_setup(vm, vcpuid);

		set_reg(vm, vcpuid, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size);
		set_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code);
		}

+3 −6

Original line number	Diff line number	Diff line
		@@ -764,11 +764,10 @@ static int vcpu_mmap_sz(void)
		*
		* Return: None
		*
		* Creates and adds to the VM specified by vm and virtual CPU with
		* the ID given by vcpuid.
		* Adds a virtual CPU to the VM specified by vm with the ID given by vcpuid.
		* No additional VCPU setup is done.
		*/
		void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot,
		int gdt_memslot)
		void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)
		{
		struct vcpu *vcpu;

		@@ -802,8 +801,6 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot,
		vm->vcpu_head->prev = vcpu;
		vcpu->next = vm->vcpu_head;
		vm->vcpu_head = vcpu;

		vcpu_setup(vm, vcpuid, pgd_memslot, gdt_memslot);
		}

		/*

+0 −2

Original line number	Diff line number	Diff line
		@@ -65,8 +65,6 @@ struct kvm_vm {
		};

		struct vcpu vcpu_find(struct kvm_vm vm, uint32_t vcpuid);
		void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot,
		int gdt_memslot);
		void virt_dump(FILE stream, struct kvm_vm vm, uint8_t indent);
		void regs_dump(FILE stream, struct kvm_regs regs, uint8_t indent);
		void sregs_dump(FILE stream, struct kvm_sregs sregs, uint8_t indent);

+3 −2

Original line number	Diff line number	Diff line
		@@ -610,7 +610,7 @@ static void kvm_setup_tss_64bit(struct kvm_vm vm, struct kvm_segment segp,
		kvm_seg_fill_gdt_64bit(vm, segp);
		}

		void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)
		static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)
		{
		struct kvm_sregs sregs;

		@@ -656,7 +656,8 @@ void vm_vcpu_add_default(struct kvm_vm vm, uint32_t vcpuid, void guest_code)
		DEFAULT_GUEST_STACK_VADDR_MIN, 0, 0);

		/* Create VCPU */
		vm_vcpu_add(vm, vcpuid, 0, 0);
		vm_vcpu_add(vm, vcpuid);
		vcpu_setup(vm, vcpuid, 0, 0);

		/* Setup guest general purpose registers */
		vcpu_regs_get(vm, vcpuid, &regs);