Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76600428 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Reduce verbosity of KVM init log 



On my GICv3 system, the following is printed to the kernel log at boot:

   kvm [1]: 8-bit VMID
   kvm [1]: IDMAP page: d20e35000
   kvm [1]: HYP VA range: 800000000000:ffffffffffff
   kvm [1]: vgic-v2@2c020000
   kvm [1]: GIC system register CPU interface enabled
   kvm [1]: vgic interrupt IRQ1
   kvm [1]: virtual timer IRQ4
   kvm [1]: Hyp mode initialized successfully

The KVM IDMAP is a mapping of a statically allocated kernel structure,
and so printing its physical address leaks the physical placement of
the kernel when physical KASLR in effect. So change the kvm_info() to
kvm_debug() to remove it from the log output.

While at it, trim the output a bit more: IRQ numbers can be found in
/proc/interrupts, and the HYP VA and vgic-v2 lines are not highly
informational either.

Cc: <stable@vger.kernel.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarChristoffer Dall <cdall@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 413aa807

virt/kvm/arm/arch_timer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -771,7 +771,7 @@ int kvm_timer_hyp_init(bool has_gic) 
		static_branch_enable(&has_gic_active_state);

		static_branch_enable(&has_gic_active_state);

	}

	}





	kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);

	kvm_debug("virtual timer IRQ%d\n", host_vtimer_irq);





	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,

	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,

			  "kvm/arm/timer:starting", kvm_timer_starting_cpu,

			  "kvm/arm/timer:starting", kvm_timer_starting_cpu,

virt/kvm/arm/mmu.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1810,8 +1810,8 @@ int kvm_mmu_init(void) 
	 */

	 */

	BUG_ON((hyp_idmap_start ^ (hyp_idmap_end - 1)) & PAGE_MASK);

	BUG_ON((hyp_idmap_start ^ (hyp_idmap_end - 1)) & PAGE_MASK);





	kvm_info("IDMAP page: %lx\n", hyp_idmap_start);

	kvm_debug("IDMAP page: %lx\n", hyp_idmap_start);

	kvm_info("HYP VA range: %lx:%lx\n",

	kvm_debug("HYP VA range: %lx:%lx\n",

		  kern_hyp_va(PAGE_OFFSET), kern_hyp_va(~0UL));

		  kern_hyp_va(PAGE_OFFSET), kern_hyp_va(~0UL));





	if (hyp_idmap_start >= kern_hyp_va(PAGE_OFFSET) &&

	if (hyp_idmap_start >= kern_hyp_va(PAGE_OFFSET) &&

virt/kvm/arm/vgic/vgic-v2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,7 @@ int vgic_v2_probe(const struct gic_kvm_info *info) 
	kvm_vgic_global_state.type = VGIC_V2;

	kvm_vgic_global_state.type = VGIC_V2;

	kvm_vgic_global_state.max_gic_vcpus = VGIC_V2_MAX_CPUS;

	kvm_vgic_global_state.max_gic_vcpus = VGIC_V2_MAX_CPUS;





	kvm_info("vgic-v2@%llx\n", info->vctrl.start);

	kvm_debug("vgic-v2@%llx\n", info->vctrl.start);





	return 0;

	return 0;

out:

out: