From nobody Fri Dec 19 04:53:38 2025 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 5988C1FDE3A for ; Wed, 18 Dec 2024 19:41:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550894; cv=none; b=jhKFvsbSsL4dOHweyyzIdrMNpDPYtcuthYjwgUNKxQ5OXsMjPuoCok+pq4Pkrs/RMFbMhtkl3Eo2o3X3JSGkJoQ/ezJ/HEW2nYXHDoGudICVXc+OUALWxgrhv8KCajWs+5QQj3ELpPcBXZjKsV71PR+MzOoDGBM2fAb0i2BlHQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550894; c=relaxed/simple; bh=UkdLM8hoJ6w+8YFWeumdtyRPMzl/t7iCJss3ecsy7+Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=i6ly/ORypKGiXbXps1sR3BTu98rAF0sENXTlhjSd1MUteyc1NsDxHRvbwtKNJ3XTcjsZ5if/WEXiY4Gx3lVHsw1eyDlyU5Z37eao/tXGyNhWjzBgYfhe6BpQ4gQ6lZSWzH4HJ3OqjK9LUiD8piQDoePT0UudGprdzkR5v3XH30s= 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=uCbEF1Qs; arc=none smtp.client-ip=209.85.218.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="uCbEF1Qs" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-aa67f18cb95so764268666b.1 for ; Wed, 18 Dec 2024 11:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734550891; x=1735155691; 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=sMqHHJAbkvVqmc+ZvuoP/w2AMJ0PvS+huStDXnV02UA=; b=uCbEF1Qsn5EfQl36S8xjWxjFaeBcWDo8IiB0RBcwm7xPIvTH+Tr63HbFNs499xHE98 6dMaMG6+rUNUK+FKgQvTJc1M9bj6QZvN4CqrK0WParNFTKjRA3/0HiuIeDsQymiqS7aV VClvtQuksIwGhl1ZqGmSESQ8LYKEH6q103FgK/HGaprCaGajZ/csJnF4kA1orrUWemtr 9axzjgYXNampo91Wdc8hg+5geC1ONfHoSSf04wmoqnpA2JtGRYSB7b8T2tHFTlwGkpA0 apwggGFLQ5Dk1Qa0DYaw7OXfyQB3E8hP0nrecKgCz6eDoWA2YPWxVdcRPJHdW+csGYC/ DjCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734550891; x=1735155691; 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=sMqHHJAbkvVqmc+ZvuoP/w2AMJ0PvS+huStDXnV02UA=; b=HjOVu047lNGoCPEx7xYP2QygQhXKRWM80hS5VtWdq/q7Gx0bvEriZgTfA2u2GcZT+S 994EvC0v5YinXIgkWqQpBrPfOY+ZVHBC4tGxyWPuGpO+YRhsysRavbgaMhWgM0UHKkze 8WhhoXeCfXa/XwFJAZha/pqUMRcpT2LtWaHKFfampwxZZu8+QpwBL9jfOgyyKMbFU4xF xUzByp1+OrPB4RlFxFRAoqK43ssaBTlhWHvkvllO8dpPs73mJJUVhop1VbQ9IyxcmHa9 OGJ5aR9Kk6u6FaOL+ylkICMAgCQJutOMdCaC23gpFrOP4YgqYNqZZEg9scR1tju3tIVo ZVdA== X-Forwarded-Encrypted: i=1; AJvYcCUTrPMTvhmVxEegcH1SfeKdOdZf6dpmDB6S4DpRGAj2+iGJjOyDy2UxHzeTY+LeJ6PiIAMpx6mcwRWQ9OM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0cLIozltZB1KC8dbword+Hm7cDE98GpP7hwDoto6p1ujdA/yR 6ndilmF37h02JPE3dsNdgTrk/ssFmdcaV2caYi4OOoZWX/6JQVC44USXRtvzAz0KjK3JYc8m7xB nWm3vqw== X-Google-Smtp-Source: AGHT+IHbX6RfegUQG4Dmsb1kyEyr86HPklOi6/oJALVsWc4EPf0tNeL14jIjXsZpNMuUN7pNAqXTgRwlD+AP X-Received: from ejdcw14.prod.google.com ([2002:a17:907:160e:b0:aa6:a21b:2ad]) (user=qperret job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:6a20:b0:aab:8a24:d5a5 with SMTP id a640c23a62f3a-aabf47a746dmr378800466b.30.1734550890875; Wed, 18 Dec 2024 11:41:30 -0800 (PST) Date: Wed, 18 Dec 2024 19:40:54 +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-14-qperret@google.com> Subject: [PATCH v4 13/18] KVM: arm64: Introduce __pkvm_host_wrprotect_guest() 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" Introduce a new hypercall to remove the write permission from a non-protected guest stage-2 mapping. This will be used for e.g. enabling dirty logging. Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba Signed-off-by: Quentin Perret --- arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 1 + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 21 +++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 19 +++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index 66ee8542dcc9..8663a588cf34 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -68,6 +68,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___pkvm_host_share_guest, __KVM_HOST_SMCCC_FUNC___pkvm_host_unshare_guest, __KVM_HOST_SMCCC_FUNC___pkvm_host_relax_perms_guest, + __KVM_HOST_SMCCC_FUNC___pkvm_host_wrprotect_guest, __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc, __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run, __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm= /hyp/include/nvhe/mem_protect.h index 181aec2d5bc1..0bbfb0e1734c 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -43,6 +43,7 @@ int __pkvm_host_share_guest(u64 pfn, u64 gfn, struct pkvm= _hyp_vcpu *vcpu, enum kvm_pgtable_prot prot); int __pkvm_host_unshare_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enu= m kvm_pgtable_prot prot); +int __pkvm_host_wrprotect_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); =20 bool addr_is_memory(phys_addr_t phys); int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_= prot prot); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 287e4ee93ef2..98d317735107 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -283,6 +283,26 @@ static void handle___pkvm_host_relax_perms_guest(struc= t kvm_cpu_context *host_ct cpu_reg(host_ctxt, 1) =3D ret; } =20 +static void handle___pkvm_host_wrprotect_guest(struct kvm_cpu_context *hos= t_ctxt) +{ + DECLARE_REG(pkvm_handle_t, handle, host_ctxt, 1); + DECLARE_REG(u64, gfn, host_ctxt, 2); + struct pkvm_hyp_vm *hyp_vm; + int ret =3D -EINVAL; + + if (!is_protected_kvm_enabled()) + goto out; + + hyp_vm =3D get_np_pkvm_hyp_vm(handle); + if (!hyp_vm) + goto out; + + ret =3D __pkvm_host_wrprotect_guest(gfn, hyp_vm); + put_pkvm_hyp_vm(hyp_vm); +out: + cpu_reg(host_ctxt, 1) =3D ret; +} + static void handle___kvm_adjust_pc(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1); @@ -495,6 +515,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__pkvm_host_share_guest), HANDLE_FUNC(__pkvm_host_unshare_guest), HANDLE_FUNC(__pkvm_host_relax_perms_guest), + HANDLE_FUNC(__pkvm_host_wrprotect_guest), HANDLE_FUNC(__kvm_adjust_pc), HANDLE_FUNC(__kvm_vcpu_run), HANDLE_FUNC(__kvm_flush_vm_context), diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvh= e/mem_protect.c index aa8e0408aebb..94e4251b5077 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1511,3 +1511,22 @@ int __pkvm_host_relax_perms_guest(u64 gfn, struct pk= vm_hyp_vcpu *vcpu, enum kvm_ =20 return ret; } + +int __pkvm_host_wrprotect_guest(u64 gfn, struct pkvm_hyp_vm *vm) +{ + u64 ipa =3D hyp_pfn_to_phys(gfn); + u64 phys; + int ret; + + host_lock_component(); + guest_lock_component(vm); + + ret =3D __check_host_shared_guest(vm, &phys, ipa); + if (!ret) + ret =3D kvm_pgtable_stage2_wrprotect(&vm->pgt, ipa, PAGE_SIZE); + + guest_unlock_component(vm); + host_unlock_component(); + + return ret; +} --=20 2.47.1.613.gc27f4b7a9f-goog