From fadaf14a944cf8048556bcaa38a3d962051b812c Mon Sep 17 00:00:00 2001
From: "Li, Fei1" <fei1.li@intel.com>
Date: Wed, 16 May 2018 16:12:22 +0800
Subject: [PATCH] hv: refine atomic_xadd

1. rename atomic_xadd_int to atomic_xadd, add atomic_xadd64.
2. add atomic_add/sbu64_return, atomic_inc/dec64_return.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
---
 hypervisor/arch/x86/guest/vcpu.c       |  2 +-
 hypervisor/debug/logmsg.c              |  2 +-
 hypervisor/include/arch/x86/guest/vm.h |  2 +-
 hypervisor/include/lib/atomic.h        | 42 ++++++++++++--------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 929d03d0f..b12b3f964 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -80,7 +80,7 @@ int create_vcpu(int cpu_id, struct vm *vm, struct vcpu **rtn_vcpu_handle)
 	 * vcpu->vcpu_id = vm->hw.created_vcpus;
 	 * vm->hw.created_vcpus++;
 	 */
-	vcpu->vcpu_id = atomic_xadd_int(&vm->hw.created_vcpus, 1);
+	vcpu->vcpu_id = atomic_xadd(&vm->hw.created_vcpus, 1);
 	/* vm->hw.vcpu_array[vcpu->vcpu_id] = vcpu; */
 	atomic_store_rel_64(
 		(unsigned long *)&vm->hw.vcpu_array[vcpu->vcpu_id],
diff --git a/hypervisor/debug/logmsg.c b/hypervisor/debug/logmsg.c
index 827652101..b8be58126 100644
--- a/hypervisor/debug/logmsg.c
+++ b/hypervisor/debug/logmsg.c
@@ -52,7 +52,7 @@ DEFINE_CPU_DATA(struct shared_buf *, earlylog_sbuf);
 
 struct logmsg {
 	uint32_t flags;
-	unsigned int seq;
+	int seq;
 	spinlock_t lock;
 };
 
diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h
index 5b264a1ad..971401f9f 100644
--- a/hypervisor/include/arch/x86/guest/vm.h
+++ b/hypervisor/include/arch/x86/guest/vm.h
@@ -47,7 +47,7 @@ struct vm_attr {
 struct vm_hw_info {
 	int num_vcpus;	/* Number of total virtual cores */
 	int exp_num_vcpus;	/* Number of real expected virtual cores */
-	uint32_t created_vcpus;	/* Number of created vcpus */
+	int created_vcpus;	/* Number of created vcpus */
 	struct vcpu **vcpu_array;	/* vcpu array of this VM */
 	uint64_t gpa_lowtop;    /* top lowmem gpa of this VM */
 };
diff --git a/hypervisor/include/lib/atomic.h b/hypervisor/include/lib/atomic.h
index 0392564f3..9a30963ec 100644
--- a/hypervisor/include/lib/atomic.h
+++ b/hypervisor/include/lib/atomic.h
@@ -226,31 +226,29 @@ static inline int atomic_cmpxchg_int(unsigned int *p,
 #define atomic_load_acq_64		atomic_load_acq_long
 #define atomic_store_rel_64		atomic_store_rel_long
 
-/*
- *  #define atomic_xadd_int(P, V) \
- *  (return (*(unsigned long *)(P)); *(unsigned long *)(P) += (V);)
- */
-static inline int atomic_xadd_int(unsigned int *p, unsigned int  v)
-{
-	__asm __volatile(BUS_LOCK  "xaddl %0,%1"
-			:  "+r" (v), "+m" (*p)
-			:
-			:  "cc", "memory");
-	return v;
-}
+#define build_atomic_xadd(name, size, type, ptr, v)		\
+static inline type name(type *ptr, type v)			\
+{								\
+	asm volatile(BUS_LOCK "xadd" size " %0,%1"		\
+			: "+r" (v), "+m" (*p)			\
+			:					\
+			: "cc", "memory");			\
+	return v;						\
+ }
+build_atomic_xadd(atomic_xadd, "l", int, p, v)
+build_atomic_xadd(atomic_xadd64, "q", long, p, v)
 
-static inline int atomic_add_return(int v, unsigned int *p)
-{
-	return v + atomic_xadd_int(p, v);
-}
+#define atomic_add_return(p, v)		( atomic_xadd(p, v) + v )
+#define atomic_sub_return(p, v)		( atomic_xadd(p, -v) - v )
 
-static inline int atomic_sub_return(int v, unsigned int *p)
-{
-	return atomic_xadd_int(p, -v) - v;
-}
+#define atomic_inc_return(v)		atomic_add_return((v), 1)
+#define atomic_dec_return(v)		atomic_sub_return((v), 1)
 
-#define	atomic_inc_return(v)		atomic_add_return(1, (v))
-#define	atomic_dec_return(v)		atomic_sub_return(1, (v))
+#define atomic_add64_return(p, v)	( atomic_xadd64(p, v) + v )
+#define atomic_sub64_return(p, v)	( atomic_xadd64(p, -v) - v )
+
+#define atomic_inc64_return(v)		atomic_add64_return((v), 1)
+#define atomic_dec64_return(v)		atomic_sub64_return((v), 1)
 
 static inline int
 atomic_cmpset_long(unsigned long *dst, unsigned long expect, unsigned long src)