From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 288763FC5C4 for ; Fri, 29 May 2026 16:51:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780073499; cv=none; b=LgEV5K8GlYXJ5dD2DFC+triVd7gxy2xB2q9gUWXTqPq0jsY/+tO2FIYU2y8UNJ43pReHLQi78kp632FpKOMF8vHP+FxY+Psiy/ig8i0SCwsgjyMbtVQzK2HUtGtkxc2IiF89WhqoDzdUvBFYCJyQlbetA8XCpZFsONcb8zwhtew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780073499; c=relaxed/simple; bh=NVsUxQn7yEnpEgTJFXM8nf5/FDwzPHZmaJDH/It9iwA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Hw+t8evpX4e7vNywz0dUj/Wf5YvjQRZ/hjQnK03U9vrv9n16pUfbVW//4j/uzfdRg8pUS9NnWD5RFQUhBpPIJlMKtZp0Vprcdzu9VPwKNZDxxYZxj4PuPaICry9H4uj9b1ofvqDmvN+czgkDp3cnS4UAUv61bwSi+b1WWU1QI+s= 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=IHhngFZF; arc=none smtp.client-ip=209.85.210.202 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="IHhngFZF" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82f756ebd0dso8399960b3a.1 for ; Fri, 29 May 2026 09:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780073494; x=1780678294; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=nlnbyJQj2RcPXqGfb4WvTtzInmRvbkDj8NcLEcQU12w=; b=IHhngFZFEeRZdfh1lXlTH4H34+X2CA6zXtNAzqL9S+QaJ01RnmtMAetjuPPOsSxT0V OxQWKyk1sOTMhZrjzTE9B027iOvcg9d/n+e1G4EWUzywiwPUXJZRpiRGWQzZ4DlGLdqb HanI1cQn4UmHOy9SRh4vp1YNinRZ3d7+IrPlWipLZ9v53hvoKUxSQmy9qbE4BTJa2V0l Pqh6/F2gE8QcrLqPwPMGBPDwTB3xJSlf8lqwHHQfdm4LyViqJif8DVMMEqKA1X29Elfd bCy9jJiLvSiQc0Kf20C/CMdWUrF3u1hE7Pk5XXso84o5lQzw23dCWcN3ThzdI+kRZY+l Q7wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780073494; x=1780678294; h=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; bh=nlnbyJQj2RcPXqGfb4WvTtzInmRvbkDj8NcLEcQU12w=; b=S2KqodsoDjAOkNUNpwmX5iD1MI16M6QQ4PMczBxHmxxpTQzq6B6AviFEu1gGRuPDSD doMXLxXTpKM0HRgh59sl2/f6cEWQPgsZeqp0z4QnMs8/cJbNkpQYtV2fQefWXjBwz7Vz 9rNr2CI6jyTZy7bRqYDz5ge1oj09haKrwiqrdEc0OPVRgtBDqkAGGO9+4P6MeJShmQk+ KGKvrdeSmwxdQcoXj+gBcU/h3NtPTXqNL3YFr+RyZxpmS+zN3iu5nLeTQMw0Q2fhbq20 X/NumezzKozCKlTBU9Lu+fL3dR/MPU9TJWGuqIF9BGwELRGNDWveqtOhIDEZDH7VhWpE dugw== X-Forwarded-Encrypted: i=1; AFNElJ93MmTqObjcfknj+qwGLmTdzKbAvp+mwaUZ294iWYvXWCGIwlt++oEccQqrpOMpU673BzflsNMTbPBrMS4=@vger.kernel.org X-Gm-Message-State: AOJu0YzsySm3hfMkEE5L9bw1Sig2xnwYSy2vl//8b0Ee19XKIzrMO27j jtUTY4S795rP7JY137nq71ZC10/T+fTTj/A4lh1bXAORqcawCto/iJPWu0BECQtcOcivGiMQX7h RYxhbvQ== X-Received: from pfbjs9.prod.google.com ([2002:a05:6a00:9189:b0:835:62a8:bbc]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:32cb:b0:82f:38:a5b2 with SMTP id d2e1a72fcca58-842255ce40emr302011b3a.40.1780073493982; Fri, 29 May 2026 09:51:33 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 09:51:04 -0700 In-Reply-To: <20260529165114.748639-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: <20260529165114.748639-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529165114.748639-11-seanjc@google.com> Subject: [PATCH v2 10/20] KVM: Move {g,p}fn <=> {g,h}pa conversion helpers to kvm_types.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , David Woodhouse , Paul Durrant , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng Cc: Waiman Long , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Woodhouse , Sebastian Andrzej Siewior , syzbot+208f7f3e5f59c11aeb90@syzkaller.appspotmail.com, Carsten Stollmaier Content-Type: text/plain; charset="UTF-8" Move the helpers to convert between pfns and physical addresses (for host and guest) into kvm_types.h so that they can be used throughout kvm_host.h (and any other KVM-related header) without having to worry about ordering. No functional change intended. Signed-off-by: Sean Christopherson --- include/linux/kvm_host.h | 15 --------------- include/linux/kvm_types.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 0dc4eb78b6d9..ffbae1e6e84e 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1923,21 +1923,6 @@ hva_to_gfn_memslot(unsigned long hva, struct kvm_memory_slot *slot) return slot->base_gfn + gfn_offset; } -static inline gpa_t gfn_to_gpa(gfn_t gfn) -{ - return (gpa_t)gfn << PAGE_SHIFT; -} - -static inline gfn_t gpa_to_gfn(gpa_t gpa) -{ - return (gfn_t)(gpa >> PAGE_SHIFT); -} - -static inline hpa_t pfn_to_hpa(kvm_pfn_t pfn) -{ - return (hpa_t)pfn << PAGE_SHIFT; -} - static inline bool kvm_is_gpa_in_memslot(struct kvm *kvm, gpa_t gpa) { unsigned long hva = gfn_to_hva(kvm, gpa_to_gfn(gpa)); diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h index e850adc3f47e..961572e102f0 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #ifdef KVM_SUB_MODULES @@ -73,6 +74,21 @@ typedef u64 hfn_t; typedef hfn_t kvm_pfn_t; +static inline gpa_t gfn_to_gpa(gfn_t gfn) +{ + return (gpa_t)gfn << PAGE_SHIFT; +} + +static inline gfn_t gpa_to_gfn(gpa_t gpa) +{ + return (gfn_t)(gpa >> PAGE_SHIFT); +} + +static inline hpa_t pfn_to_hpa(kvm_pfn_t pfn) +{ + return (hpa_t)pfn << PAGE_SHIFT; +} + struct gfn_to_hva_cache { u64 generation; gpa_t gpa; -- 2.54.0.823.g6e5bcc1fc9-goog