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 42C7DC5AE59 for ; Thu, 5 Jun 2025 15:38:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D48D6B00AA; Thu, 5 Jun 2025 11:38:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 884156B00AB; Thu, 5 Jun 2025 11:38:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 776786B00AC; Thu, 5 Jun 2025 11:38:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 51E906B00AA for ; Thu, 5 Jun 2025 11:38:31 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CB97212047C for ; Thu, 5 Jun 2025 15:38:30 +0000 (UTC) X-FDA: 83521753980.06.9B4573E Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf07.hostedemail.com (Postfix) with ESMTP id EFBF240005 for ; Thu, 5 Jun 2025 15:38:28 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Dozanv7/"; spf=pass (imf07.hostedemail.com: domain of 387lBaAUKCLYpWXXWckkcha.Ykihejqt-iigrWYg.knc@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=387lBaAUKCLYpWXXWckkcha.Ykihejqt-iigrWYg.knc@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=1749137909; 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=LyV7wZJIVzKpkK9EkEwsBwrhtHO9OpqVVjeAhwV3yWE=; b=oka1uswIMCAP2qSIHDAcX3V3lImot0qw6k9OjuE3zZMBC7LR3SHpsWeb/p6vxGQhXpy7Xa FCHE8s51Zn0vck2v/lXwRzcmDTnAneCnql2ob7/KmuvvkbH01LJlOcSjRt5c7j6gFfTupz QWAQhrng2Bmrpxt9iwiH6ZLCASZ+NCo= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Dozanv7/"; spf=pass (imf07.hostedemail.com: domain of 387lBaAUKCLYpWXXWckkcha.Ykihejqt-iigrWYg.knc@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=387lBaAUKCLYpWXXWckkcha.Ykihejqt-iigrWYg.knc@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749137909; a=rsa-sha256; cv=none; b=U9VbW9dPKP3qFZIr+uoI/uxS9bK3O/k2QJr4L5FrtBA0ZlQqsVn8GdiuzM5fT7NpQ1YLuZ n0JdDabJj/T+WNF7bvP30uIVS/PCYG6t5x9r0cXvXH5fvAHqQxsqwwJlUDdwRuGydC9So0 Tqn4vLeWiN0QB8010rqyFekQAEN2i70= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a4f6ba526eso724315f8f.1 for ; Thu, 05 Jun 2025 08:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749137907; x=1749742707; 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=LyV7wZJIVzKpkK9EkEwsBwrhtHO9OpqVVjeAhwV3yWE=; b=Dozanv7/41xayiS6Ah7khBpBrmChPOLNpvYBt7elSHXR66LyElGbZ6ZlFDSCnZG4Oc DKKmk73fvQYdsqUR0GDzYg7PMQIuwoS484st6F9VVW5v+MBpi5rJXW2qETr/BC1W5wWd 0zAYDYeu/vJzWjuNBITT0Iv7II4oSXDKUH0PX/3+bMMep82m/3w687z9bxo/2srXso+/ YBq9iVZtUF6EDBGp9J4/ssjMvKRnlR/yKu7B2zeHIFdVpIoZ02LJFLRg9nlHnVCQX6Ie 8v83yVx1moFzSFHUKaGwKvq6uSYTKblebuuw/qVfbshftTchv5wH+NjneynfMVGWaXxY 7WsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749137907; x=1749742707; 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=LyV7wZJIVzKpkK9EkEwsBwrhtHO9OpqVVjeAhwV3yWE=; b=uu87HHTix0S5T+dba8ZZd9bRwVcLgCzIcVw4IrTvCoyUvg0ESyt0Dit1c3UPNwFS6v HfO2b2/aqc7tNINOeiSFzIudwqSreii4qE74HCeUrH5OwPD6z9x2UZjwGNMnvnJ/Q0jx qAOV6YzRy2apwb6Dy6FvedixvEdIuv1xWR6pUa1mJHf44I86vmoL6aDeXKAqsmp0vzS4 DRIsSp6lMUtlB7SuAh/4kF70lLEZ0Q9RR4ULfOyYkrAk3Sp6DEEXoq5/UhplN0PVUJm0 7N4m6GbQTu9D9wERWGgsoAWQ3J63EJwZZnCJkZMg7Rb5vB9kKCJXT3L4M75CgXRNuVSH HKzQ== X-Forwarded-Encrypted: i=1; AJvYcCVvoItBpPCeksR6g3ZmKA+FrDxfmrDZjK3x+x2lS5YKDZlolU3OGSInGNYHLVsSfcAaz88c7g9PQg==@kvack.org X-Gm-Message-State: AOJu0YzKXAqce82yAjXE6gyQrhRKdemhhaKPID6DC5zOLJzNp61gzG9H lXlCh7DuDhOd3L3Qvp1MllIwxtIYSpGThrP35kDw5ZjovWjRYQSVLw/LjRyK2+FXsw353dFAbat 0ew== X-Google-Smtp-Source: AGHT+IGgV5ke5hXPrHMuRnrP+wv3u6Tkx21fI8p6ntOfTtgrw4d762tpa+/9V2HMZqsC7PIFnB4sz/aRjw== X-Received: from wrbdr8.prod.google.com ([2002:a5d:5f88:0:b0:3a4:ead6:8232]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f49:0:b0:3a4:eb7a:2cda with SMTP id ffacd0b85a97d-3a51d95dcd5mr6346937f8f.30.1749137907542; Thu, 05 Jun 2025 08:38:27 -0700 (PDT) Date: Thu, 5 Jun 2025 16:37:54 +0100 In-Reply-To: <20250605153800.557144-1-tabba@google.com> Mime-Version: 1.0 References: <20250605153800.557144-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1266.g31b7d2e469-goog Message-ID: <20250605153800.557144-13-tabba@google.com> Subject: [PATCH v11 12/18] KVM: x86: Enable guest_memfd shared memory for SW-protected VMs From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, kvmarm@lists.linux.dev 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, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: EFBF240005 X-Stat-Signature: ejgd5q76d9j9psmgtdhs549st1opgqf6 X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1749137908-662305 X-HE-Meta: U2FsdGVkX18UyOxsNS2Uq8Hfz5F9i1KNnALxCAnJYjTiq/hEV09TI4bs1JZy3KnpNvGRGaFuyPy3FdAb3fdC5Fjyo48RSRIrTBUHKKC+epxmliuJ3W7xykRi/8Uk+5znGPQhiNE6tcOoX4MNyZYhffSXN7+C9awCTq6/zSh+nIvoHIq76Bn/MAQO1aQGVnCoTbd14/mRRXbjGXEOqLCa1gUFMpxScEyey8n60cJOQH3S0ZuuAuvp5b5g691kk3JE/4yeBegGuq9bXeuMLPa5BODmk8VoRgmyOI9DcBaznwh30KMt2g9223kpDxOgoGMCV0UrHau/+nnN05A+JGfPsqIgfoHOOf21mtpAwgJgXducJU6n8d6+huqBkONFL/ZiPKYlvaMKytt8OlkSWdCy9dDq6O37TmywiXuCXlc9xCD4DSkOKZ5PFJT271xFUW80rq/k19jlh+bOnfXpT7ZNWlptBNaRPPj1EiXuDt9fSQ9LSgZah2IB2aiSkZ9ypmbXVzPZpNSwo8YfrYCrN87z9mCT8mRO3iV8npW73ujVFTydYY0oQQ4doncUNwNOgXXkr6q6maet4AioIk02aIbeUmw8QyvHJgoaIy0+R8p6Lze+iWbFrOaVmpSaeOFfXODbSkOZLzue9GQ241ONDiGjpGiyLRAkdxTLbAXkoyOMDL3nlyqIWcbUccZxzqWTkMULAI8kVsq9q99hsfTF5UpsVrCOgNl4DNB5rfdz6Muq2Fscw1TwvGsfQlw+jEC4In1Ev0R9RqXrDNkdfgu35EAIOUv1pHMKOJ/E9nPXVPJJH2q9CqaBZXJ1Y+gzs44kyu6IgkqUbVfbkWiZra+1o3sCBOEJ5KuXo11WUf1Nwa61z6imXMgbmGFMsYUEBZiXJ0/HCG7AJJ9WEihX6aZJ9+OAXLxF5cG1DEfHLtQNjQzSxQlIJj1U8kxABTYisZZbGSLZWl9oARJMUrQt5Co8Qgt rLy3L5fS YJlmBlexvzx9PRdhBXZ6pe17TkTR/i8k72lloUp9d5yDxQok67yVufQJt36eDHZpctyylvierYc74HWeY1BbK2IYQEG21clqZrGJYTd0ti8nndlAB/nJepEfdYVuC+/ELW6O1NZGmeLAWMjxS35pCnGxf4vY47ihuI1pdjhkjCAbVdXas9iR4CMr/pkiImctBXC1fO4zpWw4j2plY1RJnDSoQUMwX5QyzlzvaaIPmCuC3LTbnJGPY5W5IKszl8t1pJMTpeF1LUT5Ewk1hnckbaeRrDCRsel3D0PzmMKy4cwWrq1CeMON1QbUdUbTb0yVk8j/UA4Qh7HeHiO+fmUFDH8BbcDSyaiEX9/ouTdndeN4FCMXmvKU8HT1YlZ5nIcmIcHfzBRiR6ZLIFOFMeSkQSYhNcqIQ6VjCwg/6iocaU5X5JhDnWY6RXiQKccAj/yX0jIqTESn6jRWv+NwPaHebI63I401N1HOAWkMfFB9iGZo12uUpLTCR5Ri9ldwEobYSsXrhTJEiEpMqyZn/pvSk3AxPUkV23d+paAZDikSIy5dAW5pwmhQJG2ULY/+GtoQ0jhK4TWT1H2wxUIArETt5LY8PSMOrlLhX87LaJ0cq4B2uuSck9ozjohJZGtRVwdvL5tQYf4Dc8/eETS8fVhJnM6J3EA== 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: Define the architecture-specific macro to enable shared memory support in guest_memfd for relevant software-only VM types, specifically KVM_X86_DEFAULT_VM and KVM_X86_SW_PROTECTED_VM. Enable the KVM_GMEM_SHARED_MEM Kconfig option if KVM_SW_PROTECTED_VM is enabled. Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 10 ++++++++++ arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/x86.c | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 709cc2a7ba66..ce9ad4cd93c5 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2255,8 +2255,18 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM #define kvm_arch_supports_gmem(kvm) ((kvm)->arch.supports_gmem) + +/* + * CoCo VMs with hardware support that use guest_memfd only for backing private + * memory, e.g., TDX, cannot use guest_memfd with userspace mapping enabled. + */ +#define kvm_arch_supports_gmem_shared_mem(kvm) \ + (IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM) && \ + ((kvm)->arch.vm_type == KVM_X86_SW_PROTECTED_VM || \ + (kvm)->arch.vm_type == KVM_X86_DEFAULT_VM)) #else #define kvm_arch_supports_gmem(kvm) false +#define kvm_arch_supports_gmem_shared_mem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index b37258253543..fdf24b50af9d 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -47,6 +47,7 @@ config KVM_X86 select KVM_GENERIC_HARDWARE_ENABLING select KVM_GENERIC_PRE_FAULT_MEMORY select KVM_GENERIC_GMEM_POPULATE if KVM_SW_PROTECTED_VM + select KVM_GMEM_SHARED_MEM if KVM_SW_PROTECTED_VM select KVM_WERROR if WERROR config KVM diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 035ced06b2dd..2a02f2457c42 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12718,7 +12718,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; kvm->arch.vm_type = type; - kvm->arch.supports_gmem = (type == KVM_X86_SW_PROTECTED_VM); + kvm->arch.supports_gmem = + type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; /* Decided by the vendor code for other VM types. */ kvm->arch.pre_fault_allowed = type == KVM_X86_DEFAULT_VM || type == KVM_X86_SW_PROTECTED_VM; -- 2.49.0.1266.g31b7d2e469-goog