Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
crypto-native: do not overwrite data after partial tag
[vpp.git]
/
src
/
svm
/
ssvm.h
diff --git
a/src/svm/ssvm.h
b/src/svm/ssvm.h
index
1c0373f
..
6225a63
100644
(file)
--- a/
src/svm/ssvm.h
+++ b/
src/svm/ssvm.h
@@
-37,6
+37,7
@@
#include <vppinfra/heap.h>
#include <vppinfra/pool.h>
#include <vppinfra/format.h>
#include <vppinfra/heap.h>
#include <vppinfra/pool.h>
#include <vppinfra/format.h>
+#include <vppinfra/lock.h>
#ifndef MMAP_PAGESIZE
#define MMAP_PAGESIZE (clib_mem_get_page_size())
#ifndef MMAP_PAGESIZE
#define MMAP_PAGESIZE (clib_mem_get_page_size())
@@
-81,10
+82,11
@@
typedef struct
typedef struct
{
ssvm_shared_header_t *sh;
typedef struct
{
ssvm_shared_header_t *sh;
- u64 ssvm_size;
+ uword ssvm_size;
+ uword requested_va;
u32 my_pid;
u8 *name;
u32 my_pid;
u8 *name;
- u
word requested_va;
+ u
8 numa; /**< Numa requested at alloc time */
int i_am_master;
union
int i_am_master;
union
@@
-104,7
+106,7
@@
ssvm_lock (ssvm_shared_header_t * h, u32 my_pid, u32 tag)
}
while (clib_atomic_test_and_set (&h->lock))
}
while (clib_atomic_test_and_set (&h->lock))
- ;
+
CLIB_PAUSE ()
;
h->owner_pid = my_pid;
h->recursion_count = 1;
h->owner_pid = my_pid;
h->recursion_count = 1;
@@
-115,7
+117,7
@@
always_inline void
ssvm_lock_non_recursive (ssvm_shared_header_t * h, u32 tag)
{
while (clib_atomic_test_and_set (&h->lock))
ssvm_lock_non_recursive (ssvm_shared_header_t * h, u32 tag)
{
while (clib_atomic_test_and_set (&h->lock))
- ;
+
CLIB_PAUSE ()
;
h->tag = tag;
}
h->tag = tag;
}
@@
-127,8
+129,7
@@
ssvm_unlock (ssvm_shared_header_t * h)
{
h->owner_pid = 0;
h->tag = 0;
{
h->owner_pid = 0;
h->tag = 0;
- CLIB_MEMORY_BARRIER ();
- h->lock = 0;
+ clib_atomic_release (&h->lock);
}
}
}
}
@@
-136,8
+137,7
@@
always_inline void
ssvm_unlock_non_recursive (ssvm_shared_header_t * h)
{
h->tag = 0;
ssvm_unlock_non_recursive (ssvm_shared_header_t * h)
{
h->tag = 0;
- CLIB_MEMORY_BARRIER ();
- h->lock = 0;
+ clib_atomic_release (&h->lock);
}
static inline void *
}
static inline void *