Commit Graph

1058901 Commits

Author SHA1 Message Date
Will Deacon
618c8779c1 Revert "Revert "FROMLIST: KVM: arm64: Hook up ->page_count() for hypervisor stage-1 page-table""
This reverts commit 81ab9e20cf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If7b96c3ff000bf40c11e095679da017fffbe95c5
2022-08-04 13:03:53 +00:00
Will Deacon
90a373ac49 Revert "Revert "FROMLIST: KVM: arm64: Fixup hyp stage-1 refcount""
This reverts commit da05d9279e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I18306a81a203268a4e7d7ccebbd2adcdd23dae1b
2022-08-04 13:03:53 +00:00
Will Deacon
7246a3cbde Revert "Revert "FROMLIST: KVM: arm64: Refcount hyp stage-1 pgtable pages""
This reverts commit 647d1e9dcc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic57e47cb799258c3a93994f633ae2eda79e99bdf
2022-08-04 13:03:53 +00:00
Will Deacon
d1731fa129 Revert "Revert "FROMLIST: KVM: arm64: Provide {get,put}_page() stubs for early hyp allocator""
This reverts commit 6cb9fcb232.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia4ae26b40b2b350e5527d7afec6a61bc0105c71f
2022-08-04 13:03:53 +00:00
Will Deacon
f2d947d793 Revert "FROMGIT: KVM: arm64: Provide {get,put}_page() stubs for early hyp allocator"
This reverts commit 830bf938c4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5916a1fe2fa933675c907844b7dae7acd5c07dab
2022-08-04 13:03:53 +00:00
Will Deacon
54070caebb Revert "FROMGIT: KVM: arm64: Refcount hyp stage-1 pgtable pages"
This reverts commit acfd934617.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib1d59bfb77da8412344c22ab521f68ecae08da23
2022-08-04 13:03:53 +00:00
Will Deacon
ba46887eda Revert "FROMGIT: KVM: arm64: Fixup hyp stage-1 refcount"
This reverts commit 7fbaf37069.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I00727c7a3075eca82aa04cb861abd3ebb4102caa
2022-08-04 13:03:53 +00:00
Will Deacon
dc47c7599b Revert "FROMGIT: KVM: arm64: Hook up ->page_count() for hypervisor stage-1 page-table"
This reverts commit 5f9b0a6162.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I52be252e3057db08bd40959ba840d87c583fb47f
2022-08-04 13:03:53 +00:00
Will Deacon
b62420ace1 Revert "FROMGIT: KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2"
This reverts commit a7be01eb8d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I56089b5dd43267a5f631c7e21eb43357626a9cab
2022-08-04 13:03:53 +00:00
Will Deacon
4024540e88 Revert "BACKPORT: FROMGIT: KVM: arm64: Introduce kvm_share_hyp()"
This reverts commit 6234d46744.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia2bf02716dd5de79f0daabf1a98a064743fd0c36
2022-08-04 13:03:53 +00:00
Will Deacon
5f6d737bbc Revert "FROMGIT: KVM: arm64: pkvm: Refcount the pages shared with EL2"
This reverts commit 61936dc510.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If5e64c11192de0b1db8169ec5c1163dc635ff7d0
2022-08-04 13:03:53 +00:00
Will Deacon
356cdd5f38 Revert "FROMGIT: KVM: arm64: Extend pkvm_page_state enumeration to handle absent pages"
This reverts commit d9acb48aed.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4024f39043bf4e7a82ed2cb0b9152c29d715c1da
2022-08-04 13:03:53 +00:00
Will Deacon
6f4341a4b0 Revert "FROMGIT: KVM: arm64: Introduce wrappers for host and hyp spin lock accessors"
This reverts commit 32cc9591f0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic37575584cb7e8a0fc999740d1512936c4db2fb8
2022-08-04 13:03:53 +00:00
Will Deacon
52c94f6814 Revert "FROMGIT: KVM: arm64: Implement do_share() helper for sharing memory"
This reverts commit 2477c5eb2b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I791a125ea1178b96a2d2efdae3ac589f4ce0d12f
2022-08-04 13:03:53 +00:00
Will Deacon
0f03f85dbc Revert "FROMGIT: KVM: arm64: Implement __pkvm_host_share_hyp() using do_share()"
This reverts commit ba98bc064b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id4af9f73b7dc862bf59c081ef663053ff89ee76c
2022-08-04 13:03:53 +00:00
Will Deacon
223ec47011 Revert "FROMGIT: KVM: arm64: Implement do_unshare() helper for unsharing memory"
This reverts commit 2d57dde147.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I69e746dba5e12cada2d745c753445f610ac6af62
2022-08-04 13:03:53 +00:00
Will Deacon
bea4eea60a Revert "FROMGIT: KVM: arm64: Expose unshare hypercall to the host"
This reverts commit b45ecf7774.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I88682e661a42d8aabc0f5f46461b750e9206c6ea
2022-08-04 13:03:53 +00:00
Will Deacon
15cf0f0006 Revert "FROMGIT: KVM: arm64: pkvm: Unshare guest structs during teardown"
This reverts commit 12f8b6f54b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie814f165936e4f01ab817a552f0f123275851bde
2022-08-04 13:03:53 +00:00
Will Deacon
70d632ccf1 Revert "FROMGIT: KVM: arm64: Drop unused workaround_flags vcpu field"
This reverts commit 79e8cbf51a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I99bd979377c80340224a318874fff35c033bc417
2022-08-04 13:03:53 +00:00
Will Deacon
3fba2cc0c0 Revert "FROMGIT: KVM: arm64: vgic-v3: Fix vcpu index comparison"
This reverts commit d11273c6b3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibfdd432ac711a871576c40d25cce9af7a1233bac
2022-08-04 13:03:53 +00:00
Will Deacon
056550b1ed Revert "FROMGIT: KVM: arm64: vgic: Demote userspace-triggered console prints to kvm_debug()"
This reverts commit 60bd62a27a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I18d82a911f6ab65b806eeb9894e72ba302ec779a
2022-08-04 13:03:53 +00:00
Will Deacon
1dc91f04a4 Revert "FROMGIT: KVM: arm64: Rework kvm_pgtable initialisation"
This reverts commit fc13bc019f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic4d8020f3f310623b55adc3dde3d4bcff237300a
2022-08-04 13:03:53 +00:00
Will Deacon
a361e63c61 Revert "FROMGIT: KVM: arm64: Fix comment typo in kvm_vcpu_finalize_sve()"
This reverts commit 90ee768cbc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I00a761d776e554b5fa1c651a72e89062b8f13b98
2022-08-04 13:03:53 +00:00
Will Deacon
a7ff4a258c Revert "FROMGIT: KVM: arm64: vgic: Replace kernel.h with the necessary inclusions"
This reverts commit de680fdc4b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9bb0ad2b102a3415d5a3e57bb3c07ca5b45985f7
2022-08-04 13:03:53 +00:00
Will Deacon
dca54686eb Revert "ANDROID: KVM: arm64: Introduce IOMMU driver infrastructure"
This reverts commit 5158bd95fe.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I409940ea93cec0c92368f1f0d8041361190c20e7
2022-08-04 13:03:53 +00:00
Will Deacon
6791d1a2c8 Revert "ANDROID: KVM: arm64: Add 'host_smc_handler' to kvm_iommu_ops"
This reverts commit ba27273db7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icbfae975bb34e96a9eaf4d0f8e5bbbad56237081
2022-08-04 13:03:53 +00:00
Will Deacon
35da9fb07b Revert "ANDROID: KVM: arm64: Add 'host_stage2_set_owner' to kvm_iommu_ops"
This reverts commit f51f6b5d26.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I985a3f0c01a5c05472b7381441c9144a78b0e3a8
2022-08-04 13:03:53 +00:00
Will Deacon
2c2b64e5b3 Revert "ANDROID: KVM: arm64: Add 'host_mmio_dabt_handler' to kvm_iommu_ops"
This reverts commit 565267794a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5b1129b0a71416675a15008157e7a7a98a343517
2022-08-04 13:03:53 +00:00
Will Deacon
09d1f2e4ff Revert "ANDROID: KVM: arm64: Add 'host_stage2_adjust_mmio_range' to kvm_iommu_ops"
This reverts commit 57454d3763.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I03d1c3da627c27e11606511bd95cba62ce95d588
2022-08-04 13:03:53 +00:00
Will Deacon
4ac24d87e9 Revert "ANDROID: dt-bindings: iommu: Add Google S2MPU"
This reverts commit f43970daf2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I432c4a7edd850442c0e609e07320c164b03f4f42
2022-08-04 13:03:53 +00:00
Will Deacon
7101fee045 Revert "ANDROID: KVM: arm64: Create empty S2MPU driver"
This reverts commit d907ef4ba5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia5ff3af0762f01243ab6b39317d993c24933d6b8
2022-08-04 13:03:53 +00:00
Will Deacon
5f11cfb675 Revert "ANDROID: KVM: arm64: Parse S2MPU MMIO region"
This reverts commit 8827315de0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I452bb1c9c729685355d34e074baf8b899fa774a8
2022-08-04 13:03:53 +00:00
Will Deacon
7f57318294 Revert "ANDROID: KVM: arm64: Read and check S2MPU_VERSION"
This reverts commit e850485374.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib3390281dd569c34b92781eb8c5e261cd5a056f5
2022-08-04 13:03:53 +00:00
Will Deacon
27da5c847c Revert "ANDROID: KVM: arm64: Allocate context IDs for valid VIDs"
This reverts commit a74e3b10a1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7f74295b1353c6e10f4d61ce98e57b8d9d09a024
2022-08-04 13:03:53 +00:00
Will Deacon
f194ade76f Revert "ANDROID: KVM: arm64: Implement IRQ handler for S2MPU faults"
This reverts commit 4a75e1b060.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iec816336b559f906ddd4e8477c6b81926d066f45
2022-08-04 13:03:53 +00:00
Will Deacon
6290d3f2d5 Revert "ANDROID: KVM: arm64: Copy S2MPU configuration to hyp"
This reverts commit 0ed6ef5469.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie26957d74f1505cd2b28da4bae1b2673135a30f8
2022-08-04 13:03:53 +00:00
Will Deacon
20ea84d60f Revert "ANDROID: KVM: arm64: Enable S2MPUs in __pkvm_init_stage2_iommu"
This reverts commit f6b90bb6f5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I70db912d943e890a3c6eb4bf072845d6778d8c45
2022-08-04 13:03:53 +00:00
Will Deacon
eefeeb6a68 Revert "ANDROID: KVM: arm64: Reprogram S2MPUs in 'host_smc_handler'"
This reverts commit 6a2df20712.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4c033beff6273ee11e6a21d6e0d740218704c74f
2022-08-04 13:03:53 +00:00
Will Deacon
b44b7997ed Revert "ANDROID: KVM: arm64: Set up S2MPU Memory Protection Table"
This reverts commit 4bd76c88c5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic9b4b3997a66915da5299401c889ed668d3de2df
2022-08-04 13:03:53 +00:00
Will Deacon
7321f03379 Revert "ANDROID: KVM: arm64: Modify S2MPU MPT in 'host_stage2_set_owner'"
This reverts commit ce1b8ebce8.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I64e7e57f746da5f8b01d02f715efe37d6acc5a06
2022-08-04 13:03:53 +00:00
Will Deacon
8110d32251 Revert "ANDROID: KVM: arm64: Add S2MPU kselftest"
This reverts commit fa6ad0bcb8.

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

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I890260dd0da31b642b0dc6bd0aa47b02e3eb2b43
2022-08-04 13:03:53 +00:00
Will Deacon
4544cc012a Revert "ANDROID: KVM: arm64: Implement MMIO handler in S2MPU driver"
This reverts commit 81e70911d6.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3958d6ffebfff32038d3ce3af6c792220698f13f
2022-08-04 13:03:53 +00:00
Will Deacon
3d9e00e539 Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO registers from host stage-2"
This reverts commit 0fedf3dfd3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9ad97a3390a9af8b86f42f04965a08ac1232d592
2022-08-04 13:03:53 +00:00
Will Deacon
9b3628fd98 Revert "ANDROID: Enable KVM_S2MPU in gki_defconfig"
This reverts commit 2023f01461.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3ddcbca7b4d1bd9bed4e9f92c7de6dde0903f82e
2022-08-04 13:03:53 +00:00
Will Deacon
b27f5f4394 Revert "ANDROID: KVM: arm64: Mark select_iommu_ops static"
This reverts commit 8d929114a7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2a4a2ff21296d2f2c274b2d392a26fd649b97e22
2022-08-04 13:03:53 +00:00
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