summaryrefslogtreecommitdiffstats
path: root/src/svm
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2017-06-09 06:06:49 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-07-01 13:54:28 +0000
commit58eb866b15a45514dc356170f28640d6c9db8034 (patch)
tree4717859cc843de8ebbbbb39d580d49fec2c7ceeb /src/svm
parentb1dab65a087856dc4add42586517c29734c4e1d3 (diff)
Refactor API message handling code
This is preparation for new C API. Moving common stuff to separate headers reduces dependency issues. Change-Id: Ie7adb23398de72448e5eba6c1c1da4e1bc678725 Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/svm')
-rw-r--r--src/svm/svm.h102
-rw-r--r--src/svm/svm_common.h133
2 files changed, 134 insertions, 101 deletions
diff --git a/src/svm/svm.h b/src/svm/svm.h
index 06797fa1a79..894c3d95494 100644
--- a/src/svm/svm.h
+++ b/src/svm/svm.h
@@ -24,106 +24,10 @@
#include <pthread.h>
#include <vppinfra/clib.h>
#include <vppinfra/mem.h>
+#include <svm/svm_common.h>
#define MMAP_PAGESIZE (clib_mem_get_page_size())
-#define SVM_VERSION ((1<<16) | 1) /* set to declare region ready. */
-
-#define SVM_FLAGS_MHEAP (1<<0) /* region contains an mheap */
-#define SVM_FLAGS_FILE (1<<1) /* region backed by one or more files */
-#define SVM_FLAGS_NODATA (1<<2) /* region will be further subdivided */
-#define SVM_FLAGS_NEED_DATA_INIT (1<<3)
-
-#define SVM_PVT_MHEAP_SIZE (128<<10) /* region's private mheap (128k) */
-
-typedef struct svm_region_
-{
- volatile uword version;
- pthread_mutex_t mutex;
- pthread_cond_t condvar;
- int mutex_owner_pid; /* in case of trouble */
- int mutex_owner_tag;
- uword flags;
- uword virtual_base; /* base of the region object */
- uword virtual_size;
- void *region_heap;
- void *data_base; /* data portion base address */
- void *data_heap; /* data heap, if any */
- volatile void *user_ctx; /* user context pointer */
- /* stuff allocated in the region's heap */
- uword bitmap_size; /* nbits in virtual alloc bitmap */
- uword *bitmap; /* the bitmap */
- char *region_name;
- char *backing_file;
- char **filenames;
- uword *client_pids;
- /* pad */
-
- /* next page:
- * (64K) clib heap for the region itself
- *
- * data_base -> whatever is in this region
- */
-
-} svm_region_t;
-
-typedef struct svm_map_region_args_
-{
- const char *root_path; /* NULL means use the truly global arena */
- const char *name;
- u64 baseva;
- u64 size;
- u64 pvt_heap_size;
- uword flags;
- char *backing_file;
- uword backing_mmap_size;
- /* uid, gid to own the svm region(s) */
- int uid;
- int gid;
-} svm_map_region_args_t;
-
-
-/*
- * Memory shared across all router instances. Packet buffers, etc
- * Base should be "out of the way," and size should be big enough to
- * cover everything we plan to put here.
- */
-#define SVM_GLOBAL_REGION_BASEVA 0x30000000
-#define SVM_GLOBAL_REGION_SIZE (64<<20)
-#define SVM_GLOBAL_REGION_NAME "/global_vm"
-
-/*
- * Memory shared across individual router instances.
- */
-#define SVM_OVERLAY_REGION_BASEVA \
- (SVM_GLOBAL_REGION_BASEVA + SVM_GLOBAL_REGION_SIZE)
-#define SVM_OVERLAY_REGION_SIZE (1<<20)
-#define SVM_OVERLAY_REGION_BASENAME "/overlay_vm"
-
-typedef struct
-{
- u8 *subregion_name;
-} svm_subregion_t;
-
-typedef struct
-{
- svm_subregion_t *subregions; /* subregion pool */
- uword *name_hash;
- u8 *root_path;
-} svm_main_region_t;
-
-
-void *svm_region_find_or_create (svm_map_region_args_t * a);
-void svm_region_init (void);
-void svm_region_init_chroot (const char *root_path);
-void svm_region_init_chroot_uid_gid (const char *root_path, int uid, int gid);
-void svm_region_init_args (svm_map_region_args_t * a);
-void svm_region_exit (void);
-void svm_region_unmap (void *rp_arg);
-void svm_client_scan (const char *root_path);
-void svm_client_scan_this_region_nolock (svm_region_t * rp);
-u8 *shm_name_from_svm_map_region_args (svm_map_region_args_t * a);
-
static inline void *
svm_mem_alloc (svm_region_t * rp, uword size)
{
@@ -192,10 +96,6 @@ svm_pop_heap (void *oldheap)
clib_mem_set_heap (oldheap);
}
-u8 *format_svm_region (u8 * s, va_list * args);
-
-svm_region_t *svm_get_root_rp (void);
-
#endif /* __included_svm_h__ */
/*
diff --git a/src/svm/svm_common.h b/src/svm/svm_common.h
new file mode 100644
index 00000000000..1f184432967
--- /dev/null
+++ b/src/svm/svm_common.h
@@ -0,0 +1,133 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2009 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef __included_svm_common_h__
+#define __included_svm_common_h__
+
+#include <stdarg.h>
+#include <pthread.h>
+#include <vppinfra/types.h>
+
+#define SVM_VERSION ((1<<16) | 1) /* set to declare region ready. */
+
+#define SVM_FLAGS_MHEAP (1<<0) /* region contains an mheap */
+#define SVM_FLAGS_FILE (1<<1) /* region backed by one or more files */
+#define SVM_FLAGS_NODATA (1<<2) /* region will be further subdivided */
+#define SVM_FLAGS_NEED_DATA_INIT (1<<3)
+
+#define SVM_PVT_MHEAP_SIZE (128<<10) /* region's private mheap (128k) */
+
+typedef struct svm_region_
+{
+ volatile uword version;
+ pthread_mutex_t mutex;
+ pthread_cond_t condvar;
+ int mutex_owner_pid; /* in case of trouble */
+ int mutex_owner_tag;
+ uword flags;
+ uword virtual_base; /* base of the region object */
+ uword virtual_size;
+ void *region_heap;
+ void *data_base; /* data portion base address */
+ void *data_heap; /* data heap, if any */
+ volatile void *user_ctx; /* user context pointer */
+ /* stuff allocated in the region's heap */
+ uword bitmap_size; /* nbits in virtual alloc bitmap */
+ uword *bitmap; /* the bitmap */
+ char *region_name;
+ char *backing_file;
+ char **filenames;
+ uword *client_pids;
+ /* pad */
+
+ /* next page:
+ * (64K) clib heap for the region itself
+ *
+ * data_base -> whatever is in this region
+ */
+
+} svm_region_t;
+
+typedef struct svm_map_region_args_
+{
+ const char *root_path; /* NULL means use the truly global arena */
+ const char *name;
+ u64 baseva;
+ u64 size;
+ u64 pvt_heap_size;
+ uword flags;
+ char *backing_file;
+ uword backing_mmap_size;
+ /* uid, gid to own the svm region(s) */
+ int uid;
+ int gid;
+} svm_map_region_args_t;
+
+
+/*
+ * Memory shared across all router instances. Packet buffers, etc
+ * Base should be "out of the way," and size should be big enough to
+ * cover everything we plan to put here.
+ */
+#define SVM_GLOBAL_REGION_BASEVA 0x30000000
+#define SVM_GLOBAL_REGION_SIZE (64<<20)
+#define SVM_GLOBAL_REGION_NAME "/global_vm"
+
+/*
+ * Memory shared across individual router instances.
+ */
+#define SVM_OVERLAY_REGION_BASEVA \
+ (SVM_GLOBAL_REGION_BASEVA + SVM_GLOBAL_REGION_SIZE)
+#define SVM_OVERLAY_REGION_SIZE (1<<20)
+#define SVM_OVERLAY_REGION_BASENAME "/overlay_vm"
+
+typedef struct
+{
+ u8 *subregion_name;
+} svm_subregion_t;
+
+typedef struct
+{
+ svm_subregion_t *subregions; /* subregion pool */
+ uword *name_hash;
+ u8 *root_path;
+} svm_main_region_t;
+
+
+void *svm_region_find_or_create (svm_map_region_args_t * a);
+void svm_region_init (void);
+void svm_region_init_chroot (const char *root_path);
+void svm_region_init_chroot_uid_gid (const char *root_path, int uid, int gid);
+void svm_region_init_args (svm_map_region_args_t * a);
+void svm_region_exit (void);
+void svm_region_unmap (void *rp_arg);
+void svm_client_scan (const char *root_path);
+void svm_client_scan_this_region_nolock (svm_region_t * rp);
+u8 *shm_name_from_svm_map_region_args (svm_map_region_args_t * a);
+u8 *format_svm_region (u8 * s, va_list * args);
+
+svm_region_t *svm_get_root_rp (void);
+
+#endif /* __included_svm_common_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */