From nobody Fri Dec 19 04:53:44 2025 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (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 531CF1FCD0F for ; Wed, 18 Dec 2024 19:41:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550877; cv=none; b=dvfmZgVcHa42JRsgeOsKzVlg+sXGB0wc3CoBkxg8dl9Vd2XGFM9+YTxNb56LflzxzdNy1At84SA26Vfgfo7OJjp+7qjToC6GBvH0M7bJNmmyPY5iAGxahqC6cvlPcYez/sS8AeSKPOVUofH+ofeVQ6b8GDOYzwM8nk8O2qoRsOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550877; c=relaxed/simple; bh=7AIESUw6mMSUJQCn90MjLz83oGJmTgjvjEJnEGpsPuE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tm/TEB8PNVqzMuq7ny2OZfyRimkN/7BC0bJllkixGmWelCaKROz6kDz+YkenPmR7uJQngFFPVc/2NhqZOi4nEEZSF9Wu4YWWqJq08ESGecPdWXIaW5S2LJKaXvnW3Dg+OJhRNg4hI5jzdbwSeHSwpUhI7GELv0lBwP7CbLpxdHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--qperret.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dnlPMGAq; arc=none smtp.client-ip=209.85.208.74 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--qperret.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dnlPMGAq" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-5d3e4e09ae7so8220946a12.3 for ; Wed, 18 Dec 2024 11:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734550874; x=1735155674; 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=9ugxEmd7a7WnD5rzj6dcj8iKmGlwGaXKl0uKILMdDIg=; b=dnlPMGAqxtGJNDvfd9wkXyvsEg/Rop0wMPec0Y1YkRi5TV4O5IdbAcwbTcyrzUJXFM 9wEMrZn+QzRHbOhAXzKr2CQkrXFMujl85VMOrQU/8lwUBmly57JmZqnO+ObGcr06VOr5 e3oMvubzIe704iAvQu+Q78uZahzKx9JJtpO3mab5sqltgHmGBWnQN0k9HyOjpFHOFYR8 LnSBBhNK0i5PJBGUUX5s4DS3wGhKX8aC1unyXfAjCUtAa9ytqgoRru598MT0Wd4ffhw4 tI9zCokQgJdZ+ntkhOofUFswJARNTL6Lh9FoLXj+Qfr9arLEA4qah2suoLXlKk/+Ss1g CFdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734550874; x=1735155674; 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=9ugxEmd7a7WnD5rzj6dcj8iKmGlwGaXKl0uKILMdDIg=; b=w34H7rxu4H4qVWWHPcptjLq1VduCpeHmQ2M+pc2Q/TgiDAoO0SSnG4CKgLXufLI3Jm Mb26tQ7nVW3EHyIO7fv3js4CjS8qDfCsT63LrgPVbxl2Vx3QJIlvLfq8C1rmyebBzu0Z EflvKxhSxZoTA7PvktwU/anwczg+sCbpQoh8g+PkbrU+njW0JaYnjK2mjaLaDa95FWvk VU6+zyVjwdFIXrfrR1W7x0Z6fXm5DORS2fESiJEs8+th6FrVeMW3oEDGop/i/5faumne 3dvq4f2OOPeFYFKTC2f8N2FlUte7zgflcD0nlvs7C70i9rArV1Lj99eQBtjP4WRy7aoY igiQ== X-Forwarded-Encrypted: i=1; AJvYcCUIbX+WBiQ1SXflsNNPjgF5rDE6mz8UtYrMzvVPuqHN5UzZtMwJnDJHZJl6kSOuqzzWAgppEKb8ZFSmrQA=@vger.kernel.org X-Gm-Message-State: AOJu0YzmTAOCBm+ABi2nNGhbS1sE2qTPqOLEhLxgXKKVdRYUAV4gGLaC sB8uSKhi8GLoHxUy5e5lde+bNI8YRUu0EDCg6AqkP3sXJ+RRQ/tNyTiZiSl68+5U02DMhravbg9 AovPbZA== X-Google-Smtp-Source: AGHT+IFvLhkomwPsLLt4qoep3Va3P5u4/FTIVyNItlHOLlhdPmQivj6hJV4NPzFeQBdz1XX18dDRWVuBUpaz X-Received: from edag5.prod.google.com ([2002:a05:6402:3205:b0:5d1:21a6:f033]) (user=qperret job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3584:b0:5d3:cfd0:8d46 with SMTP id 4fb4d7f45d1cf-5d7ee4242dbmr3825137a12.30.1734550873767; Wed, 18 Dec 2024 11:41:13 -0800 (PST) Date: Wed, 18 Dec 2024 19:40:46 +0000 In-Reply-To: <20241218194059.3670226-1-qperret@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241218194059.3670226-1-qperret@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20241218194059.3670226-6-qperret@google.com> Subject: [PATCH v4 05/18] KVM: arm64: Pass walk flags to kvm_pgtable_stage2_mkyoung From: Quentin Perret To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon Cc: Fuad Tabba , Vincent Donnefort , Sebastian Ene , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" kvm_pgtable_stage2_mkyoung currently assumes that it is being called from a 'shared' walker, which will not be true once called from pKVM. To allow for the re-use of that function, make the walk flags one of its parameters. Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba Signed-off-by: Quentin Perret --- arch/arm64/include/asm/kvm_pgtable.h | 4 +++- arch/arm64/kvm/hyp/pgtable.c | 7 +++---- arch/arm64/kvm/mmu.c | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/= kvm_pgtable.h index aab04097b505..38b7ec1c8614 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -669,13 +669,15 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable *= pgt, u64 addr, u64 size); * kvm_pgtable_stage2_mkyoung() - Set the access flag in a page-table entr= y. * @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). * @addr: Intermediate physical address to identify the page-table entry. + * @flags: Flags to control the page-table walk (ex. a shared walk) * * The offset of @addr within a page is ignored. * * If there is a valid, leaf page-table entry used to translate @addr, then * set the access flag in that entry. */ -void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr); +void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr, + enum kvm_pgtable_walk_flags flags); =20 /** * kvm_pgtable_stage2_test_clear_young() - Test and optionally clear the a= ccess diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 40bd55966540..0470aedb4bf4 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -1245,14 +1245,13 @@ int kvm_pgtable_stage2_wrprotect(struct kvm_pgtable= *pgt, u64 addr, u64 size) NULL, NULL, 0); } =20 -void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr) +void kvm_pgtable_stage2_mkyoung(struct kvm_pgtable *pgt, u64 addr, + enum kvm_pgtable_walk_flags flags) { int ret; =20 ret =3D stage2_update_leaf_attrs(pgt, addr, 1, KVM_PTE_LEAF_ATTR_LO_S2_AF= , 0, - NULL, NULL, - KVM_PGTABLE_WALK_HANDLE_FAULT | - KVM_PGTABLE_WALK_SHARED); + NULL, NULL, flags); if (!ret) dsb(ishst); } diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index c9d46ad57e52..a2339b76c826 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1718,13 +1718,14 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, ph= ys_addr_t fault_ipa, /* Resolve the access fault by making the page young again. */ static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_i= pa) { + enum kvm_pgtable_walk_flags flags =3D KVM_PGTABLE_WALK_HANDLE_FAULT | KVM= _PGTABLE_WALK_SHARED; struct kvm_s2_mmu *mmu; =20 trace_kvm_access_fault(fault_ipa); =20 read_lock(&vcpu->kvm->mmu_lock); mmu =3D vcpu->arch.hw_mmu; - kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa); + kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa, flags); read_unlock(&vcpu->kvm->mmu_lock); } =20 --=20 2.47.1.613.gc27f4b7a9f-goog