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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61A69C3ABDA for ; Wed, 14 May 2025 23:45:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06EED6B00E2; Wed, 14 May 2025 19:44:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3D7A6B00E3; Wed, 14 May 2025 19:43:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D67576B00E4; Wed, 14 May 2025 19:43:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AE1086B00E2 for ; Wed, 14 May 2025 19:43:59 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E13E31411F0 for ; Wed, 14 May 2025 23:44:00 +0000 (UTC) X-FDA: 83443143840.14.1C5874D Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 1D5538000A for ; Wed, 14 May 2025 23:43:58 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qKXOiST8; spf=pass (imf30.hostedemail.com: domain of 3vSolaAsKCO4QSaUhbUojdWWeeWbU.SecbYdkn-ccalQSa.ehW@flex--ackerleytng.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3vSolaAsKCO4QSaUhbUojdWWeeWbU.SecbYdkn-ccalQSa.ehW@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266239; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pmGFcMqll2ZECWkoZDuet36vvCpdEEo2q3JYb5OCRKk=; b=sL7t7TKia41kfkJKOE3yb4BHmtAXu64i2D5CwZdI6xkHPxUXRgshIN+9Ur4y8pX0PJkJOt Hc7KN8i0I5mgm3gm6euhkNM2aYkOM0A14MIbEj7/Q0AZpZGbYsmcf4AYmUFghj906TN4EG sD9t9cGA8VwjELZuWZbN5/n/a3voCRM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=qKXOiST8; spf=pass (imf30.hostedemail.com: domain of 3vSolaAsKCO4QSaUhbUojdWWeeWbU.SecbYdkn-ccalQSa.ehW@flex--ackerleytng.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3vSolaAsKCO4QSaUhbUojdWWeeWbU.SecbYdkn-ccalQSa.ehW@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266239; a=rsa-sha256; cv=none; b=zayb8RmW/0hsGhTU0C0e4pBfHU9YfoGORo21I7BvgC2ptBHu6Ut57ZpieXedrkDVo4cx8l zbWTuZej7Nz1LV+jKbcQ+0NOVY3k4Ydf5nqla4z5TqosMNmks52WFbkgGqDSd7usoMw8Lc W/QxlT4wJhjcK8Tqs2jKfpdG0bUazgI= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af8e645a1d1so148747a12.3 for ; Wed, 14 May 2025 16:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266238; x=1747871038; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pmGFcMqll2ZECWkoZDuet36vvCpdEEo2q3JYb5OCRKk=; b=qKXOiST8+DGbgDPpxf7TMulQpkFFuJeWe8EsNm1V7JJcKm9FF7TOjQtXPrDiy5ntL7 1zHyhiP3uKPMDf3P7PceK0UxYkUtwu4qab2OLBzm+nUnq2Vd4Qs/JYBu3TvrbwGTA85n OXNvyLvrM1N+5l/MJMhC6XqhRHBZ5CGWrrVzq8YI1VCjx03wlhGSFe/icBPEl6QWTBUF j82EWkUhnyyivEJHQsM46wkRxLEXVb9uGLoj0uZRTOFyuo6NCinIR13gPxHRnkzjAE5T ubwi8xWvQu4iaOswut5Am4bbSJw1/1flhwM40RjRtDiQf/i8cawX/z9+3D2HCym7Op/y 61Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266238; x=1747871038; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pmGFcMqll2ZECWkoZDuet36vvCpdEEo2q3JYb5OCRKk=; b=ii+wxwTABNg4PKPyDzzMNaRWM+jHKreWNJc8NZIUtun9BXOCuYpo5zcUXowTKWiFMt nUH81aD5qwnmmhiNMpZ6v4h5FQZ9U/slMWSw9i3ruhi1DPHPZYGw0Ul+k92329DSo7kb S1pux+aTQw4up9GIZYX1uS9gkL0eTvRODvCPm5DmcmDMzBVUI9gpAgnc2rv5kj1IXPNy 23258fcS6cdNYo8QTCXdIJndfvZ1NRP7b1JyuMSsuNejQivL2h0VWDufRvhVFrB84vFz Yw22oxtxNACKCZg3tAckY9EptwAYfv8UqxC2A/Pvlh03p2TVlT0f0tez/sVOOdKHNGt6 M+5Q== X-Forwarded-Encrypted: i=1; AJvYcCVwPzrQLELKlcWHd1Md7AE4cGQAsqITu3dwCeHTGS0p4chG8oYtz4fRvDAfqm+MZsguA0nYOR9dpA==@kvack.org X-Gm-Message-State: AOJu0YwKlj7zjNcQTs7srM50oV6FEzkqInj/tCZbgVoDyV+y9otu0QEr 8l6jRjtc0/pHgwQyL+pnlhb7484s4WtJXp5IPhQVbmAxJjCr7FckF7evFUjAuHWTXwdHkYJdQ7H TfIom3Und0+8OXeT4GIir2Q== X-Google-Smtp-Source: AGHT+IGyG3aK+TPRgSsxWpjag/A4ruHzJ2SmD21jLoxWwmPBfdNpP7Yc+Ypfwlkx2TEetNXBaMC3rrsf4RqZeQwBkA== X-Received: from pjbsz11.prod.google.com ([2002:a17:90b:2d4b:b0:308:7499:3dfc]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:228a:b0:223:60ce:2451 with SMTP id d9443c01a7336-231b5e26004mr6306905ad.15.1747266237995; Wed, 14 May 2025 16:43:57 -0700 (PDT) Date: Wed, 14 May 2025 16:42:18 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <625bd9c98ad4fd49d7df678f0186129226f77d7d.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 39/51] KVM: guest_memfd: Merge and truncate on fallocate(PUNCH_HOLE) From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam10 X-Stat-Signature: d3t9w3qutq93gjy3otm9xyw4excfhfpf X-Rspamd-Queue-Id: 1D5538000A X-Rspam-User: X-HE-Tag: 1747266238-494825 X-HE-Meta: U2FsdGVkX184wPF9cxeIdq6pg4xPIwtIPSVL4FwWa6fN0MOn5nuuEp/POIdYcYKVisiBjKJzDM5bm6chp+p4EOrrynIYRdz08v4pYh1vHxbW1sRYsd1B3EL52hEfDUuaINIjs3MBDhBxqFfuj1wrOkG0Rg10pj1iik1W6cmE1iyIbXmyTvVZI8rPDk7LHv57NaYd+M9UKGuQLpkzTI0sei6g9GPDhDa2A6CADhEuQ5Gj4VTmFjXO2RiVYAmsRulTJ2SfVEOl10vvVDO8REaCBql4YI9vEPHBqde3liW3ZHEEJsExj6ZwsvLoUbxjXWEqFTfs3k70O6aShRPgEMNmFA2IpgtcYLM8icqIumKzb91eIGFe8qFyyq5XN/nXyGUG5V1NuPQXg5yOf0qdwvjF6e7wHBWhdy3M4f6um377bQj7liiOZajiGS41UAveV2RL/8lsULlOczANuOiymud8VFHjm0uZW+xCZTcQ0erxNz/YpxQg/+zY3e+XFpXr8MGMOzNlT/ddPuVslOBBNRS6qXMkZKW4XbUwjth/AE/7+45eodDC3PC30wNkJR/fjSSwmuw9iOjQoi3JNrFiW6dCQb9mjcudeP6NNcSAe8Dd3K7z+phasSXW3zA6jbaaFoMXUTXsu4wjOKhWEdhh6ziUIB/WIsh9v3zN/lnlD4yLt2oFkj7sOwC6oZxKtYfZB5Zln6Ly//r2sART3DsFN68pOQtaOuo4S4urV45xU9gtacZrCeb8W4NUZLLtruBUU/OE7MtaJGrHPBmD9WEn3oNli9y56cDY/0aeXNJWpUrTUSip3Kydtgx4YBdHgHbVsbW+pwEDgpnA+KuZ+vJrzjg2pNOrDSvRfkzgu2IuablSRfgWkteN47kKz9SOD/YV4eRiFTrgnrYYrUUfQd9U6J3rBFUvpFPKNSkH28khQtqKZz/xHSdx/khAnO5MWSyItpV39zXVy+fnRtF8fwwP9mn pXEsCtO8 fB/9HHB/23EAUmtsZPzqVIDXTRAZJ11xcU7BOXaw9zppwsX6mqOZSn4PH28clf5apnx5SqNdCqR5bH+U6nvmyhJElmDZATt7CoSWKSYfc9tCUuW3XFAL7r+EfkIpY2Oq/mt2WOf0xgQXTMjjrKwUvNOgkAdodXLqmQzsTru0CcG1/ShUo1Bt1jE/dHKuvqd+mZwniTsC/gMxsxY0EdKN+CroFehpCMKOPBhmxVV2m9xnQkW0zMV3v1ceo0NTIwaziwHPjF15dEm+Zw8Djh77DEh66c3YuL7fqD4mGF3tJ5KpmaTzPsbS4v01zsyN1rHYX5MM/XBSxX1raUQTmWz/IxAuAnaka08hXlPqEyE7BvNHh166+trTJHWmf88+7C/4BlLXoFwERuhNgz32+QNFHurgl5P1jzWQAnkMMjBZqsp134DSap67Onilqc86H/1NSUeiGKzTJs2w+3DCZrtxqFs8KNiftE1cCHx2Btjb4s5dQIGDGTtalm91KbtpA9PKp3vPDSSgqX/OCEbfRk3OVAMwxivm3Qw5RXJYVHbeY6VXnmrI3Uo9d4ap8PkaIRYriKsMmSCCLtpuPI/kgplXt6UX0luQT61oAObz04Dt0DaGJjSmhH/kOJIh6gujZJOtHo4EsCi0rj+yCXFZE6YuY7peNEpyVJDa5CRwNCJ8f1SB+7LNENrTDqus7cVKJxtGb6UkR X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Merge and truncate on fallocate(PUNCH_HOLE), but if the file is being closed, defer merging to folio_put() callback. Change-Id: Iae26987756e70c83f3b121edbc0ed0bc105eec0d Signed-off-by: Ackerley Tng --- virt/kvm/guest_memfd.c | 76 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 8 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index cb426c1dfef8..04b1513c2998 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -859,6 +859,35 @@ static int kvm_gmem_restructure_folios_in_range(struct inode *inode, return ret; } +static long kvm_gmem_merge_truncate_indices(struct inode *inode, pgoff_t index, + size_t nr_pages) +{ + struct folio *f; + pgoff_t unused; + long num_freed; + + unmap_mapping_pages(inode->i_mapping, index, nr_pages, false); + + if (!kvm_gmem_has_safe_refcount(inode->i_mapping, index, nr_pages, &unused)) + return -EAGAIN; + + f = filemap_get_folio(inode->i_mapping, index); + if (IS_ERR(f)) + return 0; + + /* Leave just filemap's refcounts on the folio. */ + folio_put(f); + + WARN_ON(kvm_gmem_merge_folio_in_filemap(inode, f)); + + num_freed = folio_nr_pages(f); + folio_lock(f); + truncate_inode_folio(inode->i_mapping, f); + folio_unlock(f); + + return num_freed; +} + #else static inline int kvm_gmem_try_split_folio_in_filemap(struct inode *inode, @@ -874,6 +903,12 @@ static int kvm_gmem_restructure_folios_in_range(struct inode *inode, return 0; } +static long kvm_gmem_merge_truncate_indices(struct inode *inode, pgoff_t index, + size_t nr_pages) +{ + return 0; +} + #endif #else @@ -1182,8 +1217,10 @@ static long kvm_gmem_truncate_indices(struct address_space *mapping, * * Removes folios beginning @index for @nr_pages from filemap in @inode, updates * inode metadata. + * + * Return: 0 on success and negative error otherwise. */ -static void kvm_gmem_truncate_inode_aligned_pages(struct inode *inode, +static long kvm_gmem_truncate_inode_aligned_pages(struct inode *inode, pgoff_t index, size_t nr_pages) { @@ -1191,19 +1228,34 @@ static void kvm_gmem_truncate_inode_aligned_pages(struct inode *inode, long num_freed; pgoff_t idx; void *priv; + long ret; priv = kvm_gmem_allocator_private(inode); nr_per_huge_page = kvm_gmem_allocator_ops(inode)->nr_pages_in_folio(priv); + ret = 0; num_freed = 0; for (idx = index; idx < index + nr_pages; idx += nr_per_huge_page) { - num_freed += kvm_gmem_truncate_indices( - inode->i_mapping, idx, nr_per_huge_page); + if (mapping_exiting(inode->i_mapping) || + !kvm_gmem_has_some_shared(inode, idx, nr_per_huge_page)) { + num_freed += kvm_gmem_truncate_indices( + inode->i_mapping, idx, nr_per_huge_page); + } else { + ret = kvm_gmem_merge_truncate_indices(inode, idx, + nr_per_huge_page); + if (ret < 0) + break; + + num_freed += ret; + ret = 0; + } } spin_lock(&inode->i_lock); inode->i_blocks -= (num_freed << PAGE_SHIFT) / 512; spin_unlock(&inode->i_lock); + + return ret; } /** @@ -1252,8 +1304,10 @@ static void kvm_gmem_zero_range(struct address_space *mapping, * * Removes full (huge)pages from the filemap and zeroing incomplete * (huge)pages. The pages in the range may be split. + * + * Return: 0 on success and negative error otherwise. */ -static void kvm_gmem_truncate_inode_range(struct inode *inode, loff_t lstart, +static long kvm_gmem_truncate_inode_range(struct inode *inode, loff_t lstart, loff_t lend) { pgoff_t full_hpage_start; @@ -1263,6 +1317,7 @@ static void kvm_gmem_truncate_inode_range(struct inode *inode, loff_t lstart, pgoff_t start; pgoff_t end; void *priv; + long ret; priv = kvm_gmem_allocator_private(inode); nr_per_huge_page = kvm_gmem_allocator_ops(inode)->nr_pages_in_folio(priv); @@ -1279,10 +1334,11 @@ static void kvm_gmem_truncate_inode_range(struct inode *inode, loff_t lstart, kvm_gmem_zero_range(inode->i_mapping, start, zero_end); } + ret = 0; if (full_hpage_end > full_hpage_start) { nr_pages = full_hpage_end - full_hpage_start; - kvm_gmem_truncate_inode_aligned_pages(inode, full_hpage_start, - nr_pages); + ret = kvm_gmem_truncate_inode_aligned_pages( + inode, full_hpage_start, nr_pages); } if (end > full_hpage_end && end > full_hpage_start) { @@ -1290,6 +1346,8 @@ static void kvm_gmem_truncate_inode_range(struct inode *inode, loff_t lstart, kvm_gmem_zero_range(inode->i_mapping, zero_start, end); } + + return ret; } static long kvm_gmem_punch_hole(struct inode *inode, loff_t offset, loff_t len) @@ -1298,6 +1356,7 @@ static long kvm_gmem_punch_hole(struct inode *inode, loff_t offset, loff_t len) pgoff_t start = offset >> PAGE_SHIFT; pgoff_t end = (offset + len) >> PAGE_SHIFT; struct kvm_gmem *gmem; + long ret; /* * Bindings must be stable across invalidation to ensure the start+end @@ -1308,8 +1367,9 @@ static long kvm_gmem_punch_hole(struct inode *inode, loff_t offset, loff_t len) list_for_each_entry(gmem, gmem_list, entry) kvm_gmem_invalidate_begin_and_zap(gmem, start, end); + ret = 0; if (kvm_gmem_has_custom_allocator(inode)) { - kvm_gmem_truncate_inode_range(inode, offset, offset + len); + ret = kvm_gmem_truncate_inode_range(inode, offset, offset + len); } else { /* Page size is PAGE_SIZE, so use optimized truncation function. */ truncate_inode_pages_range(inode->i_mapping, offset, offset + len - 1); @@ -1320,7 +1380,7 @@ static long kvm_gmem_punch_hole(struct inode *inode, loff_t offset, loff_t len) filemap_invalidate_unlock(inode->i_mapping); - return 0; + return ret; } static long kvm_gmem_allocate(struct inode *inode, loff_t offset, loff_t len) -- 2.49.0.1045.g170613ef41-goog