Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e93f8a0f authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

KVM: convert io_bus to SRCU 



Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent a983fb23

arch/ia64/kvm/kvm-ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -241,10 +241,10 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	return 0;

mmio:

	if (p->dir)

		r = kvm_io_bus_read(&vcpu->kvm->mmio_bus, p->addr,

		r = kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, p->addr,

				    p->size, &p->data);

	else

		r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,

		r = kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, p->addr,

				     p->size, &p->data);

	if (r)

		printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);

arch/x86/kvm/i8254.c

+3 −3
Original line number Diff line number Diff line
@@ -645,13 +645,13 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	kvm_register_irq_mask_notifier(kvm, 0, &pit->mask_notifier);



	kvm_iodevice_init(&pit->dev, &pit_dev_ops);

	ret = __kvm_io_bus_register_dev(&kvm->pio_bus, &pit->dev);

	ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, &pit->dev);

	if (ret < 0)

		goto fail;



	if (flags & KVM_PIT_SPEAKER_DUMMY) {

		kvm_iodevice_init(&pit->speaker_dev, &speaker_dev_ops);

		ret = __kvm_io_bus_register_dev(&kvm->pio_bus,

		ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS,

						&pit->speaker_dev);

		if (ret < 0)

			goto fail_unregister;
@@ -660,7 +660,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	return pit;



fail_unregister:

	__kvm_io_bus_unregister_dev(&kvm->pio_bus, &pit->dev);

	kvm_io_bus_unregister_dev(kvm, KVM_PIO_BUS, &pit->dev);



fail:

	if (pit->irq_source_id >= 0)

arch/x86/kvm/i8259.c

+3 −1
Original line number Diff line number Diff line
@@ -533,7 +533,9 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm) 
	 * Initialize PIO device

	 */

	kvm_iodevice_init(&s->dev, &picdev_ops);

	ret = kvm_io_bus_register_dev(kvm, &kvm->pio_bus, &s->dev);

	down_write(&kvm->slots_lock);

	ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, &s->dev);

	up_write(&kvm->slots_lock);

	if (ret < 0) {

		kfree(s);

		return NULL;

arch/x86/kvm/x86.c

+7 −6
Original line number Diff line number Diff line
@@ -2851,7 +2851,7 @@ static int vcpu_mmio_write(struct kvm_vcpu *vcpu, gpa_t addr, int len, 
	    !kvm_iodevice_write(&vcpu->arch.apic->dev, addr, len, v))

		return 0;



	return kvm_io_bus_write(&vcpu->kvm->mmio_bus, addr, len, v);

	return kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, addr, len, v);

}



static int vcpu_mmio_read(struct kvm_vcpu *vcpu, gpa_t addr, int len, void *v)
@@ -2860,7 +2860,7 @@ static int vcpu_mmio_read(struct kvm_vcpu *vcpu, gpa_t addr, int len, void *v) 
	    !kvm_iodevice_read(&vcpu->arch.apic->dev, addr, len, v))

		return 0;



	return kvm_io_bus_read(&vcpu->kvm->mmio_bus, addr, len, v);

	return kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, addr, len, v);

}



static int kvm_read_guest_virt(gva_t addr, void *val, unsigned int bytes,
@@ -3345,11 +3345,12 @@ static int kernel_pio(struct kvm_vcpu *vcpu, void *pd) 
	int r;



	if (vcpu->arch.pio.in)

		r = kvm_io_bus_read(&vcpu->kvm->pio_bus, vcpu->arch.pio.port,

		r = kvm_io_bus_read(vcpu->kvm, KVM_PIO_BUS, vcpu->arch.pio.port,

				    vcpu->arch.pio.size, pd);

	else

		r = kvm_io_bus_write(&vcpu->kvm->pio_bus, vcpu->arch.pio.port,

				     vcpu->arch.pio.size, pd);

		r = kvm_io_bus_write(vcpu->kvm, KVM_PIO_BUS,

				     vcpu->arch.pio.port, vcpu->arch.pio.size,

				     pd);

	return r;

}
@@ -3360,7 +3361,7 @@ static int pio_string_write(struct kvm_vcpu *vcpu) 
	int i, r = 0;



	for (i = 0; i < io->cur_count; i++) {

		if (kvm_io_bus_write(&vcpu->kvm->pio_bus,

		if (kvm_io_bus_write(vcpu->kvm, KVM_PIO_BUS,

				     io->port, io->size, pd)) {

			r = -EOPNOTSUPP;

			break;

include/linux/kvm_host.h

+13 −14
Original line number Diff line number Diff line
@@ -57,19 +57,19 @@ struct kvm_io_bus { 
	struct kvm_io_device *devs[NR_IOBUS_DEVS];

};



void kvm_io_bus_init(struct kvm_io_bus *bus);

void kvm_io_bus_destroy(struct kvm_io_bus *bus);

int kvm_io_bus_write(struct kvm_io_bus *bus, gpa_t addr, int len,

		     const void *val);

int kvm_io_bus_read(struct kvm_io_bus *bus, gpa_t addr, int len,

enum kvm_bus {

	KVM_MMIO_BUS,

	KVM_PIO_BUS,

	KVM_NR_BUSES

};



int kvm_io_bus_write(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,

		     int len, const void *val);

int kvm_io_bus_read(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, int len,

		    void *val);

int __kvm_io_bus_register_dev(struct kvm_io_bus *bus,

			       struct kvm_io_device *dev);

int kvm_io_bus_register_dev(struct kvm *kvm, struct kvm_io_bus *bus,

			    struct kvm_io_device *dev);

void __kvm_io_bus_unregister_dev(struct kvm_io_bus *bus,

int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx,

			    struct kvm_io_device *dev);

void kvm_io_bus_unregister_dev(struct kvm *kvm, struct kvm_io_bus *bus,

int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,

			      struct kvm_io_device *dev);



struct kvm_vcpu {
@@ -171,8 +171,7 @@ struct kvm { 
	atomic_t online_vcpus;

	struct list_head vm_list;

	struct mutex lock;

	struct kvm_io_bus mmio_bus;

	struct kvm_io_bus pio_bus;

	struct kvm_io_bus *buses[KVM_NR_BUSES];

#ifdef CONFIG_HAVE_KVM_EVENTFD

	struct {

		spinlock_t        lock;