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 CC010C369D9 for ; Wed, 30 Apr 2025 16:57:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 124D36B00CC; Wed, 30 Apr 2025 12:57:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D1866B00CD; Wed, 30 Apr 2025 12:57:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E156B6B00CE; Wed, 30 Apr 2025 12:57:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B9F1F6B00CC for ; Wed, 30 Apr 2025 12:57:05 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4B8E01CA205 for ; Wed, 30 Apr 2025 16:57:06 +0000 (UTC) X-FDA: 83391315252.21.238D25D Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf13.hostedemail.com (Postfix) with ESMTP id 6E7912000B for ; Wed, 30 Apr 2025 16:57:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=boe5rmOq; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3X1YSaAUKCJwP6776CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3X1YSaAUKCJwP6776CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032224; a=rsa-sha256; cv=none; b=PZJaMbbZhJnPLa8eO1M1Bm90e19oz1+viroSryrmQjH7GbF1OmyVUVLbc903vvReLltUKJ /ApNkGo0xLXRZmJZlkMApE95W6e9XUsg+32F+XfEVfAEXvV+7cdyEaNoZ7/4KhLd3nqbs6 zQXn1SZ9OufqeNe2mp8l02FrtfqjV+c= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=boe5rmOq; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3X1YSaAUKCJwP6776CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3X1YSaAUKCJwP6776CKKCHA.8KIHEJQT-IIGR68G.KNC@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032224; 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=ono0W+Y+/vEWsoVmJ4OjCULk01Pp7fxFrrjUubfzUH4=; b=DTYEo1q3UvAVaHE4R+9gfGT8A+JyIoNKjQdBgy3JG7dwjIGsYlFsLov3xQObKG+NXNrK/U Ku+VCRZ2/AE7NIdTYeNEBTbYSFT2u1LGSsv3kiid3K526GcAS1HWPJoEaSU1DV6Ni2F+HR 2rTIl1J/3R07JSBaoqarMeNaZFPHj1U= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cf446681cso127755e9.1 for ; Wed, 30 Apr 2025 09:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032223; x=1746637023; 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=ono0W+Y+/vEWsoVmJ4OjCULk01Pp7fxFrrjUubfzUH4=; b=boe5rmOqCLqPGF84S8vodRTQB+5uc8HTSNAU9CpAdgCc17MkAbyyFIskquwUlbrSH8 tg/gxW0Z5FtmK6QgyWqEiShUOlsSP7HUCJ89P2cE1UCjNeOTzeXuD28jwrxMOgifpqxQ NFoK8OGdJYsZPCZ4tS+rWTCMeo73+/SziVnzM1NEQPCN/vc5hduQql0NjkOHFDMKJYy3 oRSmzaxmNaf1QPCFd3lmBX+du/9kznTCsVuL4rIuMT6Bfi/zq2jtOXv+WpgD9tVXtg4E YO0XPlH3kL0AE/eHAjVx6XwDwiLdqPCH669B1kzoH+pspL/MYQ8ih7kYA7TRqN+AOhJy OD0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032223; x=1746637023; 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=ono0W+Y+/vEWsoVmJ4OjCULk01Pp7fxFrrjUubfzUH4=; b=L/EfmMpY1WLlY1lN+8/qTg0LxotaOvA4jUL/z/LSnj56prsfCCyvGZpROaMemzyLAt 3mqEmxDLGvjk13u8OmPuB02370AjoGlzJGrAsR5AXlYUdFcR0UQUXhdLDABlZ6gh/LK2 lw18vt79yglCOa/hpAjMWGG2v66NIp/Urhje3MjbH91jZTaH4czb8FXts+lYDbrn2Py9 TwtFUPheYhU6MYqBP+AIQipo0V5MavwsHczzeAE6yfUSTr5OIrQ6t6D/Im0MyioR2OaA CWyQoxvCfa4uSGeIb/6NhbnH0jExH4aVCHmBJ3RjUrpAMeU2Ws5C3Ddbv/Yuqm9mPgoi yDaA== X-Forwarded-Encrypted: i=1; AJvYcCXzRSfhxDUkGN65vKmIoTfBVWh5yDOATJ8RE2A5KguBB3c7hr0Dk/c19gxKbkMkkdB84vr1SDLFFg==@kvack.org X-Gm-Message-State: AOJu0YzlnLUQGF6wG0YBv6Rgf0oYUFqyEQNeL7hOr0rXLekUKhxTIFd1 ZR3YwgQpHY+2f8FYNPMrZP9NEHYttZAt+ncXQ6EHyNjPKQutot9c7bVFBG/F+b8eMPa1ZpO6ww= = X-Google-Smtp-Source: AGHT+IFiay9vVO5GKWifOcJ6D5kD8ctjc9P4X8VLK3L+uvOVYO2aSjWiPigUW5MFB91/q4pM36xBJgSB+w== X-Received: from wmbbe3.prod.google.com ([2002:a05:600c:1e83:b0:440:602a:960f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b0c:b0:43d:683:8caa with SMTP id 5b1f17b1804b1-441b1f3958emr43326145e9.15.1746032223003; Wed, 30 Apr 2025 09:57:03 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:45 +0100 In-Reply-To: <20250430165655.605595-1-tabba@google.com> Mime-Version: 1.0 References: <20250430165655.605595-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430165655.605595-4-tabba@google.com> Subject: [PATCH v8 03/13] 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 6E7912000B X-Stat-Signature: m416anph185px6cdh1x647ekax7atgub X-HE-Tag: 1746032224-919104 X-HE-Meta: U2FsdGVkX193vtc1i1P4MjQqjD0TKd1V4InijJP0zXCN6AQk5GB+96aOuw192yKwS/UhHM9BbaUP0izsV92cPWRwYoAaRKFcl6wgyFq0PvW0HKd5N3mtS33d32+4A4khyT8vpRljIUZl7r/UGiYYIrMtef7gr5If1uUveaOSRflLCM+5mmiIwSFLEUdS6a8QIGmnjnf5PydzRkt6Dob32wXcnmJVrVVYj1P2uhlgL5bfKOhBmvM5GCX0ERzLJB4NBqc/3MkN9UYMmj7CdiEgvioeINDg8jXyPwHZ4483KELgrzcF8FIM23C/a2QHs6cw7hfSoNo2zmkA/IN8Ldwu/h/BDu58o02ovYNqjcxO9Z/p2VaNDlnYaqotVDDPviZIeiZ5tmopb88Q60wycBcEle3EKmsnV8j6xakYQu7+9o8o3j3dHSpeZJ3pD/6bAOK93X3+xAs8ecnkcm9oafnyVfOIAIS+D9vLp1rUCnIZmiDMKzmoW3o2Vt7UMDqmpdk3vJJ6B+QYYwr0vGKmW0Ys41Y1zFW+H7NGhrLhu4KKpTs1nDzwJ9N/52ckrk/nupPxgYh9JjF/Vz6799a+q03jy4CdIerWsBpgOl9ARDigFE8hIN1El8VHlmEoEvj2xCjJTX25sdVgmjHr4l3kmpPg1zL+Oyj9SbqKMI0owURfaDdzYmqMFySx2Jd4Bs09Dmoey0OFlGxBidPDUNmjelK5WZNc30yIoBr0MWA0sPYMWea0fEjvDYcMM+NJHWxkxuobb1l+Pfk/qOYOfDP7ixzKw/wOabEG3NKiPn36rLtvepCC2qFjrWN/1WvFxXvsyLddd9UEoI9uS/wmIl8g3uSFofbPVVbLl8zaRI+gUAvg+LCqReujVgAYKtnDPo2vbzr6SUMP9YwsZ8Lp+5abyFIam9Ii9XSbBol8kXvnl89Sz1VR+vIqXbwqVhsk9aA4iMVeNd0iRYGnQKx/yMOKrQS 6D9GdJGw I54JYkGRTjdE2Xu4uiJWDXA5xE/C/IXYAGl6rkmPJue4Hg7F80hWQpBaxlBWRYRqPzZ5Ya/LIiM8d3VqsokRtCat1CnFW8n9d1vhIpr5mwUzVlmtyB7tpQpvmNXwyyrFweS/HyMTGa+n5BvmdquGgkhIvaBmZwWgAcH8bGVdu2i2P2LB94MdqKzktb0uh5iWcvf5I5uBGi/s59fNh0pV4OHVAT3skh0SNMa95Oj7qHnJRI4a5egOr1iSYUy0lhodN07NyyqL6D5WZ7W1XaZQ3d10lCSdJUE+NJbp0oF2vQwtB0OwtZcuht1vfrl3rv+TR84WuC9h10RiRo1WA/+DVTYcexP7iYhnoWwR3D30GCKPOirRP85u66nIvULJNqAGOE+O8YxshpnGYYTuAvKMW7Vga6GknyuzqcwwFgeeDrjeWZzk9Bamrv2WFaoYPyTFfDFqZ3er6RjQgbtADr8AKAsE+vZcBC/oxr43fcao0olDGqrNzQOa57A4HzTUi1n4FM0o2VEN9JStwwTvK3hYbtOA6dEghzjYGEOaVaPjEn+tHHrayFzYJSAwuox39QXU2cqsjTG7eiBzgrCQEkKdCut72pPNXbyN8wV5SGtnlS+jPltjCeiI5/D4rtYT6wiu9ap8/sBhVQDTriraQWVugWV/yIahECtHT6U5NkBuIc3Kja5o= 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(). 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 63bb77ee1bb1..7d654506d800 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; @@ -7683,7 +7683,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; /* Unmap the old attribute page. */ @@ -7746,7 +7746,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; /* @@ -7802,7 +7802,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.901.g37484f566f-goog