From patchwork Wed Nov 15 17:16:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13457141 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 46168C5AD4C for ; Wed, 15 Nov 2023 17:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=f7BTHhEpBv3sSU0RjCovbwWSM3TY3bbMx7S51qWHF4I=; b=uMKskM9+PsSzFB01n21LDeURDf 4KOXoIZJ2dtYt91DXuaVa0F2GmGcwLNkEAJrSWCv1uWy8HCDmJ/viJCI69GNx94T+HNPj9iPOGA5W gujBYyzeT+aGDE0HG/PEkWbr1pGBwVNiFY7/mssB3+ad99YNKNyd2uxZAdqtQkpAON/GdXr/q9yMH wWonNSVTRDw508rd+hNqoHzdrw+dmljJi7Wk+ORjwr6O1xR0140mk0rXo828XcI3B7OPB2GF+fYu+ SLv8ZZF9ETGiHevVeVqGQWlHemN67ZHlDqe45V6bQat86+QfbNcPOQuwfFZRDcadkjcQ9aRhFermi K9TslqhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r3JVz-001Pf7-2y; Wed, 15 Nov 2023 17:17:23 +0000 Received: from mail-ej1-x649.google.com ([2a00:1450:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3JVu-001PZj-1t for linux-arm-kernel@lists.infradead.org; Wed, 15 Nov 2023 17:17:20 +0000 Received: by mail-ej1-x649.google.com with SMTP id a640c23a62f3a-9e27cc6dbf0so471126966b.1 for ; Wed, 15 Nov 2023 09:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700068635; x=1700673435; 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=cTRruPNWl9dydwy1RolnY7MN//AZ8WOLTxliFM7mi1c=; b=v1FvhD8UPG7sWF1cQZ/T5OvKh5H54c2LQOkDZ48N3n9MbWfWwL/lpIjPa5U7v8Du1c a5bzmRak7xo9qQiyduAgZidfYnA/ZcUMwBVfEk1tsh0iapIGxJ+ORJi+0m6JZOfBuspp ug+4pafKPa8EyfnUHDZ5KGdZViwLZ4PzEMdaxgf9OmOATVBwnJYRiob3ZMnBNxnEVDLK t+LKVNjrx/9pRIJUWF+vNWkH63LeDNOnAx62CFdqcWdHWFuZ/BJBspUloG9KbNimTILn Gcrtj6cdU7axqZz4OGB4t7h6kRDNvFxaP0PqCJgDP8TGJM5ZcSkUCOO8ZRc9gs8cLyR5 JVCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700068635; x=1700673435; 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=cTRruPNWl9dydwy1RolnY7MN//AZ8WOLTxliFM7mi1c=; b=lLRDz5mnNScz+aOJnnfSQ3Xtmrg2yucqfM3Yh9nSMNwUrtU0aZW6IC6A3ZjThpMP+t UHIcL6AKHey21NRzMxjjwrLKsTvtBb9io0wIwyBL5fRK03mFFWUy53GhloLu7z1XjwYc Vx1T9E/IyiASRqkIJzRCoboD/Shf/0xUyTNM4YqKDy4NXlZCw7iijQiCFopFSqXNW1Ap XZQZVSSbbftfVeEy62b46MGfvfmntDU0u5j73auNT7HQvCSC6nNppRAC+fMywvNvl7M6 9ey+G5wMOyceUmKbgbbF455NiD1fhrH0HGuS6uvnanJhR9dOBm4s1yUyiAaqAJDCd0mI HI8g== X-Gm-Message-State: AOJu0Yz7rpRmAX5YCmcXUNJKkNCTFr2qLbkPcydQItcJnnoAur1tFuHw P9iwR9YifNo+O/uSTLrzyzjqHqOq6CZAJfEPQWk= X-Google-Smtp-Source: AGHT+IGsNbGDrA60Xa1dYe9ILtVmHQ514rV3j3OHq1AV69tXNThGqDwNIJ6SRVp7ouHANt4Icfonac0rBfGADpZZyaY= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a17:906:6bc9:b0:9c4:1dfa:de9 with SMTP id t9-20020a1709066bc900b009c41dfa0de9mr121012ejs.10.1700068635336; Wed, 15 Nov 2023 09:17:15 -0800 (PST) Date: Wed, 15 Nov 2023 17:16:39 +0000 In-Reply-To: <20231115171639.2852644-2-sebastianene@google.com> Mime-Version: 1.0 References: <20231115171639.2852644-2-sebastianene@google.com> X-Mailer: git-send-email 2.43.0.rc0.421.g78406f8d94-goog Message-ID: <20231115171639.2852644-11-sebastianene@google.com> Subject: [PATCH v3 09/10] arm64: ptdump: Interpret pKVM ownership annotations From: Sebastian Ene To: will@kernel.org, Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , catalin.marinas@arm.com, mark.rutland@arm.com, akpm@linux-foundation.org, maz@kernel.org Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, vdonnefort@google.com, qperret@google.com, smostafa@google.com, Sebastian Ene X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231115_091718_637298_315C4289 X-CRM114-Status: GOOD ( 12.81 ) 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 Add support for interpretting pKVM invalid stage-2 descriptors that hold ownership information. We use these descriptors to keep track of the memory donations from the host side. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/kvm_pgtable.h | 7 +++++++ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 7 ------- arch/arm64/mm/ptdump.c | 10 ++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h index 913f34d75b29..938baffa7d4d 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -87,6 +87,13 @@ typedef u64 kvm_pte_t; */ #define KVM_INVALID_PTE_LOCKED BIT(10) +/* This corresponds to page-table locking order */ +enum pkvm_component_id { + PKVM_ID_HOST, + PKVM_ID_HYP, + PKVM_ID_FFA, +}; + static inline bool kvm_pte_valid(kvm_pte_t pte) { return pte & KVM_PTE_VALID; diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 9cfb35d68850..cc2c439ffe75 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -53,13 +53,6 @@ struct host_mmu { }; extern struct host_mmu host_mmu; -/* This corresponds to page-table locking order */ -enum pkvm_component_id { - PKVM_ID_HOST, - PKVM_ID_HYP, - PKVM_ID_FFA, -}; - extern unsigned long hyp_nr_cpus; int __pkvm_prot_finalize(void); diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index ec7f6430f6d7..ffb87237078b 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -273,6 +273,16 @@ static const struct prot_bits stage2_pte_bits[] = { .val = PTE_S2_MEMATTR(MT_S2_FWB_NORMAL) | PTE_VALID, .set = "MEM/NORMAL FWB", .feature_on = is_fwb_enabled, + }, { + .mask = KVM_INVALID_PTE_OWNER_MASK | PTE_VALID, + .val = FIELD_PREP_CONST(KVM_INVALID_PTE_OWNER_MASK, + PKVM_ID_HYP), + .set = "HYP", + }, { + .mask = KVM_INVALID_PTE_OWNER_MASK | PTE_VALID, + .val = FIELD_PREP_CONST(KVM_INVALID_PTE_OWNER_MASK, + PKVM_ID_FFA), + .set = "FF-A", }, { .mask = KVM_PGTABLE_PROT_SW0, .val = KVM_PGTABLE_PROT_SW0,