# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1221728055 -32400
# Node ID 3d96f88fb220dd1b29f4873deca378913b3db3ff
# Parent 4a381ddc764a635e9242686ef8cefb5af363c873
[IA64] fix INIT injection.
xm trigger command sometimes causes an unexpected domain panic.
There are several symptoms:
* Guest nested fault (INIT handler runs with vpsr.cpl != 0)
* Interrupt when IC=0
* Unexpected virtual <--> physical mode transition
Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>
Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>
---
xen/arch/ia64/vmx/vlsapic.c | 4 ++--
xen/arch/ia64/vmx/vmx_phy_mode.c | 7 ++++++-
xen/include/asm-ia64/vmx_phy_mode.h | 2 ++
3 files changed, 10 insertions(+), 3 deletions(-)
diff -r 4a381ddc764a -r 3d96f88fb220 xen/arch/ia64/vmx/vlsapic.c
--- a/xen/arch/ia64/vmx/vlsapic.c Tue Sep 16 21:25:30 2008 +0900
+++ b/xen/arch/ia64/vmx/vlsapic.c Thu Sep 18 17:54:15 2008 +0900
@@ -43,6 +43,7 @@
#include <asm/vmx_platform.h>
#include <asm/viosapic.h>
#include <asm/vlsapic.h>
+#include <asm/vmx_phy_mode.h>
#include <asm/linux/jiffies.h>
#include <xen/domain.h>
#include <asm/hvm/support.h>
@@ -614,9 +615,8 @@ struct vcpu *lid_to_vcpu(struct domain *
* To inject INIT to guest, we must set the PAL_INIT entry
* and set psr to switch to physical mode
*/
-#define PAL_INIT_ENTRY 0x80000000ffffffa0
#define PSR_SET_BITS (IA64_PSR_DT | IA64_PSR_IT | IA64_PSR_RT | \
- IA64_PSR_IC | IA64_PSR_RI)
+ IA64_PSR_IC | IA64_PSR_RI | IA64_PSR_I | IA64_PSR_CPL)
static void vmx_inject_guest_pal_init(VCPU *vcpu)
{
diff -r 4a381ddc764a -r 3d96f88fb220 xen/arch/ia64/vmx/vmx_phy_mode.c
--- a/xen/arch/ia64/vmx/vmx_phy_mode.c Tue Sep 16 21:25:30 2008 +0900
+++ b/xen/arch/ia64/vmx/vmx_phy_mode.c Thu Sep 18 17:54:15 2008 +0900
@@ -255,7 +255,12 @@ switch_mm_mode(VCPU *vcpu, IA64_PSR old_
switch_mm_mode(VCPU *vcpu, IA64_PSR old_psr, IA64_PSR new_psr)
{
int act;
- act = mm_switch_action(old_psr, new_psr);
+ /* Switch to physical mode when injecting PAL_INIT */
+ if (unlikely(MODE_IND(new_psr) == 0 &&
+ vcpu_regs(vcpu)->cr_iip == PAL_INIT_ENTRY))
+ act = SW_2P_DT;
+ else
+ act = mm_switch_action(old_psr, new_psr);
perfc_incra(vmx_switch_mm_mode, act);
switch (act) {
case SW_2P_DT:
diff -r 4a381ddc764a -r 3d96f88fb220 xen/include/asm-ia64/vmx_phy_mode.h
--- a/xen/include/asm-ia64/vmx_phy_mode.h Tue Sep 16 21:25:30 2008 +0900
+++ b/xen/include/asm-ia64/vmx_phy_mode.h Thu Sep 18 17:54:15 2008 +0900
@@ -96,4 +96,6 @@ extern void physical_tlb_miss(VCPU *vcpu
#define VMX_MMU_PHY_D 1 /* Half physical: it=1,dt=0 */
#define VMX_MMU_PHY_DT 3 /* Full physical mode: it=0,dt=0 */
+#define PAL_INIT_ENTRY 0x80000000ffffffa0
+
#endif /* _PHY_MODE_H_ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home