From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Haiwei Li <lihaiwei@tencent.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Sasha Levin <sashal@kernel.org>,
kvm@vger.kernel.org
Subject: [PATCH AUTOSEL 5.8 28/29] KVM: Check the allocation of pv cpu mask
Date: Mon, 14 Sep 2020 09:03:57 -0400 [thread overview]
Message-ID: <20200914130358.1804194-28-sashal@kernel.org> (raw)
In-Reply-To: <20200914130358.1804194-1-sashal@kernel.org>
From: Haiwei Li <lihaiwei@tencent.com>
[ Upstream commit 0f990222108d214a0924d920e6095b58107d7b59 ]
check the allocation of per-cpu __pv_cpu_mask. Initialize ops only when
successful.
Signed-off-by: Haiwei Li <lihaiwei@tencent.com>
Message-Id: <d59f05df-e6d3-3d31-a036-cc25a2b2f33f@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/x86/kernel/kvm.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index df63786e7bfa4..d6219f3181d63 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -638,7 +638,6 @@ static void __init kvm_guest_init(void)
}
if (pv_tlb_flush_supported()) {
- pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
pv_ops.mmu.tlb_remove_table = tlb_remove_table;
pr_info("KVM setup pv remote TLB flush\n");
}
@@ -750,6 +749,14 @@ static __init int activate_jump_labels(void)
}
arch_initcall(activate_jump_labels);
+static void kvm_free_pv_cpu_mask(void)
+{
+ unsigned int cpu;
+
+ for_each_possible_cpu(cpu)
+ free_cpumask_var(per_cpu(__pv_cpu_mask, cpu));
+}
+
static __init int kvm_alloc_cpumask(void)
{
int cpu;
@@ -768,11 +775,20 @@ static __init int kvm_alloc_cpumask(void)
if (alloc)
for_each_possible_cpu(cpu) {
- zalloc_cpumask_var_node(per_cpu_ptr(&__pv_cpu_mask, cpu),
- GFP_KERNEL, cpu_to_node(cpu));
+ if (!zalloc_cpumask_var_node(
+ per_cpu_ptr(&__pv_cpu_mask, cpu),
+ GFP_KERNEL, cpu_to_node(cpu))) {
+ goto zalloc_cpumask_fail;
+ }
}
+ apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
+ pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
return 0;
+
+zalloc_cpumask_fail:
+ kvm_free_pv_cpu_mask();
+ return -ENOMEM;
}
arch_initcall(kvm_alloc_cpumask);
--
2.25.1
next prev parent reply other threads:[~2020-09-14 14:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 13:03 [PATCH AUTOSEL 5.8 01/29] xprtrdma: Release in-flight MRs on disconnect Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 02/29] NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 03/29] phy: omap-usb2-phy: disable PHY charger detect Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 04/29] habanalabs: prevent user buff overflow Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 05/29] habanalabs: fix report of RAZWI initiator coordinates Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 06/29] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 07/29] scsi: libfc: Fix for double free() Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 08/29] scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 09/29] scsi: lpfc: Extend the RDF FPIN Registration descriptor for additional events Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 10/29] regulator: pwm: Fix machine constraints application Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 11/29] spi: spi-loopback-test: Fix out-of-bounds read Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 12/29] interconnect: Show bandwidth for disabled paths as zero in debugfs Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 13/29] NFS: Zero-stateid SETATTR should first return delegation Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 14/29] SUNRPC: stop printk reading past end of string Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 15/29] rapidio: Replace 'select' DMAENGINES 'with depends on' Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 16/29] cifs: fix DFS mount with cifsacl/modefromsid Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 17/29] kobject: Drop unneeded conditional in __kobject_del() Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 18/29] openrisc: Fix cache API compile issue when not inlining Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 19/29] nvme-fc: cancel async events before freeing event struct Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 20/29] nvme-rdma: " Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 21/29] nvme-tcp: " Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 22/29] block: only call sched requeue_request() for scheduled requests Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 23/29] f2fs: fix indefinite loop scanning for free nid Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 24/29] f2fs: Return EOF on unaligned end of file DIO read Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 25/29] i2c: algo: pca: Reapply i2c bus settings after reset Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 26/29] spi: Fix memory leak on splited transfers Sasha Levin
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 27/29] gcov: add support for GCC 10.1 Sasha Levin
2020-09-14 13:03 ` Sasha Levin [this message]
2020-09-14 13:03 ` [PATCH AUTOSEL 5.8 29/29] KVM: MIPS: Change the definition of kvm type Sasha Levin
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=20200914130358.1804194-28-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=lihaiwei@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=stable@vger.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