Home » Mailing list archives » linux-kernel » 2007 » September » 17

[PATCH 048/104] KVM: Add and use pr_unimpl for standard formatting of unimplemented features

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Avi Kivity
Subject: [PATCH 048/104] KVM: Add and use pr_unimpl for standard formatting of unimplemented features
Date: Monday, September 17, 2007 - 1:31 am

From: Rusty Russell <rusty@rustcorp.com.au>

All guest-invokable printks should be ratelimited to prevent malicious
guests from flooding logs.  This is a start.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
 drivers/kvm/kvm.h      |    8 ++++++++
 drivers/kvm/kvm_main.c |   18 ++++++++----------
 drivers/kvm/svm.c      |    4 ++--
 drivers/kvm/vmx.c      |    2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index cfda3ab..6d25826 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -474,6 +474,14 @@ struct kvm_arch_ops {
 
 extern struct kvm_arch_ops *kvm_arch_ops;
 
+/* The guest did something we don't support. */
+#define pr_unimpl(vcpu, fmt, ...)					\
+ do {									\
+	if (printk_ratelimit())						\
+		printk(KERN_ERR "kvm: %i: cpu%i " fmt,			\
+		       current->tgid, (vcpu)->vcpu_id , ## __VA_ARGS__); \
+ } while(0)
+
 #define kvm_printf(kvm, fmt ...) printk(KERN_DEBUG fmt)
 #define vcpu_printf(vcpu, fmt...) kvm_printf(vcpu->kvm, fmt)
 
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 9de3b1a..1b86ab0 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -962,8 +962,7 @@ static int emulator_write_std(unsigned long addr,
 			      unsigned int bytes,
 			      struct kvm_vcpu *vcpu)
 {
-	printk(KERN_ERR "emulator_write_std: addr %lx n %d\n",
-	       addr, bytes);
+	pr_unimpl(vcpu, "emulator_write_std: addr %lx n %d\n", addr, bytes);
 	return X86EMUL_UNHANDLEABLE;
 }
 
@@ -1138,8 +1137,7 @@ int emulator_get_dr(struct x86_emulate_ctxt* ctxt, int dr, unsigned long *dest)
 		*dest = kvm_arch_ops->get_dr(vcpu, dr);
 		return X86EMUL_CONTINUE;
 	default:
-		printk(KERN_DEBUG "%s: unexpected dr %u\n",
-		       __FUNCTION__, dr);
+		pr_unimpl(vcpu, "%s: unexpected dr %u\n", __FUNCTION__, dr);
 		return X86EMUL_UNHANDLEABLE;
 	}
 }
@@ -1488,7 +1486,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
 		break;
 #endif
 	default:
-		printk(KERN_ERR "kvm: unhandled rdmsr: 0x%x\n", msr);
+		pr_unimpl(vcpu, "unhandled rdmsr: 0x%x\n", msr);
 		return 1;
 	}
 	*pdata = data;
@@ -1543,11 +1541,11 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 		break;
 #endif
 	case MSR_IA32_MC0_STATUS:
-		printk(KERN_WARNING "%s: MSR_IA32_MC0_STATUS 0x%llx, nop\n",
+		pr_unimpl(vcpu, "%s: MSR_IA32_MC0_STATUS 0x%llx, nop\n",
 		       __FUNCTION__, data);
 		break;
 	case MSR_IA32_MCG_STATUS:
-		printk(KERN_WARNING "%s: MSR_IA32_MCG_STATUS 0x%llx, nop\n",
+		pr_unimpl(vcpu, "%s: MSR_IA32_MCG_STATUS 0x%llx, nop\n",
 			__FUNCTION__, data);
 		break;
 	case MSR_IA32_UCODE_REV:
@@ -1567,7 +1565,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 		return vcpu_register_para(vcpu, data);
 
 	default:
-		printk(KERN_ERR "kvm: unhandled wrmsr: 0x%x\n", msr);
+		pr_unimpl(vcpu, "unhandled wrmsr: 0x%x\n", msr);
 		return 1;
 	}
 	return 0;
@@ -1798,7 +1796,7 @@ int kvm_setup_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,
 		/*
 		 * String I/O in reverse.  Yuck.  Kill the guest, fix later.
 		 */
-		printk(KERN_ERR "kvm: guest string pio down\n");
+		pr_unimpl(vcpu, "guest string pio down\n");
 		inject_gp(vcpu);
 		return 1;
 	}
@@ -1829,7 +1827,7 @@ int kvm_setup_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in,
 				ret = 1;
 		}
 	} else if (pio_dev)
