diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-09-08 12:26:12 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-09-08 15:24:50 +0000 |
| commit | 3b64d6334b4e8d0759cff043a55042f88d1ccb0e (patch) | |
| tree | 199b79ee32c1f5eb7596b2a4a6dbc8c1290b1b59 /src/plugins/memif | |
| parent | 2234983112fb9099135fcd1da9186004cbdf6e21 (diff) | |
vlib: move linux-specific code to vlib/linux
Change-Id: Id79d2c2be7a98e15416a537c890a8f2dd6d4464d
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/memif')
| -rw-r--r-- | src/plugins/memif/memif.c | 1 | ||||
| -rw-r--r-- | src/plugins/memif/private.h | 30 |
2 files changed, 1 insertions, 30 deletions
diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c index 7e2d947f426..4c387b92f81 100644 --- a/src/plugins/memif/memif.c +++ b/src/plugins/memif/memif.c @@ -33,6 +33,7 @@ #include <vlib/vlib.h> #include <vlib/unix/unix.h> +#include <vlib/linux/syscall.h> #include <vnet/plugin/plugin.h> #include <vnet/ethernet/ethernet.h> #include <vpp/app/version.h> diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h index 985ac5ec985..b5f2f8ff55f 100644 --- a/src/plugins/memif/private.h +++ b/src/plugins/memif/private.h @@ -228,24 +228,6 @@ int memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args); int memif_delete_if (vlib_main_t * vm, memif_if_t * mif); clib_error_t *memif_plugin_api_hookup (vlib_main_t * vm); -#ifndef __NR_memfd_create -#if defined __x86_64__ -#define __NR_memfd_create 319 -#elif defined __arm__ -#define __NR_memfd_create 385 -#elif defined __aarch64__ -#define __NR_memfd_create 279 -#else -#error "__NR_memfd_create unknown for this architecture" -#endif -#endif - -static inline int -memfd_create (const char *name, unsigned int flags) -{ - return syscall (__NR_memfd_create, name, flags); -} - static_always_inline void * memif_get_buffer (memif_if_t * mif, memif_ring_t * ring, u16 slot) { @@ -253,18 +235,6 @@ memif_get_buffer (memif_if_t * mif, memif_ring_t * ring, u16 slot) return mif->regions[region].shm + ring->desc[slot].offset; } -#ifndef F_LINUX_SPECIFIC_BASE -#define F_LINUX_SPECIFIC_BASE 1024 -#endif -#define MFD_ALLOW_SEALING 0x0002U -#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) - -#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -#define F_SEAL_GROW 0x0004 /* prevent file from growing */ -#define F_SEAL_WRITE 0x0008 /* prevent writes */ - /* memif.c */ clib_error_t *memif_init_regions_and_queues (memif_if_t * mif); clib_error_t *memif_connect (memif_if_t * mif); |