From patchwork Mon Mar 10 08:18:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chenyi Qiang X-Patchwork-Id: 14009390 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 D89F5C28B30 for ; Mon, 10 Mar 2025 08:22:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trYNb-0006bu-FE; Mon, 10 Mar 2025 04:20:55 -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 1trYNY-0006bX-7g for qemu-devel@nongnu.org; Mon, 10 Mar 2025 04:20:52 -0400 Received: from mgamail.intel.com ([198.175.65.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trYNU-0004U2-Rw for qemu-devel@nongnu.org; Mon, 10 Mar 2025 04:20:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741594849; x=1773130849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hNdLZ8kK1rf9TDHkt6IAvF/6Xekzb2aG95CQUh+XPPY=; b=W9n+C2EOGLmV7oZ9hWKISFYUa5b1MQ/WSDWHfUrdfc/rGCsRYRifhAKR RJObi2RKlE8ZcU83eAI9IjtTmHiQBpwLYvIMmUl8zHr29Nv6Tzk21BvA+ gj9a22ywCtb0jw8X1lUgn6sm4g1SqC4N2AivG6rdXbIaAZwvl+q5/kRDr dF1qvuyY3yE50mQznCBlSWhUhDPPFkIWs6G+ps04bW4gSbD42IQAjGs6y Drzf/D9HODoXqCdoi8PKRH/TPO/WH4yWtzc7HH/Nx3g4UzOcQ5kAs1mEk IMVdOX8qc0b5dQozIPGhPoPeyB76ahgwBG3OnOmNQm0taDaclTQAkDzfh Q==; X-CSE-ConnectionGUID: jU5dsonUSSWgEtvzxVixwQ== X-CSE-MsgGUID: 7bB3F7bnRO+PAP8hV3TJJw== X-IronPort-AV: E=McAfee;i="6700,10204,11368"; a="42688567" X-IronPort-AV: E=Sophos;i="6.14,235,1736841600"; d="scan'208";a="42688567" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 01:20:46 -0700 X-CSE-ConnectionGUID: Rr8bERHAT9qYYs5LAc7IXg== X-CSE-MsgGUID: v2iKTpieQ3yncekKnk3AjQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,235,1736841600"; d="scan'208";a="150862863" Received: from emr-bkc.sh.intel.com ([10.112.230.82]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 01:20:38 -0700 From: Chenyi Qiang To: David Hildenbrand , Alexey Kardashevskiy , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Roth Cc: Chenyi Qiang , qemu-devel@nongnu.org, kvm@vger.kernel.org, Williams Dan J , Peng Chao P , Gao Chao , Xu Yilun , Li Xiaoyao Subject: [PATCH v3 7/7] RAMBlock: Make guest_memfd require coordinate discard Date: Mon, 10 Mar 2025 16:18:35 +0800 Message-ID: <20250310081837.13123-8-chenyi.qiang@intel.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250310081837.13123-1-chenyi.qiang@intel.com> References: <20250310081837.13123-1-chenyi.qiang@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=198.175.65.16; envelope-from=chenyi.qiang@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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 As guest_memfd is now managed by memory_attribute_manager with RamDiscardManager, only block uncoordinated discard. Signed-off-by: Chenyi Qiang --- Changes in v3: - No change. Changes in v2: - Change the ram_block_discard_require(false) to ram_block_coordinated_discard_require(false). --- system/physmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 0ed394c5d2..a30cdd43ee 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -1872,7 +1872,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) assert(kvm_enabled()); assert(new_block->guest_memfd < 0); - ret = ram_block_discard_require(true); + ret = ram_block_coordinated_discard_require(true); if (ret < 0) { error_setg_errno(errp, -ret, "cannot set up private guest memory: discard currently blocked"); @@ -1892,7 +1892,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) error_setg(errp, "Failed to realize memory attribute manager"); object_unref(OBJECT(new_block->memory_attribute_manager)); close(new_block->guest_memfd); - ram_block_discard_require(false); + ram_block_coordinated_discard_require(false); qemu_mutex_unlock_ramlist(); goto out_free; } @@ -2152,7 +2152,7 @@ static void reclaim_ramblock(RAMBlock *block) memory_attribute_manager_unrealize(block->memory_attribute_manager); object_unref(OBJECT(block->memory_attribute_manager)); close(block->guest_memfd); - ram_block_discard_require(false); + ram_block_coordinated_discard_require(false); } g_free(block);