X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvserver-internal.h;h=ceb5d463d5c342c936cac1b99382a834deba8fa7;hb=b7249ea2dc86d5ec5494ae1b82cba8fa23cafb8b;hp=972f30181b93275ab2d0060238fb1e7d678003bb;hpb=4110d2199cb50017a71d611891e02c709cfe06a6;p=util-vserver.git diff --git a/lib/vserver-internal.h b/lib/vserver-internal.h index 972f301..ceb5d46 100644 --- a/lib/vserver-internal.h +++ b/lib/vserver-internal.h @@ -1,4 +1,4 @@ -// $Id: vserver-internal.h,v 1.1.4.14 2004/02/14 00:25:34 ensc Exp $ --*- c++ -*-- +// $Id: vserver-internal.h,v 1.25 2005/05/02 21:42:37 ensc Exp $ --*- c++ -*-- // Copyright (C) 2003 Enrico Scholz // @@ -15,41 +15,50 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#ifdef H_VSERVER_SYSCALL_INTERNAL_H +# error vserver-internal.h must not be included more than once +#endif #ifndef H_VSERVER_SYSCALL_INTERNAL_H #define H_VSERVER_SYSCALL_INTERNAL_H -#include -#include -#include -#include #include #include +#include +#include + +#include "internal.h" +#include "syscall-wrap.h" #if !defined(__NR_vserver) && defined(ENSC_SYSCALL__NR_vserver) # define __NR_vserver ENSC_SYSCALL__NR_vserver #endif +inline static ALWAYSINLINE void vc_noop0() {} + #define VC_PREFIX 0) -#define VC_SUFFIX else (void)((void)0 -#define CALL_VC_NOOP (void)0 +#define VC_SUFFIX else (void)(vc_noop0() +#define CALL_VC_NOOP vc_noop0() #define CALL_VC_GENERAL(ID, SUFFIX, FUNC, ...) \ VC_PREFIX; VC_SELECT(ID) return FUNC ## _ ## SUFFIX(__VA_ARGS__); VC_SUFFIX -#if 1 -# define VC_SELECT(ID) case ID: if(1) +#ifdef VC_MULTIVERSION_SYSCALL +# define VC_SELECT(ID) if (ver>=(ID)) # define CALL_VC(...) \ - switch (utilvserver_checkCompatVersion()&~0xff) { \ - case -1 & 0xff : if (1) break; \ - VC_SUFFIX, __VA_ARGS__ , VC_PREFIX; \ - default : errno = EINVAL; \ - } \ - return -1 + do { \ + int ver = utilvserver_checkCompatVersion(); \ + if (ver==-1) return -1; \ + VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ + errno = ENOSYS; \ + return -1; \ + } while (0) #else # define VC_SELECT(ID) if (1) -# define CALL_VC(...) \ - if (1) {} VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ - errno = ENOSYS; return -1 +# define CALL_VC(...) \ + do { \ + if (1) {} VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ + errno = ENOSYS; return -1; \ + } while (0) #endif #ifdef VC_ENABLE_API_COMPAT @@ -70,23 +79,145 @@ # define CALL_VC_V11(F,...) CALL_VC_NOOP #endif +#ifdef VC_ENABLE_API_V13 +# define CALL_VC_V13(F,...) CALL_VC_GENERAL(0x00010011, v13, F, __VA_ARGS__) +#else +# define CALL_VC_V13(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_V13 +# define CALL_VC_V13A(F,...) CALL_VC_GENERAL(0x00010012, v13, F, __VA_ARGS__) +#else +# define CALL_VC_V13A(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_V13 +# define CALL_VC_V13B(F,...) CALL_VC_GENERAL(0x00010021, v13b, F, __VA_ARGS__) +#else +# define CALL_VC_V13B(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_V13 +# define CALL_VC_V13OBS(F,...) CALL_VC_GENERAL(0x00010011, v13obs, F, __VA_ARGS__) +#else +# define CALL_VC_V13OBS(F,...) CALL_VC_NOOP +#endif + + +#ifdef VC_ENABLE_API_NET +# define CALL_VC_NET(F,...) CALL_VC_GENERAL(0x00010016, net, F, __VA_ARGS__) +#else +# define CALL_VC_NET(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_FSCOMPAT +# define CALL_VC_FSCOMPAT(F,...) CALL_VC_GENERAL(0x00010000, fscompat, F, __VA_ARGS__) +#else +# define CALL_VC_FSCOMPAT(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_OLDPROC +# define CALL_VC_OLDPROC(F,...) CALL_VC_GENERAL(0x00000000, oldproc, F, __VA_ARGS__) +#else +# define CALL_VC_OLDPROC(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_OLDUTS +# define CALL_VC_OLDUTS(F,...) CALL_VC_GENERAL(0x00000000, olduts, F, __VA_ARGS__) +#else +# define CALL_VC_OLDUTS(F,...) CALL_VC_NOOP +#endif + + + // Some kernel <-> userspace wrappers; they should be noops in most cases + #if 1 # define CTX_KERNEL2USER(X) (((X)==(uint32_t)(-1)) ? VC_NOCTX : \ ((X)==(uint32_t)(-2)) ? VC_SAMECTX : \ (xid_t)(X)) -# define CTX_USER2KERNEL(X) (((X)==VC_RANDCTX) ? (uint32_t)(-1) : \ - ((X)==VC_SAMECTX) ? (uint32_t)(-2) : \ +# define CTX_USER2KERNEL(X) (((X)==VC_DYNAMIC_XID) ? (uint32_t)(-1) : \ + ((X)==VC_SAMECTX) ? (uint32_t)(-2) : \ (uint32_t)(X)) #else # define CTX_USER2KERNEL(X) (X) # define CTX_KERNEL2USER(X) (X) #endif -#ifdef __cplusplus -extern "C" { +#if 1 +# define EXT2FLAGS_USER2KERNEL(X) (((X) & ~(VC_IMMUTABLE_FILE_FL|VC_IMMUTABLE_LINK_FL)) | \ + ((X) & VC_IMMUTABLE_FILE_FL ? EXT2_IMMUTABLE_FILE_FL : 0) | \ + ((X) & VC_IMMUTABLE_LINK_FL ? EXT2_IMMUTABLE_LINK_FL : 0)) +# define EXT2FLAGS_KERNEL2USER(X) (((X) & ~(EXT2_IMMUTABLE_FILE_FL|EXT2_IMMUTABLE_LINK_FL)) | \ + ((X) & EXT2_IMMUTABLE_FILE_FL ? VC_IMMUTABLE_FILE_FL : 0) | \ + ((X) & EXT2_IMMUTABLE_LINK_FL ? VC_IMMUTABLE_LINK_FL : 0)) +#else +# define EXT2FLAGS_KERNEL2USER(X) (X) +# define EXT2FLAGS_USER2KERNEL(X) (X) +#endif + +#if 1 +# define VHI_USER2KERNEL(X) ((((X)==vcVHI_CONTEXT) ? VHIN_CONTEXT : \ + ((X)==vcVHI_SYSNAME) ? VHIN_SYSNAME : \ + ((X)==vcVHI_NODENAME) ? VHIN_NODENAME : \ + ((X)==vcVHI_RELEASE) ? VHIN_RELEASE : \ + ((X)==vcVHI_VERSION) ? VHIN_VERSION : \ + ((X)==vcVHI_MACHINE) ? VHIN_MACHINE : \ + ((X)==vcVHI_DOMAINNAME) ? VHIN_DOMAINNAME : \ + (X))) +# define VHI_KERNEL2USER(X) ((((X)==VHIN_CONTEXT) ? vcVHI_CONTEXT : \ + ((X)==VHIN_SYSNAME) ? vcVHI_SYSNAME : \ + ((X)==VHIN_NODENAME) ? vcVHI_NODENAME : \ + ((X)==VHIN_RELEASE) ? vcVHI_RELEASE : \ + ((X)==VHIN_VERSION) ? vcVHI_VERSION : \ + ((X)==VHIN_MACHINE) ? vcVHI_MACHINE : \ + ((X)==VHIN_DOMAINNAME) ? vcVHI_DOMAINNAME : \ + (X))) +#else +# define VHI_USER2KERNEL(X) (X) +# define VHI_KERNEL2USER(X) (X) #endif +#if 1 +# define NID_KERNEL2USER(X) (((X)==(uint32_t)(-1)) ? VC_NONID : \ + (xid_t)(X)) + +# define NID_USER2KERNEL(X) (((X)==VC_DYNAMIC_NID) ? (uint32_t)(-1) : \ + (uint32_t)(X)) +#else +# define NID_USER2KERNEL(X) (X) +# define NID_KERNEL2USER(X) (X) +#endif + +#if 1 +# define NETTYPE_USER2KERNEL(X) ((X)==vcNET_IPV4 ? 0 : \ + (X)==vcNET_IPV6 ? 1 : \ + (X)==vcNET_IPV4R ? 2 : \ + (X)==vcNET_IPV6R ? 3 : \ + (X)) +# define NETTYPE_KERNEL2USER(X) ((X)==0 ? vcNET_IPV4 ? : \ + (X)==1 ? vcNET_IPV6 ? : \ + (X)==2 ? vcNET_IPV4R ? : \ + (X)==3 ? vcNET_IPV6R ? : \ + (vc_net_nx_type)(X)) +#else +# define NETTYPE_USER2KERNEL(X) (X) +# define NETTYPE_KERNEL2USER(X) (X) +#endif + +#define CDLIM_USER2KERNEL(X) ((X)==VC_CDLIM_UNSET ? CDLIM_UNSET : \ + (X)==VC_CDLIM_INFINITY ? CDLIM_INFINITY : \ + (X)==VC_CDLIM_KEEP ? CDLIM_KEEP : \ + (X)) + + /// the __typeof__ thing is a hack to deal with the kernel interface + /// using an unsigned long long value for a uint32_t type +#define CDLIM_KERNEL2USER(X) ((X)==(__typeof__(X))CDLIM_UNSET ? VC_CDLIM_UNSET : \ + (X)==(__typeof__(X))CDLIM_INFINITY ? VC_CDLIM_INFINITY : \ + (X)==(__typeof__(X))CDLIM_KEEP ? VC_CDLIM_KEEP : \ + (X)) + + #define ENSC_STRUCT_IDX(STRUCT,ATTR) \ ((char*)(&(STRUCT).ATTR) - (char*)(&(STRUCT))) #define ENSC_SAME_STRUCT_IDX(LHS,RHS,ATTR) \ @@ -96,11 +227,18 @@ extern "C" { sizeof((LHS).ATTR)==sizeof((RHS).ATTR) && \ sizeof(LHS)==sizeof(RHS)) +#define EXT2_IOC_GETCONTEXT _IOR('x', 1, long) +#define EXT2_IOC_SETCONTEXT _IOW('x', 2, long) + #ifndef HAVE_VSERVER #ifdef ENSC_SYSCALL_TRADITIONAL inline static UNUSED ALWAYSINLINE int vserver(uint32_t cmd, uint32_t id, void *data) { +#if defined __dietlibc__ + extern long int syscall (long int __sysno, ...); +#endif + return syscall(__NR_vserver, cmd, id, data); } #else @@ -110,13 +248,4 @@ _syscall3(int, vserver, #endif #endif -size_t utilvserver_uint2str(char *buf, size_t len, - unsigned int val, unsigned char base); -int utilvserver_checkCompatVersion(); - -#ifdef __cplusplus -} -#endif - - #endif // H_VSERVER_SYSCALL_INTERNAL_H