Commit Graph

1058681 Commits

Author SHA1 Message Date
Will Deacon
529b4abfdb Revert "ANDROID: KVM: arm64: s2mpu: Move SFR init to EL2"
This reverts commit 880d95ffa3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ide4de67f0e6e1d6174460e373f23b2411fdadf61
2022-08-04 13:03:53 +00:00
Will Deacon
61af7545c1 Revert "ANDROID: KVM: arm64: s2mpu: Remove all EL1 code"
This reverts commit eac866611c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I96a30a92dca40bccbd48fbf47ad5fd7b7f77d401
2022-08-04 13:03:53 +00:00
Will Deacon
70f8958813 Revert "ANDROID: KVM: arm64: s2mpu: Replace struct s2mpu with pkvm_iommu"
This reverts commit 498f6cfaf9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I16a2d3d66b9a582d52c659bf22d5471d40c9d753
2022-08-04 13:03:53 +00:00
Will Deacon
a9dd76faef Revert "ANDROID: KVM: arm64: s2mpu: Remove host_stage2_adjust_mmio_range"
This reverts commit bdcf9ecb5c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3ccba2141b959f42237160d7ea26d0aa8522952b
2022-08-04 13:03:53 +00:00
Will Deacon
a2d0c06025 Revert "ANDROID: KVM: arm64: s2mpu: Add driver initializer"
This reverts commit b5877cf5f5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icb38c5eab21bc0c00d69ff26b778d1b8903509bb
2022-08-04 13:03:53 +00:00
Will Deacon
494fb078fe Revert "ANDROID: KVM: arm64: s2mpu: Replace SMC handler with PM callbacks"
This reverts commit e3f32a19c3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I463c075c307db6cec46c3b72ccd4cb5fc2551ef5
2022-08-04 13:03:53 +00:00
Will Deacon
7570c34949 Revert "ANDROID: KVM: arm64: s2mpu: Replace DABT handler with callback"
This reverts commit 0f911c35ca.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I97bc2398abddb5835ec0681dcf58eb011f3eaa42
2022-08-04 13:03:53 +00:00
Will Deacon
0c26a21096 Revert "ANDROID: KVM: arm64: s2mpu: Move mpt_update_flags into FMPT"
This reverts commit 2927077b47.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I1b74b276d0d7bd04f56b0ff194340e495b6f7e5f
2022-08-04 13:03:53 +00:00
Will Deacon
6b0fe581de Revert "ANDROID: KVM: arm64: s2mpu: Implement host stage2 idmap callbacks"
This reverts commit 0e73ac05bf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iac3ea1edcca0734f2066ba2ed5cb4e4cf478ccf9
2022-08-04 13:03:53 +00:00
Will Deacon
27448ab565 Revert "ANDROID: KVM: arm64: Remove unused IOMMU hooks, kvm_iommu_ops"
This reverts commit 6122181d63.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2978dfcba76e8b4e0a3cf7b6bc450b05123ede3e
2022-08-04 13:03:53 +00:00
Will Deacon
38c7cbfd94 Revert "ANDROID: KVM: arm64: Invalidate TLB by VMID when tearing down the shadow VM"
This reverts commit 5715f9497b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7f02d23466b8eecc066fc49f3aeb421b6b4bdb0e
2022-08-04 13:03:53 +00:00
Will Deacon
75d85afb1d Revert "ANDROID: KVM: arm64: Only map swap-backed pages into the guest"
This reverts commit 14ad77dd00.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I42a107a75ec09cd6a721ada5df0aed18a939172a
2022-08-04 13:03:53 +00:00
Will Deacon
842b83e073 Revert "ANDROID: KVM: arm64: Handle all ID registers trapped for a protected VM"
This reverts commit 0b48050d2c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I989129e891850d187a14c0c4bc22ef0720d729d8
2022-08-04 13:03:53 +00:00
Will Deacon
d2931ac4eb Revert "ANDROID: KVM: arm64: Check pin_user_pages() return value"
This reverts commit 935f60b120.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9f6beae8ee08a04feb33a6d69a2b5ea197579329
2022-08-04 13:03:53 +00:00
Will Deacon
a66888825b Revert "ANDROID: KVM: arm64: Use PSCI MEM_PROTECT to zap guest pages on reset"
This reverts commit 4347917056.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3224c53a791029db52821f5333fe0ba9da168f64
2022-08-04 13:03:53 +00:00
Will Deacon
668645c585 Revert "ANDROID: KVM: arm64: Add is_pkvm_initialized() helper"
This reverts commit d5d40c59da.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I071ca40c9f7b35de417a17e957c68bb147c026cb
2022-08-04 13:03:53 +00:00
Will Deacon
d689e967fa Revert "ANDROID: KVM: arm64: Refactor enter_exception64()"
This reverts commit f711573491.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6341067519db01fd312717e97fd33af6736c836e
2022-08-04 13:03:53 +00:00
Will Deacon
d794e20af4 Revert "ANDROID: KVM: arm64: pkvm: Inject SIGSEGV on illegal accesses"
This reverts commit 2692f0f6f1.

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

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

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie60089221f571a98e5a8cb8f0ba87ac81bb1b6d3
2022-08-04 13:03:53 +00:00
Will Deacon
ab71832edb Revert "ANDROID: KVM: arm64: Drop FOLL_FORCE when pinning guest memory pages"
This reverts commit 3f5ffbd827.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie38216650f36b6b38f0c4052cec515955e239b80
2022-08-04 13:03:53 +00:00
Will Deacon
f1689aa7a9 Revert "ANDROID: KVM: arm64: pkvm: Don't access kvm_arm_hyp_percpu_base at EL1"
This reverts commit e3d466ac29.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icef84ef2ec9eb7bc1256750d839f93328e0b2397
2022-08-04 13:03:53 +00:00
Will Deacon
daf3271f36 Revert "ANDROID: KVM: arm64: Unmap kvm_arm_hyp_percpu_base from the host"
This reverts commit 7670745758.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5a04572d7dfbee8929288a7d4c15543c3c505410
2022-08-04 13:03:53 +00:00
Will Deacon
14d38827ac Revert "ANDROID: KVM: arm64: Explicitely map kvm_vgic_global_state at EL2"
This reverts commit fa96b5be92.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I669c57a28410308ed0f17d553e8564c6121da56e
2022-08-04 13:03:53 +00:00
Will Deacon
85cb45425f Revert "ANDROID: KVM: arm64: Don't map host sections in pkvm"
This reverts commit d10551c5fd.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9dd0930dd35616553c5a2d7a061840e837e06bb1
2022-08-04 13:03:53 +00:00
Will Deacon
68a03041a7 Revert "ANDROID: KVM: arm64: iommu: Harden __pkvm_iommu_pm_notify"
This reverts commit 0c292fa8d6.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I39c4f3ff6a0094117fe979378aed19814dc645a0
2022-08-04 13:03:53 +00:00
Will Deacon
0d6639d203 Revert "ANDROID: KVM: arm64: iommu: Free memory on registration error"
This reverts commit 597558ad5b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I98af74857a8100942e81094570291038305c0474
2022-08-04 13:03:53 +00:00
Will Deacon
59eea64c9a Revert "ANDROID: KVM: arm64: iommu: Create private mapping last"
This reverts commit c690c2e305.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If921b6b032233bc649b076fa3f4de37600c71dc3
2022-08-04 13:03:53 +00:00
Will Deacon
59fe12e0c0 Revert "ANDROID: KVM: arm64: iommu: Run validate() on struct pkvm_iommu"
This reverts commit db89d65f69.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I20750ee1f8fa246b8fd6397fcbb31a1f60a9c02b
2022-08-04 13:03:53 +00:00
Will Deacon
4a775df889 Revert "ANDROID: KVM: arm64: iommu: Create parent/child relation"
This reverts commit d5bc119656.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7aded5e8adabfe9e717bb104edcdf072b581842e
2022-08-04 13:03:53 +00:00
Will Deacon
dd8e24204e Revert "ANDROID: KVM: arm64: s2mpu: Create SysMMU_SYNC driver"
This reverts commit 611c9a2a4a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I409241329f9528be4402c0dd50e119488791a083
2022-08-04 13:03:53 +00:00
Will Deacon
57726405ee Revert "ANDROID: KVM: arm64: iommu: No powered check in DABT handler"
This reverts commit 2c05ff981a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I164f13bb4bd466e86cec2d07cda67a7641049f7a
2022-08-04 13:03:53 +00:00
Will Deacon
d3c529951d Revert "ANDROID: KVM: arm64: iommu: Add pkvm_iommu_finalize"
This reverts commit d2e71e529b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I56297185ba60400d5f52d284f7d8e167b25e5a48
2022-08-04 13:03:53 +00:00
Will Deacon
ede52bb8fe Revert "ANDROID: KVM: arm64: Make the use of host or shadow vcpu less error prone"
This reverts commit 0b9114c308.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibbfa7f977bddab8123c27d016af32b3ab360a1fe
2022-08-04 13:03:53 +00:00
Will Deacon
0ec225eb5e Revert "ANDROID: KVM: arm64: pkvm: Track the SVE state in the shadow vcpu"
This reverts commit d35bf8afbf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7400ee64cb65b99f3616dc77c66960d65881e37a
2022-08-04 13:03:53 +00:00
Will Deacon
b01c45bf4a Revert "ANDROID: KVM: arm64: iommu: Fix upper bound of PT walk"
This reverts commit 58f8121600.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib31b14b0c49a427c78a0f316b86eab46771d31d2
2022-08-04 13:03:53 +00:00
Will Deacon
e192394792 Revert "ANDROID: KVM: arm64: s2mpu: Initialize MPTs to PROT_RW"
This reverts commit b8a31a6030.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4076ea01681f5718671203cf2e024355caaa0e40
2022-08-04 13:03:53 +00:00
Will Deacon
7e017331f5 Revert "ANDROID: KVM: arm64: iommu: Optimize snapshot_host_stage2"
This reverts commit 8b304ef274.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I986e5e99986ba18ac24b54bb94ebeda781b55d8f
2022-08-04 13:03:53 +00:00
Will Deacon
52273e667f Revert "ANDROID: KVM: arm64: Fix ToCToU issue when refilling the hyp memcache"
This reverts commit 0957aec081.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id838e47d103f6a9100ae042b73abb2e907f63aa0
2022-08-04 13:03:53 +00:00
Will Deacon
5b5d8886f6 Revert "ANDROID: KVM: arm64: Pin FFA mailboxes shared by the host"
This reverts commit 7a67d424c1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9ddf51c2dc07fe5b68e6e2ce3d814dcdd36cfb27
2022-08-04 13:03:53 +00:00
Will Deacon
d81875516a Revert "ANDROID: KVM: arm64: Fix size calculation of FFA memory range"
This reverts commit 3d21efc81c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie1a4e5117d51af64d2bd2641dc68d13c13015dd5
2022-08-04 13:03:53 +00:00
Will Deacon
bb4b2952f4 Revert "ANDROID: KVM: arm64: Do not allow memslot modifications once a PVM has run"
This reverts commit 4d5aa4280a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib0661ad68724a4667eaa8ab3e7a335eeac887457
2022-08-04 13:03:53 +00:00
Will Deacon
9a287c833f Revert "ANDROID: KVM: arm64: s2mpu: Extract L1ENTRY_* consts"
This reverts commit 28632d7a23.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibdea76beec5f84e49c2485e9758ca3988b35964d
2022-08-04 13:03:53 +00:00
Will Deacon
b43d1f61f1 Revert "ANDROID: KVM: arm64: s2mpu: Refactor DABT handler"
This reverts commit e62f59e567.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5e7d2667f798b9106bffb9952b0c2dd5954d654a
2022-08-04 13:03:53 +00:00
Will Deacon
2ab7a04c0c Revert "ANDROID: KVM: arm64: s2mpu: Allow L1ENTRY_* r/o access"
This reverts commit fdfed49bf7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8558f5d4c197f1f52104e44b8b78f316a61db137
2022-08-04 13:03:53 +00:00
Will Deacon
12c8829443 Revert "ANDROID: KVM: arm64: s2mpu: Allow reading MPTC entries"
This reverts commit 520d88005f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I288452bc61971299883961cae4d8b0b32e149991
2022-08-04 13:03:53 +00:00
Will Deacon
7a630e9e6c Revert "ANDROID: KVM: arm64: s2mpu: Allow r/o access to control regs"
This reverts commit fde6251d1f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I195dd33cea8415268af305e0b1fbb97e7b215b1b
2022-08-04 13:03:53 +00:00
Will Deacon
fb1d2e66e8 Revert "ANDROID: arm64: Auto-enroll MMIO guard on protected vms"
This reverts commit 6f741e863c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I80106643ffb3004f42142c3d048a1c1998333dd8
2022-08-04 13:03:53 +00:00
Will Deacon
fde82d8ef2 Revert "FROMGIT: KVM: arm64: Handle host stage-2 faults from 32-bit EL0"
This reverts commit f5216880de.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I84ba44805200eac477db1d89c997f253138811dd
2022-08-04 13:03:53 +00:00
Will Deacon
63a3bd4756 Revert "ANDROID: KVM: arm64: pkvm: Ensure that TLBs and I-cache are private to each vcpu"
This reverts commit 92a6dd3865.

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