From patchwork Tue Aug 30 19:41:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12959795 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 5232BC0502A for ; Tue, 30 Aug 2022 19:43:20 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From: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=2iaLt9Pwcd89FMM5LBZyVFU5abc2bqNBfhZyFuCOLeQ=; b=Pt7o84Ri4+YPZj RCdBsJTMxzpdEJAvO31BcTbbxzEJNuYbscrr5B+3ZP2HULvr7QQmY70CyoBGGZEGWQTOpYkPLvlyR mXulw/8DZ7Lr88NozpnWsG7vZFaI/d8SHgFEde2q4o/ZT+XTWuuvkOZzODTR8Z566M/qEe+WnOeg1 YCTxDmQ+ix9l174o75vWAY751JQuMWpCctQfciJLYkRolxQSQjuWLhmH+Sb7vrpRf4X6mx9od6C74 bQg88DPtI9J5pe7m2Z5vSvipH7IUiI88oa01A7inGjmrGVRJXKleeyRnD2Q5f5xyBlDpcGOIt4Yvx UDSmowAEREX5Wtf0cg1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT77g-001V7O-2Y; Tue, 30 Aug 2022 19:42:08 +0000 Received: from out1.migadu.com ([2001:41d0:2:863f::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT77R-001V2Z-Uo for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2022 19:41:56 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1661888508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=SDzXqDxM55ayeb7XSHm97qt3/HgukfVMRYvpXvq6Bww=; b=KjHTgycPeLozF1oPcoStTE5XQnoDeutqMeTI88Rj2BL8ySz7NJ14eEnaNkfD9smQMKTIXH xh1j6f0tKODpAB6AYTuXEWV46HdbUZuvuKzQOkVvlQMgLV48QK2PeNwnRBIX0fuKKmQ0XB 53WH0jRq95s5ezrF0qWW95D5dah15Rg= From: Oliver Upton To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Quentin Perret , Ricardo Koller , Reiji Watanabe , David Matlack , Ben Gardon , Paolo Bonzini , Gavin Shan , Peter Xu , Sean Christopherson Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Oliver Upton Subject: [PATCH 00/14] KVM: arm64: Parallel stage-2 fault handling Date: Tue, 30 Aug 2022 19:41:18 +0000 Message-Id: <20220830194132.962932-1-oliver.upton@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220830_124155_025039_0F0A77D1 X-CRM114-Status: GOOD ( 11.18 ) 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 Presently KVM only takes a read lock for stage 2 faults if it believes the fault can be fixed by relaxing permissions on a PTE (write unprotect for dirty logging). Otherwise, stage 2 faults grab the write lock, which predictably can pile up all the vCPUs in a sufficiently large VM. Like the TDP MMU for x86, this series loosens the locking around manipulations of the stage 2 page tables to allow parallel faults. RCU and atomics are exploited to safely build/destroy the stage 2 page tables in light of multiple software observers. Patches 1-2 are a cleanup to the way we collapse page tables, with the added benefit of narrowing the window of time a range of memory is unmapped. Patches 3-7 are minor cleanups and refactorings to the way KVM reads PTEs and traverses the stage 2 page tables to make it amenable to concurrent modification. Patches 8-9 use RCU to punt page table cleanup out of the vCPU fault path, which should also improve fault latency a bit. Patches 10-14 implement the meat of this series, extending the 'break-before-make' sequence with atomics to realize locking on PTEs. Effectively a cmpxchg() is used to 'break' a PTE, thereby serializing changes to a given PTE. Finally, patch 15 flips the switch on all the new code and starts grabbing the read side of the MMU lock for stage 2 faults. Applies to 6.0-rc3. Tested with KVM selftests and benchmarked with dirty_log_perf_test, scaling from 1 to 48 vCPUs with 4GB of memory per vCPU backed by THP. ./dirty_log_perf_test -s anonymous_thp -m 2 -b 4G -v ${NR_VCPUS} Time to dirty memory: +-------+---------+------------------+ | vCPUs | 6.0-rc3 | 6.0-rc3 + series | +-------+---------+------------------+ | 1 | 0.89s | 0.92s | | 2 | 1.13s | 1.18s | | 4 | 2.42s | 1.25s | | 8 | 5.03s | 1.36s | | 16 | 8.84s | 2.09s | | 32 | 19.60s | 4.47s | | 48 | 31.39s | 6.22s | +-------+---------+------------------+ It is also worth mentioning that the time to populate memory has improved: +-------+---------+------------------+ | vCPUs | 6.0-rc3 | 6.0-rc3 + series | +-------+---------+------------------+ | 1 | 0.19s | 0.18s | | 2 | 0.25s | 0.21s | | 4 | 0.38s | 0.32s | | 8 | 0.64s | 0.40s | | 16 | 1.22s | 0.54s | | 32 | 2.50s | 1.03s | | 48 | 3.88s | 1.52s | +-------+---------+------------------+ RFC: https://lore.kernel.org/kvmarm/20220415215901.1737897-1-oupton@google.com/ RFC -> v1: - Factored out page table teardown from kvm_pgtable_stage2_map() - Use the RCU callback to tear down a subtree, instead of scheduling a callback for every individual table page. - Reorganized series to (hopefully) avoid intermediate breakage. - Dropped the use of page headers, instead stuffing KVM metadata into page::private directly Oliver Upton (14): KVM: arm64: Add a helper to tear down unlinked stage-2 subtrees KVM: arm64: Tear down unlinked stage-2 subtree after break-before-make KVM: arm64: Directly read owner id field in stage2_pte_is_counted() KVM: arm64: Read the PTE once per visit KVM: arm64: Split init and set for table PTE KVM: arm64: Return next table from map callbacks KVM: arm64: Document behavior of pgtable visitor callback KVM: arm64: Protect page table traversal with RCU KVM: arm64: Free removed stage-2 tables in RCU callback KVM: arm64: Atomically update stage 2 leaf attributes in parallel walks KVM: arm64: Make changes block->table to leaf PTEs parallel-aware KVM: arm64: Make leaf->leaf PTE changes parallel-aware KVM: arm64: Make table->block changes parallel-aware KVM: arm64: Handle stage-2 faults in parallel arch/arm64/include/asm/kvm_pgtable.h | 59 ++++- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 7 +- arch/arm64/kvm/hyp/nvhe/setup.c | 4 +- arch/arm64/kvm/hyp/pgtable.c | 360 ++++++++++++++++---------- arch/arm64/kvm/mmu.c | 65 +++-- 5 files changed, 325 insertions(+), 170 deletions(-) base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5