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 44D2CC83F03 for ; Wed, 9 Jul 2025 11:00:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3F916B00D7; Wed, 9 Jul 2025 07:00:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF01E6B00D8; Wed, 9 Jul 2025 07:00:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B42036B00D9; Wed, 9 Jul 2025 07:00:15 -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 9B6E46B00D7 for ; Wed, 9 Jul 2025 07:00:15 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6E01A109E2A for ; Wed, 9 Jul 2025 11:00:15 +0000 (UTC) X-FDA: 83644431990.09.736DFF8 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf08.hostedemail.com (Postfix) with ESMTP id 8482716001B for ; Wed, 9 Jul 2025 11:00:13 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="U/pyj3DS"; spf=pass (imf08.hostedemail.com: domain of 3u0tuaAUKCFYHyzzy4CC492.0CA96BIL-AA8Jy08.CF4@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3u0tuaAUKCFYHyzzy4CC492.0CA96BIL-AA8Jy08.CF4@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=1752058813; 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=Auu8uvlzSKOU324XIVBTX5mUMTIARGkUiREXwmkL04g=; b=yvXKX0U+BJFTBk66vDAYrr1dvxzI6UqZK24jjKHlYmRz39rZ98pHh7JVHhdbguBiKETWEp bmysiuWgzGKANF+y4NCCE/QWPgSvtRFwuGTcW4jJ5GR11JUCAki4crXRGXfVPIwSud9ExW MjJ0m2gLAFGcDWFQFb1ceqeZvaaN5+M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752058813; a=rsa-sha256; cv=none; b=wM5eiiVDTGDKT0bYQ5v7+spRBrK7jjL1Gv/dw6Y470GktBYGU482YAGjS9eUbRggmkeCfp xWQSxQtfDc05y9fqD+WHLhJsr5drMQ8KO95znnP4auzzh8fzekpVybSmLFcCgXTYkgZBpb 0WnWXZRbad+9JPm+CURg0N9akiAHtzY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="U/pyj3DS"; spf=pass (imf08.hostedemail.com: domain of 3u0tuaAUKCFYHyzzy4CC492.0CA96BIL-AA8Jy08.CF4@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3u0tuaAUKCFYHyzzy4CC492.0CA96BIL-AA8Jy08.CF4@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-451d5600a54so43241035e9.2 for ; Wed, 09 Jul 2025 04:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752058812; x=1752663612; 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=Auu8uvlzSKOU324XIVBTX5mUMTIARGkUiREXwmkL04g=; b=U/pyj3DS9+DOpji10CXGFN/JTNQx6nTCKzeyZlnJnvd2vJsO7+1tgpGTeMoiRO3E6f 8fze6ABFZ4ozG11cDr3xDS5PnR/+k1cZx88Uteg317L+Cuy1afBonuVqh/v9Q8T+gnGn /YEZHeHRsPtxeZaR+UAajgp7i1I5lxvueX+mGzy/2BfT+cv0fNf7iEJ7E5HfowNGcGB9 k1x+T/icf8zKjwVf59hrI9cPWBWuoT0Ku5brwliZvWufaviCAfd+qhnsD0f2ZdvJvvSG TqDhuC4ZkTP8fMDyCTiwM/wb9sP6nLOYzXiGyrDETXDc8aziChUjRKMcpeLnqiyxc3AT gFFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752058812; x=1752663612; 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=Auu8uvlzSKOU324XIVBTX5mUMTIARGkUiREXwmkL04g=; b=eOWtX743JGIG0taXBXaxlyDNfm18OclCwqbLV0P1wQIV2+ph7R9Z+yQDfOSUB4KRBz TwQruDsxVjxEKGZFIsgtYXzw7w5p8Habl0oHvXLyECnEI5YCGlKfvcVitCXtcv2GqeXU FWp5RZehU5SKnxzL/HxaQQFXHW6Pqxiwyn7fflKFq37U6s9QS/G2y8RTG7iImK3tyUPQ oOahBBYZPhl8ubcWKskKixSGuJg6eSd7S9QTOMseo+4H5oxfdWy09O8TPEf2hCgCBAKH 45WAeH/NYObszjU0iwM8EUD7jkK4IHT6aF/8pzOYoMkU+vkcUBJwb6KzxbaE4qoABgkY zrVg== X-Forwarded-Encrypted: i=1; AJvYcCV9BvI24IOZMVKXx9uPyD10RFieMiVdlaVufzWjkaJ3s+hHiOGPdtgK5MZ0VtgNaw8/LdC6biPLUg==@kvack.org X-Gm-Message-State: AOJu0YzMqKYcGRpgSWowCPdSCa1Ucqp69i1FGTF8UEwwCTl9C1gF5aXG yc6zJqt4ru/eldbS7jfffB8j2nG/WFSa231giDTIZ3K506yDWHRxB5idWa5FCcnSFbMUVFAXj4E C7A== X-Google-Smtp-Source: AGHT+IFPeiRjT/hk2eJKjjXIwZ7MAsw5CZ9JjPkhCk3imTKy+4sECTwl7nHXrtoS7dfr9P6aVkCK1zl5Ww== X-Received: from wmbha11.prod.google.com ([2002:a05:600c:860b:b0:453:b96:8ef9]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:3c9:b0:3a4:f787:9b58 with SMTP id ffacd0b85a97d-3b5e454249emr1500559f8f.58.1752058811734; Wed, 09 Jul 2025 04:00:11 -0700 (PDT) Date: Wed, 9 Jul 2025 11:59:37 +0100 In-Reply-To: <20250709105946.4009897-1-tabba@google.com> Mime-Version: 1.0 References: <20250709105946.4009897-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250709105946.4009897-12-tabba@google.com> Subject: [PATCH v13 11/20] KVM: x86/mmu: Allow NULL-able fault in kvm_max_private_mapping_level 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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8482716001B X-Stat-Signature: 3s3i1gqwrsbicztghoz748thprj5hswn X-HE-Tag: 1752058813-358149 X-HE-Meta: U2FsdGVkX19Yh76dUaiFCR68ZobA12HZIw3PGMPrXJfrhAw7NXvBBHIjPbz5t6kbYK+RYVzvURxQY7vw6+eGTzm3hlMdWKeB0M6pMeYymEOUdZe+1vX9mdb55CTTQ7JJtzUSJlHYjhrqlyx7P35XB28zQKEQINv7Ky4tU6nvkvvvqs7sGwpRzr9brW66ag0yeHmQ/kgvJon7QO0pp6HPhhJVKNhKxAtaLffWLoJDtt/8PJ8jSr755PMUns8wZTMH95/pb7rYRhSDlTUcEQ7V2XAwVSzVFmbFWiKeI1WGSg2QQ0mjB2Dx3rZ5SwaUK6Fwy/37uJ9Au2Rv5sTjzkPYfgTrPSk9ZMeJ1Q1wseCwwYFD2e6cSrseCiuo90ug5KXyu8iBH7+WQweXcxvROxJT95BLdQowr8qYUUwJ+G40NABz6bBHmoZGTiiDn0RzP0I9Y50XXb6uQ+oe+aUqsNNesQ97XDXiwSXf333mgFxxJ5Z+IJ09ZYfjrbzmEqLV5YDewk1kQyi/kMKWTQJMiWaGRD2E9mCfEiAA5Lo4kNDbi98atFNOpV33dhaGggqVMC105jEf6m/iAZob32A0ZOdxXN9k53IYRcLQgoeCdpo82LRFJNTYrpUzaIEZkWERk/RwCvUJEoT1y5jMvyuaHxUFhuhpHECcOIJRCF5j2cDfpSVaqKowrDzApvh0jI94hyVWKBbfNQfAzq0MnScBAXt4TvUKaPMNlU1v1Y3V/XYND7ttA/5Ak6SJR0amyHpDkAsWfJ1x9ehfdbDgz1tznFbmj/bnO0qEvVu8tITUWOLcC6UqtgT4sfK/LIv8iK2M4qu07Zg5GyFC2wTvqF/ypu+fWxA6Q8dxOZvtf4mwxynhqY+1Om2MNFr0SX6PQT/QSuOwkoaXHydip8MArC8VzDP0dtfbdboxxe2ZjspEXZiDVVzN3OI9oRTQ8ES7QO7+YtNPYEM4So4HulliT51Fy8b k7AYmf7l oSoID5aqj39tRtBLhVkVc3Kb8C+cl83Sg76J0v1Gc8VAovh1tp8W0832jgAgC18zgcRSEXsfweAgplsqtVqitLSsOnQjT5lzY+IhNt5ckuMg6+KMsUB6LsurSC1NLWBVLfmEDKBvE6NFffR51MR5Pz2lYz3t6FMpdwlpbd+bvPsVCMhlgooeFsWYYqMAij8Bdw8Qf0qte/22lGK/wfaCLVE0SPI777jjuq+w1PknbviNncNYHbRxaJspqP8w3bempClsdAU4PYpH+2EwU/hTSqcfuQr99vNJHz0vNvOxes1aimvDeK4l7ZAQuhjKtRQLKNdoWqkH7EdCkkkiaibAkZhIyH8IxB4M9z5AFg5AXhOiVB635Riy6Hj2iv0IZxOkWRrA8Gku5hto+atbRyWA2uF9U7qgmPeRh0dtf+P/VFpMr968iq+asFYSyJaL9qZc9B4BvG5dg2iHhPse7ttW4yMLwi+in0T+Bq8/ToA6kJurzTXNdl1zNf/QLaLLybPk4rtKQZFOwvkFjfgnac3BgSh5vq/CmRn4jGssiPwOkecWC4W+fmaqyIf/rOZ0uclbV2C1NTP7qJNk7/CcnKqiH9GAOn9hvldAKqeGT2Dat01b4SEJYAmlbnLEVp55V0nqMLDRPOd4tlaKsDChWN0rAHqSp4eswpUNIQSgWDKu00byIajp3tHyejZJT6w== 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: From: Ackerley Tng Refactor kvm_max_private_mapping_level() to accept a NULL kvm_page_fault pointer and rename it to kvm_gmem_max_mapping_level(). The max_mapping_level x86 operation (previously private_max_mapping_level) is designed to potentially be called without an active page fault, for instance, when kvm_mmu_max_mapping_level() is determining the maximum mapping level for a gfn proactively. Allow NULL fault pointer: Modify kvm_max_private_mapping_level() to safely handle a NULL fault argument. This aligns its interface with the kvm_x86_ops.max_mapping_level operation it wraps, which can also be called with NULL. Rename function to kvm_gmem_max_mapping_level(): This reinforces that the function's scope is for guest_memfd-backed memory, which can be either private or non-private, removing any remaining "private" connotation from its name. Optimize max_level checks: Introduce a check in the caller to skip querying for max_mapping_level if the current max_level is already PG_LEVEL_4K, as no further reduction is possible. Suggested-by: Sean Christoperson Signed-off-by: Ackerley Tng Signed-off-by: Fuad Tabba --- arch/x86/kvm/mmu/mmu.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index bb925994cbc5..495dcedaeafa 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4467,17 +4467,13 @@ static inline u8 kvm_max_level_for_order(int order) return PG_LEVEL_4K; } -static u8 kvm_max_private_mapping_level(struct kvm *kvm, - struct kvm_page_fault *fault, - int gmem_order) +static u8 kvm_gmem_max_mapping_level(struct kvm *kvm, int order, + struct kvm_page_fault *fault) { - u8 max_level = fault->max_level; u8 req_max_level; + u8 max_level; - if (max_level == PG_LEVEL_4K) - return PG_LEVEL_4K; - - max_level = min(kvm_max_level_for_order(gmem_order), max_level); + max_level = kvm_max_level_for_order(order); if (max_level == PG_LEVEL_4K) return PG_LEVEL_4K; @@ -4513,7 +4509,10 @@ static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, } fault->map_writable = !(fault->slot->flags & KVM_MEM_READONLY); - fault->max_level = kvm_max_private_mapping_level(vcpu->kvm, fault, max_order); + if (fault->max_level >= PG_LEVEL_4K) { + fault->max_level = kvm_gmem_max_mapping_level(vcpu->kvm, + max_order, fault); + } return RET_PF_CONTINUE; } -- 2.50.0.727.gbf7dc18ff4-goog