From patchwork Tue Mar 18 16:20:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14021251 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 1B9E5C28B2F for ; Tue, 18 Mar 2025 16:21:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E045280017; Tue, 18 Mar 2025 12:21:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7649E28000B; Tue, 18 Mar 2025 12:21:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 592A3280017; Tue, 18 Mar 2025 12:21:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 024B028000B for ; Tue, 18 Mar 2025 12:21:04 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1783E57490 for ; Tue, 18 Mar 2025 16:21:06 +0000 (UTC) X-FDA: 83235186132.17.038C2EC Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf20.hostedemail.com (Postfix) with ESMTP id 485B71C0003 for ; Tue, 18 Mar 2025 16:21:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="hZeAef/4"; spf=pass (imf20.hostedemail.com: domain of 3bZ3ZZwUKCFQFwxxw2AA270.yA8749GJ-886Hwy6.AD2@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3bZ3ZZwUKCFQFwxxw2AA270.yA8749GJ-886Hwy6.AD2@flex--tabba.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=1742314863; 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=Rd6be5I6g0Af011AYVWod/OD1lPj9HqVBk4Grxnf+mY=; b=YbFX9q6b5KppmAVJOgy6DErq8Ok53cds3zlEsRa2jm+00ghxi0iq+5lwUFB7zy39+GLaLz R06pDifvkRPhjIKNAhdpDbOvQTkHthhgjqtb3uf/q+i0iydYZZppj8ZRKy7lJwxZKH6Ovw 6BMif9hZfwvX+X3YQqk68zvNxwwnUQk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742314863; a=rsa-sha256; cv=none; b=XpLaEiF20tvRvel41r56+qBWaxzxiVl8h37qydFssO3AKIxfpWHyfgM419+7qZZo00saHF C6PRChpzKgXAqnlOFCDdu2fenEn6rWATOv7lzLMa2QZ7SZexv8EAxluRuR77vmKUWAMJZY IPo5nty4terqP39KgFVFF30Polx6x0I= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="hZeAef/4"; spf=pass (imf20.hostedemail.com: domain of 3bZ3ZZwUKCFQFwxxw2AA270.yA8749GJ-886Hwy6.AD2@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3bZ3ZZwUKCFQFwxxw2AA270.yA8749GJ-886Hwy6.AD2@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d209dc2d3so22015165e9.3 for ; Tue, 18 Mar 2025 09:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742314862; x=1742919662; 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=Rd6be5I6g0Af011AYVWod/OD1lPj9HqVBk4Grxnf+mY=; b=hZeAef/48pFcvBOT8FVjOBXZMZkOhlONK1Fhu4t64W67ox6IfT4Q9i+wxM/uiqtwey ANIJJfKy/sFCfSxKDcD43jWZGYG9BQ7cx+wsEP+4JVJWH9wNaad4kgBeKyFTGjLEs+DC j/aDQtHkDKICJCk3AJFJCOw73dO9mty10V7Y2+llgYr+fRYk9CKcFhxIwpEAbm+mFCmO 2G87LIJKUYrC9AYt7NcsTgjUgNhsZ3LBq7VWOK9OoDf774LIxPX6OWstPQnBJs7xpEHx YfenkCD9sUcWMkxD1WXo7GZo1wpiHE9j4CetrXzp7IXO4nLKplGfxZrLRhuaWf63c6D4 EXYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742314862; x=1742919662; 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=Rd6be5I6g0Af011AYVWod/OD1lPj9HqVBk4Grxnf+mY=; b=hKzoCkpIthTeQsQ2h2ma9t7f9Fr76ZsAExEMZIXcagohv0x9nTrP5lgq6xLqYxOWtC 3ibWs0CbA7LaLtemKHOOqBEcohaFBfuXctpMRPFqSI7yfPgUIzYKtooPUH+cssetNGP7 UhCryK+wOELRLhPasQ1okqCCzyUu9YkF4dHQsrphaW1oML30b7wwdHTKkoZANUYe3VUu RFbfqPv0WzF3YHxLZ4nIAzFGLdCsFIPtZF5EnrJlOUCRYErpfsVeqrvWbDuFyL9e6Lgd r/2avyWDDFOZVkjZfZB3uRzlSItfHzzz8V80T5J64ERlhCH22iTySbvlL//UUEIzIjSU 6Eew== X-Forwarded-Encrypted: i=1; AJvYcCXj9qEHwB6rX9kXRDqisjYa09ylCoWdesWe6da5/0SeBHRAzt1kS1QA42luD1yF8qdFAZdMSBaabQ==@kvack.org X-Gm-Message-State: AOJu0YyrMn9u17THqc8EUs9458wgVjQn6oFNTHt57H5WZ4zilYFdSSPa 4E2P8vfTW1RX1qW5rlUueuo0Qm+9ZTpfJJun/4wczSmw5i7vupsSki23q/25Y4Liw8hF/aFR0A= = X-Google-Smtp-Source: AGHT+IFTQwZzOpfOU0EGgsy+KvdlZSjBRDdavIz7oAkVvTl07k3n0vOwWg2N3mGBwzwh7UY/m+wnPF3ykA== X-Received: from wmby26.prod.google.com ([2002:a05:600c:c05a:b0:43d:c77:3fd8]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:19d2:b0:43d:5ec:b2f4 with SMTP id 5b1f17b1804b1-43d3b98d127mr28080345e9.10.1742314861661; Tue, 18 Mar 2025 09:21:01 -0700 (PDT) Date: Tue, 18 Mar 2025 16:20:46 +0000 In-Reply-To: <20250318162046.4016367-1-tabba@google.com> Mime-Version: 1.0 References: <20250318162046.4016367-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162046.4016367-8-tabba@google.com> Subject: [PATCH v6 7/7] KVM: guest_memfd: Add a guest_memfd() flag to initialize it as shared 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, tabba@google.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 485B71C0003 X-Stat-Signature: iwahf4a4sbor8k7fehj3fn76acupzn4f X-HE-Tag: 1742314862-871049 X-HE-Meta: U2FsdGVkX195f2HYM+oUbK2gqbIjvKWwBfBFLn/kkyz23kdZOcOlsUm8rWZtlzYnSK6y2KzAVIdjnYsI3KJb1xozDblonU4gAE6v19bCYosqiqtX55msZE54TnwvN03c8C4O+GAT0OpmDgbkVtmJy8zqvYQxh3ZEsUzjGNX5Cj/UAuMIZXQkFUdnODUact33saOBBkwxcwbzZATtuzSDYI89Tl/lZnDle6OM9BGhUmfThrX63PSKWxnsM7EpNAFWuQUPA7HNJP0eGBMkd/lUt0uj3b14ZOLYBAUA/P55xN/T4J4zjR+5u3m7w/4Y3mZUauN6i8vAYk8cI1Aun/hLkcvj/VHbjwbFB866+hDnK2GSnE92UAl8vAstKMrb/UCzglXI/Wx/IydozhZ4JYp9lNFjR/QDsYwelFYBiVbxtP7ECabtND3gk4GdXw7FQTyby5Xx8h/9vgz/0joZCjT74vO1LYR60CIwG5Lo6FrQg+/cHwzLgmLxJ/fAbt0qtfD1eMxeW5Hz/ffO6eyspzz/4YzfARApAr6DxzbI70dUbJgS+5ZRMmnD1eg4jPvULYt4jfT6QHzpITy9KeFcYEg7AHjYDxuK5CyR6p96XXHUrREjDOmE1V9S6TDajH0Cv0mPV/tYIcwZHxGOHXqtFzE6D+QYukgmn2kTeHVQpVN7Vs4zmiD3c2SIJaNseO7oKLuooFa3YiRKh88BR/9oBBCvs4ngsMkkj1uITX625XwhRXZtE0alR3V3Z/K7DRgHpe1rNyelNUf1VcH6qp2gMc6dyL6C05ZLSOyiCLtm817dgwGtoBdP1dl8ylrjh04rLhI3V0QgOedZ8DlDN7L2xtUM9JIMDMeSmRnpsHtA+G7Wex9I8iBMk3CreAwJtXbakEmTzII24VhqDX3MchNPuWAoUFvXiAKQfHK+UyHacfckVRALDM7dVkWRDEyJcb57b52KRR9hQfpnkWY/U9v6BoJ OFNTEcZj q0Hxgtr7DKhjWXYzI+uU/6TGHqhLOsNDXfADmXROK4m+g6RfbW0SktvzscSIHrUb2pvGgkk9+evEFt6qoQD5MAPw0I8FgKSIAjlDZSZM1QC/0BGQ/4kBWNzdXTaVXKpViBDfnsK3vaFAtapY7rCr88Y/vISp/C36ZBhcdaK4tr5RkuLmUqFlzonZItg4Pw7EYn0J+ajgkJDLU0sF7NfPaeJcAZmpu47tOkGIlX8JR4+XMrEhfKSaJF787O44vf9M2toM4IlsCWMqZxU3uuZa8rmdYY7l2tcCEzg2nyYM12dtecCAVWAVk8X8lZUZHV73T++wS+eQa/FObJ1/Dn4qA4zQJyhUhPdWOCztAyIn4XvPXpgVs35IzA8sFUdeilpO/cqEaAt3gjU+hA1h7k0/OZcQc4QbJBAY5bi25htsix1eCqm7GT7RA/cLTGSx6gsCiETcdSxDcDaO4WZFF+Pj7hguZFQAshJ+v7iHVMQCtBrUuz0EXzkr8tf7HCc0BQ+d9ysd2qkaLhj3BzQtfoSPKWd0N78RZcydeXxOAdiQbCixgy7mgeyK3jbimy3NWxVPBt2bqbLzpOL38p18C+CP16AnhWzNjMS1TJfny+735XQceN11LKFAhlhKp6oMfHpRYS/tf+5RyJJJrp8TbQQRPPLc+BVfs0/CZJVf3AohoXEFnRgPLQL7GQgXtlg== 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: Not all use cases require guest_memfd() to be shared with the host when first created. Add a new flag, GUEST_MEMFD_FLAG_INIT_SHARED, which when set on KVM_CREATE_GUEST_MEMFD initializes the memory as shared with the host, and therefore mappable by it. Otherwise, memory is private until explicitly shared by the guest with the host. Signed-off-by: Fuad Tabba --- Documentation/virt/kvm/api.rst | 4 ++++ include/uapi/linux/kvm.h | 1 + tools/testing/selftests/kvm/guest_memfd_test.c | 7 +++++-- virt/kvm/guest_memfd.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 2b52eb77e29c..a5496d7d323b 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6386,6 +6386,10 @@ most one mapping per page, i.e. binding multiple memory regions to a single guest_memfd range is not allowed (any number of memory regions can be bound to a single guest_memfd file, but the bound ranges must not overlap). +If the capability KVM_CAP_GMEM_SHARED_MEM is supported, then the flags field +supports GUEST_MEMFD_FLAG_INIT_SHARED, which initializes the memory as shared +with the host, and thereby, mappable by it. + See KVM_SET_USER_MEMORY_REGION2 for additional details. 4.143 KVM_PRE_FAULT_MEMORY diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 117937a895da..22d7e33bf09c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1566,6 +1566,7 @@ struct kvm_memory_attributes { #define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3) #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd) +#define GUEST_MEMFD_FLAG_INIT_SHARED (1UL << 0) struct kvm_create_guest_memfd { __u64 size; diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index 38c501e49e0e..4a7fcd6aa372 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -159,7 +159,7 @@ static void test_invalid_punch_hole(int fd, size_t page_size, size_t total_size) static void test_create_guest_memfd_invalid(struct kvm_vm *vm) { size_t page_size = getpagesize(); - uint64_t flag; + uint64_t flag = BIT(0); size_t size; int fd; @@ -170,7 +170,10 @@ static void test_create_guest_memfd_invalid(struct kvm_vm *vm) size); } - for (flag = BIT(0); flag; flag <<= 1) { + if (kvm_has_cap(KVM_CAP_GMEM_SHARED_MEM)) + flag = GUEST_MEMFD_FLAG_INIT_SHARED << 1; + + for (; flag; flag <<= 1) { fd = __vm_create_guest_memfd(vm, page_size, flag); TEST_ASSERT(fd == -1 && errno == EINVAL, "guest_memfd() with flag '0x%lx' should fail with EINVAL", diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 0487a08615f0..d7313e11c2cb 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -1045,6 +1045,15 @@ static int __kvm_gmem_create(struct kvm *kvm, loff_t size, u64 flags) goto err_gmem; } + if (IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM) && + (flags & GUEST_MEMFD_FLAG_INIT_SHARED)) { + err = kvm_gmem_offset_range_set_shared(file_inode(file), 0, size >> PAGE_SHIFT); + if (err) { + fput(file); + goto err_gmem; + } + } + kvm_get_kvm(kvm); gmem->kvm = kvm; xa_init(&gmem->bindings); @@ -1066,6 +1075,9 @@ int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args) u64 flags = args->flags; u64 valid_flags = 0; + if (IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM)) + valid_flags |= GUEST_MEMFD_FLAG_INIT_SHARED; + if (flags & ~valid_flags) return -EINVAL;