From mboxrd@z Thu Jan 1 00:00:00 1970 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 9B423C4167B for ; Mon, 4 Dec 2023 06:49:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rA2lN-0005sf-MX; Mon, 04 Dec 2023 01:49:05 -0500 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 1rA2lK-0005sU-S1 for qemu-devel@nongnu.org; Mon, 04 Dec 2023 01:49:04 -0500 Received: from mgamail.intel.com ([192.55.52.93]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rA2l4-0004zM-VP for qemu-devel@nongnu.org; Mon, 04 Dec 2023 01:49:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701672527; x=1733208527; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=y8yRSaEkPLF2VOkDRnbgCR2r31wGQ3+5KgDkJM6z/dU=; b=aMdzOMcmv7tsr2Lwq3uRbbQwf66NkXJZAde/SX0zVmWguHo4bkubDZAE 3WZjoqvehXObiQaPnjcPL3z4lPOYcApU+YwcsKiTz7oUu9hSdz3P0/TUy /wLQpHdsOFdTHb9ZJa5kZBCWIaC1ruMTfP5f58d5s+48vIcGrPQ/Z+VxM BKuzQ0ZRCu5PwT9mfvR1hN29AjJV5azYGA/1Lhkmbbe4YdF4YndXaLySI KVT0MOckL+S6UdLFzrFwVlWHOXD/g+G2aRdmwemqd9Oaz6PRKqaXTovMD 4draMC+O64lJrJty9IrRC5yfJWrlRv/j8V/zHjMsgKArq3XCyNf5oDKH0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="390852125" X-IronPort-AV: E=Sophos;i="6.04,249,1695711600"; d="scan'208";a="390852125" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2023 22:48:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="746725855" X-IronPort-AV: E=Sophos;i="6.04,249,1695711600"; d="scan'208";a="746725855" Received: from xiaoyaol-hp-g830.ccr.corp.intel.com (HELO [10.93.29.154]) ([10.93.29.154]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2023 22:48:31 -0800 Message-ID: <9c113486-3a47-40f1-bfe4-1639a4c7b489@intel.com> Date: Mon, 4 Dec 2023 14:48:27 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 05/70] kvm: Enable KVM_SET_USER_MEMORY_REGION2 for memslot Content-Language: en-US To: Isaku Yamahata Cc: Paolo Bonzini , David Hildenbrand , Igor Mammedov , "Michael S . Tsirkin" , Marcel Apfelbaum , Richard Henderson , Peter Xu , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Cornelia Huck , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , Eric Blake , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Michael Roth , Sean Christopherson , Claudio Fontana , Gerd Hoffmann , Isaku Yamahata , Chenyi Qiang , isaku.yamahata@intel.com References: <20231115071519.2864957-1-xiaoyao.li@intel.com> <20231115071519.2864957-6-xiaoyao.li@intel.com> <20231117205028.GB1645850@ls.amr.corp.intel.com> From: Xiaoyao Li In-Reply-To: <20231117205028.GB1645850@ls.amr.corp.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=192.55.52.93; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.999, HK_RANDOM_FROM=0.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 On 11/18/2023 4:50 AM, Isaku Yamahata wrote: > On Wed, Nov 15, 2023 at 02:14:14AM -0500, > Xiaoyao Li wrote: > >> From: Chao Peng >> >> Switch to KVM_SET_USER_MEMORY_REGION2 when supported by KVM. >> >> With KVM_SET_USER_MEMORY_REGION2, QEMU can set up memory region that >> backend'ed both by hva-based shared memory and guest memfd based private >> memory. >> >> Signed-off-by: Chao Peng >> Co-developed-by: Xiaoyao Li >> Signed-off-by: Xiaoyao Li >> --- >> accel/kvm/kvm-all.c | 56 ++++++++++++++++++++++++++++++++++------ >> accel/kvm/trace-events | 2 +- >> include/sysemu/kvm_int.h | 2 ++ >> 3 files changed, 51 insertions(+), 9 deletions(-) >> >> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c >> index 9f751d4971f8..69afeb47c9c0 100644 >> --- a/accel/kvm/kvm-all.c >> +++ b/accel/kvm/kvm-all.c >> @@ -293,35 +293,69 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram, >> static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot, bool new) >> { >> KVMState *s = kvm_state; >> - struct kvm_userspace_memory_region mem; >> + struct kvm_userspace_memory_region2 mem; >> + static int cap_user_memory2 = -1; >> int ret; >> >> + if (cap_user_memory2 == -1) { >> + cap_user_memory2 = kvm_check_extension(s, KVM_CAP_USER_MEMORY2); >> + } >> + >> + if (!cap_user_memory2 && slot->guest_memfd >= 0) { >> + error_report("%s, KVM doesn't support KVM_CAP_USER_MEMORY2," >> + " which is required by guest memfd!", __func__); >> + exit(1); >> + } >> + >> mem.slot = slot->slot | (kml->as_id << 16); >> mem.guest_phys_addr = slot->start_addr; >> mem.userspace_addr = (unsigned long)slot->ram; >> mem.flags = slot->flags; >> + mem.guest_memfd = slot->guest_memfd; >> + mem.guest_memfd_offset = slot->guest_memfd_offset; >> >> if (slot->memory_size && !new && (mem.flags ^ slot->old_flags) & KVM_MEM_READONLY) { >> /* Set the slot size to 0 before setting the slot to the desired >> * value. This is needed based on KVM commit 75d61fbc. */ >> mem.memory_size = 0; >> - ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem); >> + >> + if (cap_user_memory2) { >> + ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION2, &mem); >> + } else { >> + ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem); >> + } >> if (ret < 0) { >> goto err; >> } >> } >> mem.memory_size = slot->memory_size; >> - ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem); >> + if (cap_user_memory2) { >> + ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION2, &mem); >> + } else { >> + ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem); >> + } >> slot->old_flags = mem.flags; >> err: >> trace_kvm_set_user_memory(mem.slot >> 16, (uint16_t)mem.slot, mem.flags, >> mem.guest_phys_addr, mem.memory_size, >> - mem.userspace_addr, ret); >> + mem.userspace_addr, mem.guest_memfd, >> + mem.guest_memfd_offset, ret); >> if (ret < 0) { >> - error_report("%s: KVM_SET_USER_MEMORY_REGION failed, slot=%d," >> - " start=0x%" PRIx64 ", size=0x%" PRIx64 ": %s", >> - __func__, mem.slot, slot->start_addr, >> - (uint64_t)mem.memory_size, strerror(errno)); >> + if (cap_user_memory2) { >> + error_report("%s: KVM_SET_USER_MEMORY_REGION2 failed, slot=%d," >> + " start=0x%" PRIx64 ", size=0x%" PRIx64 "," >> + " flags=0x%" PRIx32 ", guest_memfd=%" PRId32 "," >> + " guest_memfd_offset=0x%" PRIx64 ": %s", >> + __func__, mem.slot, slot->start_addr, >> + (uint64_t)mem.memory_size, mem.flags, >> + mem.guest_memfd, (uint64_t)mem.guest_memfd_offset, >> + strerror(errno)); >> + } else { >> + error_report("%s: KVM_SET_USER_MEMORY_REGION failed, slot=%d," >> + " start=0x%" PRIx64 ", size=0x%" PRIx64 ": %s", >> + __func__, mem.slot, slot->start_addr, >> + (uint64_t)mem.memory_size, strerror(errno)); >> + } >> } >> return ret; >> } >> @@ -477,6 +511,9 @@ static int kvm_mem_flags(MemoryRegion *mr) >> if (readonly && kvm_readonly_mem_allowed) { >> flags |= KVM_MEM_READONLY; >> } >> + if (memory_region_has_guest_memfd(mr)) { >> + flags |= KVM_MEM_PRIVATE; >> + } > > Nitpick: it was renamed to KVM_MEM_GUEST_MEMFD > As long as the value is defined to same value, it doesn't matter, though. thanks for the reminder! Will update the headers and switch to KVM_MEM_GUEST_MEMFD.