Commit Graph

1058786 Commits

Author SHA1 Message Date
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
Will Deacon
94d5ecddf9 Revert "ANDROID: KVM: arm64: pkvm: Move memcache topup into a helper"
This reverts commit 339858e146.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2bf7a17e413b212bc18f0a8ab688f968753a1e74
2022-08-04 13:03:53 +00:00
Will Deacon
781c407382 Revert "ANDROID: KVM: arm64: pkvm: Rerge get_num_hvc_args into handle_pvm_exit_hvc64"
This reverts commit addb3e1f47.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia08e9c250eb792229249e650f521aa5c9945bd14
2022-08-04 13:03:53 +00:00
Will Deacon
b627f34de6 Revert "ANDROID: KVM: arm64: pkvm: Store vcpus in donated PGD at shadow-creation time"
This reverts commit f780e698c7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8be1d605613f7690a0ce2c91b16f523caf6faaaa
2022-08-04 13:03:53 +00:00
Will Deacon
b0e3391767 Revert "ANDROID: KVM: arm64: pkvm: Update the shadow view of pkvm.enabled at creation time"
This reverts commit 7c52b4e55a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I554fc97f1eb09ecea5ebee3cd97d99aef34f63ac
2022-08-04 13:03:53 +00:00
Will Deacon
aaa1536fde Revert "ANDROID: KVM: arm64: Introduce vcpu_is_protected() helper"
This reverts commit 9c2007f6d5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iff965ea172cc70be200263b6bb3905e098d43b48
2022-08-04 13:03:53 +00:00
Will Deacon
fe3d8d0610 Revert "ANDROID: KVM: arm64: Generate hyp-constants.o as an nVHE object"
This reverts commit e7d30f4c8c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9573d9cf73b859537b59e66ab167fb3235814aa7
2022-08-04 13:03:53 +00:00
Will Deacon
bd24047df8 Revert "ANDROID: KVM: arm64: pkvm: Replace pkvm_loaded_state.is_shadow with is_protected"
This reverts commit 730d3feb51.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id8f9276c91c1751abe941c1fcb480ab46c2ba4eb
2022-08-04 13:03:53 +00:00
Will Deacon
718453208b Revert "ANDROID: KVM: arm64: pkvm: Make {flush,sync}_shadow_state() take the full state"
This reverts commit 342b0133f3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id110cce06a1fc87ce92ba636d0f8e433c8f22377
2022-08-04 13:03:53 +00:00
Will Deacon
74ab599fa2 Revert "ANDROID: KVM: arm64: pkvm: Introduce entry/exit handlers for non-protected guests"
This reverts commit 20204f79de.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7baad7e1eac9ecb599c6d523fd63be35eae90d60
2022-08-04 13:03:53 +00:00
Will Deacon
f36f91850c Revert "ANDROID: KVM: arm64: pkvm: State sync primitives for non-protected guests"
This reverts commit a282cd5146.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I48809badb409aee968d80af6de0e51225c6d9a81
2022-08-04 13:03:53 +00:00
Will Deacon
7de7e7cad5 Revert "ANDROID: KVM: arm64: pkvm: Manage the non-protected guest dirty state from EL1"
This reverts commit 28f12f0fa0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9356bcade5fa5f1bdc7cb8a917b7d27750598c4e
2022-08-04 13:03:53 +00:00
Will Deacon
effcb9d307 Revert "ANDROID: KVM: arm64: pkvm: Share memory with non-protected guests"
This reverts commit 8d6a327d52.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I09b2c8ab0cca2e02680c1194d403b6eb04fc565c
2022-08-04 13:03:53 +00:00
Will Deacon
4a8d2c41f1 Revert "ANDROID: KVM: arm64: pkvm: Don't init pvm traps non non-protected guests"
This reverts commit 1fef38359c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib43801b7ccbae0ff3dbba90fd5807545a185c238
2022-08-04 13:03:53 +00:00
Will Deacon
62d2bb0336 Revert "ANDROID: KVM: arm64: pkvm: Allow the shadows to be destroyed on teardown"
This reverts commit 88c46ab100.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia915c2511df615f86dcc1f9ee6db3a5a2f1fb5ea
2022-08-04 13:03:53 +00:00
Will Deacon
cc2b97cd8d Revert "ANDROID: KVM: arm64: pkvm: Plug in cache invalidation for non-protected guests"
This reverts commit a1d06af5bf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibe4bfbcda3b20a4e49dec44134e7c2976822f1b6
2022-08-04 13:03:53 +00:00
Will Deacon
f53a0bf6f5 Revert "ANDROID: KVM: arm64: Generalise VM features into a set of flags"
This reverts commit 5abc5f17d0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib4c47c8525f84b37f795b17deb6f46e200327851
2022-08-04 13:03:53 +00:00
Will Deacon
e53dcb28d8 Revert "ANDROID: KVM: arm64: Check for PTE valitity when checking for executable/cacheable"
This reverts commit 89db48d204.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If1f19dba34d473936b43cb096eec4b4da949ca63
2022-08-04 13:03:53 +00:00
Will Deacon
41eae257b0 Revert "ANDROID: KVM: arm64: Define MMIO guard hypercalls"
This reverts commit c1f264d4f0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I178180fa556f79494f19308f624da389276c6bfe
2022-08-04 13:03:53 +00:00
Will Deacon
68cc629d41 Revert "ANDROID: KVM: arm64: Expose topup_hyp_memcache() to the rest of KVM"
This reverts commit c3e455cd33.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I1d5d4253d594b2f78ce85dffe079e00b057cd8aa
2022-08-04 13:03:53 +00:00
Will Deacon
ba9f3e3f2c Revert "ANDROID: KVM: arm64: Introduce KVM_ARCH_FLAG_MMIO_GUARD flag"
This reverts commit 4bd3bae3cc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8eeec94cfcb23321b6b4484c65f3cfd72a24e605
2022-08-04 13:03:53 +00:00
Will Deacon
93e2533bb2 Revert "ANDROID: KVM: arm64: pkvm: Add MMIO guard infrastructure"
This reverts commit f01af370af.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia1815d69520e2744ba8830d997d269c9e23e6004
2022-08-04 13:03:53 +00:00
Will Deacon
4d701c3c6a Revert "ANDROID: KVM: arm64: pkvm: Wire MMIO guard hypercalls"
This reverts commit 030481dc2d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I39520f277075b5eb150769c160cb2587ae0abcc3
2022-08-04 13:03:53 +00:00
Will Deacon
751dadca33 Revert "ANDROID: KVM: arm64: Plumb MMIO checking into the fault handling"
This reverts commit 24483ac2db.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic8ae32142b60443fe53a12bf9b62278bc5e11ef1
2022-08-04 13:03:53 +00:00
Will Deacon
4dc8c78676 Revert "ANDROID: KVM: arm64: Add some documentation for the MMIO guard feature"
This reverts commit 4837fb146d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I325a2f4a7de41d5ff8e8ced99925fab6817bc7c2
2022-08-04 13:03:53 +00:00
Will Deacon
432cf24bb2 Revert "ANDROID: mm/vmalloc: Add arch-specific callbacks to track io{remap,unmap} physical pages"
This reverts commit acd8b4b1f1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie56327837f823b424f3438d5b974c8086f8ba1e9
2022-08-04 13:03:53 +00:00
Will Deacon
3f0f2c7b38 Revert "ANDROID: arm64: Implement ioremap/iounmap hooks calling into KVM's MMIO guard"
This reverts commit 078e81b0c1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8ddb07092b9d577df6982d9b82cb5eb831e5f78c
2022-08-04 13:03:53 +00:00
Will Deacon
cbc4618d5f Revert "ANDROID: arm64: Enroll into KVM's MMIO guard if required"
This reverts commit de5c2716e3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I808f1e99876cb1945ffb47ee040b71912cf08468
2022-08-04 13:03:53 +00:00
Will Deacon
189c8d1b24 Revert "ANDROID: arm64: Add a helper to retrieve the PTE of a fixmap"
This reverts commit 41fd5d58f9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I59518f257a79359efbc19742a750dc1676daffc2
2022-08-04 13:03:53 +00:00
Will Deacon
dd8aa6aebb Revert "ANDROID: arm64: Register earlycon fixmap with the MMIO guard"
This reverts commit 870bcaf6e7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iea5d0e52f192e3da908b42b0bd60d911394a3901
2022-08-04 13:03:53 +00:00
Will Deacon
612a662d79 Revert "ANDROID: KVM: arm64: Create EL2 copy of __icache_flags for pKVM instead of alias"
This reverts commit aebc0435b1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icbb442f06e7b322de057825bc21c62b628472ba7
2022-08-04 13:03:53 +00:00
Will Deacon
7aaba75643 Revert "ANDROID: KVM: arm64: relay entropy requests from protected guests directly to secure"
This reverts commit 888643ea37.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id3a09089934bf4aa1ad283d79cf8710bab9775d5
2022-08-04 13:03:53 +00:00
Will Deacon
a423f8b8b9 Revert "FROMLIST: dt-bindings: reserved-memory: Open Profile for DICE"
This reverts commit e286af3957.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9b5bedd4d0fd10c30e9158ebcd9dfb5210ec8fd3
2022-08-04 13:03:53 +00:00
Will Deacon
3a47c1e2eb Revert "BACKPORT: FROMLIST: misc: open-dice: Add driver to expose DICE data to userspace"
This reverts commit 3251a051a2.

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

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I550d659aa6cd77c20873b403e7c2bd813502d8b7
2022-08-04 13:03:53 +00:00
Will Deacon
e335a5c33a Revert "ANDROID: KVM: arm64: Support TLB invalidation in guest context"
This reverts commit aebaed988e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8732335d95041c194cfdf81ce2c0a1bc6faa8281
2022-08-04 13:03:53 +00:00
Will Deacon
07ee4340b4 Revert "ANDROID: KVM: arm64: Fix vcpu sys_reg accessors when running with VHE"
This reverts commit 93b08c26e7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6ad61d8b6c9d6b89d58bc177e758298a01299b8a
2022-08-04 13:03:53 +00:00
Will Deacon
0856645276 Revert "ANDROID: KVM: arm64: pkvm: Force injection of a data abort on NISV MMIO exit"
This reverts commit 4132be368b.

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

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

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3297de2565bb6f2fa6bf944389c0938cebe5288c
2022-08-04 13:03:53 +00:00
Will Deacon
59717a815b Revert "FROMGIT: KVM: arm64: vgic-v3: Restrict SEIS workaround to known broken systems"
This reverts commit 180087cfb4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I80e57c5a365bc5aa4eb587257ede31ccfc0050bc
2022-08-04 13:03:53 +00:00
Will Deacon
32a4500ae9 Revert "FROMGIT: KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE"
This reverts commit bb60015aac.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie48017ceed392c53ab6d32f4c7e5763a4aa33b8e
2022-08-04 13:03:53 +00:00
Will Deacon
b16deb89e1 Revert "Revert "FROMLIST: dt-bindings: reserved-memory: Open Profile for DICE""
This reverts commit 13758e91c1.

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