From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A864175A98; Sat, 23 May 2026 00:18:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779495483; cv=none; b=AmIBP6rDoqvJ+x/5Xew/53tSy2i31D97tLsBcp0RmjUhBZewlirHR3IQdtEWQcUWjCx4ZAl0owU4be7l48LI2+EK3lXCrcwu8j7TZd+qPH4LXtZMkuxeh5NHUI1Tmzo2VDIFPOEToHVKn0PrHsh6Cz5Mag62z6jpr2EPDJpOcbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779495483; c=relaxed/simple; bh=z0QAq9t3s2RiAZ84UlhJsLG+UdFN1VXDl0SsgHlKwbo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HvFXjetM46UDLXi2g9MRGwx4Emoa++g4EPhMlzlP0WFHB4Og4D32it5qCUbf8scw1Tue62z0C0nmXFh4RAIOWgBR8blUo1ZxEySM06GcZ84RYCIsfP3F5p96+8OWFGtlWOlGFpAS4PlnVd3Gz75kQeGgVyFnjvOxG8J5kyW2P9w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R+9CYYYC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R+9CYYYC" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5DBD1C2BCF6; Sat, 23 May 2026 00:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779495483; bh=z0QAq9t3s2RiAZ84UlhJsLG+UdFN1VXDl0SsgHlKwbo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=R+9CYYYC3EQKRyDRSABqmsfc5EosogpDgXztBQthb4FVsEFxcO+7uxBNfgFqbxYoI FnbimENx23f6vsc5YiL2Lc6G+2L4SHRfCf0MnB/nlEk0oLuzJ8lJTnK3UWXQVL3PCH EeFpu72spbAkkFlV1ggvYSGkyln/rsvCUAd3VSzQqX5v7G+RVS2v6azh26NWxPYfaH 1E9MC7ZURzvXsMrP3ubb6olZ+YKU0t8O28sLqNq82kRZBAzBPyQdapDorhuNoIv/Wb YTZcD0rcf3GdW2ioIEAcKVuDcoyXPiIG1nyEICNUJWGvN23w2OUZstp/xLW0xMqeBY JAu0jXSjtAacw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BD69CD5BB3; Sat, 23 May 2026 00:18:03 +0000 (UTC) From: Ackerley Tng via B4 Relay Date: Fri, 22 May 2026 17:17:45 -0700 Subject: [PATCH v7 03/42] KVM: Enumerate support for PRIVATE memory iff kvm_arch_has_private_mem is defined Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260522-gmem-inplace-conversion-v7-3-2f0fae496530@google.com> References: <20260522-gmem-inplace-conversion-v7-0-2f0fae496530@google.com> In-Reply-To: <20260522-gmem-inplace-conversion-v7-0-2f0fae496530@google.com> To: aik@amd.com, andrew.jones@linux.dev, binbin.wu@linux.intel.com, brauner@kernel.org, chao.p.peng@linux.intel.com, david@kernel.org, ira.weiny@intel.com, jmattson@google.com, jthoughton@google.com, michael.roth@amd.com, oupton@kernel.org, pankaj.gupta@amd.com, qperret@google.com, rick.p.edgecombe@intel.com, rientjes@google.com, shivankg@amd.com, steven.price@arm.com, tabba@google.com, willy@infradead.org, wyihan@google.com, yan.y.zhao@intel.com, forkloop@google.com, pratyush@kernel.org, suzuki.poulose@arm.com, aneesh.kumar@kernel.org, liam@infradead.org, Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , Shuah Khan , Vishal Annapurve , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Youngjun Park , Qi Zheng , Shakeel Butt , Kiryl Shutsemau , Jason Gunthorpe , Vlastimil Babka Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, Ackerley Tng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1779495480; l=1835; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=I9xW+NNDdXyRw8cQmwAmq6HLPVcmsBCaOnFmhphvyFg=; b=PEpl7fWcpKP4DDYa9jEB5zhEbwWwEg5E+JKDNVBjoaawwUh2wUVJtzZVnCoLx1LJwSYvqrIC5 Q1/5bY67gZ4BtfG8Q+lEZZHG5PLarp2bqWbORMScwW5xtDaxLovCsqZ X-Developer-Key: i=ackerleytng@google.com; a=ed25519; pk=sAZDYXdm6Iz8FHitpHeFlCMXwabodTm7p8/3/8xUxuU= X-Endpoint-Received: by B4 Relay for ackerleytng@google.com/20260225 with auth_id=649 X-Original-From: Ackerley Tng Reply-To: ackerleytng@google.com From: Sean Christopherson Explicitly guard reporting support for KVM_MEMORY_ATTRIBUTE_PRIVATE based on kvm_arch_has_private_mem being #defined in anticipation of decoupling kvm_supported_mem_attributes() from CONFIG_KVM_VM_MEMORY_ATTRIBUTES. guest_memfd support for memory attributes will be unconditional to avoid yet more macros (all architectures that support guest_memfd are expected to use per-gmem attributes at some point), at which point enumerating support KVM_MEMORY_ATTRIBUTE_PRIVATE based solely on memory attributes being supported _somewhere_ would result in KVM over-reporting support on arm64. Signed-off-by: Sean Christopherson Reviewed-by: Fuad Tabba Signed-off-by: Ackerley Tng --- include/linux/kvm_host.h | 2 +- virt/kvm/kvm_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 091f201251159..68142bc962953 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -722,7 +722,7 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) } #endif -#ifndef CONFIG_KVM_VM_MEMORY_ATTRIBUTES +#ifndef kvm_arch_has_private_mem static inline bool kvm_arch_has_private_mem(struct kvm *kvm) { return false; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 306153abbafa5..abb9cfa3eb04d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2421,8 +2421,10 @@ static int kvm_vm_ioctl_clear_dirty_log(struct kvm *kvm, #ifdef CONFIG_KVM_VM_MEMORY_ATTRIBUTES static u64 kvm_supported_mem_attributes(struct kvm *kvm) { +#ifdef kvm_arch_has_private_mem if (!kvm || kvm_arch_has_private_mem(kvm)) return KVM_MEMORY_ATTRIBUTE_PRIVATE; +#endif return 0; } -- 2.54.0.794.g4f17f83d09-goog