From patchwork Mon Apr 7 08:27:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14039998 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 82891C3601A for ; Mon, 7 Apr 2025 08:35:11 +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=2Fucuhr9dizyg89eT+HA/IrugXy5DABtvkENtK6O2wY=; b=vE2BdngiyLrNum7MGPl0LuqoHq 7kmzl7zYAEQjwCaSoTO76E71OKbtglnWUgn/OVGPfNp1YEZsbEerxbRVwzCWu6g0HMsbYkHOKYIBv GQXr0qNRjpNvt92lYai8NaQdE7GhMWFOU6q9djKy8AtjLrCG60Ri35A+NiwtuY91TDuDLtTpMfYKG YEnw3ozkEdIUVd2WLXvfwDtYW7AcAfhjIlQfPcoHxy3/aIhLt9g8W3V2k6I4T4r8f96w858VAVOdB JbhsZL8vdNzpHIHEPOvCtiXvP20rsub9msYvAFgx7TJuB95ElbRFiSezmlEz+l44/hsn7bHuSfhSh TsHRImTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1hwa-0000000H1fX-3ckp; Mon, 07 Apr 2025 08:35:00 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1hpS-0000000GzxL-3Pti for linux-arm-kernel@lists.infradead.org; Mon, 07 Apr 2025 08:27:39 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-3912fc9861cso1646562f8f.1 for ; Mon, 07 Apr 2025 01:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744014457; x=1744619257; 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=2Fucuhr9dizyg89eT+HA/IrugXy5DABtvkENtK6O2wY=; b=ho9XDLrNLP65fHhomIYmi2j3CTpn8a9eFnbFFMlHJdv+o5OaKsbgjV56nJ3D2Ek5E+ EznTXVi0luAwgKqIL9QiZbPBzBPXjy15JspY05IUU6IEckC+NgjZtUTN3GPuiCcM3weo aDp53GnhDkWAVLHHku487f9QSKepC8hw8JF8GYVr+8qzubyJLUFVcQ8amty4EFqkfCfo 8ZrfWkkr4wyTvBuQ1FvjunFjBCE5XF9fUpHBPIjlSZ3XkWFrS/hckwyZrTz13eaQOZbJ C2tnDqh14dTK5iZ/3BPx/Tbg3LwYbfgnk8KuuGLc6/wa6Rui5e58p71U6ceNcpPYk8N9 Xf5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744014457; x=1744619257; 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=2Fucuhr9dizyg89eT+HA/IrugXy5DABtvkENtK6O2wY=; b=fBtav9vbE/bSsZoHvyjU4Xk7Rg568h21EfhKhnjRmPBVsb7qCN8im8td7YBAzXzdbD E0uGVyJhZwRU12d4sK277AJPN23FxFP9c79MY922tci9Qs8tQVto+FoDLFOaoqGdp3JT 4QoDIedkjLVGz10Z3XaPzWxz+18gXcDU1MIUAIxLqCDGUCd2kTkbSL/QULB6SZoMibaJ j+ZB+quhL4uY6RUqoh5R8fsOnimicmJ5RKtGExwKWEGgZKLtlEq7eAJ2IM94qjlCZSDm ZpUd8ckKT4WWsw4lVEB/mJI+9VPF/v9H8RizBsCtIErifkefRlI6GR6QLvMtcpsZVXej YYtw== X-Forwarded-Encrypted: i=1; AJvYcCUfM2cGdWBDGO9JO6HgO57nD6b6zrR5mRXfDFbBsbtBC34mVdxQKxkWGBsQNEHbcvQWztgRZGzAIbNLKJKR53XE@lists.infradead.org X-Gm-Message-State: AOJu0Yw8fZ9e8CDlIcgxrTIL+mxxaFL13J/IBoDCLLuc9xYp+OuMI4gB pLu+cis0b2qEMrZyK1ZoJQQ8ar6Z8AmGeDGjTwjJxKV5elO6p/CD+T57yvbTK/rq4fINY8MrRpr KCrvmft43yfw5/Uzwgg== X-Google-Smtp-Source: AGHT+IEdhWgRCreLOVKcTXn9rS7GYa/xcK1Uq83ChnMioO7xrrZto43NYEH+Y3QBChsKi9UezwWvTk156uLbz8oN X-Received: from wrnc10.prod.google.com ([2002:adf:e74a:0:b0:39a:bdcb:1ed9]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4009:b0:391:40b8:e890 with SMTP id ffacd0b85a97d-39d0de28a8cmr8552695f8f.22.1744014456820; Mon, 07 Apr 2025 01:27:36 -0700 (PDT) Date: Mon, 7 Apr 2025 09:27:00 +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-4-vdonnefort@google.com> Subject: [PATCH v3 3/9] KVM: arm64: Add a range to __pkvm_host_unshare_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_012738_851498_6A8811F2 X-CRM114-Status: GOOD ( 13.19 ) 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_unshare_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 96f673f42e8e..33fcf8d54aa3 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -41,7 +41,7 @@ int __pkvm_host_share_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, 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_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); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index e71601746935..7f22d104c1f1 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -274,6 +274,7 @@ static void handle___pkvm_host_unshare_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; @@ -284,7 +285,7 @@ static void handle___pkvm_host_unshare_guest(struct kvm_cpu_context *host_ctxt) if (!hyp_vm) goto out; - ret = __pkvm_host_unshare_guest(gfn, hyp_vm); + ret = __pkvm_host_unshare_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 48bc0370515f..2aa4baf728eb 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -979,7 +979,7 @@ int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu return ret; } -static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ipa) +static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ipa, u64 size) { enum pkvm_page_state state; struct hyp_page *page; @@ -993,7 +993,7 @@ static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ip return ret; if (!kvm_pte_valid(pte)) return -ENOENT; - if (level != KVM_PGTABLE_LAST_LEVEL) + if (kvm_granule_size(level) != size) return -E2BIG; state = guest_get_page_state(pte, ipa); @@ -1001,43 +1001,50 @@ static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ip return -EPERM; phys = kvm_pte_to_phys(pte); - ret = check_range_allowed_memory(phys, phys + PAGE_SIZE); + ret = check_range_allowed_memory(phys, phys + size); if (WARN_ON(ret)) return ret; - page = hyp_phys_to_page(phys); - if (page->host_state != PKVM_PAGE_SHARED_OWNED) - return -EPERM; - if (WARN_ON(!page->host_share_guest_count)) - return -EINVAL; + for_each_hyp_page(phys, size, page) { + if (page->host_state != PKVM_PAGE_SHARED_OWNED) + return -EPERM; + if (WARN_ON(!page->host_share_guest_count)) + return -EINVAL; + } *__phys = phys; return 0; } -int __pkvm_host_unshare_guest(u64 gfn, struct pkvm_hyp_vm *vm) +int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *vm) { u64 ipa = hyp_pfn_to_phys(gfn); struct hyp_page *page; - u64 phys; + u64 size, phys; int ret; + ret = __guest_check_transition_size(0, ipa, nr_pages, &size); + if (ret) + return ret; + host_lock_component(); guest_lock_component(vm); - ret = __check_host_shared_guest(vm, &phys, ipa); + ret = __check_host_shared_guest(vm, &phys, ipa, size); if (ret) goto unlock; - ret = kvm_pgtable_stage2_unmap(&vm->pgt, ipa, PAGE_SIZE); + ret = kvm_pgtable_stage2_unmap(&vm->pgt, ipa, size); if (ret) goto unlock; - page = hyp_phys_to_page(phys); - page->host_share_guest_count--; - if (!page->host_share_guest_count) - WARN_ON(__host_set_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_OWNED)); + for_each_hyp_page(phys, size, page) { + /* __check_host_shared_guest() protects against underflow */ + page->host_share_guest_count--; + if (!page->host_share_guest_count) + page->host_state = PKVM_PAGE_OWNED; + } unlock: guest_unlock_component(vm); @@ -1057,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); + ret = __check_host_shared_guest(vm, &phys, ipa, PAGE_SIZE); guest_unlock_component(vm); host_unlock_component(); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index cad25357858f..d533e898c6be 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -388,7 +388,7 @@ int pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 addr, u64 size) lockdep_assert_held_write(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) { - ret = kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gfn); + ret = kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gfn, 1); if (WARN_ON(ret)) break; rb_erase(&mapping->node, &pgt->pkvm_mappings);