From mboxrd@z Thu Jan 1 00:00:00 1970 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 A1BB015530B for ; Wed, 18 Dec 2024 19:41:03 +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=1734550866; cv=none; b=jI5CHZ7iPvaOp7ifh4LPWfdW12AFHfE58In8Nn2SlKFkTTG7qphe4hF/49qyWGhHazaZmZ/P4yxbwbEWQytcSOOrkhdviW9/lc8UJDqT/pMn/LFxLvFXYW88I8zbR3uUdZVjt/8KGL568KMdFesD5yDtg5rOE0/73yMXCm2tQUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550866; c=relaxed/simple; bh=zshUS4w0ve2iUp3o84hDt1hlZ5z3480G0Ybp7ZRHk7E=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=A5Y2MQems3uvrXSUHn3tMaEnfcclvSB+hNRrzl6Q0bRwDJenUyC9acZNrH+VGRf9hkigWuKrfGYLaEBlaGYoHU2leM5aoxMWlFbunrzH7gHbOpjMa7Slaaf80XEP3BX7jc5ucKuuXy9TMrp6ET4y7v/X5fjSE2j6uW1hCBUB/hI= 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=G+YXBOYq; 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="G+YXBOYq" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-aa66ab24344so354193966b.3 for ; Wed, 18 Dec 2024 11:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734550862; x=1735155662; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Y0egGk+E5zbRv4inQflxneULbdFdTnonLDTj+BKj8O4=; b=G+YXBOYqybuETyLAaIGPMfRY9QfjKZnvVQm277LesTmE7ui121nOP8ha/G9FUx5VnT VMgreIS3hfyen0KaShFQ3nsBg62wi5yF5Myx2EPNLqmbbA4yYZyx+lVRIKH5p/T0R/OQ 2awNAvpI1Xms5xN+Zu8DoxhuZ6AAZgXjL6ohJnVuhlvmIyZM6/yTggnqB/lWfcPPLorP zgo1UAa6jFfRoOv0oLebIpgmQEvFwvKpvQIzxzzVPqgaLhbZi6YTJZicYXfF58JJz8m9 RhbTnU/VqEHLuvoVUuuiPVpsneFFeTX9TwUkq4n0ZTjY4clU2jxfwG/qcKYi5K0fEVXC el2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734550862; x=1735155662; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Y0egGk+E5zbRv4inQflxneULbdFdTnonLDTj+BKj8O4=; b=bA3KNlfLXKkuqXzK4SxKo3kgLKc24UVpaEu/UiecM3C0TuUzzNHOHJgfJIwSbyCu5E ExiTZjqhApTQ+cZ+DZF1LhVUZ0zNBFXcqY9NgvNVhHtsb/Hb0AUjRco61sxU/K+7q0Mp GyEibLhYBN0+gqg1HfR2mRgdHyy5UXwWdKPCVWJP5P5QTBEJHgqg2H/leSmfkzMCXHV3 +n65ZWEJSIoV/zGkBGteT9smtWiiTariWO3DgCaC8GgpsX5g6tWRfH6pYD86+lEXQ9JY a8stpu5xCVCE1ldAOrK1LaSHtSG589J4R7iQVxiPIGAEAq4Rofh1b/Lh+scRqRAlHUAK bj2Q== X-Forwarded-Encrypted: i=1; AJvYcCUoKXOV1e6elfCwH5J5ImIj4jNdUEOPDTJdB4GI9FwQv0tPJrsMwjxt9pWFkoqnfJmNONZnryYXh5HmsNo=@vger.kernel.org X-Gm-Message-State: AOJu0YzvJFWSkz4t0gYj72AsLb1TxTCCkcfUoGY1PnnhXV9LoyJf1MxP cBRGB+DFefwf5iQxg9800TvUTq8w9FKHhBy4zVay70XUAAbCwXyjhA4LTE+LvceJMz5W0uQGIIK r7tYVwg== X-Google-Smtp-Source: AGHT+IFF9Bdl3ykGIZN5hSEGfg9Lfi7RyKI7xaF+0V/m/PtNz8TEdHZF7hKeCCrU7cTy07W+PAd0JMzpUqE1 X-Received: from ejcsr10.prod.google.com ([2002:a17:907:398a:b0:aa6:a5c6:7ad0]) (user=qperret job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:32c4:b0:aa6:762e:8c1c with SMTP id a640c23a62f3a-aac07a51ea1mr60053066b.48.1734550862066; Wed, 18 Dec 2024 11:41:02 -0800 (PST) Date: Wed, 18 Dec 2024 19:40:41 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20241218194059.3670226-1-qperret@google.com> Subject: [PATCH v4 00/18] KVM: arm64: Non-protected guest stage-2 support for pKVM 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-Type: text/plain; charset="UTF-8" Hi all, This is the v4 of the series adding support for non-protected guests stage-2 to pKVM. Please refer to v1 for all the context: https://lore.kernel.org/kvmarm/20241104133204.85208-1-qperret@google.com/ Please note that in its current form, this series has two main limitations that will be addressed separately: - We don't support mapping devices into guests: this requires additional hypervisor support for tracking the 'state' of devices. No device assignment until then. - Stage-2 mappings are forced to page-granularity even when backed by a huge page for the sake of simplicity of this series. I'm only aiming at functional parity-ish (from userspace's PoV) for now, support for HP can be added on top later as a perf improvement. The series is organized as follows: - Patches 01 to 04 move the host ownership state tracking from the host's stage-2 page-table to the hypervisor's vmemmap. This avoids fragmenting the host stage-2 for shared pages, which is only needed to store an annotation in the SW bits of the corresponding PTE. All pages mapped into non-protected guests are shared from pKVM's PoV, so the cost of stage-2 fragmentation will increase massively as we start tracking that at EL2. Note that these patches also help with the existing sharing for e.g. FF-A, so they could possibly be merged separately from the rest of the series. - Patches 05 to 07 implement a minor refactoring of the pgtable code to ease the integration of the pKVM MMU later on. - Patches 08 to 16 introduce all the infrastructure needed on the pKVM side for handling guest stage-2 page-tables at EL2. - Patches 17 and 18 plumb the newly introduced pKVM support into KVM/arm64. Patches based on 6.13-rc3, tested on Pixel 6 and Qemu. Changes in v4: - Collected Tested-by and Reviewed-by tags - Reworked KVM_S2_PGT to help ctags/grepping kvm_pgtable_* functions - Minor cleanups throughout Changes in v3: - Rebased on 6.13-rc3 - Applied Marc's rework of the for_each_mapping_in_range() macro mess - Removed mappings_lock in favor the mmu_lock - Dropped BUG_ON() from pkvm_mkstate() - Renamed range_is_allowed_memory() and clarified the comment inside it - Explicitly bail out when using host_stage2_set_owner_locked() on non-memory regions - Check PKVM_NOPAGE state as an equality rather than a bitwise operator - Reworked __pkvm_host_share_guest() to return -EPERM in case of illegal multi-sharing - Added get_np_pkvm_hyp_vm() to simplify HVC error handling in hyp-main.c - Cosmetic changes and improved coding consitency thoughout the series Changes in v2: - Rebased on 6.13-rc1 (small conflicts with commit 2362506f7cff ("KVM: arm64: Don't mark "struct page" accessed when making SPTE young") in particular) - Fixed kerneldoc breakage for __unmap_stage2_range() - Fixed pkvm_pgtable_test_clear_young() to use correct HVC - Folded guest_get_valid_pte() into __check_host_unshare_guest() for clarity Thanks, Quentin Marc Zyngier (1): KVM: arm64: Introduce __pkvm_vcpu_{load,put}() Quentin Perret (17): KVM: arm64: Change the layout of enum pkvm_page_state KVM: arm64: Move enum pkvm_page_state to memory.h KVM: arm64: Make hyp_page::order a u8 KVM: arm64: Move host page ownership tracking to the hyp vmemmap KVM: arm64: Pass walk flags to kvm_pgtable_stage2_mkyoung KVM: arm64: Pass walk flags to kvm_pgtable_stage2_relax_perms KVM: arm64: Make kvm_pgtable_stage2_init() a static inline function KVM: arm64: Add {get,put}_pkvm_hyp_vm() helpers KVM: arm64: Introduce __pkvm_host_share_guest() KVM: arm64: Introduce __pkvm_host_unshare_guest() KVM: arm64: Introduce __pkvm_host_relax_guest_perms() KVM: arm64: Introduce __pkvm_host_wrprotect_guest() KVM: arm64: Introduce __pkvm_host_test_clear_young_guest() KVM: arm64: Introduce __pkvm_host_mkyoung_guest() KVM: arm64: Introduce __pkvm_tlb_flush_vmid() KVM: arm64: Introduce the EL1 pKVM MMU KVM: arm64: Plumb the pKVM MMU in KVM arch/arm64/include/asm/kvm_asm.h | 9 + arch/arm64/include/asm/kvm_host.h | 4 + arch/arm64/include/asm/kvm_mmu.h | 16 + arch/arm64/include/asm/kvm_pgtable.h | 38 ++- arch/arm64/include/asm/kvm_pkvm.h | 26 ++ arch/arm64/kvm/arm.c | 23 +- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 6 +- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 39 +-- arch/arm64/kvm/hyp/include/nvhe/memory.h | 50 ++- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 16 + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 201 ++++++++++- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 320 ++++++++++++++++-- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 69 ++++ arch/arm64/kvm/hyp/nvhe/setup.c | 7 +- arch/arm64/kvm/hyp/pgtable.c | 13 +- arch/arm64/kvm/mmu.c | 93 +++-- arch/arm64/kvm/pkvm.c | 201 +++++++++++ arch/arm64/kvm/vgic/vgic-v3.c | 6 +- 19 files changed, 1006 insertions(+), 145 deletions(-) -- 2.47.1.613.gc27f4b7a9f-goog