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

Commit 6e95bfd2 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

MIPS: KVM: Quieten kvm_info() logging 



The logging from MIPS KVM is fairly noisy with kvm_info() in places
where it shouldn't be, such as on VM creation and migration to a
different CPU. Replace these kvm_info() calls with kvm_debug().

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: kvm@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Sanjay Lal <sanjayl@kymasys.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d5c704d5

arch/mips/kvm/kvm_mips.c

+13 −14
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void kvm_mips_init_vm_percpu(void *arg) 
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

{

	if (atomic_inc_return(&kvm_mips_instance) == 1) {

		kvm_info("%s: 1st KVM instance, setup host TLB parameters\n",

		kvm_debug("%s: 1st KVM instance, setup host TLB parameters\n",

			  __func__);

		on_each_cpu(kvm_mips_init_vm_percpu, kvm, 1);

	}
@@ -181,7 +181,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 


	/* If this is the last instance, restore wired count */

	if (atomic_dec_return(&kvm_mips_instance) == 0) {

		kvm_info("%s: last KVM instance, restoring TLB parameters\n",

		kvm_debug("%s: last KVM instance, restoring TLB parameters\n",

			  __func__);

		on_each_cpu(kvm_mips_uninit_tlbs, NULL, 1);

	}
@@ -244,8 +244,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
				goto out;

			}



			kvm_info

			    ("Allocated space for Guest PMAP Table (%ld pages) @ %p\n",

			kvm_debug("Allocated space for Guest PMAP Table (%ld pages) @ %p\n",

				  npages, kvm->arch.guest_pmap);



			/* Now setup the page table */
@@ -291,7 +290,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	if (err)

		goto out_free_cpu;



	kvm_info("kvm @ %p: create cpu %d at %p\n", kvm, id, vcpu);

	kvm_debug("kvm @ %p: create cpu %d at %p\n", kvm, id, vcpu);



	/* Allocate space for host mode exception handlers that handle

	 * guest mode exits
@@ -311,7 +310,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
		err = -ENOMEM;

		goto out_free_cpu;

	}

	kvm_info("Allocated %d bytes for KVM Exception Handlers @ %p\n",

	kvm_debug("Allocated %d bytes for KVM Exception Handlers @ %p\n",

		  ALIGN(size, PAGE_SIZE), gebase);



	/* Save new ebase */
@@ -337,7 +336,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 


	/* General handler, relocate to unmapped space for sanity's sake */

	offset = 0x2000;

	kvm_info("Installing KVM Exception handlers @ %p, %#x bytes\n",

	kvm_debug("Installing KVM Exception handlers @ %p, %#x bytes\n",

		  gebase + offset,

		  mips32_GuestExceptionEnd - mips32_GuestException);
@@ -356,7 +355,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
		goto out_free_gebase;

	}



	kvm_info("Allocated COMM page @ %p\n", vcpu->arch.kseg0_commpage);

	kvm_debug("Allocated COMM page @ %p\n", vcpu->arch.kseg0_commpage);

	kvm_mips_commpage_init(vcpu);



	/* Init */

arch/mips/kvm/kvm_tlb.c

+8 −8
Original line number Diff line number Diff line
@@ -679,16 +679,16 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		    vcpu->arch.guest_user_mm.context.asid[cpu];

		newasid++;



		kvm_info("[%d]: cpu_context: %#lx\n", cpu,

		kvm_debug("[%d]: cpu_context: %#lx\n", cpu,

			  cpu_context(cpu, current->mm));

		kvm_info("[%d]: Allocated new ASID for Guest Kernel: %#x\n",

		kvm_debug("[%d]: Allocated new ASID for Guest Kernel: %#x\n",

			  cpu, vcpu->arch.guest_kernel_asid[cpu]);

		kvm_info("[%d]: Allocated new ASID for Guest User: %#x\n", cpu,

		kvm_debug("[%d]: Allocated new ASID for Guest User: %#x\n", cpu,

			  vcpu->arch.guest_user_asid[cpu]);

	}



	if (vcpu->arch.last_sched_cpu != cpu) {

		kvm_info("[%d->%d]KVM VCPU[%d] switch\n",

		kvm_debug("[%d->%d]KVM VCPU[%d] switch\n",

			  vcpu->arch.last_sched_cpu, cpu, vcpu->vcpu_id);

		/*

		 * Migrate the timer interrupt to the current CPU so that it