From patchwork Tue Oct 19 12:12:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12569731 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 16599C433EF for ; Tue, 19 Oct 2021 12:16:48 +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 DC1C56115B for ; Tue, 19 Oct 2021 12:16:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC1C56115B 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=s7PNgvxI0+F0URFQ1tY7XHPVtCEVFKmxnuCnOH0p2Zs=; b=J6q0g/GIWe5BtkF8A5Rt38I6Gh v+GppXzqN7ihLXfJtmmCvxXQkcD8zSZVOPUT13CPZB5zfSmMkSGwxOoZ3JSqnWKZbgzB9WEcnB+Jk pc4QZxNVJ1TbMQbP5wmi4gM4CSQwL1imjS9o9DM4OFH9qnZfPCibBEHCC3hV5VJqBCHJ1KbzxpPin hi1RpZcBuGI+P9QJ7LQws7ojORygZULKZqFO8FSZ6/dPMwEFJ7m9a+FfZu9FAlNE3gnw5a+BR+zYw y1J3e7u0s7wJ2U95hgovcJuQGGSzQr9gAjdQGnYkno/YpK/m975XMZqeRsT6YBzz4uZEhFKXoS9jl i5C4ZECA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mco1V-0016Cr-M8; Tue, 19 Oct 2021 12:15:17 +0000 Received: from mail-ed1-x549.google.com ([2a00:1450:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcnzd-0015Dy-Bl for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 12:13:22 +0000 Received: by mail-ed1-x549.google.com with SMTP id x5-20020a50f185000000b003db0f796903so17387211edl.18 for ; Tue, 19 Oct 2021 05:13:19 -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=Xom4QB7AOMzMrKQIokAKkuFuVfZT5vZhj8rSYX3sNOQ=; b=UEBfi9pZv9JWQ9n6/h/iOXEYKZp+KAlUh2DKJbB4tCbbbpQt6Q9qFpuPdsiYcGSHx4 LX6u3LKvK+ZLLiBEXefMFZZuJL/m57dP0wNf92XMwUS2Vc4dHj+r3kRAM+CL+lqpMimX 354GwtJhsJ/BwC6r/0XdfiJNr9uoaPCzbdcNTOih4LRbc2iBl63nuNe9XPomDGTu4R52 5h9hahfNMP9P3o1jfQpOzoMJ43rFPXjB2Uz7vART5kBtHnDArZemdhxKKysPgIU8UxyD IXWd2hd/An+PUfJ97+ttKWnIHwUIuxY1/PzKFQseQtOWrSYNG0vc08yZilX4NoOhQn46 fInA== 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=Xom4QB7AOMzMrKQIokAKkuFuVfZT5vZhj8rSYX3sNOQ=; b=UVrzrwyeaksqbxwUKInN8CXD4m9PuRBkitAhXgQZDsxbWvbECiJpvhf5FNvNePI8ix Z/lovHZaqhe1ltzSXgykOzJ/CS6PC+eeQU6c4WgjuV3zRjDBMPPDwHDX0QrG9G03WaoY aPHpi2JouwizwF9sRZmcGXjZ9cv9cdoKX9hVpk3d4PjIwxh/62zu/nJLk5dTqU8Ssf58 F0Sy3O9kWDhi8N1cCtQ2VWAsQPkTf2ecyrnAfsKpONR3fIuAEYYDMkFxTeNk/GlRja8V KT61F5F1UW/YADHas/Ps8dM/6PjAA1x/gWkGxshSF6hXhZeHHMtTNLQ8b2DxyWs+SULK ADBQ== X-Gm-Message-State: AOAM532+bqvKQ8IYdcMzQwp8yHRMh9Oi1woKlXW44SBv1f9Qdc3N3HUP BBay85ygtTjy5Eu30FfpW8NHHvITsHGo X-Google-Smtp-Source: ABdhPJxpv/+Qrz1w29XpbnCupLR0QNbk4QaH0nM4qXe1dCgEnX/Y+92sdhWJIqq0OnYUXAbOKpiNqDTYPy5k X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:59ca:401f:83a8:de6d]) (user=qperret job=sendgmr) by 2002:aa7:dbcf:: with SMTP id v15mr53721659edt.243.1634645598342; Tue, 19 Oct 2021 05:13:18 -0700 (PDT) Date: Tue, 19 Oct 2021 13:12:54 +0100 In-Reply-To: <20211019121304.2732332-1-qperret@google.com> Message-Id: <20211019121304.2732332-6-qperret@google.com> Mime-Version: 1.0 References: <20211019121304.2732332-1-qperret@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 05/15] 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 , Andrew Walbran Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kernel-team@android.com, qperret@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_051321_438134_90EB032D X-CRM114-Status: UNSURE ( 9.64 ) 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 9e5c92237a51..56343b1bb3a9 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -247,6 +247,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;