mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
KVM: bit ops for deliver_bitmap
It's also convenient when we extend KVM supported vcpu number in the future. Signed-off-by: Sheng Yang <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
This commit is contained in:
parent
110c2faeba
commit
bfd349d073
3 changed files with 26 additions and 22 deletions
|
|
@ -203,7 +203,7 @@ void kvm_ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
|
|||
static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
|
||||
{
|
||||
union kvm_ioapic_redirect_entry entry = ioapic->redirtbl[irq];
|
||||
unsigned long deliver_bitmask;
|
||||
DECLARE_BITMAP(deliver_bitmask, KVM_MAX_VCPUS);
|
||||
struct kvm_vcpu *vcpu;
|
||||
int vcpu_id, r = -1;
|
||||
|
||||
|
|
@ -213,22 +213,24 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
|
|||
entry.fields.delivery_mode, entry.fields.vector,
|
||||
entry.fields.trig_mode);
|
||||
|
||||
kvm_get_intr_delivery_bitmask(ioapic, &entry, &deliver_bitmask);
|
||||
if (!deliver_bitmask) {
|
||||
ioapic_debug("no target on destination\n");
|
||||
return 0;
|
||||
}
|
||||
bitmap_zero(deliver_bitmask, KVM_MAX_VCPUS);
|
||||
|
||||
/* Always delivery PIT interrupt to vcpu 0 */
|
||||
#ifdef CONFIG_X86
|
||||
if (irq == 0)
|
||||
deliver_bitmask = 1;
|
||||
__set_bit(0, deliver_bitmask);
|
||||
else
|
||||
#endif
|
||||
kvm_get_intr_delivery_bitmask(ioapic, &entry, deliver_bitmask);
|
||||
|
||||
for (vcpu_id = 0; deliver_bitmask != 0; vcpu_id++) {
|
||||
if (!(deliver_bitmask & (1 << vcpu_id)))
|
||||
continue;
|
||||
deliver_bitmask &= ~(1 << vcpu_id);
|
||||
if (find_first_bit(deliver_bitmask, KVM_MAX_VCPUS) >= KVM_MAX_VCPUS) {
|
||||
ioapic_debug("no target on destination\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
while ((vcpu_id = find_first_bit(deliver_bitmask, KVM_MAX_VCPUS))
|
||||
< KVM_MAX_VCPUS) {
|
||||
__clear_bit(vcpu_id, deliver_bitmask);
|
||||
vcpu = ioapic->kvm->vcpus[vcpu_id];
|
||||
if (vcpu) {
|
||||
if (entry.fields.delivery_mode ==
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
|
|||
case IOAPIC_LOWEST_PRIORITY:
|
||||
vcpu = kvm_get_lowest_prio_vcpu(ioapic->kvm,
|
||||
entry->fields.vector, deliver_bitmask);
|
||||
*deliver_bitmask = 1 << vcpu->vcpu_id;
|
||||
__set_bit(vcpu->vcpu_id, deliver_bitmask);
|
||||
break;
|
||||
case IOAPIC_FIXED:
|
||||
case IOAPIC_NMI:
|
||||
|
|
@ -76,10 +76,12 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
|
|||
struct kvm_vcpu *vcpu;
|
||||
struct kvm_ioapic *ioapic = ioapic_irqchip(kvm);
|
||||
union kvm_ioapic_redirect_entry entry;
|
||||
unsigned long deliver_bitmask;
|
||||
DECLARE_BITMAP(deliver_bitmask, KVM_MAX_VCPUS);
|
||||
|
||||
BUG_ON(!ioapic);
|
||||
|
||||
bitmap_zero(deliver_bitmask, KVM_MAX_VCPUS);
|
||||
|
||||
entry.bits = 0;
|
||||
entry.fields.dest_id = (e->msi.address_lo &
|
||||
MSI_ADDR_DEST_ID_MASK) >> MSI_ADDR_DEST_ID_SHIFT;
|
||||
|
|
@ -95,16 +97,15 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
|
|||
|
||||
/* TODO Deal with RH bit of MSI message address */
|
||||
|
||||
kvm_get_intr_delivery_bitmask(ioapic, &entry, &deliver_bitmask);
|
||||
kvm_get_intr_delivery_bitmask(ioapic, &entry, deliver_bitmask);
|
||||
|
||||
if (!deliver_bitmask) {
|
||||
if (find_first_bit(deliver_bitmask, KVM_MAX_VCPUS) >= KVM_MAX_VCPUS) {
|
||||
printk(KERN_WARNING "kvm: no destination for MSI delivery!");
|
||||
return -1;
|
||||
}
|
||||
for (vcpu_id = 0; deliver_bitmask != 0; vcpu_id++) {
|
||||
if (!(deliver_bitmask & (1 << vcpu_id)))
|
||||
continue;
|
||||
deliver_bitmask &= ~(1 << vcpu_id);
|
||||
while ((vcpu_id = find_first_bit(deliver_bitmask,
|
||||
KVM_MAX_VCPUS)) < KVM_MAX_VCPUS) {
|
||||
__clear_bit(vcpu_id, deliver_bitmask);
|
||||
vcpu = ioapic->kvm->vcpus[vcpu_id];
|
||||
if (vcpu) {
|
||||
if (r < 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue