From patchwork Wed May 4 03:24:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12837096 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 774BEC433F5 for ; Wed, 4 May 2022 03:26:54 +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: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=Yu4eIPYwmzgmkjixYlrUoX6LaqJVN9vdn6Gk+xsAEAo=; b=QZ5 im+m7U5p/E7jY6IqtopgvVaQ5VdqBiF1o3YuoQb4okr3v7f6PfuwDVC+OTqSTe5KHHQL1HsSnzV1W edXvc0LshsVmqV52GzgT4xgEjfv9kEKd5HLbvLSi9GGf+HkA6crJziLePXpVWXf9gCs/a2cqajeXN z053c1Gb3L4H133zyNx8r3oSN9i73UXTvLeOxXzv+PgtvUcowah1t9OpORoUjQu6pKfGeROqCKPrL dojYcjN2HFH4uWqvEDxcoNwZH9F4Oo1JSLuUg6qulW6bqDj2sqbPHGCegyTuiAbC9PgjD3QK1psA2 lOpaZZhk8SX8CPrqENsYY300c3Zq53w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nm5dL-008YMF-NY; Wed, 04 May 2022 03:24:59 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nm5dI-008YJz-Al for linux-arm-kernel@lists.infradead.org; Wed, 04 May 2022 03:24:57 +0000 Received: by mail-pl1-x649.google.com with SMTP id y14-20020a1709027c8e00b0015906c1ea31so133203pll.20 for ; Tue, 03 May 2022 20:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=KgPp4H0NuOXhN/wKLMYd5omlFxsjaCCDTXWIWXRSBbg=; b=DmyQSOYJGcco5+Z4OTfOviHTkWkf+fn4I7+QmVo96W+55a7ZQD7pIzftEAC3pnN8ZA l9JcBz03PNT7zTv1nUYlVUfKoC4VpY85yltqlsI6Xvd0Lmqep6+thdtV2s31+MT0FwpO QGEQ4A0BkecMPTbEqMvp6Bg+K7qJLJjV/zOSNJf03h0nwFjjTIyWhhDSnW3slTH3bsJH Y4c3nZYGMB+yKeWutRtXiYPLrYyUfec5ztQc2jKgLOypWbICymKSrVim4l4DL1zPUIiP CHdmOTTLgA3y6KADxJGz9tVkJJ5ra4vTG89lT4lG9Vo9O6O5GYBs/0RUyCzDTxEKH6w1 PRtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=KgPp4H0NuOXhN/wKLMYd5omlFxsjaCCDTXWIWXRSBbg=; b=Fzq+J74hva9DcGvFdoZ3A8nB5Je7+0sPPX7tck4BmpyGFZYZK4x8J9eAaVtR7Q5fAO IpiQsKLSjpBMPPnRcaNpBt2r3YPDBdITQy9dYkQLGmb2097GPdSaL89Q8/1w4hPSFqK6 0gTw0BwduSCFGYa/zKUX5Oyv1ccYy0PAEVyoPoy1mQ+3wvffYGSIF4pBd/Puy3Z6kMq2 hq1glyGkgkIAiZ4OpELCMPiK5CDcpIxR/EO//7SIgQ14cjg7aTpuJYzgb1DSTXpa4/O2 6QlIs4yCkdp0bZYg1XLOuGD0cCI8pnr+qQ2e2Xr9TgoljT1ALkDbvsdmNejZKdykXvj9 bXww== X-Gm-Message-State: AOAM5300qpIJbYbGwJrBU0p9DDOK70XclcDm1RVzHyDMVzg+/My5jkIS dNa6cOGhUjyZT6MuHV+p2ngPDPoZSZo= X-Google-Smtp-Source: ABdhPJy0md364rnqqnpBagaJWaE/z1Wg/rNj8Qldyb9Z+17hxkDrPJCpHr8Z5hTe7QOHoLuWhwefh8NqYp8= X-Received: from oupton3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:21eb]) (user=oupton job=sendgmr) by 2002:a17:90a:c986:b0:1d9:56e7:4e83 with SMTP id w6-20020a17090ac98600b001d956e74e83mr221104pjt.1.1651634693511; Tue, 03 May 2022 20:24:53 -0700 (PDT) Date: Wed, 4 May 2022 03:24:34 +0000 Message-Id: <20220504032446.4133305-1-oupton@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH v6 00/12] KVM: arm64: PSCI SYSTEM_SUSPEND support From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, reijiw@google.com, ricarkol@google.com, Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220503_202456_415250_EEA60A7B X-CRM114-Status: GOOD ( 17.91 ) 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 The PSCI v1.0 specification describes a call, SYSTEM_SUSPEND, which allows software to request that the system be placed into the lowest possible power state and await a wakeup event. This call is optional in v1.0 and v1.1. KVM does not currently support this optional call. This series adds support for the PSCI SYSTEM_SUSPEND call to KVM/arm64. For reasons best described in patch 8, it is infeasible to correctly implement PSCI SYSTEM_SUSPEND (or any system-wide event for that matter) in a split design between kernel/userspace. As such, this series cheaply exits to userspace so it can decide what to do with the call. This series also gives userspace some help to emulate suspension with a new MP state that awaits an unmasked pending interrupt. Patches 1-5 are small reworks to more easily shoehorn the new features into the kernel. Patch 6 stands up the new suspend MP state, allowing userspace to emulate the PSCI call. Patch 7 actually allows userspace to enable the PSCI call, which requires explicit opt-in for the new KVM_EXIT_SYSTEM_EVENT type. Patches 8-11 clean up the way PSCI is tested in selftests to more easily add new test cases. Finally, the last patch actually tests that PSCI SYSTEM_SUSPEND calls within the guest result in userspace exits. Applies cleanly to 5.18-rc5. I'm sure you're already aware of it Marc, but for the sake of everyone else there's some light conflict with Raghu's patches that you've got queued up [1]. Tested with the included selftest and a hacked up kvmtool [2] with support for the new UAPI. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/hcall-selection [2]: https://lore.kernel.org/all/20220311175717.616958-1-oupton@google.com/ v5: http://lore.kernel.org/r/20220311174001.605719-1-oupton@google.com v5 -> v6: - Rebase to 5.18-rc5 - Collect Reiji's R-b's - Drop the system_event helper. Since we now have variadic data returning to userspace it doesn't make much sense to roll it up into a helper. Meh. - Put back the pointless kvm_vcpu_request() in kvm_arm_vcpu_suspend(). We'll rip out the reliance on vCPU requests for power state later on. It is entirely benign, even when a vCPU targets itself. Oliver Upton (12): KVM: arm64: Don't depend on fallthrough to hide SYSTEM_RESET2 KVM: arm64: Dedupe vCPU power off helpers KVM: arm64: Track vCPU power state using MP state values KVM: arm64: Rename the KVM_REQ_SLEEP handler KVM: arm64: Return a value from check_vcpu_requests() KVM: arm64: Add support for userspace to suspend a vCPU KVM: arm64: Implement PSCI SYSTEM_SUSPEND selftests: KVM: Rename psci_cpu_on_test to psci_test selftests: KVM: Create helper for making SMCCC calls selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test selftests: KVM: Refactor psci_test to make it amenable to new tests selftests: KVM: Test SYSTEM_SUSPEND PSCI call Documentation/virt/kvm/api.rst | 76 ++++++- arch/arm64/include/asm/kvm_host.h | 10 +- arch/arm64/kvm/arm.c | 104 +++++++-- arch/arm64/kvm/psci.c | 65 ++++-- include/uapi/linux/kvm.h | 4 + tools/testing/selftests/kvm/.gitignore | 2 +- tools/testing/selftests/kvm/Makefile | 2 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 121 ---------- .../testing/selftests/kvm/aarch64/psci_test.c | 213 ++++++++++++++++++ .../selftests/kvm/include/aarch64/processor.h | 22 ++ .../selftests/kvm/lib/aarch64/processor.c | 25 ++ tools/testing/selftests/kvm/steal_time.c | 13 +- 12 files changed, 480 insertions(+), 177 deletions(-) delete mode 100644 tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c create mode 100644 tools/testing/selftests/kvm/aarch64/psci_test.c