-		printk(KERN_ERR "no string pio read support yet, "
+		pr_unimpl(vcpu, "no string pio read support yet, "
 		       "port %x size %d count %ld\n",
 			port, size, count);
 
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 7beaff1..3ec30d7 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -1167,7 +1167,7 @@ static int invalid_op_interception(struct vcpu_svm *svm,
 static int task_switch_interception(struct vcpu_svm *svm,
 				    struct kvm_run *kvm_run)
 {
-	printk(KERN_DEBUG "%s: task swiche is unsupported\n", __FUNCTION__);
+	pr_unimpl(&svm->vcpu, "%s: task switch is unsupported\n", __FUNCTION__);
 	kvm_run->exit_reason = KVM_EXIT_UNKNOWN;
 	return 0;
 }
@@ -1183,7 +1183,7 @@ static int emulate_on_interception(struct vcpu_svm *svm,
 				   struct kvm_run *kvm_run)
 {
 	if (emulate_instruction(&svm->vcpu, NULL, 0, 0) != EMULATE_DONE)
-		printk(KERN_ERR "%s: failed\n", __FUNCTION__);
+		pr_unimpl(&svm->vcpu, "%s: failed\n", __FUNCTION__);
 	return 1;
 }
 
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 3bf3650..ae54d9a 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1920,7 +1920,7 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 		break;
 	}
 	kvm_run->exit_reason = 0;
-	printk(KERN_ERR "kvm: unhandled control register: op %d cr %d\n",
+	pr_unimpl(vcpu, "unhandled control register: op %d cr %d\n",
 	       (int)(exit_qualification >> 4) & 3, cr);
 	return 0;
 }
-- 
1.5.3

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Nick Piggin, (Sun Sep 16, 2:29 pm)
[PATCH 000/104] KVM patch queue for the 2.6.24 merge window, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 002/104] KVM: SMP: Add vcpu_id field in struct vcpu, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 003/104] KVM: Future-proof the exit information uni ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 004/104] KVM: In-kernel string pio write support, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 005/104] KVM: Trivial: /dev/kvm interface is no lon ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 006/104] KVM: Trivial: Remove unused struct cpu_use ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 007/104] KVM: Trivial: Make decode_register() static, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 008/104] KVM: Trivial: Comment spelling may escape grep, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 009/104] KVM: Trivial: Avoid hardware_disable prede ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 010/104] KVM: Trivial: Use standard CR0 flags macro ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 011/104] KVM: Use standard CR3 flags, tighten checking, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 012/104] KVM: Use standard CR4 flags, tighten checking, Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 013/104] KVM: Trivial: Use standard BITMAP macros, ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 014/104] KVM: Set exit_reason to KVM_EXIT_MMIO wher ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 015/104] KVM: Use standard CR8 flags, and fix TPR d ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 016/104] KVM: x86 emulator: fix cmov for writeback ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 017/104] KVM: x86 emulator: fix faulty check for tw ..., Avi Kivity, (Mon Sep 17, 1:30 am)
[PATCH 018/104] KVM: Return if the pdptrs are invalid when ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 019/104] KVM: Hoist kvm_mmu_reload() out of the cri ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 020/104] KVM: Move gfn_to_page out of kmap/unmap pairs, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 021/104] KVM: VMX: Import some constants of vmcs fr ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 022/104] KVM: Remove dead code in the cmpxchg instr ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 023/104] KVM: load_pdptrs() cleanups, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 024/104] KVM: Remove arch specific components from ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 025/104] KVM: Dynamically allocate vcpus, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 026/104] KVM: VMX: Improve the method of writing vm ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 027/104] KVM: add hypercall nr to kvm_run, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 028/104] KVM: Use the scheduler preemption notifier ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 029/104] KVM: Convert vm lock to a mutex, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 030/104] KVM: fx_init() needs preemption disabled w ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 031/104] KVM: VMX: pass vcpu_vmx internally, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 032/104] KVM: Remove three magic numbers, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 033/104] KVM: SVM: de-containization, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 034/104] KVM: SVM: internal function name cleanup, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 035/104] KVM: Change the emulator_{read,write,cmpxc ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 036/104] KVM: Remove kvm_{read,write}_guest(), Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 037/104] KVM: Use kmem cache for allocating vcpus, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 038/104] KVM: Use alignment properties of vcpu to s ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 039/104] KVM: kvm_vm_ioctl_get_dirty_log restore &quot;n ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 040/104] KVM: VMX: Add cpu consistency check, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 041/104] KVM: Don't assign vcpu-&gt;cr3 if it's invali ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 042/104] KVM: Cleanup mark_page_dirty, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 043/104] KVM: SVM: Make set_msr_interception more r ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 044/104] KVM: Remove redundant alloc_vmcs_cpu decla ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 045/104] KVM: Fix defined but not used warning in d ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 046/104] KVM: Remove stat_set from debugfs, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 047/104] KVM: Remove unneeded kvm_dev_open and kvm_ ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 048/104] KVM: Add and use pr_unimpl for standard fo ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 049/104] KVM: Use kmem_cache_free for kmem_cache_za ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 050/104] KVM: VMX: Remove a duplicated ia32e mode v ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 051/104] KVM: Remove useless assignment, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 052/104] KVM: Cleanup string I/O instruction emulation, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 053/104] KVM: Clean up kvm_setup_pio(), Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 055/104] KVM: Communicate cr8 changes to userspace, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 056/104] KVM: x86 emulator: implement 'and $imm, %{ ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 057/104] KVM: x86 emulator: implement 'jmp rel' ins ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 058/104] KVM: x86 emulator: Implement 'jmp rel shor ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 059/104] KVM: x86 emulator: implement 'push reg' (o ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 060/104] KVM: VMX: allow rmode_tss_base() to work w ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 061/104] KVM: Support more memory slots, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 062/104] KVM: X86 emulator: fix 'push reg' writeback, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 063/104] KVM: VMX: Split segments reload in vmx_loa ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 064/104] KVM: Add support for in-kernel PIC emulation, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 065/104] KVM: Define and use cr8 access functions, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 066/104] KVM: Emulate local APIC in kernel, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 067/104] KVM: In-kernel I/O APIC model, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 068/104] KVM: Emulate hlt in the kernel, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 069/104] KVM: Protect in-kernel pio using kvm-&gt;lock, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 070/104] KVM: Add get/set irqchip ioctls for in-ker ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 071/104] KVM: Bypass irq_pending get/set when using ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 072/104] KVM: in-kernel IOAPIC save and restore support, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 073/104] KVM: in-kernel LAPIC save and restore support, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 074/104] KVM: pending irq save/restore, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 075/104] KVM: VMX: Use shadow TPR/cr8 for 64-bits g ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 076/104] KVM: Keep track of missed timer irq injections, Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 077/104] KVM: Migrate lapic hrtimer when vcpu moves ..., Avi Kivity, (Mon Sep 17, 1:31 am)
[PATCH 078/104] KVM: disable tpr/cr8 sync when in-kernel A ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 079/104] KVM: deliver PIC interrupt only to vcpu0, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 080/104] KVM: round robin for APIC lowest priority ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 081/104] KVM: enable in-kernel APIC INIT/SIPI handling, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 082/104] KVM: Set the ET flag in CR0 after initiali ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 083/104] KVM: Remove the unused invlpg member of st ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 084/104] KVM: Clean up unloved invlpg emulation, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 085/104] KVM: Keep control regs in sync, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 086/104] KVM: Hoist SVM's get_cs_db_l_bits into cor ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 087/104] KVM: Simplify memory allocation, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 088/104] KVM: Rename kvm_arch_ops to kvm_x86_ops, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 089/104] KVM: MMU: Don't do GFP_NOWAIT allocations, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 090/104] KVM: VMX: Move vm entry failure handling t ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 091/104] KVM: Move main vcpu loop into subarch inde ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 092/104] KVM: VMX: Fix exit qualification width on i386, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 093/104] KVM: x86 emulator: push imm8, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 094/104] KVM: x86 emulator: call near, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 095/104] KVM: x86 emulator: pushf, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 096/104] KVM: Improve emulation failure reporting, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 097/104] KVM: x86 emulator: sort opcodes into ascen ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 098/104] KVM: x86 emulator: imlpement jump conditio ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 099/104] KVM: X86 emulator: jump conditional short, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 100/104] KVM: x86 emulator: lea, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 101/104] KVM: x86 emulator: jmp abs, Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 102/104] KVM: x86 emulator: fix src, dst value init ..., Avi Kivity, (Mon Sep 17, 1:32 am)
[PATCH 103/104] KVM: x86 emulator: popf, Avi Kivity, (Mon Sep 17, 1:32 am)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Christoph Hellwig, (Mon Sep 17, 2:13 am)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Avi Kivity, (Mon Sep 17, 2:15 am)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Avi Kivity, (Mon Sep 17, 2:18 am)
git-send-email creates duplicate Message-Id's, Adrian Bunk, (Mon Sep 17, 8:59 am)
Re: [PATCH 048/104] KVM: Add and use pr_unimpl for standar ..., Joe Perches, (Mon Sep 17, 9:16 am)
Re: [PATCH 045/104] KVM: Fix defined but not used warning ..., David Miller, (Mon Sep 17, 9:27 am)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Nick Piggin, (Mon Sep 17, 10:17 am)
Re: [kvm-devel] [PATCH 045/104] KVM: Fix defined but not u ..., Avi Kivity, (Mon Sep 17, 10:35 am)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Avi Kivity, (Mon Sep 17, 11:19 am)
Re: git-send-email creates duplicate Message-Id's, Junio C Hamano, (Mon Sep 17, 1:22 pm)
Re: git-send-email creates duplicate Message-Id's, Matti Aarnio, (Mon Sep 17, 1:47 pm)
Re: [PATCH 048/104] KVM: Add and use pr_unimpl for standar ..., Rusty Russell, (Mon Sep 17, 4:08 pm)
Re: [PATCH 001/104] KVM: Fix *nopage() in kvm_main.c, Avi Kivity, (Tue Sep 18, 3:44 am)