From patchwork Wed Oct 13 15:58:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12556265 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24484C433F5 for ; Wed, 13 Oct 2021 16:04:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E2F0F611BD for ; Wed, 13 Oct 2021 16:04:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E2F0F611BD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:References: Mime-Version:Message-Id: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=Cn6WD6ToQR5R0eLzi+A1mNv8k9aSjvtoqwjPgQjfNDE=; b=opeTrNu94Y3zfCE08WhtH8lIBy 5Gn+Op0ufls4k9ahw6GmUdg5AOn8WQizDNFx2ET+sPxwpNo+VLX/PYSefopfUvTh2mZ/cn7SzYUlS 9eyXh7L/mulcXogVF/F2p5qIUTbUMeQN25k4VKqRUyMEPdJApc0sadOF/Q+4ZkBB2t/uBWa/qutrr qRF9F0xl7A+lbNL4NAinLDQ62gzCJK90OL4W0IURnHJEUbo5ZE1SNhMNzBgEnjZXTFYYg1et5gq2q zxspD8azmr/HzgzZTTT5H8M7AJFNUuOWoWZoLsvWryBQjT5HPI3W5yQJBGaDaH+OWvGGAP58Q9zGa mAqOMWnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1magig-00HVA4-Ee; Wed, 13 Oct 2021 16:03:06 +0000 Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1magee-00HTO6-V3 for linux-arm-kernel@lists.infradead.org; Wed, 13 Oct 2021 15:58:58 +0000 Received: by mail-qk1-x749.google.com with SMTP id v14-20020a05620a0f0e00b0043355ed67d1so2243249qkl.7 for ; Wed, 13 Oct 2021 08:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=kINe0IWr90RBHgOAjYvlhVKzPYz79JHCEDd5CCbeejk=; b=OsS0vN4gyNtNRBwMG8bFigYCqkq3NooTKR7YjqqinRU1RPJxKLUz47JA1C3v8vh/1I yfLpGr6j0uvRc5U+NVL8ceUMekYzc6PXHJPkoBCbo1LcBSWP61RnabYuvsYnc/ELrilQ u1wd9tD4HSNnUO/mKylza3pmeVGPserwu8e5b/QisNp5m8+YGH/CKaDdVOS8tLMBDbgt MpYKA1gHhlXQUV9f7nJf/mP68j2oIb0ukvdNI9FTnhBF2i3H4OLN/A8vej7da8eZuWaI wwUjRR5U0HVYHzA3Xes9MbWGfxBccnUtmJ2XCEdoCqEeznbLJ/RjkfghxkDOCf3POi/I wnAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=kINe0IWr90RBHgOAjYvlhVKzPYz79JHCEDd5CCbeejk=; b=FmXmftVNS0st4IEVW/MK67UFYi4HyZhmNIKqfqiC8waYZMXoWSDPl9N+gl2UvQTOer ZFXXMZMZW2AY7N2kjcLi6eX1rYYQr9ZLndrhdW7dvoM4xibUHiMXirr/h6bt8m5erzyx as6ZTvem+pCl4wzVpDQ4GSx3YNwwGIIWkejrYS3khr8El39Q8rVNIA0BHlYnURwIb7RY lfpvgUKAusvgQP1b4WyoR+cbQDtpSDxQQnj8WSTJCBsUdnHWlYJ6kWaPbpdDhfm2jf+j ZsQROAUUy9aeC2zOmENW0u/GmaisiG5wxXUdclhSs88nzHaT1jj8xTE/smeXA51bLhui 8Ybg== X-Gm-Message-State: AOAM530DLAEL4slvr7tVLGiodFeBAi19payyLhfTQ/BNstuIv6ig4JO9 6VPm5k162zLFAV87GfDSN+rJuVpbEGg+ X-Google-Smtp-Source: ABdhPJzDyz3x0TsxSS86fGtgHfDEAddB8Qdemu3K02NrgNa0NMLZw6aQqeBbr2Pk48QMxkVNxj6evJ7yA3g9 X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:65b5:73d3:1558:b9ae]) (user=qperret job=sendgmr) by 2002:ac8:5994:: with SMTP id e20mr43717qte.331.1634140734872; Wed, 13 Oct 2021 08:58:54 -0700 (PDT) Date: Wed, 13 Oct 2021 16:58:24 +0100 In-Reply-To: <20211013155831.943476-1-qperret@google.com> Message-Id: <20211013155831.943476-10-qperret@google.com> Mime-Version: 1.0 References: <20211013155831.943476-1-qperret@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 09/16] KVM: arm64: Hook up ->page_count() for hypervisor stage-1 page-table From: Quentin Perret To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Fuad Tabba , David Brazdil Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211013_085857_070160_FD27BD8E X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. 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 From: Will Deacon kvm_pgtable_hyp_unmap() relies on the ->page_count() function callback being provided by the memory-management operations for the page-table. Wire up this callback for the hypervisor stage-1 page-table. Signed-off-by: Will Deacon Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/nvhe/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index ad89801dfed7..98b39facae04 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -246,6 +246,7 @@ void __noreturn __pkvm_init_finalise(void) .virt_to_phys = hyp_virt_to_phys, .get_page = hpool_get_page, .put_page = hpool_put_page, + .page_count = hyp_page_count, }; pkvm_pgtable.mm_ops = &pkvm_pgtable_mm_ops;