Commit 5c2b2176 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.7-2' of... 

Merge tag 'kvmarm-fixes-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm64 fixes for 6.7, part #2

 - Ensure a vCPU's redistributor is unregistered from the MMIO bus
   if vCPU creation fails

 - Fix building KVM selftests for arm64 from the top-level Makefile
parents a26b7cd2 0c12e6c8

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);



	kvm_vgic_vcpu_destroy(vcpu);

	kvm_arm_vcpu_destroy(vcpu);

}

arch/arm64/kvm/vgic/vgic-init.c

+29 −18
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) 
		vgic_v4_teardown(kvm);

}



void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

static void __kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -379,29 +379,39 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) 
	vgic_flush_pending_lpis(vcpu);



	INIT_LIST_HEAD(&vgic_cpu->ap_list_head);

	if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {

		vgic_unregister_redist_iodev(vcpu);

		vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;

	}

}



static void __kvm_vgic_destroy(struct kvm *kvm)

void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;



	mutex_lock(&kvm->slots_lock);

	__kvm_vgic_vcpu_destroy(vcpu);

	mutex_unlock(&kvm->slots_lock);

}



void kvm_vgic_destroy(struct kvm *kvm)

{

	struct kvm_vcpu *vcpu;

	unsigned long i;



	lockdep_assert_held(&kvm->arch.config_lock);

	mutex_lock(&kvm->slots_lock);



	vgic_debug_destroy(kvm);



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_vgic_vcpu_destroy(vcpu);

		__kvm_vgic_vcpu_destroy(vcpu);



	mutex_lock(&kvm->arch.config_lock);



	kvm_vgic_dist_destroy(kvm);

}



void kvm_vgic_destroy(struct kvm *kvm)

{

	mutex_lock(&kvm->arch.config_lock);

	__kvm_vgic_destroy(kvm);

	mutex_unlock(&kvm->arch.config_lock);

	mutex_unlock(&kvm->slots_lock);

}



/**
@@ -469,25 +479,26 @@ int kvm_vgic_map_resources(struct kvm *kvm) 
		type = VGIC_V3;

	}



	if (ret) {

		__kvm_vgic_destroy(kvm);

	if (ret)

		goto out;

	}



	dist->ready = true;

	dist_base = dist->vgic_dist_base;

	mutex_unlock(&kvm->arch.config_lock);



	ret = vgic_register_dist_iodev(kvm, dist_base, type);

	if (ret) {

	if (ret)

		kvm_err("Unable to register VGIC dist MMIO regions\n");

		kvm_vgic_destroy(kvm);

	}

	mutex_unlock(&kvm->slots_lock);

	return ret;



	goto out_slots;

out:

	mutex_unlock(&kvm->arch.config_lock);

out_slots:

	mutex_unlock(&kvm->slots_lock);



	if (ret)

		kvm_vgic_destroy(kvm);



	return ret;

}

arch/arm64/kvm/vgic/vgic-mmio-v3.c

+3 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu) 
	return ret;

}



static void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)

void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)

{

	struct vgic_io_device *rd_dev = &vcpu->arch.vgic_cpu.rd_iodev;
@@ -833,6 +833,8 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm) 
	unsigned long c;

	int ret = 0;



	lockdep_assert_held(&kvm->slots_lock);



	kvm_for_each_vcpu(c, vcpu, kvm) {

		ret = vgic_register_redist_iodev(vcpu);

		if (ret)

arch/arm64/kvm/vgic/vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq); 
int vgic_v3_save_pending_tables(struct kvm *kvm);

int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count);

int vgic_register_redist_iodev(struct kvm_vcpu *vcpu);

void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu);

bool vgic_v3_check_base(struct kvm *kvm);



void vgic_v3_load(struct kvm_vcpu *vcpu);

tools/testing/selftests/kvm/Makefile

+16 −10
Original line number Diff line number Diff line
@@ -17,16 +17,6 @@ else 
	ARCH_DIR := $(ARCH)

endif



ifeq ($(ARCH),arm64)

tools_dir := $(top_srcdir)/tools

arm64_tools_dir := $(tools_dir)/arch/arm64/tools/

GEN_HDRS := $(top_srcdir)/tools/arch/arm64/include/generated/

CFLAGS += -I$(GEN_HDRS)



$(GEN_HDRS): $(wildcard $(arm64_tools_dir)/*)

	$(MAKE) -C $(arm64_tools_dir) O=$(tools_dir)

endif



LIBKVM += lib/assert.c

LIBKVM += lib/elf.c

LIBKVM += lib/guest_modes.c
@@ -234,6 +224,22 @@ CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ 
ifeq ($(ARCH),s390)

	CFLAGS += -march=z10

endif

ifeq ($(ARCH),arm64)

tools_dir := $(top_srcdir)/tools

arm64_tools_dir := $(tools_dir)/arch/arm64/tools/



ifneq ($(abs_objdir),)

arm64_hdr_outdir := $(abs_objdir)/tools/

else

arm64_hdr_outdir := $(tools_dir)/

endif



GEN_HDRS := $(arm64_hdr_outdir)arch/arm64/include/generated/

CFLAGS += -I$(GEN_HDRS)



$(GEN_HDRS): $(wildcard $(arm64_tools_dir)/*)

	$(MAKE) -C $(arm64_tools_dir) OUTPUT=$(arm64_hdr_outdir)

endif



no-pie-option := $(call try-run, echo 'int main(void) { return 0; }' | \

        $(CC) -Werror $(CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)