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 43AEDC54ED1 for ; Tue, 27 May 2025 18:02:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72A0D6B008A; Tue, 27 May 2025 14:02:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E3306B0092; Tue, 27 May 2025 14:02:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57BDA6B0092; Tue, 27 May 2025 14:02:56 -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 2A7036B008A for ; Tue, 27 May 2025 14:02:56 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C7C3312131C for ; Tue, 27 May 2025 18:02:55 +0000 (UTC) X-FDA: 83489458710.23.6E34EAD Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf21.hostedemail.com (Postfix) with ESMTP id D3BED1C0017 for ; Tue, 27 May 2025 18:02:53 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="LR//nNOr"; spf=pass (imf21.hostedemail.com: domain of 3TP41aAUKCGkaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3TP41aAUKCGkaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@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=1748368973; 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=N93IbLALKdYCf1GiKS11Qu3xpDb0jOxHx0uJTo/bq4Q=; b=B0CfhPLj+qHABLfQDaGNxZw3jfykRLmSdX32V8yNG1KbEtW1EQsZswmBeVuzaPJNYgWS9P KQF5I/5GCQLlu7FLmOwfG9+c3VaynD3DUnRkDyqXwOZlZf/MCwwHWfARWDelbZzVfuUTmY K9zmbdRSfFVhMzbgEQ8jziTdh76AR/Y= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="LR//nNOr"; spf=pass (imf21.hostedemail.com: domain of 3TP41aAUKCGkaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3TP41aAUKCGkaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368974; a=rsa-sha256; cv=none; b=f/SLcDzyhQCjMFRn6DQL05T4rMlZMQCLG9Pttjs4M51F/X/vodFXOHm/EMJlQFA05CCoqA 86OqwWX8/QKFsiGpGPKQ4Mdg2Z2TeprJkTc1LOEP1GRfeHsWV052Re7NdowoXRN2hckz45 Vgl6WudhdQNH31aJ9+g+phcfYmf6+F8= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a3696a0d3aso1548350f8f.2 for ; Tue, 27 May 2025 11:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368972; x=1748973772; 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=N93IbLALKdYCf1GiKS11Qu3xpDb0jOxHx0uJTo/bq4Q=; b=LR//nNOr4XkTVqHkf6p3w/quxnc228V8FYSlq37v9tV381fDQTRz7xgJ9yFbumiI35 uH0IFyoJK4HOqW2hqYQwEfZ4+9m9Xkh8rUkKvBg6O02p4Dh01o9VtviCrbyYqc9hs830 /Q0KUYUsXULFzl/rQcggCaiAsn8TGu+VqcmrVtmg61tu4cysSrkIZf1TD8e6+WRB7VSi 0hcoLgqkAjpk1fQPFhCGnsWyOZVqcFLkLvlysTNbBKVYVeUihyng3FA6Mv/8+Cb5k3vs /vAyQMzOZgDIy3Ose6jMpnFc+6AHA0SOKE6jQ5KR1+80SzggffCfhYx1sAY8aqFMzqtY XSPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368972; x=1748973772; 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=N93IbLALKdYCf1GiKS11Qu3xpDb0jOxHx0uJTo/bq4Q=; b=kWT8kXENK9ekGZbjJWmyVJ9pZgS8w77R84eFIN1uwomUd2AKgAyt4M1Br+0N9ebU8L Kae3Y8XNN82FE/nPofXPZZOCkjFEJfC4f78GEsjXszcAiYKtWleQRquxYTrwuCxMrIu9 F24t+zwokTTuo8VS7Ekz0LanzY4KnlRxeR16JuBsAgBtZCFcUIq3KhKs3ouC+P0eC3rD 9/5JIjPLP8h3arlqX/KDY09g6tMIJOzfT25b7RQUHnTtJH22RHDH0nV9nn0U3yhUIFUl V591ZmYqbigXaw2q6eZZs+80OM9FMIrLF3fFJU3y2/M6p4nd1Hjzu3Pp4GUaPBihWMph qlxQ== X-Forwarded-Encrypted: i=1; AJvYcCXIMwOOzhCJsXhWAkdqG+5nEsv5YCDS2A5OEyjEVBJ+NMxuDtfpff74bCV4h2zDRi9AS3OdCJymPw==@kvack.org X-Gm-Message-State: AOJu0Ywt8H75hC6XqlcqpDgeia+WJdMXnx5fxiuHaCQtivYmWMSNkO3z yHrjUrqmrS0h1RaMujVZn/5rLH6s6ePoDcT9rQVzftLWi/HQjkuNpj2jKrm01T3IKyVo1AB4jWN l1g== X-Google-Smtp-Source: AGHT+IGz6MIl22so8xg2Skb3Oh+5iI9gcMMAR/8wKnp3bzW9/kLtp8Rg4Ad4rhI5QSegPiDbuPORXHvyyA== X-Received: from wrbck12.prod.google.com ([2002:a5d:5e8c:0:b0:3a4:cf7c:16c3]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5846:0:b0:3a4:dd63:4ae0 with SMTP id ffacd0b85a97d-3a4dd634d88mr6208111f8f.35.1748368972426; Tue, 27 May 2025 11:02:52 -0700 (PDT) Date: Tue, 27 May 2025 19:02:32 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-4-tabba@google.com> Subject: [PATCH v10 03/16] KVM: Rename kvm_arch_has_private_mem() to kvm_arch_supports_gmem() 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, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D3BED1C0017 X-Stat-Signature: wajp386h8jznn65igim37966rybx51yd X-Rspam-User: X-HE-Tag: 1748368973-979742 X-HE-Meta: U2FsdGVkX19P+X/UjIZEoxf+LiSpAxGJoai0ZtKuXZLAywzokfpassGfiyELkiWaB9iEVKeIsrAP5G1kCp4lGhgiOIoiVcisqtI/awYC6YNIaOhs0uxe09an0aAiONKsqsImtLTQBlUm8HRnxUR8Ee4H6yADmf7ovtLgNaSuM4N5N6G3+rk0mgW6oFckYWRiBTinVRAcRKp1Tw+HO3FL53/EKH7e63rdMyweKt6C4Tefy9vlG2S/pSY1/eDT+vxU7KXx9Q7JfwBeo/NM6PJ44ZNMNXp+UXoM2nBSaJ/7KrIEfUsvtdCl6QjTP6ub4eQOiUNgB0jR7bguR8kIrKe3kxjBopCq6oiUHcjDDG0XEU6J7WBetRiEyRJQlwBFC38oEVnCAqvgIwtsLbtQ2atdshaRxb/Ubs36mWZz1fiFA5OWLKPlpE7AjCdihkcqt0Y0E5cgNxA8H08yWgNVPdx7Chq3I6WNulL11O0D7gT9DlCYD6kYTXynlmEaRZvQUIFqOsj7O9KhkjZvfOCQiLvBWow7HRpt0psaS7yZji4E1kBX/rJ7Y7YdGiUv/XW9auF2+adnsp3Jf4QuxZTYmwLUwG6p4y+W0KQfO7GRLcmD/mwLPCaF4oMB0dVhvsySGkKjXPEwWJdTmaiXhKBT9jwJmlycWh5iDiUaiDqPEZWsAWtGTXSXD+9GASsrmZWtzHlIFcunMnpxNcFwTlq6dY3IJ2pRswGiMmGwpXu58vxd7HUcYLGjH+fY5flqIk/OWUba1oXVluAOCmvxfKvfBFbsVpdJs/R/EDOcveemf43OjzjmsVyPKI+CqhAD9KFtQKuHGBXSOoiWwEUAX1BaoGKkwy8HBZ9UWo/JKIqYAyAgiRJYH10ZOXJO5c6LUI8BTth6zDXtQN3JVvDDfAVCnzo3fR7dQUNxskMYNYb07Js0we0znMnVrcB1LyxgX8nvK05JWqbw4deVD4zbGBSTtXv FN58NNBY 5A2g2RuCNtr+V9ZsA0alzuZL5DnXMXBXcDTjlBvZUKiNIT5n5x3vFVavIqNzvZeZWySJgrT9dabWt565a/47iyaKWkcMCfTfFXqz4qTnVp5APe2gYbDNIN/eSfEWWMByZdiJFoojFUPdVcQ8vm+IPHRQb1gdPXyC+mIjXzNrxh/o5f0+8o0p0nTGiGdD2KDEJCn0cek6+E6hkAa7KeYwFMnnYPBREPrq/w6ZZBpcmozjM2AmaYl7FIrshgfcddkEMhQ/Miv8Ko9iRPLpYZmHrjoPhgfYOnylnFU7Qjp0f0x12b6HYDmySWg4F9xw/7TyFwJg41/ItKTpSQ8JXsVnSrDrKLwA1tT/g3yInXcmSGlJBpe2hVXmqezo61PAK3oqrxVUNTl85pMs8Ern2+XNvElICm/ZRbJn5GsQf8hqYmQS4sH8mutuRsKcjenfjMF6aM4CWLoUS4gr/j6sB0SXQEmnHUWoC2C0uUll6l5eIW0RRS5xz0Zj3Lx+67SfWIrHp6oZVg8MOeWYEF/CBnB09nP4r5RyknQKyy6HlbG+7Jg37NpKleYHOIJxYnuQN3hAVEqkZOqbPVr914PLjkksCQxKklp+rjgOqNOUi/KYbXehx772vW2u0/xrv2a2TtrZnLs1IYahBOBaFBgJQ3wMJDFbeLFNnsGrD9asHtVCasMyqvGHr4NeGzZHm7LdasbEzHlMR 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: The function kvm_arch_has_private_mem() is used to indicate whether guest_memfd is supported by the architecture, which until now implies that its private. To decouple guest_memfd support from whether the memory is private, rename this function to kvm_arch_supports_gmem(). Reviewed-by: Gavin Shan Reviewed-by: Ira Weiny Co-developed-by: David Hildenbrand Signed-off-by: David Hildenbrand Signed-off-by: Fuad Tabba --- arch/x86/include/asm/kvm_host.h | 8 ++++---- arch/x86/kvm/mmu/mmu.c | 8 ++++---- include/linux/kvm_host.h | 6 +++--- virt/kvm/kvm_main.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 52f6f6d08558..4a83fbae7056 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2254,9 +2254,9 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, #ifdef CONFIG_KVM_GMEM -#define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) +#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.has_private_mem) #else -#define kvm_arch_has_private_mem(kvm) false +#define kvm_arch_supports_gmem(kvm) false #endif #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) @@ -2309,8 +2309,8 @@ enum { #define HF_SMM_INSIDE_NMI_MASK (1 << 2) # define KVM_MAX_NR_ADDRESS_SPACES 2 -/* SMM is currently unsupported for guests with private memory. */ -# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_has_private_mem(kvm) ? 1 : 2) +/* SMM is currently unsupported for guests with guest_memfd (esp private) memory. */ +# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_supports_gmem(kvm) ? 1 : 2) # define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0) # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm) #else diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 8d1b632e33d2..b66f1bf24e06 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4917,7 +4917,7 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, if (r) return r; - if (kvm_arch_has_private_mem(vcpu->kvm) && + if (kvm_arch_supports_gmem(vcpu->kvm) && kvm_mem_is_private(vcpu->kvm, gpa_to_gfn(range->gpa))) error_code |= PFERR_PRIVATE_ACCESS; @@ -7705,7 +7705,7 @@ bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm, * Zapping SPTEs in this case ensures KVM will reassess whether or not * a hugepage can be used for affected ranges. */ - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) return false; if (WARN_ON_ONCE(range->end <= range->start)) @@ -7784,7 +7784,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, * a range that has PRIVATE GFNs, and conversely converting a range to * SHARED may now allow hugepages. */ - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) return false; /* @@ -7840,7 +7840,7 @@ void kvm_mmu_init_memslot_memory_attributes(struct kvm *kvm, { int level; - if (!kvm_arch_has_private_mem(kvm)) + if (!kvm_arch_supports_gmem(kvm)) return; for (level = PG_LEVEL_2M; level <= KVM_MAX_HUGEPAGE_LEVEL; level++) { diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7ca23837fa52..6ca7279520cf 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -719,11 +719,11 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) #endif /* - * Arch code must define kvm_arch_has_private_mem if support for private memory + * Arch code must define kvm_arch_supports_gmem if support for guest_memfd * is enabled. */ -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) -static inline bool kvm_arch_has_private_mem(struct kvm *kvm) +#if !defined(kvm_arch_supports_gmem) && !IS_ENABLED(CONFIG_KVM_GMEM) +static inline bool kvm_arch_supports_gmem(struct kvm *kvm) { return false; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4996cac41a8f..2468d50a9ed4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1531,7 +1531,7 @@ static int check_memory_region_flags(struct kvm *kvm, { u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; - if (kvm_arch_has_private_mem(kvm)) + if (kvm_arch_supports_gmem(kvm)) valid_flags |= KVM_MEM_GUEST_MEMFD; /* Dirty logging private memory is not currently supported. */ @@ -2362,7 +2362,7 @@ static int kvm_vm_ioctl_clear_dirty_log(struct kvm *kvm, #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES static u64 kvm_supported_mem_attributes(struct kvm *kvm) { - if (!kvm || kvm_arch_has_private_mem(kvm)) + if (!kvm || kvm_arch_supports_gmem(kvm)) return KVM_MEMORY_ATTRIBUTE_PRIVATE; return 0; @@ -4844,7 +4844,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #endif #ifdef CONFIG_KVM_GMEM case KVM_CAP_GUEST_MEMFD: - return !kvm || kvm_arch_has_private_mem(kvm); + return !kvm || kvm_arch_supports_gmem(kvm); #endif default: break; -- 2.49.0.1164.gab81da1b16-goog