Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Jan Kiszka <jan.kiszka@siemens.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H . Peter Anvin" <hpa@zytor.com>
Cc:     x86@kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        jailhouse-dev@googlegroups.com
Subject: [PATCH 08/10] x86: jailhouse: Halt instead of failing to restart
Date:   Thu, 16 Nov 2017 08:26:50 +0100
Message-Id: <30bc2e239c4a6e9d69059f86521122c8a1c4882f.1510817211.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1510817211.git.jan.kiszka@siemens.com>
References: <cover.1510817211.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1510817211.git.jan.kiszka@siemens.com>
References: <cover.1510817211.git.jan.kiszka@siemens.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Jan Kiszka <jan.kiszka@siemens.com>

Jailhouse provides no guest-initiated restart. So, do not even try to.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 arch/x86/kernel/jailhouse.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index c1ed7fcd7bfa..0bcca175c35e 100644
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -12,10 +12,12 @@
 
 #include <linux/acpi_pmtmr.h>
 #include <linux/kernel.h>
+#include <linux/reboot.h>
 #include <asm/apic.h>
 #include <asm/cpu.h>
 #include <asm/hypervisor.h>
 #include <asm/i8259.h>
+#include <asm/reboot.h>
 #include <asm/setup.h>
 
 #define SETUP_JAILHOUSE		0x53484c4a /* "JLHS" */
@@ -133,6 +135,12 @@ static unsigned long jailhouse_calibrate_tsc(void)
 	return 0;
 }
 
+static void jailhouse_no_restart(void)
+{
+	pr_notice("Jailhouse: Restart not supported, halting\n");
+	machine_halt();
+}
+
 static unsigned int x2apic_get_apic_id(unsigned long id)
 {
         return id;
@@ -153,6 +161,8 @@ static void __init jailhouse_init_platform(void)
 	x86_platform.calibrate_cpu = jailhouse_calibrate_cpu;
 	x86_platform.calibrate_tsc = jailhouse_calibrate_tsc;
 
+	machine_ops.emergency_restart = jailhouse_no_restart;
+
 	data = early_memremap(pa_data, sizeof(*data));
 
 	if (data->header.type != SETUP_JAILHOUSE ||
-- 
2.12.3


From 1584194694096903505@xxx Thu Nov 16 04:16:31 +0000 2017
X-GM-THRID: 1584194694096903505
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread