From patchwork Wed Nov 2 23:18:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 14532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp200176wru; Wed, 2 Nov 2022 16:23:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4AQwHSEXTRjrEZEcy2YH8S1/nEfmvTDvJ/JXlXXLNWiBqQcamj9zZ3CSyLMEMwVegAHcOn X-Received: by 2002:a63:2b53:0:b0:439:34d9:5d47 with SMTP id r80-20020a632b53000000b0043934d95d47mr23083823pgr.283.1667431391804; Wed, 02 Nov 2022 16:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667431391; cv=none; d=google.com; s=arc-20160816; b=nt6LlA2OfRcjw+R/TLeNxhL61fEWvjgbGz12Ov7K5opLi+EFz4nWJcGsONpNgzbxfW OoSYloumZbv1oyQchW4LF/ybHF2BLmkaUCKtwsm5LGN+jn4zIm5ik642zfoL+zddf8h/ gdH1qWcy7on33S3dQNEXd2t1A39/yVIgYfF6wOHmY6fCN1RCu88c6IV6yN3VWNxjaphu 6JbqBiy5oLChIhdI1kCFDr+YhfJBMt0Xx8brWkNhbevP8IOrFtnXB7bz7pKccgk0z6mi hmm20Pfs94Ive/82txKCPKpDjf+ifOnaZAVboi8jF9lkGy4hDDZKUun7ShpjNM8Zvk0d V3iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=yE/4Y9j/oYhrNnppN3pBbrFR3yZQeQID1rXlzF1UIrs=; b=U7/QPr24eoPhFze7llEYP7ChWpbARIPtkU91vgo6615SNuvkdY5b94QaEb6i3DZljr Hn5Wzf9z8dKKX/kxwQS+f1eGkvnUiYFPFLC3efFdN1jtVF+RkNhMXUHQ1dQppdNBOIer Amibp6kKS2KTVbVitvmlNzjh3tU6J0Bcf4meX2h1OQyxyDBEliQSwQoWcNNVjpiB+Xat qXOB0dA28V2WDv5sTDGXnKacI1rrhJNAnUM+5cT94VO7wwovrs/855piGV6qnzzOari9 N5I881Upnz2kl2mvEBSNjO8nre8aW20iwylTSxKC7iEkkoyQDEtqjACe+x1/K6omJhOO Ttsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ay8cPyDC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk18-20020a17090b33d200b0020d542eb5f0si4692367pjb.110.2022.11.02.16.22.59; Wed, 02 Nov 2022 16:23:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ay8cPyDC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230280AbiKBXWX (ORCPT + 99 others); Wed, 2 Nov 2022 19:22:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231354AbiKBXUi (ORCPT ); Wed, 2 Nov 2022 19:20:38 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCF979FD2 for ; Wed, 2 Nov 2022 16:19:54 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id nl16-20020a17090b385000b002138288fd51so2482417pjb.6 for ; Wed, 02 Nov 2022 16:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=yE/4Y9j/oYhrNnppN3pBbrFR3yZQeQID1rXlzF1UIrs=; b=ay8cPyDCIqaMfo0DK1yGgX9Wb9Bl9/1fVHbdhv2aAy1cj0+xuZ97OrHcZUeV1cFb37 6xEzJJ8+vktqwJnTtuH1USFvq8dlhSmN+zODY90fpIycgDYl660YnoWyBjRJ4shxmyzm eiIMz6ZQ5l1bjRGivO4fA9kceUx/9ETkzTfr9tWJ9HyO6sppdHxDi6fl6UdHy8ptqT6P DK4l+CKIMpqMLCpZJAWwhuO/obSacLjdsxWR0MNI7G5lNuNRlHspSUm1vSdSmF25/DFv q5eNxeOVs/atfRGxPMYHZj9KnffzNZveBs/Mh+BUBe8auRPPWp99Q7jjD7exn9MfTR0m 9eDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yE/4Y9j/oYhrNnppN3pBbrFR3yZQeQID1rXlzF1UIrs=; b=osdmG+gMDwTiB8mLAmJb2vfGLQa54J9YD+jd0l3ptPjIsmNzM8Gf3VY1nVVIqHTCun 6LlYtC8uuRbhh/nJb2VqUyr0iDkOcBjyT3bZh7EzT+P8VYrzsynxioPWGMXH0zn3Ot9k E+Rnmzp1GNDWDJX3eDW0Ojo/XhQxYChJyNKwQi+7c0rHe2paU58OzqnMy5qq9iOdC5AN 0ShzN4DddQU+8CglcbdJxkyGkWQrcSWhp6JP4bWVMaesYK2kR2cGF/DRA3XnCgywioQl fbxcPf2QSAY+/VZW3OXJbXX5EwFuNEacvBPRnBh6UQ1E1j3p895l9u2hVryFBeqaDKHA 4GWw== X-Gm-Message-State: ACrzQf3LC+Ocxwi7D0AZpHyZeo0nJBLCfQ6LFtVSLQHtrHxXCbfA2zS2 Xbgpx53q5OHzI3TBDk3eUxYE9dVlMkY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:d412:0:b0:56c:6f25:8b12 with SMTP id a18-20020a62d412000000b0056c6f258b12mr27322827pfh.60.1667431181026; Wed, 02 Nov 2022 16:19:41 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 2 Nov 2022 23:18:43 +0000 In-Reply-To: <20221102231911.3107438-1-seanjc@google.com> Mime-Version: 1.0 References: <20221102231911.3107438-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221102231911.3107438-17-seanjc@google.com> Subject: [PATCH 16/44] KVM: arm64: Unregister perf callbacks if hypervisor finalization fails From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Huacai Chen , Aleksandar Markovic , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Matthew Rosato , Eric Farman , Sean Christopherson , Vitaly Kuznetsov Cc: James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , Atish Patra , David Hildenbrand , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Isaku Yamahata , Fabiano Rosas , Michael Ellerman , Chao Gao , Thomas Gleixner , Yuan Yao X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748428539461503902?= X-GMAIL-MSGID: =?utf-8?q?1748428539461503902?= Undo everything done by init_subsystems() if a later initialization step fails, i.e. unregister perf callbacks in addition to unregistering the power management notifier. Fixes: bfa79a805454 ("KVM: arm64: Elevate hypervisor mappings creation at EL2") Signed-off-by: Sean Christopherson --- arch/arm64/kvm/arm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 73644def7780..f400a8c029dd 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1839,12 +1839,21 @@ static int init_subsystems(void) kvm_register_perf_callbacks(NULL); out: + if (err) + hyp_cpu_pm_exit(); + if (err || !is_protected_kvm_enabled()) on_each_cpu(_kvm_arch_hardware_disable, NULL, 1); return err; } +static void teardown_subsystems(void) +{ + kvm_unregister_perf_callbacks(); + hyp_cpu_pm_exit(); +} + static void teardown_hyp_mode(void) { int cpu; @@ -2237,7 +2246,7 @@ int kvm_arch_init(void *opaque) err = init_subsystems(); if (err) - goto out_subs; + goto out_hyp; if (!in_hyp_mode) { err = finalize_hyp_mode(); @@ -2258,7 +2267,7 @@ int kvm_arch_init(void *opaque) return 0; out_subs: - hyp_cpu_pm_exit(); + teardown_subsystems(); out_hyp: if (!in_hyp_mode) teardown_hyp_mode();