iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: MMU: audit: inline audit function

Browse Source 
inline audit function and little cleanup

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Xiao Guangrong 2011-11-30 17:43:24 +08:00 committed by Avi Kivity
parent d750ea2886
commit e37fa7853c
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/x86/kvm/mmu.c
View File

@ -59,21 +59,6 @@ enum {
AUDIT_POST_SYNC AUDIT_POST_SYNC
}; };
char *audit_point_name[] = {
"pre page fault",
"post page fault",
"pre pte write",
"post pte write",
"pre sync",
"post sync"
};
#ifdef CONFIG_KVM_MMU_AUDIT
static void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point);
#else
static void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point) { }
#endif
#undef MMU_DEBUG #undef MMU_DEBUG
#ifdef MMU_DEBUG #ifdef MMU_DEBUG
@ -1539,6 +1524,13 @@ static int kvm_sync_page_transient(struct kvm_vcpu *vcpu,
return ret; return ret;
} }
#ifdef CONFIG_KVM_MMU_AUDIT
#include "mmu_audit.c"
#else
static void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point) { }
static void mmu_audit_disable(void) { }
#endif
static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
struct list_head *invalid_list) struct list_head *invalid_list)
{ {
@ -4035,12 +4027,6 @@ void kvm_mmu_destroy(struct kvm_vcpu *vcpu)
mmu_free_memory_caches(vcpu); mmu_free_memory_caches(vcpu);
} }
#ifdef CONFIG_KVM_MMU_AUDIT
#include "mmu_audit.c"
#else
static void mmu_audit_disable(void) { }
#endif
void kvm_mmu_module_exit(void) void kvm_mmu_module_exit(void)
{ {
mmu_destroy_caches(); mmu_destroy_caches();

29
arch/x86/kvm/mmu_audit.c
View File

@ -19,6 +19,15 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
char const *audit_point_name[] = {
"pre page fault",
"post page fault",
"pre pte write",
"post pte write",
"pre sync",
"post sync"
};
#define audit_printk(kvm, fmt, args...) \ #define audit_printk(kvm, fmt, args...) \
printk(KERN_ERR "audit: (%s) error: " \ printk(KERN_ERR "audit: (%s) error: " \
fmt, audit_point_name[kvm->arch.audit_point], ##args) fmt, audit_point_name[kvm->arch.audit_point], ##args)
@ -227,18 +236,22 @@ static void audit_vcpu_spte(struct kvm_vcpu *vcpu)
static bool mmu_audit; static bool mmu_audit;
static struct jump_label_key mmu_audit_key; static struct jump_label_key mmu_audit_key;
static void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point) static void __kvm_mmu_audit(struct kvm_vcpu *vcpu, int point)
{ {
static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 10); static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 10);
if (static_branch((&mmu_audit_key))) { if (!__ratelimit(&ratelimit_state))
if (!__ratelimit(&ratelimit_state)) return;
return;
vcpu->kvm->arch.audit_point = point; vcpu->kvm->arch.audit_point = point;
audit_all_active_sps(vcpu->kvm); audit_all_active_sps(vcpu->kvm);
audit_vcpu_spte(vcpu); audit_vcpu_spte(vcpu);
} }
static inline void kvm_mmu_audit(struct kvm_vcpu *vcpu, int point)
{
if (static_branch((&mmu_audit_key)))
__kvm_mmu_audit(vcpu, point);
} }
static void mmu_audit_enable(void) static void mmu_audit_enable(void)