Commit Graph

1058828 Commits

Author SHA1 Message Date
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
Will Deacon
54ad32c3ae Revert "ANDROID: KVM: arm64: Call __pkvm_host_share_guest on memory abort"
This reverts commit ea8ad30e3a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8676ec0e89d536fe71627a5994c60a9ae33ef984
2022-08-04 13:03:53 +00:00
Will Deacon
53126fcffe Revert "ANDROID: KVM: arm64: Reclaim vm state pages in teardown memcache"
This reverts commit 4fc088eb4d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib501d33a02db97c1f6baea30799f5bb2a5e199b6
2022-08-04 13:03:53 +00:00
Will Deacon
595bc3a9a9 Revert "ANDROID: KVM: arm64: Avoid switching to guest context if guest is already loaded"
This reverts commit 42fe901800.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icfe3e376901026537c30d82f582f4ea1b70f95df
2022-08-04 13:03:53 +00:00
Will Deacon
a0ef0f6062 Revert "ANDROID: BACKPORT: KVM: arm64: Turn kvm_pgtable_stage2_set_owner into kvm_pgtable_stage2_annotate"
This reverts commit cc8d7dcc40.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id91c26607ade15cf26e0b16ff34d75ac510a5796
2022-08-04 13:03:53 +00:00
Will Deacon
9a15f73e76 Revert "ANDROID: BACKPORT: KVM: arm64: Make owner ids 32 bits wide"
This reverts commit 5da4a4ca5f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ife482bbf47e0d284ef13a1ea3221e1788749cda2
2022-08-04 13:03:53 +00:00
Will Deacon
6185f0af6a Revert "ANDROID: BACKPORT: KVM: arm64: Use guest VMID as owner id"
This reverts commit dded44bcfd.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9f065a0e0d60df6663f6fffedfbc94d77dc16c4a
2022-08-04 13:03:53 +00:00
Will Deacon
e3c771734c Revert "ANDROID: KVM: arm64: Refcount shadow structs on vcpu_{load/put}()"
This reverts commit 6f93dc7bb9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5d6f272349a30363081dd10962a04600c6191030
2022-08-04 13:03:53 +00:00
Will Deacon
5a6e3a9fc5 Revert "ANDROID: KVM: arm64: Reject concurrent loading of a vCPU on multiple physical CPUs"
This reverts commit d3e0947f47.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iec17d6136e5a482553bf4ca24d21a975c71894b6
2022-08-04 13:03:53 +00:00
Will Deacon
a712ed58dc Revert "ANDROID: KVM: arm64: Add initial support for KVM_CAP_EXIT_HYPERCALL"
This reverts commit a1bd2a6b3c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I1e80a4ad2243313d0e9ff899a2686a1a6afa00f6
2022-08-04 13:03:53 +00:00
Will Deacon
3201118a4b Revert "ANDROID: KVM: arm64: Add __pkvm_guest_share_host()"
This reverts commit 00c5ba045a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I43fba407a67d82879075ecca198707e95e8cfd54
2022-08-04 13:03:53 +00:00
Will Deacon
f0aa9058a5 Revert "ANDROID: KVM: arm64: Add __pkvm_guest_unshare_host()"
This reverts commit f3468eac6f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie7b3c5c296c8c3a76fb91e1db0d9ee8f8830241f
2022-08-04 13:03:53 +00:00
Will Deacon
14283663e3 Revert "ANDROID: KVM: arm64: Advertise KVM vendor hypercalls to protected guests"
This reverts commit dfd60e8e53.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5f4fdc27bbd4d80d9c459061df087680959803a9
2022-08-04 13:03:53 +00:00
Will Deacon
0dd604b38e Revert "ANDROID: KVM: arm64: Add MEMINFO and {UN,}SHARE hypercalls for protected guests"
This reverts commit da4c4dc33a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5f812a7f92fc3762cb455b779f56aedac2e2cb83
2022-08-04 13:03:53 +00:00
Will Deacon
691a2f8a06 Revert "ANDROID: KVM: arm64: Allow userspace to receive SHARE and UNSHARE notifications"
This reverts commit 0b7e337baf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Idfaa58fd19bbd63cd1c154b0db808a6010780cd6
2022-08-04 13:03:53 +00:00
Will Deacon
e27735571c Revert "ANDROID: KVM: arm64: Donate pages to protected guests"
This reverts commit f85c26161b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If58c476aa2d6a9a48a616a0cb820bce27bbd38fb
2022-08-04 13:03:53 +00:00
Will Deacon
e4e37ef81b Revert "ANDROID: BACKPORT: KVM: arm64: Zero protected guest pages on teardown"
This reverts commit f4c9f74c6b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I28028ce2f48286a2a9e756f14b35582931324ec3
2022-08-04 13:03:53 +00:00
Will Deacon
20840b293b Revert "FROMLIST: firmware/smccc: Call arch-specific hook on discovering KVM services"
This reverts commit 8e3a834c92.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ifbbb03e1bec289ec469f4baa7064639b4d333612
2022-08-04 13:03:53 +00:00
Will Deacon
5e2f16424e Revert "ANDROID: BACKPORT: arm64: mm: Implement memory encryption API using KVM sharing hypercalls"
This reverts commit e8238cfc5d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I69dfeba4439dc5d3eb1f551348344e77b8843a56
2022-08-04 13:03:53 +00:00
Will Deacon
c23d4c1dee Revert "ANDROID: KVM: arm64: Create EL2 shadow for VMs when pKVM is enabled"
This reverts commit 08a460da6c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3175fc312cac51fb610c77a8971c3d0bd4601a8c
2022-08-04 13:03:53 +00:00
Will Deacon
9cd6530cd8 Revert "ANDROID: KVM: arm64: Ignore 'kvm-arm.mode=protected' when using VHE"
This reverts commit 13e73a21a9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I14dafb03c3225941aafda6bdffbe5ca82ab338c0
2022-08-04 13:03:53 +00:00
Will Deacon
18da892d53 Revert "ANDROID: KVM: arm64: Extend comment in has_vhe()"
This reverts commit 705b678b8b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ifdfdf46dd90dc60255e4ffa5166c5ef8742bb003
2022-08-04 13:03:53 +00:00
Will Deacon
654f169aca Revert "ANDROID: BACKPORT: KVM: arm64: Parse reserved-memory node for pkvm guest firmware region"
This reverts commit 4b23440d04.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I97772be62d61ef852ffb318eca86117c01c2c5fb
2022-08-04 13:03:53 +00:00
Will Deacon
1f5daaad2a Revert "ANDROID: KVM: arm64: Unmap PVM firmware from host stage-2 during de-privilege"
This reverts commit ab5c0b846b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie841e089ff0a8a1de8fd3137b6271a846de14f24
2022-08-04 13:03:53 +00:00
Will Deacon
77fa9a4630 Revert "ANDROID: KVM: arm64: Copy pvmfw into guest pages during donation from the host"
This reverts commit 29cbec8da5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I34cf99f136ec35541daea3980ef28b48cb549db2
2022-08-04 13:03:53 +00:00
Will Deacon
841262de62 Revert "ANDROID: KVM: arm64: Reset primary vCPU according to PVM firmware boot protocol"
This reverts commit 94d7fa9be4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia079aadbc80cdc6cacc59440392ab64228633b62
2022-08-04 13:03:53 +00:00
Will Deacon
a3c29e1691 Revert "ANDROID: BACKPORT: KVM: arm64: Introduce KVM_VM_TYPE_ARM_PROTECTED machine type for PVMs"
This reverts commit 3c4b7ff736.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9009040d4630399b83c96140fcf9ddd27148edfd
2022-08-04 13:03:53 +00:00
Will Deacon
c174bacad8 Revert "ANDROID: KVM: arm64: Introduce KVM_CAP_ARM_PROTECTED_VM to set/query PVM firmware"
This reverts commit eb41d18574.

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