From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46428C4332F for ; Thu, 3 Nov 2022 15:30:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232237AbiKCPau (ORCPT ); Thu, 3 Nov 2022 11:30:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231260AbiKCPad (ORCPT ); Thu, 3 Nov 2022 11:30:33 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5F4E1C438 for ; Thu, 3 Nov 2022 08:30:02 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id 78so1938920pgb.13 for ; Thu, 03 Nov 2022 08:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=UyUe+HbRzSrTdJquQCMiaXWC2coZG28I37xguDaJaYg=; b=JxP3em5mMEo8M/seyYjwqQClKWueZhrkefM7iopEbtJ9U0ARhXsBBlBaHvB0YZ+mCq 7I2lDIbzgsTnUJXXFFd+Mf2MRkvMQ3d/mi120+0k+co+feliF2fGnlDGLipP3oo4jHIs yhCQnzB0LNdLsoCiyP2ThdGCDug/wevVBzx4ZCIoRVJzM62ULFanZrMyKnrfoLhgGw7L LE3NJVvLI80qGdb5QUdNBUYtcEfD6sTxNonp/rLGuh5no7R8ACiBwreWQkoFJnyoE1Nq joZ/uzznkWHqO7mwwbSR52gm1kYa+vf+hliw2Y9f1o05+cN6N5swUWJ7vJszMr5BEKoW HTcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UyUe+HbRzSrTdJquQCMiaXWC2coZG28I37xguDaJaYg=; b=I8LojCvNana1gWRWPNjyrIN0oFHYBZdLOWqUeoVOQkZF776NX7Y/G/tVInb6gBVTp3 xX6X6UZQHkpeWjL73WVEjTcbDns+VnT6WxMocEQblYDCH8wf0Q694tprqoCUI2vszh9+ tMCaCpFvAQlsetLDzwq5+a4ttnhirwQkOPnqNi++0ZIjbx7WLyWSzLs7TFc234+oYkVX S70eLcfQAx4M2WVVW3JL0J+HnybSu4cm9AtNosd9HUYKoefIrYxgnF0sVq+zh5NhdUIu iP6/Xxqi2TpQMpz+Zs+g4pa2ToCE0Wd9lAUpaJIx3JvIcTACgjdCX9p/EA+zV777h+Sm LJFQ== X-Gm-Message-State: ACrzQf0VPBxTqHBFkx0GVUKPzG0rhDSnPz5WHdXHZEP/mY/cU4UIabTa KvdQ7R5EbIFRaoELULytnydvkA== X-Google-Smtp-Source: AMsMyM6by5WQXi0G4lBZGaavWsGrxKC8DeWyAUbAtvZsM8BboB9ucyemIyMYLKoI4FadI1MlyxYOPw== X-Received: by 2002:a05:6a00:1996:b0:56d:a845:5789 with SMTP id d22-20020a056a00199600b0056da8455789mr17697890pfl.59.1667489402026; Thu, 03 Nov 2022 08:30:02 -0700 (PDT) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id f3-20020a170902f38300b0017a018221e2sm835452ple.70.2022.11.03.08.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 08:30:01 -0700 (PDT) Date: Thu, 3 Nov 2022 15:29:58 +0000 From: Sean Christopherson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: 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 , Vitaly Kuznetsov , 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 Subject: Re: [PATCH 17/44] KVM: arm64: Do arm/arch initialiation without bouncing through kvm_init() Message-ID: References: <20221102231911.3107438-1-seanjc@google.com> <20221102231911.3107438-18-seanjc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Thu, Nov 03, 2022, Philippe Mathieu-Daudé wrote: > Hi Sean, > > On 3/11/22 00:18, Sean Christopherson wrote: > > Move arm/arch specific initialization directly in arm's module_init(), > > now called kvm_arm_init(), instead of bouncing through kvm_init() to > > reach kvm_arch_init(). Invoking kvm_arch_init() is the very first action > > performed by kvm_init(), i.e. this is a glorified nop. > > > > Making kvm_arch_init() a nop will allow dropping it entirely once all > > other architectures follow suit. > > > > No functional change intended. > > > > Signed-off-by: Sean Christopherson > > --- > > arch/arm64/kvm/arm.c | 25 ++++++++++++++++--------- > > 1 file changed, 16 insertions(+), 9 deletions(-) > > > /* NOP: Compiling as a module not supported */ > > void kvm_arch_exit(void) > > { > > - kvm_unregister_perf_callbacks(); > > Doesn't this belong to the previous patch? No, but the above changelog is a lie, there is very much a functional change here. The goal of the previous patch is to fix the error paths in kvm_arch_init(), a.k.a. kvm_arm_init(). After fixing kvm_arch_init(), there are still bugs in the sequence as a whole because kvm_arch_exit() doesn't unwind other state, e.g. kvm_arch_exit() should really look something like: void kvm_arch_exit(void) { teardown_subsystems(); if (!is_kernel_in_hyp_mode()) teardown_hyp_mode(); kvm_arm_vmid_alloc_free(); if (is_protected_kvm_enabled()) ??? } Becuase although the comment "NOP: Compiling as a module not supported" is correct about KVM ARM always having to be built into the kernel, kvm_arch_exit() can still be called if a later stage of kvm_init() fails. But rather than add a patch to fix kvm_arch_exit(), I chose to fix the bug by moving code out of kvm_arch_init() so that the unwind sequence established in the previous patch could be reused. Except I managed to forget those details when writing the changelog. The changelog should instead be: KVM: arm64: Do arm/arch initialization without bouncing through kvm_init() Do arm/arch specific initialization directly in arm's module_init(), now called kvm_arm_init(), instead of bouncing through kvm_init() to reach kvm_arch_init(). Invoking kvm_arch_init() is the very first action performed by kvm_init(), so from a initialization perspective this is a glorified nop. Avoiding kvm_arch_init() also fixes a mostly benign bug as kvm_arch_exit() doesn't properly unwind if a later stage of kvm_init() fails. While the soon-to-be-deleted comment about compiling as a module being unsupported is correct, kvm_arch_exit() can still be called by kvm_init() if any step after the call to kvm_arch_init() succeeds. Add a FIXME to call out that pKVM initialization isn't unwound if kvm_init() fails, which is a pre-existing problem inherited from kvm_arch_exit(). Making kvm_arch_init() a nop will also allow dropping kvm_arch_init() and kvm_arch_exit() entirely once all other architectures follow suit.