From patchwork Tue Jun 16 02:58:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1309943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mCb25KRdz9sSd; Tue, 16 Jun 2020 12:59:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jl1oX-0000du-Of; Tue, 16 Jun 2020 02:59:05 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jl1oP-0000XW-So for kernel-team@lists.ubuntu.com; Tue, 16 Jun 2020 02:58:57 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jl1oP-00064I-II for kernel-team@lists.ubuntu.com; Tue, 16 Jun 2020 02:58:57 +0000 Received: by mail-qk1-f197.google.com with SMTP id x68so15852069qkd.1 for ; Mon, 15 Jun 2020 19:58:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zCLHQqr/77Hj38woIwh6lyM8ino4IigRN+uW8wtexB4=; b=sLJHyFbApIUMuqdJuvlXWKASpvXFjdZKNLd1hKXMgdx1gD0QkZXdHLvL6hpOWtsISb kMFyFAx6tZoOosVPoCqfv+QsuiGhu2bsbtsOlVVQWC4WYHPzyU8MMkM7FrfYq/zcTKa6 4lyAeimctKekbtv5wAJ2EjWCEoITwGboNUc61b0ifSFEKs3DalH4TZhAGlnILwdvuaX7 P/jFtHWmZIjlcNP21Fjiilp8lh2viG8fhskPzMnJCzqw0Bm94hK0TbgJDd91H2l8ONCj +Az/X7BRIpxvLxv8oBOODdheJXaOWz+kU5gNs4xdEhEesRSTrUudfTHW+Zwi0A3m9IwF bvWw== X-Gm-Message-State: AOAM533QF4vFZPDsq+84rRaPUYatORWS3xfPLCQy0QlzZiWDANiPRLNW q882GtVsgw0ohazsfKvEX+umci9O6uRyh7jos76PHZKjUwyGU1zvtz2JOqH/YEbux2JdWybvz+N oxpSQPQm4/dWpwYLAgjuA7zseoydCoVaeQ1rhvMBA X-Received: by 2002:ac8:440b:: with SMTP id j11mr18767008qtn.134.1592276336268; Mon, 15 Jun 2020 19:58:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2ov//UO0/tZll0+a2atzwuCEfm+Z4Kt+ISHalwxz9SRhlhXYRr+2bKVroYjMDMYgOy61x2g== X-Received: by 2002:ac8:440b:: with SMTP id j11mr18766997qtn.134.1592276335967; Mon, 15 Jun 2020 19:58:55 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e6:18:74d9:26:da92:f043]) by smtp.gmail.com with ESMTPSA id i14sm12397109qkl.105.2020.06.15.19.58.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 19:58:55 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic:linux-azure-4.15][PATCH 5/9] x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump Date: Mon, 15 Jun 2020 23:58:38 -0300 Message-Id: <20200616025842.102415-6-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200616025842.102415-1-marcelo.cerri@canonical.com> References: <20200616025842.102415-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Tianyu Lan BugLink: http://bugs.launchpad.net/bugs/1875456 If kmsg_dump_register() fails, hv_panic_page will not be used anywhere. So free and reset it. Fixes: 81b18bce48af ("Drivers: HV: Send one page worth of kmsg dump over Hyper-V during panic") Reviewed-by: Michael Kelley Signed-off-by: Tianyu Lan Link: https://lore.kernel.org/r/20200406155331.2105-3-Tianyu.Lan@microsoft.com Signed-off-by: Wei Liu (backported from commit 7f11a2cc10a4ae3a70e2c73361f4a9a33503539b) [mc: fixed context] Signed-off-by: Marcelo Henrique Cerri --- drivers/hv/vmbus_drv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 15a6d43234c5..9b156b476669 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1204,9 +1204,13 @@ static int vmbus_bus_init(void) hv_panic_page = (void *)get_zeroed_page(GFP_KERNEL); if (hv_panic_page) { ret = kmsg_dump_register(&hv_kmsg_dumper); - if (ret) + if (ret) { pr_err("Hyper-V: kmsg dump register " "error 0x%x\n", ret); + free_page( + (unsigned long)hv_panic_page); + hv_panic_page = NULL; + } } else pr_err("Hyper-V: panic message page memory " "allocation failed"); @@ -1234,7 +1238,6 @@ static int vmbus_bus_init(void) hv_remove_vmbus_irq(); bus_unregister(&hv_bus); - free_page((unsigned long)hv_panic_page); unregister_sysctl_table(hv_ctl_table_hdr); hv_ctl_table_hdr = NULL; return ret;