anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Refactor unpinning host vcpu

Browse Source 
Factor out unpinning a single host vcpu from unpin_host_vcpus(),
since it will be used in a future patch in the error path.

No functional change intended.

Bug: 232070947
Signed-off-by: Fuad Tabba <tabba@google.com>
Change-Id: I321e41ae624b2daae8fc917432be0673e32235aa
This commit is contained in:
Fuad Tabba
2022-10-10 09:17:17 +01:00
committed by Will Deacon
parent bf48426928
commit 31d3b09cb7
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm64/kvm/hyp/nvhe/pkvm.c
View File

@@ -366,25 +366,28 @@ static int copy_features(struct kvm_vcpu *shadow_vcpu, struct kvm_vcpu *host_vcp
return 0;
}
static void unpin_host_vcpu(struct shadow_vcpu_state *shadow_vcpu)
{
struct kvm_vcpu *host_vcpu = shadow_vcpu->vcpu.arch.pkvm.host_vcpu;
size_t sve_state_size;
void *sve_state = shadow_vcpu->vcpu.arch.sve_state;
hyp_unpin_shared_mem(host_vcpu, host_vcpu + 1);
if (!sve_state)
return;
sve_state = kern_hyp_va(sve_state);
sve_state_size = vcpu_sve_state_size(&shadow_vcpu->vcpu);
hyp_unpin_shared_mem(sve_state, sve_state + sve_state_size);
}
static void unpin_host_vcpus(struct shadow_vcpu_state *shadow_vcpus, int nr_vcpus)
{
int i;
for (i = 0; i < nr_vcpus; i++) {
struct kvm_vcpu *host_vcpu = shadow_vcpus[i].vcpu.arch.pkvm.host_vcpu;
struct kvm_vcpu *shadow_vcpu = &shadow_vcpus[i].vcpu;
void *sve_state = shadow_vcpu->arch.sve_state;
size_t sve_state_size;
hyp_unpin_shared_mem(host_vcpu, host_vcpu + 1);
if (!sve_state)
continue;
sve_state = kern_hyp_va(sve_state);
sve_state_size = vcpu_sve_state_size(shadow_vcpu);
hyp_unpin_shared_mem(sve_state, sve_state + sve_state_size);
}
for (i = 0; i < nr_vcpus; i++)
unpin_host_vcpu(&shadow_vcpus[i]);
}
static int set_host_vcpus(struct shadow_vcpu_state *shadow_vcpus, int nr_vcpus,