From patchwork Fri Aug 18 09:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 13357644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B0916C678DC for ; Fri, 18 Aug 2023 10:00:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWwGd-0004r1-1X; Fri, 18 Aug 2023 05:59:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWwFb-0004TW-3A for qemu-devel@nongnu.org; Fri, 18 Aug 2023 05:58:39 -0400 Received: from mgamail.intel.com ([192.55.52.120]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWwFV-0000In-Ok for qemu-devel@nongnu.org; Fri, 18 Aug 2023 05:58:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692352714; x=1723888714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/H6irGWQBE1Vlux9V2bGZaDyfdDjrk/4WuCDu3qovd8=; b=euFo9IbF4HyprARg37yYLKvMrYqE01j4DygAIKItfqDfygoPgUO8AKxX 8r+54xkqQZVHj4lPZoviBmk4tvXmxF/2BP+ZQPCmyCHCFFPIC0aN91mrO 72DKDnCoIKTcpq4eDeN6so2hCuRiiiwOUfGb7V7lXCa5snKD8250xl6UZ cJyJwi2BBbEbQF+4j8tiYDIXV5NTwS1IReTn+XV2QpAWX1YIuE8zzDr+C 0VAPyjm6WcNt6EngaynzHEW24GaRmdsSQpHLbvX77VSwpI9FxJwqEc1aK ejmfcOW9dyv/dG6/+9HFn1kO5+c6IaPQZwKycyl42wisgx42GCyiuW2/8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="371966471" X-IronPort-AV: E=Sophos;i="6.01,182,1684825200"; d="scan'208";a="371966471" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2023 02:57:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10805"; a="849235407" X-IronPort-AV: E=Sophos;i="6.01,182,1684825200"; d="scan'208";a="849235407" Received: from lxy-clx-4s.sh.intel.com ([10.239.48.46]) by fmsmga002.fm.intel.com with ESMTP; 18 Aug 2023 02:57:29 -0700 From: Xiaoyao Li To: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Ani Sinha , Peter Xu , David Hildenbrand , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Cornelia Huck , Eric Blake , Markus Armbruster , Marcelo Tosatti , Gerd Hoffmann Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Eduardo Habkost , Laszlo Ersek , xiaoyao.li@intel.com, Isaku Yamahata , erdemaktas@google.com, Chenyi Qiang Subject: [PATCH v2 36/58] memory: Introduce memory_region_init_ram_gmem() Date: Fri, 18 Aug 2023 05:50:19 -0400 Message-Id: <20230818095041.1973309-37-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230818095041.1973309-1-xiaoyao.li@intel.com> References: <20230818095041.1973309-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.120; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.021, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Introduce memory_region_init_ram_gmem() to allocate private gmem on the MemoryRegion initialization. It's for the usercase of TDVF, which must be private on TDX case. Signed-off-by: Xiaoyao Li --- include/exec/memory.h | 6 +++++ softmmu/memory.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 759f797b6acd..127ffb6556b9 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1564,6 +1564,12 @@ void memory_region_init_ram(MemoryRegion *mr, uint64_t size, Error **errp); +void memory_region_init_ram_gmem(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size, + Error **errp); + /** * memory_region_init_rom: Initialize a ROM memory region. * diff --git a/softmmu/memory.c b/softmmu/memory.c index af6aa3c1e3c9..ded44dcef1aa 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -25,6 +25,7 @@ #include "qom/object.h" #include "trace.h" +#include #include "exec/memory-internal.h" #include "exec/ram_addr.h" #include "sysemu/kvm.h" @@ -3602,6 +3603,57 @@ void memory_region_init_ram(MemoryRegion *mr, vmstate_register_ram(mr, owner_dev); } +#ifdef CONFIG_KVM +void memory_region_init_ram_gmem(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size, + Error **errp) +{ + DeviceState *owner_dev; + Error *err = NULL; + int priv_fd; + + memory_region_init_ram_nomigrate(mr, owner, name, size, &err); + if (err) { + error_propagate(errp, err); + return; + } + + if (object_dynamic_cast(OBJECT(current_accel()), TYPE_KVM_ACCEL)) { + KVMState *s = KVM_STATE(current_accel()); + struct kvm_create_guest_memfd gmem = { + .size = size, + /* TODO: add property to hostmem backend for huge pmd */ + .flags = KVM_GUEST_MEMFD_ALLOW_HUGEPAGE, + }; + + priv_fd = kvm_vm_ioctl(s, KVM_CREATE_GUEST_MEMFD, &gmem); + if (priv_fd < 0) { + fprintf(stderr, "%s: error creating gmem: %s\n", __func__, + strerror(-priv_fd)); + abort(); + } + } else { + fprintf(stderr, "%s: gmem unsupported accel: %s\n", __func__, + current_accel_name()); + abort(); + } + + memory_region_set_gmem_fd(mr, priv_fd); + memory_region_set_default_private(mr); + + /* This will assert if owner is neither NULL nor a DeviceState. + * We only want the owner here for the purposes of defining a + * unique name for migration. TODO: Ideally we should implement + * a naming scheme for Objects which are not DeviceStates, in + * which case we can relax this restriction. + */ + owner_dev = DEVICE(owner); + vmstate_register_ram(mr, owner_dev); +} +#endif + void memory_region_init_rom(MemoryRegion *mr, Object *owner, const char *name,