From patchwork Mon Apr 7 08:27:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14040000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0111DC36010 for ; Mon, 7 Apr 2025 08:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nJ/jjb8x4qHGtCi1F2Spdei5y6Mc/3znj/Y5u8/slow=; b=2jj+LLScYQb+NqOZRO8DIpeX7w fywj2BnncVXt5OHQwimvVNXV9P2u8qujfHtxqarBdIyDgzJ3HfMLJSlfNg4mvW6BTgFPPFOFne27C +gEjFvS9SeoWQ1AEx6U34vxgcXtF79fS4NfATpKTojzB7sll3mSRQcjdxrlwAAoutwz1Xqb/aUW2r KoUw29oVKR+EdQYxWks5oJuMERX5rFTyF8oNOVCpUjJuXnO1EGh/sPLM+zv6t1D/or2Mvkk387A1L NA//c2QgWlkx0twODYLI2jt2MrhoxHicmcDQiMe5L9jfr4NQEE5KEnZ0C5+4wb13pBlrmLG/XlvHY Oxax9xMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1hyJ-0000000H2Iy-2qM2; Mon, 07 Apr 2025 08:36:47 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1hpU-0000000Gzxt-1KA1 for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 08:27:41 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-43cf446681cso29483615e9.1 for ; Mon, 07 Apr 2025 01:27:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744014458; x=1744619258; darn=lists.infradead.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=nJ/jjb8x4qHGtCi1F2Spdei5y6Mc/3znj/Y5u8/slow=; b=TbDA7zLUMgCrSDEbn/vi2D9SuBIPx8miWxsNPvqSN22sQndWrXTKFNehy3sUoQ6WVX VPQn+a+faLwYERXGVMzzb3txYwDIpcJrLMbONp/bJhwa4rvNL+dgy4MEei/ic3IJ89Ga NoQje8eF69fU6SR93BIeSjDYtiCi+swE17LPBUt4BsRS/6q4JLooUjLJQ4sVh0yV7ZNU jc1sp7E7fT3Cb93TPblYD2kbgFHAheNpDhUrKyBTIRhW+d05cDl4Y/tuk9NPmpsrQTuL l9BugmKqYW+lLrKWbFKJp9yac2kJk2t2jw3hEhhJw87OSRyScHyw7J5B7jv++5PUMBBX I1jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744014458; x=1744619258; 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=nJ/jjb8x4qHGtCi1F2Spdei5y6Mc/3znj/Y5u8/slow=; b=GD2mHhjvhK67IgOm+8l1LHxXhc4071vb7GtfFQxjDB63PixfdQWGMNtFD9VNknfk6i 2B4E1+6ZgLo60e6BLpN2isEo+DTyhp4K9HZOuWZ7L9//n2zFD/IzXrtrGA99cEKve5eH sZPKCjR4xLW8fDKfe1cllZvw5M7jA4yP+CcQpy7TfhUd29L29/6XhSEBgvfodixc9HBk 3Pp7fgBaJ7Nrm/3bEaby/mmij1tAXArg0pFTtKJTD4xCWzzudkEqPTdaZj6NHvm9k8OF HwsyZ4RPef0Ptoh70fAw/F5f65fM5XGIMTgosB93bTUkikTl3jccQB+mNru5UH+c/AFc /uag== X-Forwarded-Encrypted: i=1; AJvYcCVy6jQLGAshqNsjeMulrtH8NoLuA6M1IFzZGdg+F4ajOCMi75fs5TX5nbjhWxDMab4RXuKFwrr+WvqUFhy9uE1f@lists.infradead.org X-Gm-Message-State: AOJu0Yw9zpU4sH5onXV5bQ2yEWV2fPp98Jxq9xKBbkgZN2uGrvCqq+ju v44DfAd9oUKHXxGw2c8izOUVwtkX7NiQ5/tiBv0X5AsBtav9aUGJ7p03Bjl0oJPc5/puzyHQktg QLzk/B3OUWraZ2X+Nig== X-Google-Smtp-Source: AGHT+IHP7fXZDXZO1SVUM/nAWffAl8j24dVEofbaGP6xim/maUgpuYSc9eBtkCECigSAtXktdS8fUDWaay4OhPcn X-Received: from wmqe6.prod.google.com ([2002:a05:600c:4e46:b0:43b:c914:a2d9]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5249:b0:43d:585f:ebf5 with SMTP id 5b1f17b1804b1-43edf1dd307mr59921735e9.1.1744014458622; Mon, 07 Apr 2025 01:27:38 -0700 (PDT) Date: Mon, 7 Apr 2025 09:27:01 +0100 In-Reply-To: <20250407082706.1239603-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250407082706.1239603-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250407082706.1239603-5-vdonnefort@google.com> Subject: [PATCH v3 4/9] KVM: arm64: Add a range to __pkvm_host_wrprotect_guest() From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_012740_353595_75BAD9FA X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for supporting stage-2 huge mappings for np-guest. Add a nr_pages argument to the __pkvm_host_wrprotect_guest hypercall. This range supports only two values: 1 or PMD_SIZE / PAGE_SIZE (that is 512 on a 4K-pages system). Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 33fcf8d54aa3..3393a8ecf243 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -43,8 +43,8 @@ int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu enum kvm_pgtable_prot prot); int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *hyp_vm); int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enum kvm_pgtable_prot prot); -int __pkvm_host_wrprotect_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); int __pkvm_host_test_clear_young_guest(u64 gfn, bool mkold, struct pkvm_hyp_vm *vm); +int __pkvm_host_wrprotect_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *hyp_vm); int __pkvm_host_mkyoung_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu); bool addr_is_memory(phys_addr_t phys); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 7f22d104c1f1..e13771a67827 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -314,6 +314,7 @@ static void handle___pkvm_host_wrprotect_guest(struct kvm_cpu_context *host_ctxt { DECLARE_REG(pkvm_handle_t, handle, host_ctxt, 1); DECLARE_REG(u64, gfn, host_ctxt, 2); + DECLARE_REG(u64, nr_pages, host_ctxt, 3); struct pkvm_hyp_vm *hyp_vm; int ret = -EINVAL; @@ -324,7 +325,7 @@ static void handle___pkvm_host_wrprotect_guest(struct kvm_cpu_context *host_ctxt if (!hyp_vm) goto out; - ret = __pkvm_host_wrprotect_guest(gfn, hyp_vm); + ret = __pkvm_host_wrprotect_guest(gfn, nr_pages, hyp_vm); put_pkvm_hyp_vm(hyp_vm); out: cpu_reg(host_ctxt, 1) = ret; diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 2aa4baf728eb..9929fd7e729b 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1053,7 +1053,7 @@ int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *vm) return ret; } -static void assert_host_shared_guest(struct pkvm_hyp_vm *vm, u64 ipa) +static void assert_host_shared_guest(struct pkvm_hyp_vm *vm, u64 ipa, u64 size) { u64 phys; int ret; @@ -1064,7 +1064,7 @@ static void assert_host_shared_guest(struct pkvm_hyp_vm *vm, u64 ipa) host_lock_component(); guest_lock_component(vm); - ret = __check_host_shared_guest(vm, &phys, ipa, PAGE_SIZE); + ret = __check_host_shared_guest(vm, &phys, ipa, size); guest_unlock_component(vm); host_unlock_component(); @@ -1084,7 +1084,7 @@ int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enum kvm_ if (prot & ~KVM_PGTABLE_PROT_RWX) return -EINVAL; - assert_host_shared_guest(vm, ipa); + assert_host_shared_guest(vm, ipa, PAGE_SIZE); guest_lock_component(vm); ret = kvm_pgtable_stage2_relax_perms(&vm->pgt, ipa, prot, 0); guest_unlock_component(vm); @@ -1092,17 +1092,21 @@ int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enum kvm_ return ret; } -int __pkvm_host_wrprotect_guest(u64 gfn, struct pkvm_hyp_vm *vm) +int __pkvm_host_wrprotect_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *vm) { - u64 ipa = hyp_pfn_to_phys(gfn); + u64 size, ipa = hyp_pfn_to_phys(gfn); int ret; if (pkvm_hyp_vm_is_protected(vm)) return -EPERM; - assert_host_shared_guest(vm, ipa); + ret = __guest_check_transition_size(0, ipa, nr_pages, &size); + if (ret) + return ret; + + assert_host_shared_guest(vm, ipa, size); guest_lock_component(vm); - ret = kvm_pgtable_stage2_wrprotect(&vm->pgt, ipa, PAGE_SIZE); + ret = kvm_pgtable_stage2_wrprotect(&vm->pgt, ipa, size); guest_unlock_component(vm); return ret; @@ -1116,7 +1120,7 @@ int __pkvm_host_test_clear_young_guest(u64 gfn, bool mkold, struct pkvm_hyp_vm * if (pkvm_hyp_vm_is_protected(vm)) return -EPERM; - assert_host_shared_guest(vm, ipa); + assert_host_shared_guest(vm, ipa, PAGE_SIZE); guest_lock_component(vm); ret = kvm_pgtable_stage2_test_clear_young(&vm->pgt, ipa, PAGE_SIZE, mkold); guest_unlock_component(vm); @@ -1132,7 +1136,7 @@ int __pkvm_host_mkyoung_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu) if (pkvm_hyp_vm_is_protected(vm)) return -EPERM; - assert_host_shared_guest(vm, ipa); + assert_host_shared_guest(vm, ipa, PAGE_SIZE); guest_lock_component(vm); kvm_pgtable_stage2_mkyoung(&vm->pgt, ipa, 0); guest_unlock_component(vm); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index d533e898c6be..1483136df01f 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -407,7 +407,7 @@ int pkvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size) lockdep_assert_held(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) { - ret = kvm_call_hyp_nvhe(__pkvm_host_wrprotect_guest, handle, mapping->gfn); + ret = kvm_call_hyp_nvhe(__pkvm_host_wrprotect_guest, handle, mapping->gfn, 1); if (WARN_ON(ret)) break; }