From nobody Mon Feb 9 15:26:12 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 914451AE87B for ; Fri, 16 Aug 2024 12:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811959; cv=none; b=f/bT1y/DMx1CrpYbfWj2YV5n+KYsrD1Xjsx/Q6CwEsod18Vz+f1s74jQRW4v3MWIjME+EVpJNXIyua0hNWfMNb0RonRfpdAHhnE8N6dDmBUHCzZgLXaHyolv9jZlDml7y58/FOu5tv/pMENulsPL59clr4Fmt9oy7qxwkHcCwMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811959; c=relaxed/simple; bh=mc+7e6AhIbB/zISdvS6jolgkLJQbBVfZdKZ8MqRkIps=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NcTVxSdVxGeqWqA6AWj5YOYGcC8UsA4MZ0jo51jBbVkwdlAg53tQN1XNlDFPUfd6sdd6HsLlp7j+97lbZHas2+OZE9YWbC41S9mMPoYLKlUSOdQQM7T3V4osVQBEzuL3DIKblCkwvTr5ik2fs/wWnlzG2QY/xQ5STEEbLPRAZMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EWf3/f7I; arc=none smtp.client-ip=209.85.128.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--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EWf3/f7I" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ad660add0fso24255727b3.0 for ; Fri, 16 Aug 2024 05:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811956; x=1724416756; darn=vger.kernel.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=nI6i7YX14nljpUXmJtSY/UgyOMgnkcqXo7+aUg8YmfE=; b=EWf3/f7IpJULGqYvAbzMGG5/awLKGfm6Vs2xVBx+qRdZEN4Z+kVFgDrOJ+Q6McI7ja 1Cp7pPG1/rq0ZtfAKuAEd8eQzeeT3xLvJCvuIJf277abHDZW847hEeFm5xL0UDmES8GC jRaNEhzUflttSseulO/5boOPATYC03DwFbV2zUVBBpac9ZJFb3n9Yni+vCCsyGiTn4Fz fruqAl7/sqjuDbG/57VFIzbuid6GgiN9UA0SaX9lGSpLCV7xMftDaA3Yi9myVcnIxvNj rZosKngWYLT6ZaqKay/1HInMxsCX7DaqJhSZNLFvl333o5pv8jfyEoB3QNgUKGQw4VgD U+VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811956; x=1724416756; 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=nI6i7YX14nljpUXmJtSY/UgyOMgnkcqXo7+aUg8YmfE=; b=OsLE1oVq3pjZYsvJV0YRyRcpFKt5E5sc14knq4PiGxy1KkUXdAr99eQKiaduk/iEIm w8hn+5xvVn+uBb084Ov+/xTtl5uW1Tnsl4mc1ruYwjsYW5RhshC6E0VNppAK7L3RQePC MB8CmBitvr5yNClvW4zkD/zHfqnoa3VVscbBqyqlRCjbwi+wWxcVvvpKOVn5YegwRUkU Q3nSVI2YZotyq7hbKnDnw2hKErwvAPNDM5wXlrLZvPVxzP2jQW21iuIcLs4WBkcEeTcr +7XVRH03SCrxZ0h1D78iUYVuTbRYYwhyFq/umx/pwTt8azuMriJ7EqszxYK+DIcbTJDB AjaQ== X-Forwarded-Encrypted: i=1; AJvYcCVmjhFZq7RexYk3mpsJBgBEWZrno7eS9Xk2K+51f4MwXQ8UUl33Uz82dhBAW15w2/5wFtMdRifup2ci5E9/U3sWwv7uA/wVKx2Cn5vv X-Gm-Message-State: AOJu0YylJ2M6CB0C3u7qEiMC1KPKpB/8XAmpvb+FfrYGReemGPiTZpWk vKgYnxNmMPnB+uRNMQw6f89Y/UeC7wQX7xqWejBucbYFeSC53JkNKnp1cXH27zpKOtBg6Um7V63 RJmiXhRpCND/zkYmld2GYICNGvQ== X-Google-Smtp-Source: AGHT+IGBZXo0joGkpRiMwmJyr97s6u1s6BZU4K3nLmENh0HF/8kX9FtEm3bAcQpjCF+W1kNezc9xW+sgWbb25EB7K5s= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:690c:3405:b0:691:a38c:a61d with SMTP id 00721157ae682-6b1d7ef3527mr730297b3.3.1723811956425; Fri, 16 Aug 2024 05:39:16 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:01 +0000 In-Reply-To: <20240816123906.3683425-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-2-sebastianene@google.com> Subject: [PATCH v8 1/6] KVM: arm64: Move pagetable definitions to common header From: Sebastian Ene To: akpm@linux-foundation.org, alexghiti@rivosinc.com, ankita@nvidia.com, ardb@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, james.morse@arm.com, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for using the stage-2 definitions in ptdump, move some of these macros in the common header. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/kvm_pgtable.h | 42 ++++++++++++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 42 ---------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/= kvm_pgtable.h index 19278dfe7978..03f4c3d7839c 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -59,6 +59,48 @@ typedef u64 kvm_pte_t; =20 #define KVM_PHYS_INVALID (-1ULL) =20 +#define KVM_PTE_LEAF_ATTR_LO GENMASK(11, 2) + +#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX GENMASK(4, 2) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP GENMASK(7, 6) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO \ + ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 2 : 3; }) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW \ + ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 0 : 1; }) +#define KVM_PTE_LEAF_ATTR_LO_S1_SH GENMASK(9, 8) +#define KVM_PTE_LEAF_ATTR_LO_S1_SH_IS 3 +#define KVM_PTE_LEAF_ATTR_LO_S1_AF BIT(10) + +#define KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR GENMASK(5, 2) +#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R BIT(6) +#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W BIT(7) +#define KVM_PTE_LEAF_ATTR_LO_S2_SH GENMASK(9, 8) +#define KVM_PTE_LEAF_ATTR_LO_S2_SH_IS 3 +#define KVM_PTE_LEAF_ATTR_LO_S2_AF BIT(10) + +#define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 50) + +#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) + +#define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) + +#define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) + +#define KVM_PTE_LEAF_ATTR_HI_S1_GP BIT(50) + +#define KVM_PTE_LEAF_ATTR_S2_PERMS (KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | \ + KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ + KVM_PTE_LEAF_ATTR_HI_S2_XN) + +#define KVM_INVALID_PTE_OWNER_MASK GENMASK(9, 2) +#define KVM_MAX_OWNER_ID 1 + +/* + * Used to indicate a pte for which a 'break-before-make' sequence is in + * progress. + */ +#define KVM_INVALID_PTE_LOCKED BIT(10) + static inline bool kvm_pte_valid(kvm_pte_t pte) { return pte & KVM_PTE_VALID; diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 9e2bbee77491..c3e9d77bba23 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -17,48 +17,6 @@ #define KVM_PTE_TYPE_PAGE 1 #define KVM_PTE_TYPE_TABLE 1 =20 -#define KVM_PTE_LEAF_ATTR_LO GENMASK(11, 2) - -#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX GENMASK(4, 2) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP GENMASK(7, 6) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO \ - ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 2 : 3; }) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW \ - ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 0 : 1; }) -#define KVM_PTE_LEAF_ATTR_LO_S1_SH GENMASK(9, 8) -#define KVM_PTE_LEAF_ATTR_LO_S1_SH_IS 3 -#define KVM_PTE_LEAF_ATTR_LO_S1_AF BIT(10) - -#define KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR GENMASK(5, 2) -#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R BIT(6) -#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W BIT(7) -#define KVM_PTE_LEAF_ATTR_LO_S2_SH GENMASK(9, 8) -#define KVM_PTE_LEAF_ATTR_LO_S2_SH_IS 3 -#define KVM_PTE_LEAF_ATTR_LO_S2_AF BIT(10) - -#define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 50) - -#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) - -#define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) - -#define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) - -#define KVM_PTE_LEAF_ATTR_HI_S1_GP BIT(50) - -#define KVM_PTE_LEAF_ATTR_S2_PERMS (KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | \ - KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ - KVM_PTE_LEAF_ATTR_HI_S2_XN) - -#define KVM_INVALID_PTE_OWNER_MASK GENMASK(9, 2) -#define KVM_MAX_OWNER_ID 1 - -/* - * Used to indicate a pte for which a 'break-before-make' sequence is in - * progress. - */ -#define KVM_INVALID_PTE_LOCKED BIT(10) - struct kvm_pgtable_walk_data { struct kvm_pgtable_walker *walker; =20 --=20 2.46.0.184.g6999bdac58-goog