From patchwork Wed Apr 15 00:59:38 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: 284347 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 05AF1C2BB1D for ; Wed, 15 Apr 2020 01:21:32 +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 BD0522087E for ; Wed, 15 Apr 2020 01:21:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD0522087E 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]:41136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWk6-0003s3-Tz for qemu-devel@archiver.kernel.org; Tue, 14 Apr 2020 21:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58571) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWPD-0001TS-1O for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOWP9-0005DE-Bc for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:54 -0400 Received: from mx01.bbu.dsd.mx.bitdefender.com ([91.199.104.161]:49118) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOWP8-00052o-Rg for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:51 -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 8C91A3074898 for ; Wed, 15 Apr 2020 03:59:36 +0300 (EEST) Received: from localhost.localdomain (unknown [91.199.104.27]) by smtp.bitdefender.com (Postfix) with ESMTPSA id 7D8F1305B7A0; Wed, 15 Apr 2020 03:59:36 +0300 (EEST) From: =?utf-8?q?Adalbert_Laz=C4=83r?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v1 26/26] kvm: vmi: add 'command' and 'event' properties Date: Wed, 15 Apr 2020 03:59:38 +0300 Message-Id: <20200415005938.23895-27-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?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There are cases when the access to an introspected VM must be limited to certain introspection commands/events. Signed-off-by: Adalbert Lazăr --- accel/kvm/vmi.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 12 deletions(-) diff --git a/accel/kvm/vmi.c b/accel/kvm/vmi.c index f70d78848a..1574a643c4 100644 --- a/accel/kvm/vmi.c +++ b/accel/kvm/vmi.c @@ -73,6 +73,9 @@ typedef struct VMIntrospection { QDict *qmp_rsp; bool kvmi_hooked; + + GArray *allowed_commands; + GArray *allowed_events; } VMIntrospection; typedef struct VMIntrospectionClass { @@ -94,6 +97,8 @@ static bool suspend_pending; static bool migrate_pending; static bool shutdown_pending; +static __s32 all_IDs = -1; + #define TYPE_VM_INTROSPECTION "introspection" #define VM_INTROSPECTION(obj) \ @@ -239,6 +244,25 @@ static void prop_set_uint32(Object *obj, Visitor *v, const char *name, } } +static void prop_add_to_array(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + Error *local_err = NULL; + GArray *arr = opaque; + uint32_t value; + + visit_type_uint32(v, name, &value, &local_err); + if (!local_err && value == (uint32_t)all_IDs) { + error_setg(&local_err, "VMI: add %s: invalid id %d", name, value); + } + if (local_err) { + error_propagate(errp, local_err); + } else { + g_array_append_val(arr, value); + } +} + static bool chardev_is_connected(VMIntrospection *i, Error **errp) { Object *obj = OBJECT(i->chr); @@ -286,6 +310,15 @@ static void instance_init(Object *obj) object_property_add_str(obj, "chardev", NULL, prop_set_chardev, NULL); object_property_add_str(obj, "key", NULL, prop_set_key, NULL); + i->allowed_commands = g_array_new(FALSE, FALSE, sizeof(uint32_t)); + object_property_add(obj, "command", "uint32", + prop_add_to_array, NULL, + NULL, i->allowed_commands, NULL); + i->allowed_events = g_array_new(FALSE, FALSE, sizeof(uint32_t)); + object_property_add(obj, "event", "uint32", + prop_add_to_array, NULL, + NULL, i->allowed_events, NULL); + i->handshake_timeout = HANDSHAKE_TIMEOUT_SEC; object_property_add(obj, "handshake_timeout", "uint32", prop_set_uint32, prop_get_uint32, @@ -368,6 +401,13 @@ static void instance_finalize(Object *obj) VMIntrospectionClass *ic = VM_INTROSPECTION_CLASS(obj->class); VMIntrospection *i = VM_INTROSPECTION(obj); + if (i->allowed_commands) { + g_array_free(i->allowed_commands, TRUE); + } + if (i->allowed_events) { + g_array_free(i->allowed_events, TRUE); + } + g_free(i->chardevid); g_free(i->keyid); @@ -531,11 +571,39 @@ static bool validate_handshake(VMIntrospection *i, Error **errp) return true; } +static bool set_allowed_features(int ioctl, GArray *allowed, Error **errp) +{ + struct kvm_introspection_feature feature; + gint i; + + feature.allow = 1; + + if (allowed->len == 0) { + feature.id = all_IDs; + if (kvm_vm_ioctl(kvm_state, ioctl, &feature)) { + goto out_err; + } + } else { + for (i = 0; i < allowed->len; i++) { + feature.id = g_array_index(allowed, uint32_t, i); + if (kvm_vm_ioctl(kvm_state, ioctl, &feature)) { + goto out_err; + } + } + } + + return true; + +out_err: + error_setg_errno(errp, -errno, + "VMI: feature %d with id %d failed", + ioctl, feature.id); + return false; +} + static bool connect_kernel(VMIntrospection *i, Error **errp) { - struct kvm_introspection_feature commands, events; struct kvm_introspection_hook kernel; - const __s32 all_ids = -1; memset(&kernel, 0, sizeof(kernel)); memcpy(kernel.uuid, &qemu_uuid, sizeof(kernel.uuid)); @@ -553,20 +621,14 @@ static bool connect_kernel(VMIntrospection *i, Error **errp) i->kvmi_hooked = true; - commands.allow = 1; - commands.id = all_ids; - if (kvm_vm_ioctl(kvm_state, KVM_INTROSPECTION_COMMAND, &commands)) { - error_setg_errno(errp, -errno, - "VMI: ioctl/KVM_INTROSPECTION_COMMAND failed"); + if (!set_allowed_features(KVM_INTROSPECTION_COMMAND, + i->allowed_commands, errp)) { unhook_kvmi(i); return false; } - events.allow = 1; - events.id = all_ids; - if (kvm_vm_ioctl(kvm_state, KVM_INTROSPECTION_EVENT, &events)) { - error_setg_errno(errp, -errno, - "VMI: ioctl/KVM_INTROSPECTION_EVENT failed"); + if (!set_allowed_features(KVM_INTROSPECTION_EVENT, + i->allowed_events, errp)) { unhook_kvmi(i); return false; }