From nobody Sun May 19 09:23:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588996859; cv=none; d=zohomail.com; s=zohoarc; b=gOTVe2cFxhHj1HNF+DGL0PT6DOJc1TMfEYgTGG6CBBZM6elrOpNurW5ok+BJIqn0qcP879fm22t6knBnhKFGzAyNeSybs5oNvv/uAQJnJUwTuypYGYPgOGfkbANhryLlHBQ7jRvy7LXAt1aNwWwz2vvINs0v9+r8A/9gsiQBwcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588996859; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VfuJiK26S6GEUf4IiZItvCG+3tLgVIjX79dqbNpE2Bs=; b=RmJZXNglNEuM0GeK48N3C72gIusT9Lrb7RBHeJvAXJGFo2AC5BYdSdGDi4N6RSoHXdDyH8PPjo+cwmNwh93aA0i4h5GsONXwf3Bb6R7xpWWFY5iQYbNnutmQ8htedKwVqZFz5MJ04UoE28o64O216wSRIbraYaaLv1pjHNWtMFE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588996859397914.1955458881242; Fri, 8 May 2020 21:00:59 -0700 (PDT) Received: from localhost ([::1]:54596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXGfZ-0007Xs-5d for importer@patchew.org; Sat, 09 May 2020 00:00:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXGep-00073Y-Tr for qemu-devel@nongnu.org; Sat, 09 May 2020 00:00:11 -0400 Received: from mga05.intel.com ([192.55.52.43]:1080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXGen-0007PI-ER for qemu-devel@nongnu.org; Sat, 09 May 2020 00:00:11 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 20:59:59 -0700 Received: from unknown (HELO coxu-arch-shz.sh.intel.com) ([10.239.160.118]) by orsmga003.jf.intel.com with ESMTP; 08 May 2020 20:59:57 -0700 IronPort-SDR: EFsATYgQNpFDBbsyeSLk+nfq3S2I20vyHmTHMqPlIwbOW41pNURmSC7Uo4GuM7S1CkpIcbwNF4 EJEk1+fLSvig== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: 2zjpfZ7uITg3MHN/7Ngi/khu0DsuD9p0TjvscsyS+YPNrGsCQsfJWUnMqStVvbsFDO7322pQad L0I7fW1jX79g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,370,1583222400"; d="scan'208";a="261198278" From: Colin Xu To: philmd@redhat.com, pbonzini@redhat.com Subject: [PATCH V2] hax: Dynamic allocate vcpu state structure Date: Sat, 9 May 2020 11:59:52 +0800 Message-Id: <20200509035952.187615-1-colin.xu@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=colin.xu@intel.com; helo=mga05.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/08 23:59:59 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: bowen.wang@intel.com, wenchao.wang@intel.com, qemu-devel@nongnu.org, colin.xu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: WangBowen Dynamic allocating vcpu state structure according to smp value to be more precise and safe. Previously it will alloccate array of fixed size HAX_MAX_VCPU. This is achieved by using g_new0 to dynamic allocate the array. The allocated size is obtained from smp.max_cpus in MachineState. Also, the size is compared with HAX_MAX_VCPU when creating the vm. The reason for choosing dynamic array over linked list is because the status is visited by index all the time. This will lead to QEMU checking whether the smp value is larger than the HAX_MAX_VCPU when creating vm, if larger, the process will terminate, otherwise it will allocate array of size smp to store the status. V2: Check max_cpus before open vm. (Philippe) Signed-off-by: WangBowen Signed-off-by: Colin Xu --- target/i386/hax-all.c | 25 +++++++++++++++++++------ target/i386/hax-i386.h | 5 +++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index f9c83fff2547..c93bb23a446a 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -232,10 +232,10 @@ int hax_init_vcpu(CPUState *cpu) return ret; } =20 -struct hax_vm *hax_vm_create(struct hax_state *hax) +struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus) { struct hax_vm *vm; - int vm_id =3D 0, ret; + int vm_id =3D 0, ret, i; =20 if (hax_invalid_fd(hax->fd)) { return NULL; @@ -245,6 +245,11 @@ struct hax_vm *hax_vm_create(struct hax_state *hax) return hax->vm; } =20 + if (max_cpus > HAX_MAX_VCPU) { + fprintf(stderr, "Maximum VCPU number QEMU supported is %d\n", HAX_= MAX_VCPU); + return NULL; + } + vm =3D g_new0(struct hax_vm, 1); =20 ret =3D hax_host_create_vm(hax, &vm_id); @@ -259,6 +264,12 @@ struct hax_vm *hax_vm_create(struct hax_state *hax) goto error; } =20 + vm->numvcpus =3D max_cpus; + vm->vcpus =3D g_new0(struct hax_vcpu_state *, vm->numvcpus); + for (i =3D 0; i < vm->numvcpus; i++) { + vm->vcpus[i] =3D NULL; + } + hax->vm =3D vm; return vm; =20 @@ -272,12 +283,14 @@ int hax_vm_destroy(struct hax_vm *vm) { int i; =20 - for (i =3D 0; i < HAX_MAX_VCPU; i++) + for (i =3D 0; i < vm->numvcpus; i++) if (vm->vcpus[i]) { fprintf(stderr, "VCPU should be cleaned before vm clean\n"); return -1; } hax_close_fd(vm->fd); + vm->numvcpus =3D 0; + g_free(vm->vcpus); g_free(vm); hax_global.vm =3D NULL; return 0; @@ -292,7 +305,7 @@ static void hax_handle_interrupt(CPUState *cpu, int mas= k) } } =20 -static int hax_init(ram_addr_t ram_size) +static int hax_init(ram_addr_t ram_size, int max_cpus) { struct hax_state *hax =3D NULL; struct hax_qemu_version qversion; @@ -324,7 +337,7 @@ static int hax_init(ram_addr_t ram_size) goto error; } =20 - hax->vm =3D hax_vm_create(hax); + hax->vm =3D hax_vm_create(hax, max_cpus); if (!hax->vm) { fprintf(stderr, "Failed to create HAX VM\n"); ret =3D -EINVAL; @@ -352,7 +365,7 @@ static int hax_init(ram_addr_t ram_size) =20 static int hax_accel_init(MachineState *ms) { - int ret =3D hax_init(ms->ram_size); + int ret =3D hax_init(ms->ram_size, (int)ms->smp.max_cpus); =20 if (ret && (ret !=3D -ENOSPC)) { fprintf(stderr, "No accelerator found.\n"); diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h index 54e9d8b057f3..7d988f81da05 100644 --- a/target/i386/hax-i386.h +++ b/target/i386/hax-i386.h @@ -47,7 +47,8 @@ struct hax_state { struct hax_vm { hax_fd fd; int id; - struct hax_vcpu_state *vcpus[HAX_MAX_VCPU]; + int numvcpus; + struct hax_vcpu_state **vcpus; }; =20 #ifdef NEED_CPU_H @@ -58,7 +59,7 @@ int valid_hax_tunnel_size(uint16_t size); /* Host specific functions */ int hax_mod_version(struct hax_state *hax, struct hax_module_version *vers= ion); int hax_inject_interrupt(CPUArchState *env, int vector); -struct hax_vm *hax_vm_create(struct hax_state *hax); +struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus); int hax_vcpu_run(struct hax_vcpu_state *vcpu); int hax_vcpu_create(int id); int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, --=20 2.26.2