[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] x86/setup: delay setting SYS_STATE_smp_boot
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Mon, 16 May 2022 13:12:03 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nhCkh1FZ1F5zJ5J/ndjap8DJe5PWS3yWzz3ngommb2g=; b=UUyelrA/DpS2Yd4+vanonIdwaE60/fBd0NESMSsIF2tlGcrwbN5dX7BpIDvGxk/vCCQWk9TqjQV1CXknaljZXVpDuRB6pPMifY21FEqXt2//R0qIEsIRbd4fIZDxVbcEvCSnXaI6GHtb/72gIbbg7yxeOy+axRxss8lCggIfVRhekMBt5xeRUX9jbkopXtY929CWQvhwh6M8lcpghbD31C00RJYMymW6hUriop/11g6yVveaFLDw5FPkv1iG49CtHHnX1KkeZawVEfY3cJIpulok6zMezW7ghr8Tf6gUaRKyEZRBc3pdnBZSYTvOJOE0K16Q/n+7tn3jpRAc7tIgMw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ty21+rlkdHzwrhvrYoW0pZl3NPk7vUcRBCx2k1pcbcDquVZ8ScVsP5Uh4VZEZqDTEBBVQf3koEqkMz9u+w1xI1B4nXXvnzTCUQX4CUQ3cFpja+p2PE1shGIj2XvEa9hIcuNKab0VFuL3j1UzGPPtP97r/63e77rcNVUeHf7Aiedbzg4t2NUspkKjsAcx9UJA1LE4HdI+k/ZqWOlUhjaGpSjWr2xyWnAXBV1ehSf3pTRrJ8hdmSQVWpEHalJ3L5BPbPO5kAkDLSE731BDFQ5V7llVTVS6VYLfqCiMytB/8e4/YF/A179sgZ9NFNKEG37wmGTgFivThqpyu/4T9dGpGw==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Mon, 16 May 2022 11:12:29 +0000
- Ironport-data: A9a23:MjpUrKvq3Wo+yeAahq8cI7p3gefnVCFfMUV32f8akzHdYApBsoF/q tZmKT2EPqreYmb0eoojbou0phlSvZWHnYBiSFFs/ihkQitE+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/nOHNIQMcacUsxLbVYMpBwJ1FQywobVvqYy2YLjW17U5 IuoyyHiEATNNwBcYzp8B52r8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatA88tqBb /TC1NmEElbxpH/BPD8HfoHTKSXmSpaKVeSHZ+E/t6KK2nCurQRquko32WZ1he66RFxlkvgoo Oihu6BcRi8XHoDrt7g4YyB5UBwlN6ZMwrLuC0iW5Jn7I03uKxMAwt1IJWRvZ8gy3LYyBmtDs /sFNDoKcxaPwfqsx662QfVtgcJlK9T3OIQYuTdryjSx4fQOGMifBfmVo4IFmm5v2qiiHt6HD yYdQSBoYxnaJQVGJ38cCY4knffujX76G9FdgA3M+vpnujCJpOB3+L/sAfTbWNnQee9yg3uDg 2ns7mnhUw5PYbRzzhLAqBpAnNTnjS79HY4fCrC83vprm0GIgHweDgUMUlm2quX/jVSxM/pdI UEJ/islrYAp6VemCNL6WnWQv3qsrhMaHd1KHIUHBBqlz6PV50OTADgCRzsYMtg+7pZpGXoty 0ODmM7vCXp3qrqJRHmB97CS6zSvJSwSKmxEbigBJecY3+TeTEgIpkqnZr5e/GSd14Cd9e3Yq 9xSkBUDug==
- Ironport-hdrordr: A9a23:CUnlHah3ToZWKsFK2SKBOqRErXBQXzx13DAbv31ZSRFFG/FwyP rCoB1L73XJYWgqM03I+eruBEBPewK/yXcT2/hoAV7CZniehILMFu1fBOTZslnd8kHFltK1tp 0QDpSWdueAamSS5PySiGfYLz9J+qj8zEnCv5a6854Cd3AIV0k2hD0JcTpzX3cGMzVuNN4cLt 6x98BHrz2vdTA+adm6PGAMW6zmq8fQnJzrTBYaD1p/gTP+xA+A2frfKVy1zx0eWzRAzfML9n XEqRXw4uGGv+ugwhHR+mfP59B9mcfnyPFEGMuQ4/JlXAnEu0KNXsBMSreCtDc6rKWG70srqs DFp1MaM8F6+xrqDxOIiCqo/zOl/Ccl6nfkx1Pdq2Dku9bFSDUzDNcErZ5FczPCgnBQ8e1U4e Zu5Sa0ppBXBRTPkGDW/N7TTSxnkUKyvD4LjfMTtXpCSoETAYUh57D3xHklX6voIRiKprzOSI JVfYDhDbdtABinhknizyVSKIfGZAVyIv+EKnJyyfB9nQIm30yR9HFou/D3rk1wiK7VdKM0md gsSp4Y8o2mbvVmGJ6VV91xNfdeNAT2MGPxGVPXB2jbP4c6HF+Ig6LLwdwOlZGXkdozvdMPpK g=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Booting with Shadow Stacks leads to the following assert on a debug
hypervisor:
(XEN) [ 11.625166] Assertion 'local_irq_is_enabled()' failed at
arch/x86/smp.c:265
(XEN) [ 11.629410] ----[ Xen-4.17.0-10.24-d x86_64 debug=y Not tainted
]----
(XEN) [ 11.633679] CPU: 0
(XEN) [ 11.637834] RIP: e008:[<ffff82d040345300>]
flush_area_mask+0x40/0x13e
[...]
(XEN) [ 11.806158] Xen call trace:
(XEN) [ 11.811255] [<ffff82d040345300>] R flush_area_mask+0x40/0x13e
(XEN) [ 11.816459] [<ffff82d040338a40>] F modify_xen_mappings+0xc5/0x958
(XEN) [ 11.821689] [<ffff82d0404474f9>] F
arch/x86/alternative.c#_alternative_instructions+0xb7/0xb9
(XEN) [ 11.827053] [<ffff82d0404476cc>] F alternative_branches+0xf/0x12
(XEN) [ 11.832416] [<ffff82d04044e37d>] F __start_xen+0x1ef4/0x2776
(XEN) [ 11.837809] [<ffff82d040203344>] F __high_start+0x94/0xa0
Fix this by switching to state SYS_STATE_smp_boot after alternatives
have been applied.
Fixes: (78e072bc37 'x86/mm: avoid inadvertently degrading a TLB flush to local
only')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
xen/arch/x86/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 53a73010e0..318f02f6ae 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1853,12 +1853,12 @@ void __init noreturn __start_xen(unsigned long mbi_p)
console_init_postirq();
- system_state = SYS_STATE_smp_boot;
-
do_presmp_initcalls();
alternative_branches();
+ system_state = SYS_STATE_smp_boot;
+
/*
* NB: when running as a PV shim VCPUOP_up/down is wired to the shim
* physical cpu_add/remove functions, so launch the guest with only
--
2.36.0
|
