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

Commit 876b31fd authored by Nikita Leshenko's avatar Nikita Leshenko Committed by Greg Kroah-Hartman
Browse files

KVM: x86: ioapic: Preserve read-only values in the redirection table 




[ Upstream commit b200dded0a6974a3b69599832b2203483920ab25 ]

According to 82093AA (IOAPIC) manual, Remote IRR and Delivery Status are
read-only. QEMU implements the bits as RO in commit 479c2a1cb7fb
("ioapic: keep RO bits for IOAPIC entry").

Signed-off-by: default avatarNikita Leshenko <nikita.leshchenko@oracle.com>
Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Reviewed-by: default avatarSteve Rutherford <srutherford@google.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d3ab3b2

arch/x86/kvm/ioapic.c

+6 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) 
{

	unsigned index;

	bool mask_before, mask_after;

	int old_remote_irr, old_delivery_status;

	union kvm_ioapic_redirect_entry *e;



	switch (ioapic->ioregsel) {
@@ -300,6 +301,9 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) 
			return;

		e = &ioapic->redirtbl[index];

		mask_before = e->fields.mask;

		/* Preserve read-only fields */

		old_remote_irr = e->fields.remote_irr;

		old_delivery_status = e->fields.delivery_status;

		if (ioapic->ioregsel & 1) {

			e->bits &= 0xffffffff;

			e->bits |= (u64) val << 32;
@@ -307,6 +311,8 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) 
			e->bits &= ~0xffffffffULL;

			e->bits |= (u32) val;

		}

		e->fields.remote_irr = old_remote_irr;

		e->fields.delivery_status = old_delivery_status;



		/*

		 * Some OSes (Linux, Xen) assume that Remote IRR bit will