From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH 3/9] KVM: x86: use u16 for logical VCPU mask in lapic Date: Fri, 6 May 2016 22:53:59 +0200 Message-ID: <1462568045-31085-4-git-send-email-rkrcmar@redhat.com> References: <1462568045-31085-1-git-send-email-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Paolo Bonzini , "Lan, Tianyu" , Igor Mammedov , Jan Kiszka , Peter Xu To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:45876 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758275AbcEFUy2 (ORCPT ); Fri, 6 May 2016 16:54:28 -0400 In-Reply-To: <1462568045-31085-1-git-send-email-rkrcmar@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: for_all_bits() never were type safe, so we don't lose safety when casting u16 * to unsigned long * and u16 is the size we want to avoid mishaps when sending the pointer to functions that operate only on 16 bits. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- arch/x86/kvm/lapic.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 90e07c109dfe..6ae5e74031d6 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -714,7 +714,7 @@ static void kvm_apic_disabled_lapic_found(struct kv= m *kvm) */ static inline bool kvm_apic_map_get_dest_lapic(struct kvm *kvm, struct= kvm_lapic *src, struct kvm_lapic_irq *irq, struct kvm_apic_map *map, - struct kvm_lapic ***dst, unsigned long *bitmap) + struct kvm_lapic ***dst, u16 *bitmap) { int i, lowest; bool x2apic_ipi; @@ -743,9 +743,7 @@ static inline bool kvm_apic_map_get_dest_lapic(stru= ct kvm *kvm, struct kvm_lapic return true; } =20 - *bitmap =3D 0; - if (!kvm_apic_map_get_logical_dest(map, irq->dest_id, dst, - (u16 *)bitmap)) + if (!kvm_apic_map_get_logical_dest(map, irq->dest_id, dst, bitmap)) return false; =20 if (!kvm_lowest_prio_delivery(irq)) @@ -753,7 +751,7 @@ static inline bool kvm_apic_map_get_dest_lapic(stru= ct kvm *kvm, struct kvm_lapic =20 if (!kvm_vector_hashing_enabled()) { lowest =3D -1; - for_each_set_bit(i, bitmap, 16) { + for_each_set_bit(i, (unsigned long *)bitmap, 16) { if (!(*dst)[i]) continue; if (lowest < 0) @@ -767,7 +765,7 @@ static inline bool kvm_apic_map_get_dest_lapic(stru= ct kvm *kvm, struct kvm_lapic return true; =20 lowest =3D kvm_vector_to_index(irq->vector, hweight16(*bitmap), - bitmap, 16); + (unsigned long *)bitmap, 16); =20 if (!(*dst)[lowest]) { kvm_apic_disabled_lapic_found(kvm); @@ -785,7 +783,7 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm,= struct kvm_lapic *src, struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map) { struct kvm_apic_map *map; - unsigned long bitmap; + u16 bitmap; struct kvm_lapic **dst =3D NULL; int i; bool ret; @@ -802,7 +800,7 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm,= struct kvm_lapic *src, =20 ret =3D kvm_apic_map_get_dest_lapic(kvm, src, irq, map, &dst, &bitmap= ); if (ret) - for_each_set_bit(i, &bitmap, 16) { + for_each_set_bit(i, (unsigned long *)&bitmap, 16) { if (!dst[i]) continue; if (*r < 0) @@ -832,7 +830,7 @@ bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, = struct kvm_lapic_irq *irq, struct kvm_vcpu **dest_vcpu) { struct kvm_apic_map *map; - unsigned long bitmap; + u16 bitmap; struct kvm_lapic **dst =3D NULL; bool ret =3D false; =20 @@ -844,7 +842,7 @@ bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, = struct kvm_lapic_irq *irq, =20 if (kvm_apic_map_get_dest_lapic(kvm, NULL, irq, map, &dst, &bitmap) &= & hweight16(bitmap) =3D=3D 1) { - unsigned long i =3D find_first_bit(&bitmap, 16); + unsigned long i =3D find_first_bit((unsigned long *)&bitmap, 16); =20 if (dst[i]) { *dest_vcpu =3D dst[i]->vcpu; --=20 2.8.2