From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E1D2441024 for ; Tue, 14 Jul 2026 23:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784070645; cv=none; b=ZGvoBjklNlgAm4Th09HgkZxs+Nj1pQwXDxuqJXdLE0zKZqqqEIbwp+Gmj/8aYg2Baw1yL3ZVyWsjuWfP5sjJPRDCsXTjTiKhm5nT0HCV19PesfJV+W2uc+TNbWKzxt0JQTg7enlIL3xxDniO8uIpwfQA9kz3gjfIsxV2HcdCiY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784070645; c=relaxed/simple; bh=tz5b/wi/KYGTi5Nu6+p4FjHc5VJHE+aDIvXJoyYFA78=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XoHIecug4m9ArIC98PZYCg9TqeYcFncQKz7nBzIQTgCwDRUP9zlNBQnNO9+pYLdZ3KC7wsQMUTftjtHcAQ+RDrrH5I1XDG+74QoMcG1Brj2Z++P8ERWbPfDnqb1Je/l3buz6cqDN6jJoIKVIhgX/EwgTMpyPDq0jwfs428yueTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=tHp8I8PJ; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tHp8I8PJ" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2cd01a14e81so69470065ad.1 for ; Tue, 14 Jul 2026 16:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784070639; x=1784675439; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=RrCeiUHQV6TkQ4lj9oPcaTCYumTpjVqI/CaCzGV8zm8=; b=tHp8I8PJgGIN2bFXhcMYInAs0uw0egFbPspSKXD0L/A31k4DCnEnvOXOE9Fl3hAvzH G+h8FJ5LzqcD0YG1sFhGUKzxyIH3ag8+AGk0mFzjZe877suZyhpHP274nujTUD/dIfmn km06QAl/n3yJZzbeEH5MMhW3Wb4q10Mjihhgy+Md6Ox1mXz1KIDvoT1i8mChZB5gtT1s kPRpzUrGtdZCA3wTl0Upq3XSGRQhg/EEAAnnQ4COgLcjgdcYZFlIy1YmMO0nJOgm8NMB SX4KGObVwezAOsr+qT7Av5QAVs05O3r5a5YX+jsH9Ri4SmJZQW+2P2a9nkLgRnXrvR1c SUYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784070639; x=1784675439; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=RrCeiUHQV6TkQ4lj9oPcaTCYumTpjVqI/CaCzGV8zm8=; b=eN07uE/RbJAsq19KNLVnqfOTqD+efkrbdI4CFwv7MUqyXG6ELDN0e5CodPoT7nOp1+ ytAsAC+noHBOm4yBaSAiPTPzcMH4LitUdQCpBMJmJQ3JE2Fll/KUsLK0M8z9BAOiGnIq 1Lr8PIwaNsBDxcD2O5qidumEeSwEc1N9V5knqKC55TMYazTZoXF5fZTi80A+oWJlLOP5 vGmbchanOuWukwH96fgogFRn21cNGc4RXi7FkSiUvHni4P3JXYqrVAltK+ktv9xORKHF VeQmKCYV7B+JeyDxUvqeCnSpYY1B625FZfk94bJl4EKdL71HSvx/TnVPx5Rr0DI8zmet tB2A== X-Forwarded-Encrypted: i=1; AHgh+RoY9YQqtyO/3pAJN52qZ4auZZ9bwn9QTFxVoPcq0jkSf7KFHm/LqWReKT7L73n0efkQH0Epuo2UI3lS3M0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8cp0RlD+969RvUBC/+C/WBoXYJwR5CuqajjOn98Vvtxl5Kr+Z kc01Y/BIP8C0c4rV+RNfNvxRlZGzPof9S/Lpk41CbUf521b5cDz2Qgd3p7ddY8Gm1cam7JEWGq5 9GOzQCg== X-Received: from pjbgb7.prod.google.com ([2002:a17:90b:607:b0:380:6618:e058]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:55cc:b0:381:22d6:f7a3 with SMTP id 98e67ed59e1d1-38e2a030362mr523926a91.18.1784070617847; Tue, 14 Jul 2026 16:10:17 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 14 Jul 2026 16:10:09 -0700 In-Reply-To: <20260714231015.3337831-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260714231015.3337831-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.141.g00534a21ce-goog Message-ID: <20260714231015.3337831-2-seanjc@google.com> Subject: [PATCH v5 1/7] KVM: guest_memfd: Plumb the number of pages and max order into .invalidate() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Fuad Tabba , Ackerley Tng Content-Type: text/plain; charset="UTF-8" Plumb the number of pages to "invalidate", i.e. reclaim, along with the max order with which the pages can be mapped. This will allow x86 to combine its vendor-specific implementations for conversion and reclaim, a.k.a. preparation and invalidation, into a single hook. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 4 ++-- include/linux/kvm_host.h | 2 +- virt/kvm/guest_memfd.c | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1f5dc685f049..a2cbf6fae118 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10627,9 +10627,9 @@ int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_ord #endif #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE -void kvm_arch_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) +void kvm_arch_gmem_invalidate(kvm_pfn_t pfn, kvm_pfn_t nr_pages, int max_order) { - kvm_x86_call(gmem_invalidate)(start, end); + kvm_x86_call(gmem_invalidate)(pfn, pfn + nr_pages); } void kvm_arch_gmem_invalidate_range(struct kvm *kvm, struct kvm_gfn_range *range) { diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9db6eb4023c4..996b39ebdb68 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2614,7 +2614,7 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, #endif #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE -void kvm_arch_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end); +void kvm_arch_gmem_invalidate(kvm_pfn_t pfn, kvm_pfn_t nr_pages, int order); void kvm_arch_gmem_invalidate_range(struct kvm *kvm, struct kvm_gfn_range *range); #endif diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 171a9da1b685..99c070bfd446 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -530,11 +530,8 @@ static int kvm_gmem_error_folio(struct address_space *mapping, struct folio *fol #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE static void kvm_gmem_free_folio(struct folio *folio) { - struct page *page = folio_page(folio, 0); - kvm_pfn_t pfn = page_to_pfn(page); - int order = folio_order(folio); - - kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order)); + kvm_arch_gmem_invalidate(folio_file_pfn(folio, 0), folio_nr_pages(folio), + folio_order(folio)); } #endif -- 2.55.0.141.g00534a21ce-goog