From patchwork Fri Mar 28 15:31:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14032182 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5811A1D61B7 for ; Fri, 28 Mar 2025 15:31:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743175904; cv=none; b=KOq+oDVyqFirKwlx+f+ig7bY7UuQcfPpcqHqxGikUTVhrs5R/J7kcCO3nVm40honUkO8RnsB6RyraMv+/+GcWTwruFIr5QpbqzzwNc5BZ9kqfRMZ7/RwpXB0Ol5KMkDOwuqsgG/H39zBE3e7Ka0B7vvtmRGWcrD1FHZNARqS380= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743175904; c=relaxed/simple; bh=3g9AH9oSvUwCNVwYdH5PtJPKPAklKGH5WHxqN6AhJFo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MrqPekpdkJlwMjxOiZdhMy2d//PligVy5fs7uijG/ySxo+N5a+sUVH0S2TnwggYNgb/x2ZzcP84vr75OH/Qinp2LGsFsq4yMHLTlRRAmS06yi2nI7p8TsFRdMmRTEMcSt2O3bX4jYace+nlV9hdmFwuuHgI2cQqiVTVg1lRl5UY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mCNMvNJJ; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mCNMvNJJ" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d51bd9b41so21024755e9.3 for ; Fri, 28 Mar 2025 08:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743175900; x=1743780700; darn=vger.kernel.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=V/jpShOFnJ6I/k4rEqX8noV9TrB3vpkLt2594tqNmFU=; b=mCNMvNJJiGxEP8dbzmpGw3GxoZb5BsGOkyw8EQxrBa0wTfAv1sHBdXNEL36JgeV6da LaKsp9nlBhqI4SjcaiglkLpyrsDjUBFvz44FZUQAud/3COQ0hsBk+3Onamu4C4bwh4gq ix371cY6rBb1JF1ybR8qxVAgDNmAyxYOgegjrnlqbD8TiqDwg5FGnQ/akHEUzYvH8qE6 5YKqzV4o/MLbw6+oXzW51XYyAoXkiKLlSh8RiS4WYVoWbd39hWZBnJlYOtovfMzHPMe2 fLhsY/B8Uu4+TsAQdK2yZZ96CHj8tcdtnFdqRbAc4D644Jw9usg3QCcpy4+8LBWHKU+6 Icxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743175900; x=1743780700; 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=V/jpShOFnJ6I/k4rEqX8noV9TrB3vpkLt2594tqNmFU=; b=lD3msGOEyBqMPIP6ntA0Nb0isDDl9nGsj+70eQmQmCPxxFp4f8Zy77oQ8uaJtNXZNg PCW9AAjmKjjzvCsXSmeYwUhKS9y4spFKOpx+LnX+oKjeOuZfR3YjHVgoCqmFcvRMSP/Q rsEhee+QnrXv13tGJkBCyz49GixQHIkJ3XC/5vfisKZAP2NGLYz2xZjHkZhcwDqj4byW KeqMvB8iz2QrttKc1n+8noeV4N98VjesBz811WRMd0McSXhfaghEA1MRRvwQRDB+s6RM iDOSUKF6GnOvpmqqanqrAoUS4Ru6pJ6SJ6leu3T49fm879FwosXOfIq6LIFRe4s0/qwb oG5Q== X-Forwarded-Encrypted: i=1; AJvYcCXm+QOvk/MeMCtiar2JRJrZjsgWoTHmbSQjjbIV1kRneKiAQW/5RmqDZ4fVy4rXkGRyIq/BZWoYomJuSWsP@vger.kernel.org X-Gm-Message-State: AOJu0Ywk8Pq/ODoPtzTffKpFZw7lZYVp7JadGTgkTvKaqrmOyLfFe/6R PM59zqY/zicd0JpKeskVPdonr0HkpOP/pyj63I7Mkuz6Rz9uJmpVBYTeXj9XFj4qrqQpsXhWcw= = X-Google-Smtp-Source: AGHT+IEcG7Zl1YWubAQ/xxzfCc7DzPo7o1l3NxQG19us3iyaCBZ3hbODn54f9bMZd/gVjGPshQUZSrIV3Q== X-Received: from wmsp31.prod.google.com ([2002:a05:600c:1d9f:b0:43d:1f62:f36c]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:45c8:b0:43c:fdbe:439b with SMTP id 5b1f17b1804b1-43d84f5de84mr98366605e9.4.1743175900745; Fri, 28 Mar 2025 08:31:40 -0700 (PDT) Date: Fri, 28 Mar 2025 15:31:29 +0000 In-Reply-To: <20250328153133.3504118-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250328153133.3504118-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250328153133.3504118-4-tabba@google.com> Subject: [PATCH v7 3/7] KVM: guest_memfd: Track folio sharing within a struct kvm_gmem_private From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, tabba@google.com From: Ackerley Tng Track guest_memfd folio sharing state within the inode, since it is a property of the guest_memfd's memory contents. The guest_memfd PRIVATE memory attribute is not used for two reasons. It reflects the userspace expectation for the memory state, and therefore can be toggled by userspace. Also, although each guest_memfd file has a 1:1 binding with a KVM instance, the plan is to allow multiple files per inode, e.g. to allow intra-host migration to a new KVM instance, without destroying guest_memfd. Signed-off-by: Ackerley Tng Co-developed-by: Vishal Annapurve Signed-off-by: Vishal Annapurve Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba --- virt/kvm/guest_memfd.c | 58 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index ac6b8853699d..cde16ed3b230 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -17,6 +17,18 @@ struct kvm_gmem { struct list_head entry; }; +struct kvm_gmem_inode_private { +#ifdef CONFIG_KVM_GMEM_SHARED_MEM + struct xarray shared_offsets; + rwlock_t offsets_lock; +#endif +}; + +static struct kvm_gmem_inode_private *kvm_gmem_private(struct inode *inode) +{ + return inode->i_mapping->i_private_data; +} + #ifdef CONFIG_KVM_GMEM_SHARED_MEM void kvm_gmem_handle_folio_put(struct folio *folio) { @@ -324,8 +336,28 @@ static pgoff_t kvm_gmem_get_index(struct kvm_memory_slot *slot, gfn_t gfn) return gfn - slot->base_gfn + slot->gmem.pgoff; } +static void kvm_gmem_evict_inode(struct inode *inode) +{ + struct kvm_gmem_inode_private *private = kvm_gmem_private(inode); + +#ifdef CONFIG_KVM_GMEM_SHARED_MEM + /* + * .evict_inode can be called before private data is set up if there are + * issues during inode creation. + */ + if (private) + xa_destroy(&private->shared_offsets); +#endif + + truncate_inode_pages_final(inode->i_mapping); + + kfree(private); + clear_inode(inode); +} + static const struct super_operations kvm_gmem_super_operations = { - .statfs = simple_statfs, + .statfs = simple_statfs, + .evict_inode = kvm_gmem_evict_inode, }; static int kvm_gmem_init_fs_context(struct fs_context *fc) @@ -553,6 +585,7 @@ static struct inode *kvm_gmem_inode_make_secure_inode(const char *name, loff_t size, u64 flags) { const struct qstr qname = QSTR_INIT(name, strlen(name)); + struct kvm_gmem_inode_private *private; struct inode *inode; int err; @@ -561,10 +594,20 @@ static struct inode *kvm_gmem_inode_make_secure_inode(const char *name, return inode; err = security_inode_init_security_anon(inode, &qname, NULL); - if (err) { - iput(inode); - return ERR_PTR(err); - } + if (err) + goto out; + + err = -ENOMEM; + private = kzalloc(sizeof(*private), GFP_KERNEL); + if (!private) + goto out; + +#ifdef CONFIG_KVM_GMEM_SHARED_MEM + xa_init(&private->shared_offsets); + rwlock_init(&private->offsets_lock); +#endif + + inode->i_mapping->i_private_data = private; inode->i_private = (void *)(unsigned long)flags; inode->i_op = &kvm_gmem_iops; @@ -577,6 +620,11 @@ static struct inode *kvm_gmem_inode_make_secure_inode(const char *name, WARN_ON_ONCE(!mapping_unevictable(inode->i_mapping)); return inode; + +out: + iput(inode); + + return ERR_PTR(err); } static struct file *kvm_gmem_inode_create_getfile(void *priv, loff_t size,