Skip to contentSkip to conversation

KVM: Check the allocation of pv cpu mask

PATCH Applied Haiwei Li 3 participants 4 messages Sep 1, 2020 – Sep 11, 2020

Subsystems (3)

v1 of 5 Applied Latest is v5 →

lore
Share & tools
lore

Haiwei Li

author
#0 lore raw

PATCH 1/1 KVM: Check the allocation of pv cpu mask

From: Haiwei Li <[email protected]>

check the allocation of per-cpu __pv_cpu_mask. Initialize ops only when successful.

---
 arch/x86/kernel/kvm.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
arch/x86/kernel/kvm.c +19 -4
index 08320b0b2b27..a64b894eaac0 100644
@@ -555,7 +555,6 @@ static void kvm_send_ipi_mask_allbutself(const struct cpumask *mask, int vector)
 static void kvm_setup_pv_ipi(void)
 {
 	apic->send_IPI_mask = kvm_send_ipi_mask;
-	apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
 	pr_info("setup PV IPIs\n");
 }
 
@@ -654,7 +653,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");
 	}
@@ -767,6 +765,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;
@@ -785,11 +791,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.18.4

#1 lore raw
Thank you for the patch! Yet something to improve:

Hi Haiwei,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on kvm/linux-next]
[also build test ERROR on linus/master v5.9-rc3 next-20200828] [cannot apply to linux/master vhost/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Haiwei-Li/KVM-Check-the-allocation-of-pv-cpu-mask/20200901-195412
base:   https://git.kernel.org/pub/scm/virt/kvm/kvm.git linux-next
config: x86_64-randconfig-a011-20200901 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project c10e63677f5d20f18010f8f68c631ddc97546f7d)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> arch/x86/kernel/kvm.c:801:35: error: use of undeclared identifier 'kvm_send_ipi_mask_allbutself'
           apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
                                            ^

1 error generated.

# https://github.com/0day-ci/linux/commit/13dd13ab0aefbb5c31bd8681831e6a11ac381509
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Haiwei-Li/KVM-Check-the-allocation-of-pv-cpu-mask/20200901-195412 git checkout 13dd13ab0aefbb5c31bd8681831e6a11ac381509
vim +/kvm_send_ipi_mask_allbutself +801 arch/x86/kernel/kvm.c

791
792 if (alloc)
793 for_each_possible_cpu(cpu) {
794 if (!zalloc_cpumask_var_node(
795 per_cpu_ptr(&__pv_cpu_mask, cpu),
796 GFP_KERNEL, cpu_to_node(cpu))) {
797 goto zalloc_cpumask_fail;
798 }
799 }
800

 > 801		apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;

802 pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
803 return 0;
804
805 zalloc_cpumask_fail:
806 kvm_free_pv_cpu_mask();
807 return -ENOMEM;
808 }
809 arch_initcall(kvm_alloc_cpumask);
810

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

author
#2 lore raw
Quoted 24 lines · kernel test robot

Hi Haiwei,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on kvm/linux-next]
[also build test ERROR on linus/master v5.9-rc3 next-20200828] [cannot apply to linux/master vhost/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Haiwei-Li/KVM-Check-the-allocation-of-pv-cpu-mask/20200901-195412
base:   https://git.kernel.org/pub/scm/virt/kvm/kvm.git linux-next
config: x86_64-randconfig-a011-20200901 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project c10e63677f5d20f18010f8f68c631ddc97546f7d)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64

If you fix the issue, kindly add following tag as appropriate

Quoted 8 lines

All errors (new ones prefixed by >>):

Quoted 1 line
Quoted 1 line

arch/x86/kernel/kvm.c:801:35: error: use of undeclared identifier 'kvm_send_ipi_mask_allbutself'

            apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
                                             ^
    1 error generated.

THX, i will fix and resend.

Quoted 32 lines

# https://github.com/0day-ci/linux/commit/13dd13ab0aefbb5c31bd8681831e6a11ac381509
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Haiwei-Li/KVM-Check-the-allocation-of-pv-cpu-mask/20200901-195412 git checkout 13dd13ab0aefbb5c31bd8681831e6a11ac381509
vim +/kvm_send_ipi_mask_allbutself +801 arch/x86/kernel/kvm.c

    791	
    792		if (alloc)
    793			for_each_possible_cpu(cpu) {
    794				if (!zalloc_cpumask_var_node(
    795					per_cpu_ptr(&__pv_cpu_mask, cpu),
    796					GFP_KERNEL, cpu_to_node(cpu))) {
    797					goto zalloc_cpumask_fail;
    798				}
    799			}
    800	
Quoted 1 line

801 apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;

    802		pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
    803		return 0;
    804	
    805	zalloc_cpumask_fail:
    806		kvm_free_pv_cpu_mask();
    807		return -ENOMEM;
    808	}
    809	arch_initcall(kvm_alloc_cpumask);
    810	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]

maintainer Applied
#3 lore raw
In reply to Haiwei Li
Quoted 72 lines · Haiwei Li

From: Haiwei Li <[email protected]>

check the allocation of per-cpu __pv_cpu_mask. Initialize ops only when successful.

---
 arch/x86/kernel/kvm.c | 23 +++++++++++++++++++----

 1 file changed, 19 insertions(+), 4 deletions(-)
arch/x86/kernel/kvm.c +19 -4
index 08320b0b2b27..a64b894eaac0 100644
@@ -555,7 +555,6 @@ static void kvm_send_ipi_mask_allbutself(const
 struct cpumask *mask, int vector)
  static void kvm_setup_pv_ipi(void)
  {
      apic->send_IPI_mask = kvm_send_ipi_mask;
-    apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
      pr_info("setup PV IPIs\n");
  }
@@ -654,7 +653,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");
      }
@@ -767,6 +765,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;
@@ -785,11 +791,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);
 
Signature · 1 line
2.18.4

Queued, thanks.

I am currently on leave so I am going through the patches and queuing them, but I will only push kvm/next and kvm/queue next week. kvm/master patches will be sent to Linus for the next -rc though.

Paolo