| Message ID | 20241202154742.3611749-10-tabba@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: arm64: Rework guest VM fixed feature handling and trapping in pKVM | expand |
On Monday 02 Dec 2024 at 15:47:36 (+0000), Fuad Tabba wrote: > In hVHE mode, HCR_E2H should be set for both protected and > non-protected VMs. Since commit 23c9d58cb458 ("KVM: arm64: Fix I'm not finding that sha upstream, in which branch is it? > initializing traps in protected mode"), this has been fixed, and > the setting of the flag here is redundant. > > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c > index ffa500b500f2..cede527a59d4 100644 > --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c > +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c > @@ -57,9 +57,6 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu) > /* No support for AArch32. */ > val |= HCR_RW; > > - if (has_hvhe()) > - val |= HCR_E2H; > - > /* > * Always trap: > * - Feature id registers: to control features exposed to guests > -- > 2.47.0.338.g60cca15819-goog >
On Wed, 11 Dec 2024 at 12:38, Quentin Perret <qperret@google.com> wrote: > > On Monday 02 Dec 2024 at 15:47:36 (+0000), Fuad Tabba wrote: > > In hVHE mode, HCR_E2H should be set for both protected and > > non-protected VMs. Since commit 23c9d58cb458 ("KVM: arm64: Fix > > I'm not finding that sha upstream, in which branch is it? The whole commit is wrong, not just the hash, which refers to something I have locally. It should be b56680de9c64 ("KVM: arm64: Initialize trap register values in hyp in pKVM") I'll fix on the respin. Thanks! /fuad > > initializing traps in protected mode"), this has been fixed, and > > the setting of the flag here is redundant. > > > > Signed-off-by: Fuad Tabba <tabba@google.com> > > --- > > arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c > > index ffa500b500f2..cede527a59d4 100644 > > --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c > > +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c > > @@ -57,9 +57,6 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu) > > /* No support for AArch32. */ > > val |= HCR_RW; > > > > - if (has_hvhe()) > > - val |= HCR_E2H; > > - > > /* > > * Always trap: > > * - Feature id registers: to control features exposed to guests > > -- > > 2.47.0.338.g60cca15819-goog > >
diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index ffa500b500f2..cede527a59d4 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -57,9 +57,6 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu) /* No support for AArch32. */ val |= HCR_RW; - if (has_hvhe()) - val |= HCR_E2H; - /* * Always trap: * - Feature id registers: to control features exposed to guests
In hVHE mode, HCR_E2H should be set for both protected and non-protected VMs. Since commit 23c9d58cb458 ("KVM: arm64: Fix initializing traps in protected mode"), this has been fixed, and the setting of the flag here is redundant. Signed-off-by: Fuad Tabba <tabba@google.com> --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 --- 1 file changed, 3 deletions(-)