Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp626084rwi; Wed, 2 Nov 2022 16:22:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5bpodtY3BZ3qhTLHZ2K3HdvzzJwrVdMTNPsHs0IUH7W52i3kt3CyMSByxzMo0QdishkqKi X-Received: by 2002:a17:902:e5cc:b0:187:2b02:969d with SMTP id u12-20020a170902e5cc00b001872b02969dmr14876128plf.9.1667431362584; Wed, 02 Nov 2022 16:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667431362; cv=none; d=google.com; s=arc-20160816; b=DAKISPIQAvr/GHneRkExCxaElVFx6BbYxiBspEQbSd1h8krlgmCJgJfG4+jO2WwU+8 Mk3QgM6ss6BzfohQp2Ga9MeWaDjGFxNcyKaQVJznFL8+yalVhLc4ee/Y25KmTuIYWtPz bijnKQPKPaqwCtpqwZ56QwugblrjjjSTo+XbgMEVFVSvFAetnBU+es5VOHnWLduMa9Dq p4acj9o66ur/WRDf7wCIkGyeiSbBBE4yAdRxvcb2azvCtU0lsUhvLgL8fOFPcwhztpj7 tNsk6eo5x31xgQhlB0NUliPuSE3se+TJz66gyALDeSd/GGUax9m0ORkRAm4fah0PxuZn f2lA== 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=Pp3PbLfGlbPMUpUfY94YYIKSvd3QEyEjimXY5GHh7Do=; b=GZoWCRZ5ItJ08sdXzH7Hz1gciOfj3anVnpSWPVVJPA5uCcyaqnAZ9ph8UJWGPakc1k +J/TJXwKkXccTLjbKYlxyVpjeNOAkT3jv/3t/WI5YDaaLVvpqG7qs37CGWQhYfhfppZj IxxP/q8FPK5MKyKp0oVLQo8sIcs4iP9C7PTaKhl7NmlxzglvgfMBsarbxUYccstA8lLb DHyVZ1qfQJ6F3Rdy5Q9upaIqUXvtn1TWanbb8hL+r5SSojqIeAbs44f4jBpozT+iDOvh 5slgrKfMNPYJBRJv/XxKyRS0S4grvwn9zhEuBXhYoG6wiWamtci/d92zS4/bmeqcrdW6 J5aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UkZGnXGm; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a056a00170600b0056c8da80bfcsi20255696pfc.351.2022.11.02.16.22.30; Wed, 02 Nov 2022 16:22:42 -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=UkZGnXGm; 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 S231216AbiKBXUY (ORCPT + 98 others); Wed, 2 Nov 2022 19:20:24 -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 S230368AbiKBXT4 (ORCPT ); Wed, 2 Nov 2022 19:19:56 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C777521B4 for ; Wed, 2 Nov 2022 16:19:25 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id p5-20020a170902e74500b001884ba979f8so212427plf.17 for ; Wed, 02 Nov 2022 16:19:25 -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=Pp3PbLfGlbPMUpUfY94YYIKSvd3QEyEjimXY5GHh7Do=; b=UkZGnXGmq2elzgV9DLUz74QXF30iTWbFGDiWfdaXhQTrFX8aiqCFVBpq5xcu6/5CJ0 6CAeS4zBndyLbi6uL4aOTOJPom/GUXPjp+wnaiLNi/IOKHaUUiAdDM0lQqJcKi8lJ3vx vnARJXxit3idHJ3CVkd3Epv6mh/Uh5po1QC+vmSMzcdxDA+trq8VPV/HTVpleuhXsuBJ gB5evBsfkJOotXoUamKJrE8Yp7t9k0CZooSYyZMUGEw+wssTud1LYZ35nFOFQX6SsKf7 8kThfTBVhIqoMM2+KcJViQg4ABdkLDTwvbAbS0YvwKJ8JO2nHVa2hjZQKtmcKqW09CRW 6M/w== 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=Pp3PbLfGlbPMUpUfY94YYIKSvd3QEyEjimXY5GHh7Do=; b=68oce8L+mGBkfTXMGavrbC8rg6HvIGnqU3dhmlZjYajORpdPZYS1ch9LQolQGp0mzf //sFdSDQQiL6507UAUBB4bPJhU0B987VQhJ/cHpvnrgWIfX2HOtbSIAcOh7kwNnOxSX6 0vi+1oE96MJJklI1tVITU6OOxAsWBZGs15tJFw6J3+SC2O2zMF+TGurIbfuN9HGoODna MM//nPKZnBJtjNCFnlLkm8UCptQOZ27xDx9F8vAGCa/IxtodBFSXe2qLxP1c4+Sy3V4M q1uqGz6u10hbgdl4OvVH5iHq6XZz63n7N185jNTtYTz3CvCx1YQrLd2b4nG4o6Vbq58N 4qpw== X-Gm-Message-State: ACrzQf3t15hoAI4CEo5SdBnDeyACLFmsXju9l246D3b6yBm+MCAmyDEv DQOEqg7iND5+GKqGDnCjXJHLwjJteYw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:1206:0:b0:470:18c:1489 with SMTP id h6-20020a631206000000b00470018c1489mr6904894pgl.357.1667431164538; Wed, 02 Nov 2022 16:19:24 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 2 Nov 2022 23:18:33 +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-7-seanjc@google.com> Subject: [PATCH 06/44] KVM: s390: Move hardware setup/unsetup to init/exit 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 Content-Type: text/plain; charset="UTF-8" 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 Now that kvm_arch_hardware_setup() is called immediately after kvm_arch_init(), fold the guts of kvm_arch_hardware_(un)setup() into kvm_arch_{init,exit}() as a step towards dropping one of the hooks. No functional change intended. Signed-off-by: Sean Christopherson --- arch/s390/kvm/kvm-s390.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 8395433a79b2..1aaee15211f2 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -323,21 +323,12 @@ static struct notifier_block kvm_clock_notifier = { int kvm_arch_hardware_setup(void *opaque) { - gmap_notifier.notifier_call = kvm_gmap_notifier; - gmap_register_pte_notifier(&gmap_notifier); - vsie_gmap_notifier.notifier_call = kvm_s390_vsie_gmap_notifier; - gmap_register_pte_notifier(&vsie_gmap_notifier); - atomic_notifier_chain_register(&s390_epoch_delta_notifier, - &kvm_clock_notifier); return 0; } void kvm_arch_hardware_unsetup(void) { - gmap_unregister_pte_notifier(&gmap_notifier); - gmap_unregister_pte_notifier(&vsie_gmap_notifier); - atomic_notifier_chain_unregister(&s390_epoch_delta_notifier, - &kvm_clock_notifier); + } static void allow_cpu_feat(unsigned long nr) @@ -517,6 +508,13 @@ int kvm_arch_init(void *opaque) if (rc) goto err_gib; + gmap_notifier.notifier_call = kvm_gmap_notifier; + gmap_register_pte_notifier(&gmap_notifier); + vsie_gmap_notifier.notifier_call = kvm_s390_vsie_gmap_notifier; + gmap_register_pte_notifier(&vsie_gmap_notifier); + atomic_notifier_chain_register(&s390_epoch_delta_notifier, + &kvm_clock_notifier); + return 0; err_gib: @@ -533,6 +531,11 @@ int kvm_arch_init(void *opaque) void kvm_arch_exit(void) { + gmap_unregister_pte_notifier(&gmap_notifier); + gmap_unregister_pte_notifier(&vsie_gmap_notifier); + atomic_notifier_chain_unregister(&s390_epoch_delta_notifier, + &kvm_clock_notifier); + kvm_s390_gib_destroy(); if (IS_ENABLED(CONFIG_VFIO_PCI_ZDEV_KVM)) kvm_s390_pci_exit(); -- 2.38.1.431.g37b22c650d-goog