From patchwork Wed Nov 30 23:09:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 28042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1198854wrr; Wed, 30 Nov 2022 15:12:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf4lY6qlVDQ66QHflJF0HLrDsxwelTpRRI1xNS/ar3jsETeI7ho9fbik6Y5/N5uj9Ei+zB7i X-Received: by 2002:a17:90b:30c6:b0:219:11ae:265f with SMTP id hi6-20020a17090b30c600b0021911ae265fmr28283124pjb.194.1669849938273; Wed, 30 Nov 2022 15:12:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669849938; cv=none; d=google.com; s=arc-20160816; b=NArcM7vIiRIHNcGfFSIR4opwCd0Bfr7v8QmQqycTXCNyjunnMbBH1+xshLmEidvSpe 83NtprFzExXXF884o7IXVYE0xMbeqRooeID8s+PKCX7vPld3NkdjiMpp0Z0rfMTaT0jz QG9V7KKTyxPHiquJivW8sKG/PaENv1wro+polctSZdaozJ+4AS/TKAX/1BsFdbQvFmsU qiGCMmTHekj5UqXxUwvuQeVVnSeOGxGDDCpK6a+vjhLLRDa+A7ORn80VAMycqRdk0+Bn ogGRip53HFZOUXuFSrMLsXNnIjfw3D3Y6YUmjATcIpq5mEU1N+phZTj0mfoFXyhGV9IW ZgRw== 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=eiSwfPmu4ewAiGcYbvYY+86df6I0KPgxP3gGecAMxPE=; b=tRUGoIsfZh2Mv3wDNMnsQAn4wXobNmI59boNhhC/VZnlXrve2x6P7wNjWlP/1jum7h n5Bys6Y5kSpFt4kHP4NxZjzmmRk/7YSLYZsB1grevzwFDMj6K58SfnVmzo5Lytd52+Hh poW0oCvtVzGhVMhe5UnX9hJTMrGGx5WNZ2NHJd4mTz7dy+mlRv19q3Dt1Qzkt/s7LeXy EMuBhdXi/GNkCTYjaGmRo9X5NfSBUjLqgIplotSlW7WWn4AFUewEoMhdV4UrXiJmexue 0OcMJC/Wj6o0fmd8bMY1RmTphOyiE0t9C2KJ8vj7ukAW5hYxyMeTst9EpMOSMC8j1QkG wYQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iL8L003X; 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 c34-20020a631c62000000b004783ad1eb57si2547851pgm.342.2022.11.30.15.12.05; Wed, 30 Nov 2022 15:12:18 -0800 (PST) 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=iL8L003X; 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 S229965AbiK3XLg (ORCPT + 99 others); Wed, 30 Nov 2022 18:11:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbiK3XKs (ORCPT ); Wed, 30 Nov 2022 18:10:48 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1A8599F41 for ; Wed, 30 Nov 2022 15:10:06 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id q63-20020a632a42000000b0045724b1dfb9so102197pgq.3 for ; Wed, 30 Nov 2022 15:10:06 -0800 (PST) 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=eiSwfPmu4ewAiGcYbvYY+86df6I0KPgxP3gGecAMxPE=; b=iL8L003XqB+GKgCwHArr5kcxs4MyewOQ/xo1XysK8lk71q/4iO5w3SKvia9KqD7amd nXu1/r0fblzdTNOJpq/EYl9gFk0lysyFVV/7oFccNNQgU1JhwDr1/0HsYHMNLSclslmA UAtezhSD+JCAni39XkYX4QGkvZksvWY0lR4tjm/jCfiuQLeieGvg5A3LN33ihkcJ66/D QbO+O4mX6xEZLgdpufHO4gE+50I1GNIH2gNitP+ZjnsiKLl2r5s0LRLVS15/Koi+mQZn TJODgWK9oIR1COz+tFiDAPrhXmMt5j7wHvbTN67IWmBvfAG9+GHxtj6LR7jSg7tvIMuj 4E5A== 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=eiSwfPmu4ewAiGcYbvYY+86df6I0KPgxP3gGecAMxPE=; b=O3rwIwfwMA/qkW6QBX6qnwJQi/bxrM6ZOreGjtaecawkwvAfB9JjrZ0q3v9tMTgTjJ KMdHg23PwuR+aJXSOxBxO+oY/D8kfpkgwQTatKRJRC+PPpUaqvi2RtLHess3vOFgmM0j tW+lBl9//d82h0eaOxn04lqHKC2ti0lyVfpogB0YkLtJp0Y6klyVz/X7LOIRk9YExEEr VKK+CYLSpvh8ZWFTZW/4Fv3CFcLDTuQXJJdorsvkQnR60EA/ZVOqWDBvgFIjdRcCiZmB 2EzU/bl4vi4loV/Bky+CKEj7jI1dfnwiRLfSz9KQOLrrffsszTYUzFN/OpcFqvRWShXf dhXw== X-Gm-Message-State: ANoB5pnOoxsJnTvivvZPWrhvo+Awwm+qhG9QeEN00GAdoNzdB0vJVtTY wZN6EokwE1FD6GI2n7BYV9r2YqEtKCw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:ce05:b0:219:23ea:b314 with SMTP id f5-20020a17090ace0500b0021923eab314mr23130247pju.230.1669849806254; Wed, 30 Nov 2022 15:10:06 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 30 Nov 2022 23:09:01 +0000 In-Reply-To: <20221130230934.1014142-1-seanjc@google.com> Mime-Version: 1.0 References: <20221130230934.1014142-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221130230934.1014142-18-seanjc@google.com> Subject: [PATCH v2 17/50] KVM: arm64: Free hypervisor allocations if vector slot init 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 , David Woodhouse , Paul Durrant 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, Yuan Yao , Cornelia Huck , Isaku Yamahata , " =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= " , Fabiano Rosas , Michael Ellerman , Kai Huang , Chao Gao , Thomas Gleixner 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=ham 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?1750964568806848852?= X-GMAIL-MSGID: =?utf-8?q?1750964568806848852?= Teardown hypervisor mode if vector slot setup fails in order to avoid leaking any allocations done by init_hyp_mode(). Fixes: b881cdce77b4 ("KVM: arm64: Allocate hyp vectors statically") Signed-off-by: Sean Christopherson --- arch/arm64/kvm/arm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 07f5cef5c33b..fa986ebb4793 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -2237,18 +2237,18 @@ int kvm_arch_init(void *opaque) err = kvm_init_vector_slots(); if (err) { kvm_err("Cannot initialise vector slots\n"); - goto out_err; - } - - err = init_subsystems(); - if (err) goto out_hyp; + } + + err = init_subsystems(); + if (err) + goto out_subs; if (!in_hyp_mode) { err = finalize_hyp_mode(); if (err) { kvm_err("Failed to finalize Hyp protection\n"); - goto out_hyp; + goto out_subs; } } @@ -2262,8 +2262,9 @@ int kvm_arch_init(void *opaque) return 0; -out_hyp: +out_subs: hyp_cpu_pm_exit(); +out_hyp: if (!in_hyp_mode) teardown_hyp_mode(); out_err: