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

Commit 9057a484 authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman
Browse files

Revert "x86/kvm: fix vcpu-id indexed array sizes" 



commit 1e254d0d86a0f2efd4190a89d5204b37c18c6381 upstream.

This reverts commit 76b4f357d0e7d8f6f0013c733e6cba1773c266d3.

The commit has the wrong reasoning, as KVM_MAX_VCPU_ID is not defining the
maximum allowed vcpu-id as its name suggests, but the number of vcpu-ids.
So revert this patch again.

Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210913135745.13944-2-jgross@suse.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3033e572

arch/x86/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, 
static void rtc_irq_eoi_tracking_reset(struct kvm_ioapic *ioapic)

{

	ioapic->rtc_status.pending_eoi = 0;

	bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID + 1);

	bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID);

}



static void kvm_rtc_eoi_tracking_restore_all(struct kvm_ioapic *ioapic);

arch/x86/kvm/ioapic.h

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ struct kvm_vcpu; 


struct dest_map {

	/* vcpu bitmap where IRQ has been sent */

	DECLARE_BITMAP(map, KVM_MAX_VCPU_ID + 1);

	DECLARE_BITMAP(map, KVM_MAX_VCPU_ID);



	/*

	 * Vector sent to a given vcpu, only valid when

	 * the vcpu's bit in map is set

	 */

	u8 vectors[KVM_MAX_VCPU_ID + 1];

	u8 vectors[KVM_MAX_VCPU_ID];

};