Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions arch/riscv/kvm/tlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,14 @@ static void make_xfence_request(struct kvm *kvm,
{
unsigned long i;
struct kvm_vcpu *vcpu;
unsigned int actual_req = req;
DECLARE_BITMAP(vcpu_mask, KVM_MAX_VCPUS);
DECLARE_BITMAP(req_vcpu_mask, KVM_MAX_VCPUS);
DECLARE_BITMAP(fallback_req_vcpu_mask, KVM_MAX_VCPUS);

bitmap_zero(vcpu_mask, KVM_MAX_VCPUS);
if (!data || !data->type)
return;

bitmap_zero(req_vcpu_mask, KVM_MAX_VCPUS);
bitmap_zero(fallback_req_vcpu_mask, KVM_MAX_VCPUS);
kvm_for_each_vcpu(i, vcpu, kvm) {
if (hbase != -1UL) {
if (vcpu->vcpu_id < hbase ||
Expand All @@ -345,21 +349,19 @@ static void make_xfence_request(struct kvm *kvm,
continue;
}

bitmap_set(vcpu_mask, i, 1);

if (!data || !data->type)
continue;

/*
* Enqueue hfence data to VCPU hfence queue. If we don't
* have space in the VCPU hfence queue then fallback to
* a more conservative hfence request.
*/
if (!vcpu_hfence_enqueue(vcpu, data))
actual_req = fallback_req;
bitmap_set(fallback_req_vcpu_mask, i, 1);
else
bitmap_set(req_vcpu_mask, i, 1);
}

kvm_make_vcpus_request_mask(kvm, actual_req, vcpu_mask);
kvm_make_vcpus_request_mask(kvm, req, req_vcpu_mask);
kvm_make_vcpus_request_mask(kvm, fallback_req, fallback_req_vcpu_mask);
}

void kvm_riscv_fence_i(struct kvm *kvm,
Expand Down