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

Commit e32edf4f authored by Nikolay Nikolaev's avatar Nikolay Nikolaev Committed by Marc Zyngier
Browse files

KVM: Redesign kvm_io_bus_ API to pass VCPU structure to the callbacks. 



This is needed in e.g. ARM vGIC emulation, where the MMIO handling
depends on the VCPU that does the access.

Signed-off-by: default avatarNikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 1a748478

arch/powerpc/kvm/mpic.c

+6 −4
Original line number Diff line number Diff line
@@ -1374,8 +1374,9 @@ static int kvm_mpic_write_internal(struct openpic *opp, gpa_t addr, u32 val) 
	return -ENXIO;

}



static int kvm_mpic_read(struct kvm_io_device *this, gpa_t addr,

			 int len, void *ptr)

static int kvm_mpic_read(struct kvm_vcpu *vcpu,

			 struct kvm_io_device *this,

			 gpa_t addr, int len, void *ptr)

{

	struct openpic *opp = container_of(this, struct openpic, mmio);

	int ret;
@@ -1415,8 +1416,9 @@ static int kvm_mpic_read(struct kvm_io_device *this, gpa_t addr, 
	return ret;

}



static int kvm_mpic_write(struct kvm_io_device *this, gpa_t addr,

			  int len, const void *ptr)

static int kvm_mpic_write(struct kvm_vcpu *vcpu,

			  struct kvm_io_device *this,

			  gpa_t addr, int len, const void *ptr)

{

	struct openpic *opp = container_of(this, struct openpic, mmio);

	int ret;

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu, 


	idx = srcu_read_lock(&vcpu->kvm->srcu);



	ret = kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, run->mmio.phys_addr,

	ret = kvm_io_bus_read(vcpu, KVM_MMIO_BUS, run->mmio.phys_addr,

			      bytes, &run->mmio.data);



	srcu_read_unlock(&vcpu->kvm->srcu, idx);
@@ -880,7 +880,7 @@ int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu, 


	idx = srcu_read_lock(&vcpu->kvm->srcu);



	ret = kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, run->mmio.phys_addr,

	ret = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, run->mmio.phys_addr,

			       bytes, &run->mmio.data);



	srcu_read_unlock(&vcpu->kvm->srcu, idx);

arch/s390/kvm/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu) 
	 * - gpr 3 contains the virtqueue index (passed as datamatch)

	 * - gpr 4 contains the index on the bus (optionally)

	 */

	ret = kvm_io_bus_write_cookie(vcpu->kvm, KVM_VIRTIO_CCW_NOTIFY_BUS,

	ret = kvm_io_bus_write_cookie(vcpu, KVM_VIRTIO_CCW_NOTIFY_BUS,

				      vcpu->run->s.regs.gprs[2] & 0xffffffff,

				      8, &vcpu->run->s.regs.gprs[3],

				      vcpu->run->s.regs.gprs[4]);

arch/x86/kvm/i8254.c

+9 −5
Original line number Diff line number Diff line
@@ -443,7 +443,8 @@ static inline int pit_in_range(gpa_t addr) 
		(addr < KVM_PIT_BASE_ADDRESS + KVM_PIT_MEM_LENGTH));

}



static int pit_ioport_write(struct kvm_io_device *this,

static int pit_ioport_write(struct kvm_vcpu *vcpu,

				struct kvm_io_device *this,

			    gpa_t addr, int len, const void *data)

{

	struct kvm_pit *pit = dev_to_pit(this);
@@ -519,7 +520,8 @@ static int pit_ioport_write(struct kvm_io_device *this, 
	return 0;

}



static int pit_ioport_read(struct kvm_io_device *this,

static int pit_ioport_read(struct kvm_vcpu *vcpu,

			   struct kvm_io_device *this,

			   gpa_t addr, int len, void *data)

{

	struct kvm_pit *pit = dev_to_pit(this);
@@ -589,7 +591,8 @@ static int pit_ioport_read(struct kvm_io_device *this, 
	return 0;

}



static int speaker_ioport_write(struct kvm_io_device *this,

static int speaker_ioport_write(struct kvm_vcpu *vcpu,

				struct kvm_io_device *this,

				gpa_t addr, int len, const void *data)

{

	struct kvm_pit *pit = speaker_to_pit(this);
@@ -606,7 +609,8 @@ static int speaker_ioport_write(struct kvm_io_device *this, 
	return 0;

}



static int speaker_ioport_read(struct kvm_io_device *this,

static int speaker_ioport_read(struct kvm_vcpu *vcpu,

				   struct kvm_io_device *this,

				   gpa_t addr, int len, void *data)

{

	struct kvm_pit *pit = speaker_to_pit(this);

arch/x86/kvm/i8259.c

+6 −6
Original line number Diff line number Diff line
@@ -528,42 +528,42 @@ static int picdev_read(struct kvm_pic *s, 
	return 0;

}



static int picdev_master_write(struct kvm_io_device *dev,

static int picdev_master_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			       gpa_t addr, int len, const void *val)

{

	return picdev_write(container_of(dev, struct kvm_pic, dev_master),

			    addr, len, val);

}



static int picdev_master_read(struct kvm_io_device *dev,

static int picdev_master_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			      gpa_t addr, int len, void *val)

{

	return picdev_read(container_of(dev, struct kvm_pic, dev_master),

			    addr, len, val);

}



static int picdev_slave_write(struct kvm_io_device *dev,

static int picdev_slave_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			      gpa_t addr, int len, const void *val)

{

	return picdev_write(container_of(dev, struct kvm_pic, dev_slave),

			    addr, len, val);

}



static int picdev_slave_read(struct kvm_io_device *dev,

static int picdev_slave_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			     gpa_t addr, int len, void *val)

{

	return picdev_read(container_of(dev, struct kvm_pic, dev_slave),

			    addr, len, val);

}



static int picdev_eclr_write(struct kvm_io_device *dev,

static int picdev_eclr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			     gpa_t addr, int len, const void *val)

{

	return picdev_write(container_of(dev, struct kvm_pic, dev_eclr),

			    addr, len, val);

}



static int picdev_eclr_read(struct kvm_io_device *dev,

static int picdev_eclr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			    gpa_t addr, int len, void *val)

{

	return picdev_read(container_of(dev, struct kvm_pic, dev_eclr),