From patchwork Wed Apr 15 00:59:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adalbert_Laz=C4=83r?= X-Patchwork-Id: 284352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DA76C2BB1D for ; Wed, 15 Apr 2020 01:13:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 23D2420732 for ; Wed, 15 Apr 2020 01:13:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23D2420732 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bitdefender.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWcJ-0001CV-53 for qemu-devel@archiver.kernel.org; Tue, 14 Apr 2020 21:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58484) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWPA-0001L6-Cv for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOWP8-0005C6-SX for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:52 -0400 Received: from mx01.bbu.dsd.mx.bitdefender.com ([91.199.104.161]:49104) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOWP8-00052R-JG for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:50 -0400 Received: from smtp.bitdefender.com (smtp02.buh.bitdefender.net [10.17.80.76]) by mx01.bbu.dsd.mx.bitdefender.com (Postfix) with ESMTPS id EBB1E30747D5; Wed, 15 Apr 2020 03:59:35 +0300 (EEST) Received: from localhost.localdomain (unknown [91.199.104.27]) by smtp.bitdefender.com (Postfix) with ESMTPSA id D6C48305B7A3; Wed, 15 Apr 2020 03:59:35 +0300 (EEST) From: =?utf-8?q?Adalbert_Laz=C4=83r?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v1 19/26] kvm: vmi: intercept force-reset Date: Wed, 15 Apr 2020 03:59:31 +0300 Message-Id: <20200415005938.23895-20-alazar@bitdefender.com> In-Reply-To: <20200415005938.23895-1-alazar@bitdefender.com> References: <20200415005938.23895-1-alazar@bitdefender.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 91.199.104.161 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Adalbert_Laz=C4=83r?= , Marian Rotariu , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marian Rotariu On forced reset, KVM and the instrospection tool must clean-up the introspection structures. An important thing that must by done by KVM is to unlink the shared memory pages (the introspection tool can map memory pages from the introspected VM in its own process/VM). CC: Markus Armbruster Signed-off-by: Marian Rotariu Signed-off-by: Adalbert Lazăr --- accel/kvm/vmi.c | 6 ++++++ include/sysemu/vmi-intercept.h | 2 ++ monitor/qmp-cmds.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/accel/kvm/vmi.c b/accel/kvm/vmi.c index e511558f3d..90906478b4 100644 --- a/accel/kvm/vmi.c +++ b/accel/kvm/vmi.c @@ -73,6 +73,7 @@ static const char *action_string[] = { "none", "suspend", "resume", + "force-reset", }; static bool suspend_pending; @@ -677,6 +678,8 @@ static bool record_intercept_action(VMI_intercept_command action) case VMI_INTERCEPT_RESUME: suspend_pending = false; break; + case VMI_INTERCEPT_FORCE_RESET: + break; default: return false; } @@ -693,6 +696,9 @@ static bool intercept_action(VMIntrospection *i, } switch (action) { + case VMI_INTERCEPT_FORCE_RESET: + disconnect_and_unhook_kvmi(i); + return false; case VMI_INTERCEPT_RESUME: enable_socket_reconnect(i); return false; diff --git a/include/sysemu/vmi-intercept.h b/include/sysemu/vmi-intercept.h index 06998ff18a..ef591b49e7 100644 --- a/include/sysemu/vmi-intercept.h +++ b/include/sysemu/vmi-intercept.h @@ -14,8 +14,10 @@ typedef enum { VMI_INTERCEPT_NONE = 0, VMI_INTERCEPT_SUSPEND, VMI_INTERCEPT_RESUME, + VMI_INTERCEPT_FORCE_RESET, } VMI_intercept_command; bool vm_introspection_intercept(VMI_intercept_command ic, Error **errp); +bool vm_introspection_qmp_delay(void *mon, QObject *id, bool resume); #endif /* QEMU_VMI_INTERCEPT_H */ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index eabd20fca3..d164635b5f 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -98,6 +98,10 @@ void qmp_stop(Error **errp) void qmp_system_reset(Error **errp) { + if (vm_introspection_intercept(VMI_INTERCEPT_FORCE_RESET, errp)) { + return; + } + qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET); }