lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 104/205] KVM: s390: unregister debug feature on failing arch init
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]

    Make sure the debug feature and its allocated resources get
    released upon unsuccessful architecture initialization.

    A related indication of the issue will be reported as kernel
    message.

    Signed-off-by: Michael Mueller <mimu@linux.ibm.com>
    Reviewed-by: Cornelia Huck <cohuck@redhat.com>
    Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
    Reviewed-by: David Hildenbrand <david@redhat.com>
    Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com>
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++---
    1 file changed, 14 insertions(+), 3 deletions(-)

    diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
    index 4f6adbea592b..f674a81c8868 100644
    --- a/arch/s390/kvm/kvm-s390.c
    +++ b/arch/s390/kvm/kvm-s390.c
    @@ -361,19 +361,30 @@ static void kvm_s390_cpu_feat_init(void)

    int kvm_arch_init(void *opaque)
    {
    + int rc;
    +
    kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long));
    if (!kvm_s390_dbf)
    return -ENOMEM;

    if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) {
    - debug_unregister(kvm_s390_dbf);
    - return -ENOMEM;
    + rc = -ENOMEM;
    + goto out_debug_unreg;
    }

    kvm_s390_cpu_feat_init();

    /* Register floating interrupt controller interface. */
    - return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);
    + rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);
    + if (rc) {
    + pr_err("Failed to register FLIC rc=%d\n", rc);
    + goto out_debug_unreg;
    + }
    + return 0;
    +
    +out_debug_unreg:
    + debug_unregister(kvm_s390_dbf);
    + return rc;
    }

    void kvm_arch_exit(void)
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:59    [W:4.072 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site