From patchwork Thu Jul 29 13:27:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12408719 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6219EC4338F for ; Thu, 29 Jul 2021 13:31:20 +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 30983601FC for ; Thu, 29 Jul 2021 13:31:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 30983601FC 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:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ecgqz3jsXuVpikpf0BRYskbiBTNgib5cJQ+BUpFg/cU=; b=ift ldke5Wdli+8ffZIz78T/76xlYrMDbf1lBkdodIvdymQ+jWdkJ3sfVaET6w2zWyCGMXUrD2+cj8s6h 7iPCYvNmLVlcOf8E+T/gWY9YM8WNzfXtxVKjiz0ujdgr8f97t1zM+ui4l383ZFcBNKE5V4EeW1XH8 l8pjNU43mluTCIVmDr9JcbSAwIK8vXNMgxomF7d0I/AsTQ1qWyymxjf81T9qKv2h1VvRSZ2I/ucNt +zx5nHm3yfu6cJReScfsgf6oNozNfpoUu3aITA5iqdYe0yZZfaN4f0eSjkyIqfqI8Ytradg64+yC3 SpTDConNEw9gY52ji6AL10AO1KQUPlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m965N-004Ea7-14; Thu, 29 Jul 2021 13:28:29 +0000 Received: from mail-qk1-x74a.google.com ([2607:f8b0:4864:20::74a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m965I-004EZD-5J for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 13:28:25 +0000 Received: by mail-qk1-x74a.google.com with SMTP id 18-20020a05620a0792b02903b8e915ccceso3797047qka.18 for ; Thu, 29 Jul 2021 06:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=uCsDvrfcUF+1HjCy/5u0lXgukkeSpeNSQPNFAPtE5Og=; b=TwUGuSD9qt0RaCZOS9MqYshAwbluPWeQnV47t4m6fl1LT4Bu8aMFJPgR4wel2mQ/0d VMq3hAK+GBdhK0pDqqszgH6EjWtt0g+gsttm5me4V/4bLlmdJtY8xDdSkXQhD2+kh7En APBRNllYpK/w+G4htTFazfyOkcJT2CNzdRflI8pGflgUvStmidwaEZJ1ISLDNIz8XHkE I8TAGDAGu8wQRDYBI3LsbMZm8DvGc5Yhi05TnDxDgHirqn7QwkGG9pUJKe1iAk3KJ5ST nrE4ll47uKL1HWghtXbFmGP9rQo/7u9BGNvZD5e4hpV4BN1enHUmTMlPD1rE19y/oH2I Rzug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=uCsDvrfcUF+1HjCy/5u0lXgukkeSpeNSQPNFAPtE5Og=; b=Gw582i/AxwxTvKP/XqtHeCLNsNy71slc7gE/+AgYOxo5jClJ3pXlgrq4wLpLzSIJPe O/pXd1mwHAGDmCogkWiMFW04ElnB+9IQc/B3vGbBBz1Gs7PLsu4fZtr6nuwhN3zFktLH pphlRQj5c+jsQxMl4MZvbr1eLG6eK1S8fmHZ9GGhlvIG3vkf16HrSi2c2q1K168jNpZO SnZyHBYh02I38QEOEowThIUQT7OgOJbYgZs9wrnN0qV7rxpR2YKyC0GRANBKiTxzxq+Z 10B56KYgPliowQB3Rqg0ZBBHDb9vnFwCsn4EgUzUCkeZMDhkPl8atpTzoB5i5O/H8WsA GO0A== X-Gm-Message-State: AOAM5332a36MPz50wC6PAt+025AdKuSqensrQueZbfpqAMLVXSw5xgEE ZR6D8v/XFPEfVVNHBa7npfx7VPS58u61 X-Google-Smtp-Source: ABdhPJwFLu6UzIEWRzj8e8yAxcsgzIxAgdeYD1x+wnn2xqD3UBVZS+HjIyhzCZDdD20gs2aUkHHEOqy6y/hY X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:293a:bc89:7514:5218]) (user=qperret job=sendgmr) by 2002:a05:6214:27e7:: with SMTP id jt7mr5278007qvb.28.1627565302295; Thu, 29 Jul 2021 06:28:22 -0700 (PDT) Date: Thu, 29 Jul 2021 14:27:57 +0100 Message-Id: <20210729132818.4091769-1-qperret@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog Subject: [PATCH v3 00/21] Track shared pages at EL2 in protected mode From: Quentin Perret To: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, tabba@google.com, dbrazdil@google.com, kernel-team@android.com, Quentin Perret X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_062824_265987_2B92B840 X-CRM114-Status: GOOD ( 17.59 ) 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 Hi all, This is v3 of the patch series previously posted here: https://lore.kernel.org/kvmarm/20210726092905.2198501-1-qperret@google.com/ This series aims to improve how the nVHE hypervisor tracks ownership of memory pages when running in protected mode ("kvm-arm.mode=protected" on the kernel command line). The main issue with the existing ownership tracking code is that it is completely binary: a page is either owned by an entity (e.g. the host) or not. However, we'll need something smarter to track shared pages, as is needed for virtio, or even just host/hypervisor communications. This series introduces a few changes to the kvm page-table library to allow annotating shared pages in ignored bits (a.k.a. software bits) of leaf entries, and makes use of that infrastructure to track all pages that are shared between the host and the hypervisor. We will obviously want to apply the same treatment to guest stage-2 page-tables, but that is not really possible to do until EL2 manages them directly, so I'll keep that for another series. The series is based on the kvmarm/fixes branch, and has been tested on AML-S905X-CC (Le Potato) and using various Qemu configurations. Changes since v2: - Renamed and refactored the find_range() path for host memory aborts; - Added hyp_assert_lock_held() using Will's hyp_spin_is_locked() helper, and sprinkled a few of them throughout the series; - Changed how host stage-2 mappings are adjusted after __pkvm_init() by walking the hyp stage-1 instead of relying on the host calling __pkvm_mark_hyp. Changes since v1: - Changed the 'share' hypercall to accept a single page at a time; - Dropped the patch allowing to continue stage-2 map when hitting the EAGAIN case; - Dropped some of the custom pgtable walkers and used Marc's get_leaf() patch instead; - Changed pgtable API to manipulate SW bits directly rather than specifying shared pages; - Added comments and documentations all over; - Cleanups and small refactoring. Thanks, Quentin Marc Zyngier (1): KVM: arm64: Introduce helper to retrieve a PTE and its level Quentin Perret (19): KVM: arm64: Introduce hyp_assert_lock_held() KVM: arm64: Provide the host_stage2_try() helper macro KVM: arm64: Expose page-table helpers KVM: arm64: Optimize host memory aborts KVM: arm64: Rename KVM_PTE_LEAF_ATTR_S2_IGNORED KVM: arm64: Don't overwrite software bits with owner id KVM: arm64: Tolerate re-creating hyp mappings to set software bits KVM: arm64: Enable forcing page-level stage-2 mappings KVM: arm64: Allow populating software bits KVM: arm64: Add helpers to tag shared pages in SW bits KVM: arm64: Expose host stage-2 manipulation helpers KVM: arm64: Expose pkvm_hyp_id KVM: arm64: Introduce addr_is_memory() KVM: arm64: Enable retrieving protections attributes of PTEs KVM: arm64: Mark host bss and rodata section as shared KVM: arm64: Remove __pkvm_mark_hyp KVM: arm64: Refactor protected nVHE stage-1 locking KVM: arm64: Restrict EL2 stage-1 changes in protected mode KVM: arm64: Make __pkvm_create_mappings static Will Deacon (1): KVM: arm64: Add hyp_spin_is_locked() for basic locking assertions at EL2 arch/arm64/include/asm/kvm_asm.h | 5 +- arch/arm64/include/asm/kvm_pgtable.h | 166 ++++++++---- arch/arm64/kvm/Kconfig | 9 + arch/arm64/kvm/arm.c | 46 ---- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 33 ++- arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 +- arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 25 ++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 20 +- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 221 ++++++++++++++-- arch/arm64/kvm/hyp/nvhe/mm.c | 22 +- arch/arm64/kvm/hyp/nvhe/setup.c | 82 +++++- arch/arm64/kvm/hyp/pgtable.c | 247 +++++++++--------- arch/arm64/kvm/mmu.c | 28 +- 13 files changed, 625 insertions(+), 282 deletions(-)