From: ltykernel@gmail.com
To: kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, liuwe@microsoft.com, tglx@linutronix.de,
mingo@redhat.com, bp@alien8.de, hpa@zytor.com, x86@kernel.org,
michael.h.kelley@microsoft.com
Cc: Tianyu Lan <Tianyu.Lan@microsoft.com>,
linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
vkuznets@redhat.com
Subject: [PATCH V3 2/6] x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump
Date: Tue, 24 Mar 2020 00:57:16 -0700 [thread overview]
Message-ID: <20200324075720.9462-3-Tianyu.Lan@microsoft.com> (raw)
In-Reply-To: <20200324075720.9462-1-Tianyu.Lan@microsoft.com>
From: Tianyu Lan <Tianyu.Lan@microsoft.com>
If kmsg_dump_register() fails, hv_panic_page will not be used
anywhere. So free and reset it.
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
---
Change since v1:
- Update commit log
- Remove hv_free_hyperv_page() in the error path
---
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 6478240d11ab..00a511f15926 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1385,9 +1385,13 @@ static int vmbus_bus_init(void)
hv_panic_page = (void *)hv_alloc_hyperv_zeroed_page();
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);
+ hv_free_hyperv_page(
+ (unsigned long)hv_panic_page);
+ hv_panic_page = NULL;
+ }
} else
pr_err("Hyper-V: panic message page memory "
"allocation failed");
@@ -1416,7 +1420,6 @@ static int vmbus_bus_init(void)
hv_remove_vmbus_irq();
bus_unregister(&hv_bus);
- hv_free_hyperv_page((unsigned long)hv_panic_page);
unregister_sysctl_table(hv_ctl_table_hdr);
hv_ctl_table_hdr = NULL;
return ret;
--
2.14.5
next prev parent reply other threads:[~2020-03-24 7:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 7:57 [PATCH V3 0/6] x86/Hyper-V: Panic code path fixes ltykernel
2020-03-24 7:57 ` [PATCH V3 1/6] x86/Hyper-V: Unload vmbus channel in hv panic callback ltykernel
2020-03-25 18:28 ` Michael Kelley
2020-03-24 7:57 ` ltykernel [this message]
2020-03-25 18:30 ` [PATCH V3 2/6] x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump Michael Kelley
2020-03-24 7:57 ` [PATCH V3 3/6] x86/Hyper-V: Trigger crash enlightenment only once during system crash ltykernel
2020-03-25 18:31 ` Michael Kelley
2020-03-24 7:57 ` [PATCH V3 4/6] x86/Hyper-V: Report crash register data or ksmg before running crash kernel ltykernel
2020-03-25 18:33 ` Michael Kelley
2020-03-24 7:57 ` [PATCH V3 5/6] x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set ltykernel
2020-03-25 18:34 ` Michael Kelley
2020-03-24 7:57 ` [PATCH V3 6/6] x86/Hyper-V: Report crash data in die() when panic_on_oops is set ltykernel
2020-03-25 18:36 ` Michael Kelley
2020-03-31 7:38 ` [PATCH V4 " ltykernel
2020-03-31 13:51 ` Michael Kelley
2020-03-31 14:26 ` Tianyu Lan
2020-04-01 18:53 ` Wei Liu
2020-04-02 12:51 ` Tianyu Lan
2020-03-30 10:13 ` [PATCH V3 0/6] x86/Hyper-V: Panic code path fixes Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200324075720.9462-3-Tianyu.Lan@microsoft.com \
--to=ltykernel@gmail.com \
--cc=Tianyu.Lan@microsoft.com \
--cc=bp@alien8.de \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuwe@microsoft.com \
--cc=michael.h.kelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).