From nobody Fri Dec 19 04:53:06 2025 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (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 7541B1FCF79 for ; Wed, 18 Dec 2024 19:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550880; cv=none; b=WqDmZR3QscN2zbe9cOl+Vbrp0NyqjoC9qfTPi+K61GJPZa9syylTJC7vO2Q3nN1jDowfQOIdBFluNy0M0lILtA200YIHRSVFQndoacDYxXN6YLBBHq+sClvz9yyWxTExpphcnSvIcp4/JrGU+gZ8bQ2/n6CBOn1OWS+Z9CN0YmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550880; c=relaxed/simple; bh=mJD4yWXbQfCVFxUs++pz/aE19rffZcKbfDbdSaBfXgo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kPTUTtlK/xS6hH8YugKgj387zbF7wTit/yjFX8xSI0FHU43vBeFxCAzVLscbjl670BLdBm46PipnDhROyrTbgDRyRqPU4umVHkcnpKnG3vrZdE8mwLjCFkAFN6weV6MqfCaGWYqYVoCgVGpARbh1PSr5ZIoyPUY2ZYUtIFtcSEU= 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=yh2tH0v7; arc=none smtp.client-ip=209.85.218.73 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="yh2tH0v7" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-aa6b904a886so523139166b.0 for ; Wed, 18 Dec 2024 11:41:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734550876; x=1735155676; 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=/S80FmDYKb1wMSZogthtihTZ2ow/iC1/VbK9O8uYM7w=; b=yh2tH0v7XZua0/lMAPBY00c6epUUQ35peatlNgvRLjAnGpiyla6Lmh2oWDHh9AIr9+ 5LM13zf3IZuUw6haRpNGPTHc9Qrii0tMQ8ykK1p9gAkONnsa8s+d1i5wUxURkvVyaaEA qVlK+w4FWFjxsBQs2ES9DJ6De1iTfLqEI+CQAAscaO67Z6ACx0pxaG9FRrR2gl2A/CqK CLS+AX2Mcw05ARcuxO091nSjZvbK7ZQSIK5Qn8YNbSAB4gHsvmDf0JlnJcegYJGAObQy kH5yLFlow68d9z/MZG6SrR9dgH8SjOo6XS5mRtnFzcXxAND/9ir7xnwPSq2M/seWo6pM i8AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734550876; x=1735155676; 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=/S80FmDYKb1wMSZogthtihTZ2ow/iC1/VbK9O8uYM7w=; b=G2MpMJJ97nFI54GdUuXHHJnXVWMks9W3DmV5DNP6MlMl+uroxE5Wd0ZJ3RZbipUzNS QgOicS4APP1dUDVx9VIaWUg0NqhUMOpFGj2TGpUu5XIV2z+EebZhqZYraYaeI9NNMUlS /J9WWK3bdCfyFl6Tew56D2qhZDLsIdsesDdFpy6EDrS/HqOImQUM3jtuvmkOe8Zotsra KN2JpPEADq/LHAADAwUgkVhFwl96NRKOCvmEHRoZElogOzXI1+rgulFsBow2ezgp9SNX 52dJSpXV9yAUpYof0E8V1Xb6z2TaOHgBOFV6EUKwPfqGRx4PGu+bGdVy9YxFkKOXgH98 P8sA== X-Forwarded-Encrypted: i=1; AJvYcCWwvMAMg8EP3CZR5VKcDmqEPxu5CzjuILYMVvVKeNPrr9pRvPzhxoOPCRqIYs61NTHkh0idHvg3HfqpX6o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy85iNqSirxAOIAizlsB8Q69nd5rFxiaRfCSdIXDtm9tnAT8nM6 ncLgXDSUS6VAEVvPb1JlGPLgesumy4fiaa1SjkbTgHKKiATorePHm/lWMFOm5M+qV6feXboSS7j LCqb3Ow== X-Google-Smtp-Source: AGHT+IGO+aoiY0pAX0txDmM56AhyGulUG5MWxWr8/SJsqYx74spHn0f9QQj9LlBmJWIaz8dI7mVe/cFIZAmV X-Received: from ejchq16.prod.google.com ([2002:a17:907:3f10:b0:aa6:c227:374c]) (user=qperret job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:6e90:b0:aa6:8bb4:5035 with SMTP id a640c23a62f3a-aabf479ebadmr460491566b.31.1734550875904; Wed, 18 Dec 2024 11:41:15 -0800 (PST) Date: Wed, 18 Dec 2024 19:40:47 +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-7-qperret@google.com> Subject: [PATCH v4 06/18] KVM: arm64: Pass walk flags to kvm_pgtable_stage2_relax_perms 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_relax_perms 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 | 6 ++---- arch/arm64/kvm/mmu.c | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/= kvm_pgtable.h index 38b7ec1c8614..c2f4149283ef 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -707,6 +707,7 @@ bool kvm_pgtable_stage2_test_clear_young(struct kvm_pgt= able *pgt, u64 addr, * @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). * @addr: Intermediate physical address to identify the page-table entry. * @prot: Additional permissions to grant for the mapping. + * @flags: Flags to control the page-table walk (ex. a shared walk) * * The offset of @addr within a page is ignored. * @@ -719,7 +720,8 @@ bool kvm_pgtable_stage2_test_clear_young(struct kvm_pgt= able *pgt, u64 addr, * Return: 0 on success, negative error code on failure. */ int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr, - enum kvm_pgtable_prot prot); + enum kvm_pgtable_prot prot, + enum kvm_pgtable_walk_flags flags); =20 /** * kvm_pgtable_stage2_flush_range() - Clean and invalidate data cache to P= oint diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 0470aedb4bf4..b7a3b5363235 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -1307,7 +1307,7 @@ bool kvm_pgtable_stage2_test_clear_young(struct kvm_p= gtable *pgt, u64 addr, } =20 int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr, - enum kvm_pgtable_prot prot) + enum kvm_pgtable_prot prot, enum kvm_pgtable_walk_flags flags) { int ret; s8 level; @@ -1325,9 +1325,7 @@ int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable= *pgt, u64 addr, if (prot & KVM_PGTABLE_PROT_X) clr |=3D KVM_PTE_LEAF_ATTR_HI_S2_XN; =20 - ret =3D stage2_update_leaf_attrs(pgt, addr, 1, set, clr, NULL, &level, - KVM_PGTABLE_WALK_HANDLE_FAULT | - KVM_PGTABLE_WALK_SHARED); + ret =3D stage2_update_leaf_attrs(pgt, addr, 1, set, clr, NULL, &level, fl= ags); if (!ret || ret =3D=3D -EAGAIN) kvm_call_hyp(__kvm_tlb_flush_vmid_ipa_nsh, pgt->mmu, addr, level); return ret; diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index a2339b76c826..641e4fec1659 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1452,6 +1452,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys= _addr_t fault_ipa, enum kvm_pgtable_prot prot =3D KVM_PGTABLE_PROT_R; struct kvm_pgtable *pgt; struct page *page; + enum kvm_pgtable_walk_flags flags =3D KVM_PGTABLE_WALK_HANDLE_FAULT | KVM= _PGTABLE_WALK_SHARED; =20 if (fault_is_perm) fault_granule =3D kvm_vcpu_trap_get_perm_fault_granule(vcpu); @@ -1695,13 +1696,11 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, ph= ys_addr_t fault_ipa, * PTE, which will be preserved. */ prot &=3D ~KVM_NV_GUEST_MAP_SZ; - ret =3D kvm_pgtable_stage2_relax_perms(pgt, fault_ipa, prot); + ret =3D kvm_pgtable_stage2_relax_perms(pgt, fault_ipa, prot, flags); } else { ret =3D kvm_pgtable_stage2_map(pgt, fault_ipa, vma_pagesize, __pfn_to_phys(pfn), prot, - memcache, - KVM_PGTABLE_WALK_HANDLE_FAULT | - KVM_PGTABLE_WALK_SHARED); + memcache, flags); } =20 out_unlock: --=20 2.47.1.613.gc27f4b7a9f-goog