Skip to contentSkip to conversation

KVM: svm: inititalize hash table structures directly

PATCH In review David Hildenbrand 2 participants 2 messages Jan 24, 2017 – Feb 14, 2017

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

David Hildenbrand

author
#0 lore raw

PATCH 1/1 KVM: svm: inititalize hash table structures directly

The hashtable and guarding spinlock are global data structures, we can inititalize them statically.

Signed-off-by David Hildenbrand <[email protected]>
---
 arch/x86/kvm/svm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/svm.c +2 -4
index 08a4d3a..222b3be 100644
@@ -971,8 +971,8 @@ static void svm_disable_lbrv(struct vcpu_svm *svm)
  * a particular vCPU.
  */
 #define SVM_VM_DATA_HASH_BITS	8
-DECLARE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);
-static spinlock_t svm_vm_data_hash_lock;
+static DEFINE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);
+static DEFINE_SPINLOCK(svm_vm_data_hash_lock);
 
 /* Note:
  * This function is called from IOMMU driver to notify

@@ -1077,8 +1077,6 @@ static __init int svm_hardware_setup(void)
 		} else {
 			pr_info("AVIC enabled\n");
 
-			hash_init(svm_vm_data_hash);
-			spin_lock_init(&svm_vm_data_hash_lock);
 			amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier);
 		}
 	}
Signature · 1 line
2.9.3
Reviewed-by on v1 1/1
#1 lore raw

2017-01-24 22:21+0100, David Hildenbrand:

Quoted 5 lines

The hashtable and guarding spinlock are global data structures, we can inititalize them statically.

Signed-off-by David Hildenbrand <[email protected]>

---

Reviewed-by Radim Krčmář <[email protected]>
Quoted 30 lines
 arch/x86/kvm/svm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/svm.c +2 -4
index 08a4d3a..222b3be 100644
@@ -971,8 +971,8 @@ static void svm_disable_lbrv(struct vcpu_svm *svm)
  * a particular vCPU.
  */
 #define SVM_VM_DATA_HASH_BITS	8
-DECLARE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);
-static spinlock_t svm_vm_data_hash_lock;
+static DEFINE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS);
+static DEFINE_SPINLOCK(svm_vm_data_hash_lock);
 
 /* Note:
  * This function is called from IOMMU driver to notify

@@ -1077,8 +1077,6 @@ static __init int svm_hardware_setup(void)
 		} else {
 			pr_info("AVIC enabled\n");
 
-			hash_init(svm_vm_data_hash);
-			spin_lock_init(&svm_vm_data_hash_lock);
 			amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier);
 		}
 	}
Signature · 1 line
2.9.3