Commit Graph

1058855 Commits

Author SHA1 Message Date
Will Deacon
8d1be014db Revert "ANDROID: KVM: arm64: Initialize pkvm_pgtable.mm_ops earlier"
This reverts commit e3bc721865.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0f24937e19518bab92d7c649c6f87ec18eec2549
2022-08-04 13:03:53 +00:00
Will Deacon
31094eab00 Revert "Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO regions in MPT""
This reverts commit d52e3e4473.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I465cb99696ef1aba22a8cb575736b81773e47831
2022-08-04 13:03:53 +00:00
Will Deacon
5436ba5277 Revert "ANDROID: KVM: arm64: Remove kernel-doc in S2MPU driver"
This reverts commit f5a3444bf3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I713a3f4e954e0a6730b169fd075914d64471cad1
2022-08-04 13:03:53 +00:00
Will Deacon
571f6ea647 Revert "ANDROID: KVM: arm64: Wait on S2MPU.STATUS after invalidation"
This reverts commit 89dc7c6b94.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I67b7371a39bcb709367d3977017045e9e067d66a
2022-08-04 13:03:53 +00:00
Will Deacon
a45d3fe7ce Revert "FROMLIST: KVM: arm64: pkvm: Use the mm_ops indirection for cache maintenance"
This reverts commit d94a14c7f2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ifa6c14dffe0d3574772d26775ac7c964cbeeea55
2022-08-04 13:03:53 +00:00
Will Deacon
5bfe2b9511 Revert "ANDROID: KVM: arm64: Implement do_donate() helper for donating memory"
This reverts commit 7479c4b499.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I53d2151082d761c0102d2c29246436c53de88e0b
2022-08-04 13:03:53 +00:00
Will Deacon
79e165b8cc Revert "ANDROID: KVM: arm64: Implement hyp -> host memory donation"
This reverts commit 17086543c9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib5e25f606e69411178c933972266f278dbbef369
2022-08-04 13:03:53 +00:00
Will Deacon
326fb8d362 Revert "ANDROID: KVM: arm64: Add __pkvm_host_donate_hyp()"
This reverts commit 2c2efee64d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id6750257c04b3f63cfcb7ecd046b374ab29bac82
2022-08-04 13:03:53 +00:00
Will Deacon
607636d2eb Revert "ANDROID: KVM: arm64: Add __pkvm_hyp_donate_host()"
This reverts commit 394b00e804.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2431d37b0e202fd38c5f7ffb84995d7aa6fccb9b
2022-08-04 13:03:53 +00:00
Will Deacon
168c93f276 Revert "ANDROID: KVM: arm64: Move hyp refcount manipulation helpers"
This reverts commit 91adb28087.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2cc1c6377ad059f2e90916da20573cbc41cd19d2
2022-08-04 13:03:53 +00:00
Will Deacon
8b29f4a626 Revert "ANDROID: KVM: arm64: Back hyp_vmemmap for all of memory"
This reverts commit b047bd2325.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If3f226371bae6419cbff922b13090061f5767d65
2022-08-04 13:03:53 +00:00
Will Deacon
8f3105d135 Revert "ANDROID: KVM: arm64: Add helpers to pin memory shared with hyp"
This reverts commit 8499e08c40.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I28d5e9344ffbb2f27fd1ef432dca29933bbd193b
2022-08-04 13:03:53 +00:00
Will Deacon
9bf320d18f Revert "ANDROID: KVM: arm64: Split up nvhe/fixed_config.h"
This reverts commit ba3a8a156d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I257b4ce70d06b94e7c502d14f78774d0b2c6bf1f
2022-08-04 13:03:53 +00:00
Will Deacon
e77ce0a14d Revert "ANDROID: KVM: arm64: Trap debug break and watch from guest"
This reverts commit 9b08f9cf8e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I12b04cb929fc891e8c6f06a86f1fe3d9e1f5db10
2022-08-04 13:03:53 +00:00
Will Deacon
d9cd49c2e1 Revert "ANDROID: KVM: arm64: FAR_EL2 mask as a define"
This reverts commit b72132ff31.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4632fbed70e1cc4fa4c7009e2da93cdd8a7408d1
2022-08-04 13:03:53 +00:00
Will Deacon
7d1015fa9d Revert "ANDROID: KVM: arm64: Add hyp_spinlock_t static initializer"
This reverts commit b7ceb8bab7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id40d2098b3d9cfbe85bb83549e36dd2a1bdda503
2022-08-04 13:03:53 +00:00
Will Deacon
8e35b1cebb Revert "ANDROID: KVM: arm64: Fix initializing traps for protected VMs"
This reverts commit 03233fe45b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ieada5ccc1e2badebce286cc815de8380e5602849
2022-08-04 13:03:53 +00:00
Will Deacon
26c300dbe6 Revert "ANDROID: KVM: arm64: Move pstate reset values to kvm_arm.h"
This reverts commit 1d49d311c2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia6b0472de8de3d32487cec031c11411fe5822dd1
2022-08-04 13:03:53 +00:00
Will Deacon
7de2e597af Revert "ANDROID: KVM: arm64: Refactor reset_mpidr to extract its computation"
This reverts commit 6d967c004b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5baf33fe3365651483a4f7172af170b0505bbbb2
2022-08-04 13:03:53 +00:00
Will Deacon
53bb9be307 Revert "ANDROID: KVM: arm64: Reset sysregs for protected VMs"
This reverts commit 9293478f7f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ief05045a01c06f9d89f0d3e6bfe5003a66f7d644
2022-08-04 13:03:53 +00:00
Will Deacon
df0d439fe0 Revert "ANDROID: KVM: arm64: Shadow table for KVM EL2 state"
This reverts commit 1669999c8d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I805c15e408ee95210e7759ba8333291932e4a0ae
2022-08-04 13:03:53 +00:00
Will Deacon
5d928307c4 Revert "ANDROID: KVM: arm64: Add handlers for entry/exit state"
This reverts commit c455437342.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibab263104de5a76ccc9a25dba1de7273a7cf4d5f
2022-08-04 13:03:53 +00:00
Will Deacon
101ae88972 Revert "ANDROID: KVM: arm64: Move pkvm_vcpu_init_traps to shadow vcpu init"
This reverts commit 717dc97b99.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ief0e0303a341253f772817b7e0983092fb2219fa
2022-08-04 13:03:53 +00:00
Will Deacon
e93e37edf2 Revert "ANDROID: KVM: arm64: Merge vmcr/apr save/restore"
This reverts commit 4eda3ce580.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ieaf3d86587164d809a780e533226a78b158ca4d6
2022-08-04 13:03:53 +00:00
Will Deacon
8390b3b63d Revert "ANDROID: KVM: arm64: Move vgic state between host and shadow vcpu structures"
This reverts commit 9dc084e269.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I711af7b1c67f7d415517dd1a6e35ae7dbd1ae474
2022-08-04 13:03:53 +00:00
Will Deacon
6c8d7e0937 Revert "ANDROID: KVM: arm64: Save/restore virtual timer state from the shadow vcpu"
This reverts commit 6696aa13c7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I75811464cb5ab603631a61cd4b5800cd7bae1c1c
2022-08-04 13:03:53 +00:00
Will Deacon
f0f89c1ecf Revert "ANDROID: KVM: arm64: pkvm: Introduce __pkvm_{load,put}_vcpu()"
This reverts commit b63dac10a4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I649e7b038a250438b5ced08e1e992c509478020c
2022-08-04 13:03:53 +00:00
Will Deacon
be2a4c8d6b Revert "ANDROID: KVM: arm64: Pin host structs for pVMs"
This reverts commit 3401cd27ad.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibdec9f01629130f13665c20a07a2c4d3175fa80c
2022-08-04 13:03:53 +00:00
Will Deacon
486bbd0ccb Revert "ANDROID: KVM: arm64: Restrict protected VM capabilities"
This reverts commit 7d81b2a5e6.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I68bbe79a094fed39010176745722f9b253305692
2022-08-04 13:03:53 +00:00
Will Deacon
0dcae57ee0 Revert "ANDROID: KVM: arm64: pkvm: Lazy host FP save/restore"
This reverts commit dc2fae6338.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie48002bf23295cf0bc9177837024002445263b07
2022-08-04 13:03:53 +00:00
Will Deacon
98f15f3ecb Revert "ANDROID: KVM: arm64: pkvm: Rework sysreg entry/exit handling"
This reverts commit 103321bfc5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic7aa0f1cc86922e56361851e22b049d0b5fec751
2022-08-04 13:03:53 +00:00
Will Deacon
0f296c1c24 Revert "ANDROID: KVM: arm64: pkvm: Refactor DABT entry/exit"
This reverts commit 32b11a8a56.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I60b9b6ef6538b1d531794cf6dc570f622c32ab77
2022-08-04 13:03:53 +00:00
Will Deacon
8d825602a0 Revert "ANDROID: KVM: arm64: Move some kvm_psci functions to a shared header"
This reverts commit ac64a28652.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib4dadc4a43fa8d7bdae1b22af2b5fb12eeaeb498
2022-08-04 13:03:53 +00:00
Will Deacon
f2a5edef60 Revert "ANDROID: KVM: arm64: refactor vcpu_read_sys_reg and vcpu_write_sys_reg for hyp use"
This reverts commit 36a84952bc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I944941d20cd327d63f9926e00c0760da220dff2e
2022-08-04 13:03:53 +00:00
Will Deacon
91e68c0605 Revert "ANDROID: KVM: arm64: refactor kvm_vcpu_enable_ptrauth() for hyp use"
This reverts commit 9a893ced59.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I96e0c63c352e916f454d0e3296994cbdf33dcb32
2022-08-04 13:03:53 +00:00
Will Deacon
5139895b73 Revert "ANDROID: KVM: arm64: Handle PSCI for protected VMs"
This reverts commit 96da61b2fa.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib8b3fdfbbd4d5eefaed8e683091cf0d73a22d5c6
2022-08-04 13:03:53 +00:00
Will Deacon
f7ec3cc1d2 Revert "ANDROID: KVM: arm64: Avoid BBM when changing only s/w bits in Stage-2 PTE"
This reverts commit 233f0df2b1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If70acbf8ec01efb259ba9874ab4f38766694f16f
2022-08-04 13:03:53 +00:00
Will Deacon
a09642a9e8 Revert "ANDROID: KVM: arm64: Provide a helper to compute the size of stage-2 PGDs"
This reverts commit f42a0f7153.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib444d288ccbde9880b6b37d1a4c907d325a9db44
2022-08-04 13:03:53 +00:00
Will Deacon
73ad873a4e Revert "ANDROID: KVM: arm64: Allow non-coallescable pages in a hyp_pool"
This reverts commit a437069d13.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I349d95060a7b7e6d223ff7c3e28d6900b370868a
2022-08-04 13:03:53 +00:00
Will Deacon
a7f0a75e2b Revert "ANDROID: KVM: arm64: Consolidate stage-2 init in one function"
This reverts commit cef2dc6c49.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9b1fcd6dd3d64026a4d9df7206a9f2ad0bba49d2
2022-08-04 13:03:53 +00:00
Will Deacon
6a67140c2a Revert "ANDROID: KVM: arm64: Add generic hyp_memcache helpers"
This reverts commit 23de5749a2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I29f7f542ddd61600255600ac1140a0bf5756caf4
2022-08-04 13:03:53 +00:00
Will Deacon
f41c4dd64b Revert "ANDROID: KVM: arm64: Add hyp_memcache helpers for the kernel"
This reverts commit 16dd5fd0d4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I483dd849964b690b9da1a17b784b3d1499ccf5c1
2022-08-04 13:03:53 +00:00
Will Deacon
f325ce29e3 Revert "ANDROID: KVM: arm64: Add hyp_memcache helpers for pkvm"
This reverts commit e3e29226fc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic88a5dbc7b601f3a43f573f4eaea8298acd05ea1
2022-08-04 13:03:53 +00:00
Will Deacon
d9c00241e9 Revert "ANDROID: arm64: Annotate icache_inval_pou as position-independent"
This reverts commit 4b57e10b5c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ica06f930d3a93f2d543c1aa74162fd105b5657e3
2022-08-04 13:03:53 +00:00
Will Deacon
ab4f5f55f7 Revert "ANDROID: BACKPORT: KVM: arm64: Make hyp stage-1 refcnt correct on the whole range"
This reverts commit 71a2987234.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ieb10fd1a85c2f4e496da234f499511cd3c342ed2
2022-08-04 13:03:53 +00:00
Will Deacon
be1a18f4ae Revert "ANDROID: KVM: arm64: Factor out private range VA allocation"
This reverts commit c9cc94723b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I657204a15aa35ad0b2856ec682523abc1bf5aeaf
2022-08-04 13:03:53 +00:00
Will Deacon
7846bb7095 Revert "ANDROID: KVM: arm64: Add pcpu fixmap infrastructure at EL2"
This reverts commit 09d4026ae9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I51c7e73ef297cc21f85e38f5ee025d4c4b822b6e
2022-08-04 13:03:53 +00:00
Will Deacon
8c43892488 Revert "ANDROID: KVM: arm64: Prepare EL2 guest stage-2 page-table"
This reverts commit a97793ae99.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I53bec8d02fa7f63aa2a8bb49c1ae01e83fd57aa8
2022-08-04 13:03:53 +00:00
Will Deacon
73c6837255 Revert "ANDROID: KVM: arm64: Reclaim guest page-table pages during teardown"
This reverts commit 35c5a8c85d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I453d3361aada191103eae926bc19ef9acf359a59
2022-08-04 13:03:53 +00:00
Will Deacon
55e91d79da Revert "ANDROID: KVM: arm64: Add __pkvm_host_share_guest hypercall"
This reverts commit 2570e98d66.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I90168fb7c16e743da75c19edce7edc8c29ea2002
2022-08-04 13:03:53 +00:00