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 72204C677C4 for ; Wed, 11 Jun 2025 13:34:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84ABA6B00A8; Wed, 11 Jun 2025 09:34:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 823976B00A9; Wed, 11 Jun 2025 09:34:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EB896B00AA; Wed, 11 Jun 2025 09:34:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4A7FB6B00A8 for ; Wed, 11 Jun 2025 09:34:01 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CA77C140CEE for ; Wed, 11 Jun 2025 13:34:00 +0000 (UTC) X-FDA: 83543213040.03.F658611 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf20.hostedemail.com (Postfix) with ESMTP id E94E51C000C for ; Wed, 11 Jun 2025 13:33:58 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=BTeIeymX; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3xYVJaAUKCEAvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3xYVJaAUKCEAvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749648839; 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=Q0GmgHpBmCA6zvNGFoi1Z/wq5QrRCsY3MSz2+Tp46gs=; b=rONHCqWZfyg+mrdcQk7zfgrn0e8Trlkkhpi3QWyOc+/5JnwbBi3UtYMnFbgKRn1x5H1sxg k25CBz1EDAS1iFHlKe0dAeJjBDL7xiLN1lZEm6ceoaS92PDsLjx1/IiPwrXVJsI3zYuafh t5w1iO6OdnvL7NcxyhS565iAgwN4HPA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648839; a=rsa-sha256; cv=none; b=CPHF5rGZlqR+dnznUNwBCxmjfwlSw/sbo3BxH++pIBPBuKb3/mj+vHtzpAYDf1SCOg4AiR uMH27ks6jZfOixPFH0efbg7YwTQclkBymJb/eZ8dGu4ns4LndAAp884LUsH+xl/gYtcdx3 kyjtEpRfaD1KMB4qxYdzIvod66zrCBU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=BTeIeymX; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3xYVJaAUKCEAvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3xYVJaAUKCEAvcddciqqing.eqonkpwz-oomxcem.qti@flex--tabba.bounces.google.com Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a4e9252ba0so3884064f8f.0 for ; Wed, 11 Jun 2025 06:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648837; x=1750253637; 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=Q0GmgHpBmCA6zvNGFoi1Z/wq5QrRCsY3MSz2+Tp46gs=; b=BTeIeymXP+TRtpcbfOjuwDZjwoM2byKgslgG9l4S1xRrcWdQGq4k1ruEZvm378gMRm 2Cvy2W2w+cYJE/UqO2T43G66MAsL4eGbhw9+22Knvt9Ox9eTstV629jU9BwRnGEBhjZf LBklQsnSyjJXOasIaNCUrl1QiA1emmx4h84vAEfspimVfdXcJoUGU5eS36AJ/WCXrGPC J7+zR2PzupECyDD2ecAWZWreDImZBJ8jKrG8rQrwGFiK6dbjIhOXL67KPR8amsQM0HGH 5jv1NlogTrroFDiD+ZptksrKQacoGrERLWIbtGeziPnxS1R6IJ0mQvqLcL+j4oC7wHnO CI1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648837; x=1750253637; 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=Q0GmgHpBmCA6zvNGFoi1Z/wq5QrRCsY3MSz2+Tp46gs=; b=hR/Pbq96C6aFPbzCoK6PHKDoi/nkZ2VTphs+gZUpCuyyOgAckV0d0t7ZQKwYnp/z2X 18tazNVWjInlVuNNxq8pmGSpDJC18KDuvTO//PzIm+AmCf50LxNAlfuLx5mURyKqafKR irSO5wesGl3jm2NVHloxGjBucVE7pFAEV4RMz21pKto18seB6CZViOjCxPPXmzCzzazR HcjEZSctAnxv9XsbNOf4SQ+r617wpHNe28AMopVCrCK3DoVA9Ff7OEZxWFU2Cnbf2+uh drkdOzUtGeHfnNqVv2NgP3BYuEr3CaWLm7UV1/K3SV7c/WctbxXgEEElmc6lEaa9X+7b CqJg== X-Forwarded-Encrypted: i=1; AJvYcCV2+VQpWrjmt2+Io61Lj46DAWQiCrxVQuJJbJSjMg/LNWIsv90QIy3dLNOfzdvchKqMYe1fCCpFKw==@kvack.org X-Gm-Message-State: AOJu0Yy1DUpDU1QecaKoJXAzmBbT7pdIMvfI+bNm8XjYK6zIT/89S2/f EFFemyv22GC5gI+m7Zd1ZI9vbrrUC5sXtF7PL0lQOcHySxjlpltTgOgYyMGQY9zuA5yl7ytSOaX Ahg== X-Google-Smtp-Source: AGHT+IFsqWff+6T7vsnYAkU42VVIgmr2bH+P6xTa1OxLp26jM0y9wIP/2qeKEvMKHtR2cbUL2VHzGV2row== X-Received: from wmbji2.prod.google.com ([2002:a05:600c:a342:b0:453:910:1a18]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:290d:b0:3a5:2ef8:3512 with SMTP id ffacd0b85a97d-3a558aa3a1fmr2525369f8f.14.1749648837456; Wed, 11 Jun 2025 06:33:57 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:24 +0100 In-Reply-To: <20250611133330.1514028-1-tabba@google.com> Mime-Version: 1.0 References: <20250611133330.1514028-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611133330.1514028-13-tabba@google.com> Subject: [PATCH v12 12/18] KVM: x86: Enable guest_memfd shared memory for non-CoCo 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-Stat-Signature: rrmrwdu8w3smdxkxnh9wqsgxnahen3ra X-Rspamd-Queue-Id: E94E51C000C X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1749648838-578287 X-HE-Meta: U2FsdGVkX19Z0u7KIbbjdz6datpJB1NApJsBop4OBYUqFT9oQeBCCDqNHY3yKPdABrOk3a+Uh/Q8XPY7PT3Bmqzp0Vol3gyAFEUxTYN3ZBUvtrgj41bIgtxPZs3obZwIVP9AudMckZ0em+SvqbVqvKbxUa2gLh1YSHo16H2kma8PqIYlhn12carizj5UE6hGI1tp4Pw+zb5e6KxjRzBYUQ3/yEfkmN8rHwI3fUn5JZcIvKugCtse0hbExEqwuvq0k7wJEta7isu3WQ4yIMo8g27I73lPgpMPxg0HgcW7PHXf1xIn3PyaOqp09eZVdW45M2FRd9+u9cR84VR56Vr7ZIhxG5rVdBQv50n1rgAe7ZBynLgOZoAROgesRrxKRVG/msdWvTLHnHlBa5904xKN78nZMvoqgT6pKcxSYBFQ+YnHQrciU5UVgfITRRS8raVAqucSr+jPlJp8h98J0KK9+2wcfDn1nHRZVGZAfETr3fc3VuBMC/JzxXv74iCJfC4G7E/aeCxVioglb5+fK5EwABzNz+X7e00IiqDpX++yVKG91EZjckWsxel0damcYsvpYdyctkVMcThAch1duuMj8gr5iMBFYvVz8ZugclCLpk2jv/oebgOorZwK41Su2Mfj+TVEGz2aDmiP8gr7cCOw2dcTSAatMpNW7wGw2RbdBsmlvWu1uoHBGzJKDfRl+xe/WXLc5Io3IyZcgT+DGgDD6sYV5mCbdE5v4yqhs6ZJnftKJYM6vtvtnOkPwXPwoltBgrDeRmyYtv9CF5a5OL/0AUeBoFXvXsdBzjelMTHFMehQnIqJ7tuYg/NWUhETi7Dq4OKm9jjxwlJOifHkwrYmKpgA8z0ihohwqQEC/Z9IVNcjlWO1d2f2OURBjltSwYEKXZJYQy5PgjENsoiLrzPXM99POvfIg10FhQnm6LiJc8oPAe2D4n8JaRZbLOaR0uOm0ksUN8AW6j8p0hILJsU b+wpfdUi bYlJODJ3T38Vi/4ElYz9yE+ZQTWYrpdpl3H9OzY3Aj4xiwmotK8mFTOoHISBd+eke36WeX6MjNdV8g73ghnD5wWX/Ew1hiIHI2/dec91LDVNcazxnlkXvUli+TTRqU55q/mEZsfCvag/tKaCJd28pbWa052dER6IRAOIslml/EXC8fOyTJwmpouOk/rDL1JPdN0P7J1Poxe9LtyCK9+z+5mlN2OYn1uWOwkSb64RjmqpmLrNlJeRJggFRkO0eK6Lh+7Px8YDm8+U7x/PDLRSrRkH7877WSFSpM50PD5G5onPeZwRBhmPGiRBGHb/KRm8mvPkjtxjLluLqa0CZL9OaS8vDO9fWoTfpF8Oq7ZmQq5Us33BfgERBkbfO/I3Auj0o3H3xlNmSCSNyhtV0A+bJxrSOXbybhXR77Gq8Uk6XUblDvm2sy4jQ+KQY+NmhwjVC/TIqlUSeUZKXVYb9Du5bXRQysGLfUxVhxCOsFMwvRcRrF3r6T6eO+eNJwMfK4d/WRYT4q3sbb0FXf9porFD1OwJFJD9yFgKhroYzmWZS07TukoDkyhhHgxxwUE/WhZdewqmC0RknS4LrQR9l05U+m0IYDjQQtMb800uk+zylnO1sgG4xTEByoW8PIvgIp1lI7u2xslbVOEDYj4MMTnQMElLo1A== 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 ordinary, i.e., non-CoCo, 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 4bc50c1e21bd..7b9ccdd99f32 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2271,8 +2271,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 9151cd82adab..29845a286430 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 401256ee817f..e21f5f2fe059 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12778,7 +12778,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.50.0.rc0.642.g800a2b2222-goog