From 59365d1fc365243af486d1086e55889ca21352d5 Mon Sep 17 00:00:00 2001 From: eeb Date: Thu, 29 Sep 2005 12:13:04 +0000 Subject: [PATCH] * More PORTALS -> LND renaming --- lnet/include/libcfs/darwin/kp30.h | 2 +- lnet/include/libcfs/darwin/libcfs.h | 2 +- lnet/include/libcfs/kp30.h | 241 +++++++++++++++++----------------- lnet/include/libcfs/libcfs.h | 16 +-- lnet/include/libcfs/linux/libcfs.h | 2 +- lnet/include/lnet/lib-lnet.h | 30 ++--- lnet/klnds/gmlnd/gmlnd.h | 2 +- lnet/klnds/gmlnd/gmlnd_api.c | 16 +-- lnet/klnds/gmlnd/gmlnd_cb.c | 2 +- lnet/klnds/gmlnd/gmlnd_utils.c | 18 +-- lnet/klnds/iiblnd/iiblnd.c | 56 ++++---- lnet/klnds/iiblnd/iiblnd.h | 2 +- lnet/klnds/iiblnd/iiblnd_cb.c | 26 ++-- lnet/klnds/openiblnd/openiblnd.c | 54 ++++---- lnet/klnds/openiblnd/openiblnd.h | 2 +- lnet/klnds/openiblnd/openiblnd_cb.c | 10 +- lnet/klnds/ptllnd/ptllnd.c | 26 ++-- lnet/klnds/ptllnd/ptllnd.h | 10 +- lnet/klnds/ptllnd/ptllnd_cb.c | 4 +- lnet/klnds/ptllnd/ptllnd_peer.c | 6 +- lnet/klnds/ptllnd/ptllnd_proc.c | 8 +- lnet/klnds/ptllnd/ptllnd_rx_buf.c | 12 +- lnet/klnds/ptllnd/ptllnd_tx.c | 4 +- lnet/klnds/qswlnd/qswlnd.c | 26 ++-- lnet/klnds/qswlnd/qswlnd.h | 6 +- lnet/klnds/qswlnd/qswlnd_cb.c | 2 +- lnet/klnds/ralnd/ralnd.c | 50 +++---- lnet/klnds/ralnd/ralnd.h | 2 +- lnet/klnds/ralnd/ralnd_cb.c | 2 +- lnet/klnds/socklnd/socklnd.c | 62 ++++----- lnet/klnds/socklnd/socklnd.h | 6 +- lnet/klnds/socklnd/socklnd_cb.c | 14 +- lnet/klnds/viblnd/viblnd.c | 64 ++++----- lnet/klnds/viblnd/viblnd.h | 2 +- lnet/klnds/viblnd/viblnd_cb.c | 8 +- lnet/libcfs/darwin/darwin-curproc.c | 2 +- lnet/libcfs/darwin/darwin-debug.c | 2 +- lnet/libcfs/darwin/darwin-fs.c | 2 +- lnet/libcfs/darwin/darwin-mem.c | 2 +- lnet/libcfs/darwin/darwin-module.c | 22 ++-- lnet/libcfs/darwin/darwin-prim.c | 2 +- lnet/libcfs/darwin/darwin-proc.c | 2 +- lnet/libcfs/darwin/darwin-sync.c | 2 +- lnet/libcfs/darwin/darwin-tracefile.c | 2 +- lnet/libcfs/darwin/darwin-utils.c | 2 +- lnet/libcfs/debug.c | 33 ++--- lnet/libcfs/linux/linux-curproc.c | 2 +- lnet/libcfs/linux/linux-debug.c | 2 +- lnet/libcfs/linux/linux-fs.c | 2 +- lnet/libcfs/linux/linux-lock.c | 2 +- lnet/libcfs/linux/linux-lwt.c | 2 +- lnet/libcfs/linux/linux-mem.c | 2 +- lnet/libcfs/linux/linux-module.c | 34 ++--- lnet/libcfs/linux/linux-prim.c | 2 +- lnet/libcfs/linux/linux-proc.c | 14 +- lnet/libcfs/linux/linux-sync.c | 2 +- lnet/libcfs/linux/linux-tcpip.c | 16 +-- lnet/libcfs/linux/linux-tracefile.c | 2 +- lnet/libcfs/linux/linux-utils.c | 2 +- lnet/libcfs/lwt.c | 6 +- lnet/libcfs/module.c | 94 ++++++------- lnet/libcfs/nidstrings.c | 28 ++-- lnet/libcfs/tracefile.c | 2 +- lnet/libcfs/watchdog.c | 6 +- lnet/lnet/acceptor.c | 4 +- lnet/lnet/api-ni.c | 40 +++--- lnet/lnet/config.c | 40 +++--- lnet/lnet/lib-eq.c | 6 +- lnet/lnet/lib-md.c | 2 +- lnet/lnet/lib-me.c | 2 +- lnet/lnet/lib-move.c | 30 ++--- lnet/lnet/lib-msg.c | 2 +- lnet/lnet/module.c | 10 +- lnet/lnet/peer.c | 18 +-- lnet/lnet/router.c | 46 +++---- lnet/lnet/router_proc.c | 36 ++--- lnet/tests/ping_cli.c | 16 +-- lnet/tests/ping_srv.c | 8 +- lnet/tests/sping_cli.c | 16 +-- lnet/tests/sping_srv.c | 8 +- lnet/tests/ut_cli.c | 6 +- lnet/tests/ut_srv.c | 8 +- lnet/ulnds/ptllnd/ptllnd.c | 20 +-- lnet/ulnds/ptllnd/ptllnd.h | 2 +- lnet/ulnds/ptllnd/ptllnd_cb.c | 24 ++-- lnet/ulnds/socklnd/connection.c | 2 +- lnet/ulnds/socklnd/debug.c | 129 ------------------ lnet/ulnds/socklnd/select.c | 2 +- lnet/utils/debug.c | 34 ++--- lnet/utils/l_ioctl.c | 6 +- lnet/utils/portals.c | 190 +++++++++++++-------------- 91 files changed, 829 insertions(+), 966 deletions(-) delete mode 100644 lnet/ulnds/socklnd/debug.c diff --git a/lnet/include/libcfs/darwin/kp30.h b/lnet/include/libcfs/darwin/kp30.h index 3f85b62..fbfccd2 100644 --- a/lnet/include/libcfs/darwin/kp30.h +++ b/lnet/include/libcfs/darwin/kp30.h @@ -84,7 +84,7 @@ typedef struct { /* -------------------------------------------------------------------------- */ -#define IOCTL_PORTAL_TYPE struct portal_ioctl_data +#define IOCTL_PORTAL_TYPE struct libcfs_ioctl_data #define LPU64 "%llu" #define LPD64 "%lld" diff --git a/lnet/include/libcfs/darwin/libcfs.h b/lnet/include/libcfs/darwin/libcfs.h index 8e4eb89..3e96748 100644 --- a/lnet/include/libcfs/darwin/libcfs.h +++ b/lnet/include/libcfs/darwin/libcfs.h @@ -155,7 +155,7 @@ __entry_nesting(&__cdd); /* ENTRY_NESTING_SUPPORT */ #endif -#define LUSTRE_PTL_PID 12345 +#define LUSTRE_LNET_PID 12345 #define _XNU_LIBCFS_H diff --git a/lnet/include/libcfs/kp30.h b/lnet/include/libcfs/kp30.h index fc13061..1c89acc 100644 --- a/lnet/include/libcfs/kp30.h +++ b/lnet/include/libcfs/kp30.h @@ -4,7 +4,7 @@ #ifndef __LIBCFS_KP30_H__ #define __LIBCFS_KP30_H__ -#define PORTAL_DEBUG +#define LIBCFS_DEBUG #include #if defined(__linux__) @@ -21,7 +21,7 @@ #ifdef __KERNEL__ -#ifdef PORTAL_DEBUG +#ifdef LIBCFS_DEBUG #define LASSERT(e) ((e) ? 0 : libcfs_assertion_failed( #e , __FILE__, \ __FUNCTION__, __LINE__)) #define LASSERTF(cond, fmt...) \ @@ -39,46 +39,46 @@ #define LASSERTF(cond, fmt...) do { } while (0) #endif -/* LBUG_WITH_LOC defined in portals//kp30.h */ +/* LBUG_WITH_LOC defined in lnet//kp30.h */ #define LBUG() LBUG_WITH_LOC(__FILE__, __FUNCTION__, __LINE__) /* * Memory */ -#ifdef PORTAL_DEBUG +#ifdef LIBCFS_DEBUG extern atomic_t libcfs_kmemory; -# define portal_kmem_inc(ptr, size) \ -do { \ - atomic_add(size, &libcfs_kmemory); \ +# define libcfs_kmem_inc(ptr, size) \ +do { \ + atomic_add(size, &libcfs_kmemory); \ } while (0) -# define portal_kmem_dec(ptr, size) do { \ - atomic_sub(size, &libcfs_kmemory); \ +# define libcfs_kmem_dec(ptr, size) do { \ + atomic_sub(size, &libcfs_kmemory); \ } while (0) #else -# define portal_kmem_inc(ptr, size) do {} while (0) -# define portal_kmem_dec(ptr, size) do {} while (0) -#endif /* PORTAL_DEBUG */ +# define libcfs_kmem_inc(ptr, size) do {} while (0) +# define libcfs_kmem_dec(ptr, size) do {} while (0) +#endif /* LIBCFS_DEBUG */ -#define PORTAL_VMALLOC_SIZE 16384 +#define LIBCFS_VMALLOC_SIZE 16384 -#define PORTAL_ALLOC_GFP(ptr, size, mask) \ +#define LIBCFS_ALLOC_GFP(ptr, size, mask) \ do { \ LASSERT(!in_interrupt() || \ - (size <= PORTAL_VMALLOC_SIZE && mask == CFS_ALLOC_ATOMIC));\ - if ((size) > PORTAL_VMALLOC_SIZE) \ + (size <= LIBCFS_VMALLOC_SIZE && mask == CFS_ALLOC_ATOMIC));\ + if ((size) > LIBCFS_VMALLOC_SIZE) \ (ptr) = cfs_alloc_large(size); \ else \ (ptr) = cfs_alloc((size), (mask)); \ if ((ptr) == NULL) { \ - CERROR("PORTALS: out of memory at %s:%d (tried to alloc '"\ + CERROR("LNET: out of memory at %s:%d (tried to alloc '" \ #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));\ - CERROR("PORTALS: %d total bytes allocated by portals\n", \ + CERROR("LNET: %d total bytes allocated by lnet\n", \ atomic_read(&libcfs_kmemory)); \ } else { \ - portal_kmem_inc((ptr), (size)); \ + libcfs_kmem_inc((ptr), (size)); \ if (!((mask) & CFS_ALLOC_ZERO)) \ memset((ptr), 0, (size)); \ } \ @@ -86,25 +86,25 @@ do { \ (int)(size), (ptr), atomic_read (&libcfs_kmemory)); \ } while (0) -#define PORTAL_ALLOC(ptr, size) \ - PORTAL_ALLOC_GFP(ptr, size, CFS_ALLOC_IO) +#define LIBCFS_ALLOC(ptr, size) \ + LIBCFS_ALLOC_GFP(ptr, size, CFS_ALLOC_IO) -#define PORTAL_ALLOC_ATOMIC(ptr, size) \ - PORTAL_ALLOC_GFP(ptr, size, CFS_ALLOC_ATOMIC) +#define LIBCFS_ALLOC_ATOMIC(ptr, size) \ + LIBCFS_ALLOC_GFP(ptr, size, CFS_ALLOC_ATOMIC) -#define PORTAL_FREE(ptr, size) \ +#define LIBCFS_FREE(ptr, size) \ do { \ int s = (size); \ if ((ptr) == NULL) { \ - CERROR("PORTALS: free NULL '" #ptr "' (%d bytes) at " \ + CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at " \ "%s:%d\n", s, __FILE__, __LINE__); \ break; \ } \ - if (s > PORTAL_VMALLOC_SIZE) \ + if (s > LIBCFS_VMALLOC_SIZE) \ cfs_free_large(ptr); \ else \ cfs_free(ptr); \ - portal_kmem_dec((ptr), s); \ + libcfs_kmem_dec((ptr), s); \ CDEBUG(D_MALLOC, "kfreed '" #ptr "': %d at %p (tot %d).\n", \ s, (ptr), atomic_read(&libcfs_kmemory)); \ } while (0) @@ -168,21 +168,18 @@ void libcfs_debug_dumpstack(cfs_task_t *tsk); void libcfs_run_upcall(char **argv); void libcfs_run_lbug_upcall(char * file, const char *fn, const int line); void libcfs_debug_dumplog(void); -int portals_debug_init(unsigned long bufsize); -int portals_debug_cleanup(void); -int portals_debug_clear_buffer(void); -int portals_debug_mark_buffer(char *text); -int portals_debug_set_daemon(unsigned int cmd, unsigned int length, - char *file, unsigned int size); -__s32 portals_debug_copy_to_user(char *buf, unsigned long len); +int libcfs_debug_init(unsigned long bufsize); +int libcfs_debug_cleanup(void); +int libcfs_debug_clear_buffer(void); +int libcfs_debug_mark_buffer(char *text); -void portals_debug_set_level(unsigned int debug_level); +void libcfs_debug_set_level(unsigned int debug_level); extern void libcfs_daemonize (char *name); extern void libcfs_blockallsigs (void); #else /* !__KERNEL__ */ -# ifdef PORTAL_DEBUG +# ifdef LIBCFS_DEBUG # undef NDEBUG # include # define LASSERT(e) assert(e) @@ -198,8 +195,8 @@ do { \ # endif # define LBUG() assert(0) # define printk(format, args...) printf (format, ## args) -# define PORTAL_ALLOC(ptr, size) do { (ptr) = malloc(size); } while (0); -# define PORTAL_FREE(a, b) do { free(a); } while (0); +# define LIBCFS_ALLOC(ptr, size) do { (ptr) = malloc(size); } while (0); +# define LIBCFS_FREE(a, b) do { free(a); } while (0); void libcfs_debug_dumplog(void); #endif @@ -220,26 +217,26 @@ void libcfs_debug_dumplog(void); #define CLASSERT(cond) ({ switch(42) { case (cond): case 0: break; } }) /* support decl needed both by kernel and liblustre */ -int libcfs_isknown_lnd(int type); -char *libcfs_lnd2modname(int type); -char *libcfs_lnd2str(int type); -int libcfs_str2lnd(char *str); -char *libcfs_net2str(__u32 net); -char *libcfs_nid2str(lnet_nid_t nid); -__u32 libcfs_str2net(char *str); +int libcfs_isknown_lnd(int type); +char *libcfs_lnd2modname(int type); +char *libcfs_lnd2str(int type); +int libcfs_str2lnd(char *str); +char *libcfs_net2str(__u32 net); +char *libcfs_nid2str(lnet_nid_t nid); +__u32 libcfs_str2net(char *str); lnet_nid_t libcfs_str2nid(char *str); -int libcfs_str2anynid(lnet_nid_t *nid, char *str); -char *libcfs_id2str(lnet_process_id_t id); -void libcfs_setnet0alias(int type); - -/* how a lustre portals NID encodes net:address */ -#define PTL_NIDADDR(nid) ((__u32)((nid) & 0xffffffff)) -#define PTL_NIDNET(nid) ((__u32)(((nid) >> 32)) & 0xffffffff) -#define PTL_MKNID(net,addr) ((((__u64)(net))<<32)|((__u64)(addr))) +int libcfs_str2anynid(lnet_nid_t *nid, char *str); +char *libcfs_id2str(lnet_process_id_t id); +void libcfs_setnet0alias(int type); + +/* how an LNET NID encodes net:address */ +#define LNET_NIDADDR(nid) ((__u32)((nid) & 0xffffffff)) +#define LNET_NIDNET(nid) ((__u32)(((nid) >> 32)) & 0xffffffff) +#define LNET_MKNID(net,addr) ((((__u64)(net))<<32)|((__u64)(addr))) /* how net encodes type:number */ -#define PTL_NETNUM(net) ((net) & 0xffff) -#define PTL_NETTYP(net) (((net) >> 16) & 0xffff) -#define PTL_MKNET(typ,num) ((((__u32)(typ))<<16)|((__u32)(num))) +#define LNET_NETNUM(net) ((net) & 0xffff) +#define LNET_NETTYP(net) (((net) >> 16) & 0xffff) +#define LNET_MKNET(typ,num) ((((__u32)(typ))<<16)|((__u32)(num))) #ifndef CURRENT_TIME # define CURRENT_TIME time(0) @@ -251,10 +248,10 @@ void libcfs_setnet0alias(int type); * All stuff about lwt are put in arch/kp30.h * -------------------------------------------------------------------- */ -struct portals_device_userstate +struct libcfs_device_userstate { - int pdu_memhog_pages; - cfs_page_t *pdu_memhog_root_page; + int ldu_memhog_pages; + cfs_page_t *ldu_memhog_root_page; }; #include @@ -263,9 +260,9 @@ struct portals_device_userstate * USER LEVEL STUFF BELOW */ -#define PORTAL_IOCTL_VERSION 0x0001000a +#define LIBCFS_IOCTL_VERSION 0x0001000a -struct portal_ioctl_data { +struct libcfs_ioctl_data { __u32 ioc_len; __u32 ioc_version; @@ -291,29 +288,29 @@ struct portal_ioctl_data { }; -struct portal_ioctl_hdr { +struct libcfs_ioctl_hdr { __u32 ioc_len; __u32 ioc_version; }; -struct portals_debug_ioctl_data +struct libcfs_debug_ioctl_data { - struct portal_ioctl_hdr hdr; + struct libcfs_ioctl_hdr hdr; unsigned int subs; unsigned int debug; }; -#define PORTAL_IOC_INIT(data) \ +#define LIBCFS_IOC_INIT(data) \ do { \ memset(&data, 0, sizeof(data)); \ - data.ioc_version = PORTAL_IOCTL_VERSION; \ + data.ioc_version = LIBCFS_IOCTL_VERSION; \ data.ioc_len = sizeof(data); \ } while (0) /* FIXME check conflict with lustre_lib.h */ -#define PTL_IOC_DEBUG_MASK _IOWR('f', 250, long) +#define LIBCFS_IOC_DEBUG_MASK _IOWR('f', 250, long) -static inline int portal_ioctl_packlen(struct portal_ioctl_data *data) +static inline int libcfs_ioctl_packlen(struct libcfs_ioctl_data *data) { int len = sizeof(*data); len += size_round(data->ioc_inllen1); @@ -321,79 +318,79 @@ static inline int portal_ioctl_packlen(struct portal_ioctl_data *data) return len; } -static inline int portal_ioctl_is_invalid(struct portal_ioctl_data *data) +static inline int libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data) { if (data->ioc_len > (1<<30)) { - CERROR ("PORTALS ioctl: ioc_len larger than 1<<30\n"); + CERROR ("LIBCFS ioctl: ioc_len larger than 1<<30\n"); return 1; } if (data->ioc_inllen1 > (1<<30)) { - CERROR ("PORTALS ioctl: ioc_inllen1 larger than 1<<30\n"); + CERROR ("LIBCFS ioctl: ioc_inllen1 larger than 1<<30\n"); return 1; } if (data->ioc_inllen2 > (1<<30)) { - CERROR ("PORTALS ioctl: ioc_inllen2 larger than 1<<30\n"); + CERROR ("LIBCFS ioctl: ioc_inllen2 larger than 1<<30\n"); return 1; } if (data->ioc_inlbuf1 && !data->ioc_inllen1) { - CERROR ("PORTALS ioctl: inlbuf1 pointer but 0 length\n"); + CERROR ("LIBCFS ioctl: inlbuf1 pointer but 0 length\n"); return 1; } if (data->ioc_inlbuf2 && !data->ioc_inllen2) { - CERROR ("PORTALS ioctl: inlbuf2 pointer but 0 length\n"); + CERROR ("LIBCFS ioctl: inlbuf2 pointer but 0 length\n"); return 1; } if (data->ioc_pbuf1 && !data->ioc_plen1) { - CERROR ("PORTALS ioctl: pbuf1 pointer but 0 length\n"); + CERROR ("LIBCFS ioctl: pbuf1 pointer but 0 length\n"); return 1; } if (data->ioc_pbuf2 && !data->ioc_plen2) { - CERROR ("PORTALS ioctl: pbuf2 pointer but 0 length\n"); + CERROR ("LIBCFS ioctl: pbuf2 pointer but 0 length\n"); return 1; } if (data->ioc_plen1 && !data->ioc_pbuf1) { - CERROR ("PORTALS ioctl: plen1 nonzero but no pbuf1 pointer\n"); + CERROR ("LIBCFS ioctl: plen1 nonzero but no pbuf1 pointer\n"); return 1; } if (data->ioc_plen2 && !data->ioc_pbuf2) { - CERROR ("PORTALS ioctl: plen2 nonzero but no pbuf2 pointer\n"); + CERROR ("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n"); return 1; } - if (portal_ioctl_packlen(data) != data->ioc_len ) { - CERROR ("PORTALS ioctl: packlen != ioc_len\n"); + if (libcfs_ioctl_packlen(data) != data->ioc_len ) { + CERROR ("LIBCFS ioctl: packlen != ioc_len\n"); return 1; } if (data->ioc_inllen1 && data->ioc_bulk[data->ioc_inllen1 - 1] != '\0') { - CERROR ("PORTALS ioctl: inlbuf1 not 0 terminated\n"); + CERROR ("LIBCFS ioctl: inlbuf1 not 0 terminated\n"); return 1; } if (data->ioc_inllen2 && data->ioc_bulk[size_round(data->ioc_inllen1) + data->ioc_inllen2 - 1] != '\0') { - CERROR ("PORTALS ioctl: inlbuf2 not 0 terminated\n"); + CERROR ("LIBCFS ioctl: inlbuf2 not 0 terminated\n"); return 1; } return 0; } #ifndef __KERNEL__ -static inline int portal_ioctl_pack(struct portal_ioctl_data *data, char **pbuf, +static inline int libcfs_ioctl_pack(struct libcfs_ioctl_data *data, char **pbuf, int max) { char *ptr; - struct portal_ioctl_data *overlay; - data->ioc_len = portal_ioctl_packlen(data); - data->ioc_version = PORTAL_IOCTL_VERSION; + struct libcfs_ioctl_data *overlay; + data->ioc_len = libcfs_ioctl_packlen(data); + data->ioc_version = LIBCFS_IOCTL_VERSION; - if (*pbuf && portal_ioctl_packlen(data) > max) + if (*pbuf && libcfs_ioctl_packlen(data) > max) return 1; if (*pbuf == NULL) { *pbuf = malloc(data->ioc_len); } if (!*pbuf) return 1; - overlay = (struct portal_ioctl_data *)*pbuf; + overlay = (struct libcfs_ioctl_data *)*pbuf; memcpy(*pbuf, data, sizeof(*data)); ptr = overlay->ioc_bulk; @@ -401,7 +398,7 @@ static inline int portal_ioctl_pack(struct portal_ioctl_data *data, char **pbuf, LOGL(data->ioc_inlbuf1, data->ioc_inllen1, ptr); if (data->ioc_inlbuf2) LOGL(data->ioc_inlbuf2, data->ioc_inllen2, ptr); - if (portal_ioctl_is_invalid(overlay)) + if (libcfs_ioctl_is_invalid(overlay)) return 1; return 0; @@ -409,46 +406,46 @@ static inline int portal_ioctl_pack(struct portal_ioctl_data *data, char **pbuf, #else -extern int portal_ioctl_getdata(char *buf, char *end, void *arg); +extern int libcfs_ioctl_getdata(char *buf, char *end, void *arg); #endif /* ioctls for manipulating snapshots 30- */ -#define IOC_PORTAL_TYPE 'e' -#define IOC_PORTAL_MIN_NR 30 +#define IOC_LIBCFS_TYPE 'e' +#define IOC_LIBCFS_MIN_NR 30 /* libcfs ioctls */ -#define IOC_PORTAL_PANIC _IOWR('e', 30, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_CLEAR_DEBUG _IOWR('e', 31, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_MARK_DEBUG _IOWR('e', 32, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_LWT_CONTROL _IOWR('e', 33, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_LWT_SNAPSHOT _IOWR('e', 34, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_LWT_LOOKUP_STRING _IOWR('e', 35, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_MEMHOG _IOWR('e', 36, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_PING _IOWR('e', 37, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_PANIC _IOWR('e', 30, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_CLEAR_DEBUG _IOWR('e', 31, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_MARK_DEBUG _IOWR('e', 32, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_LWT_CONTROL _IOWR('e', 33, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_LWT_SNAPSHOT _IOWR('e', 34, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_LWT_LOOKUP_STRING _IOWR('e', 35, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_MEMHOG _IOWR('e', 36, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_PING _IOWR('e', 37, IOCTL_PORTAL_TYPE) /* lnet ioctls */ -#define IOC_PORTAL_GET_NI _IOWR('e', 50, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_FAIL_NID _IOWR('e', 51, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_ADD_ROUTE _IOWR('e', 52, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_DEL_ROUTE _IOWR('e', 53, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_ROUTE _IOWR('e', 54, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_NOTIFY_ROUTER _IOWR('e', 55, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_UNCONFIGURE _IOWR('e', 56, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_PORTALS_COMPATIBILITY _IOWR('e', 57, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_NI _IOWR('e', 50, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_FAIL_NID _IOWR('e', 51, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_ADD_ROUTE _IOWR('e', 52, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_DEL_ROUTE _IOWR('e', 53, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_ROUTE _IOWR('e', 54, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_NOTIFY_ROUTER _IOWR('e', 55, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_UNCONFIGURE _IOWR('e', 56, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_PORTALS_COMPATIBILITY _IOWR('e', 57, IOCTL_PORTAL_TYPE) /* lnd ioctls */ -#define IOC_PORTAL_REGISTER_MYNID _IOWR('e', 70, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_CLOSE_CONNECTION _IOWR('e', 71, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_PUSH_CONNECTION _IOWR('e', 72, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_CONN _IOWR('e', 73, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_DEL_PEER _IOWR('e', 74, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_ADD_PEER _IOWR('e', 75, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_PEER _IOWR('e', 76, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_TXDESC _IOWR('e', 77, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_ADD_INTERFACE _IOWR('e', 78, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_DEL_INTERFACE _IOWR('e', 79, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_INTERFACE _IOWR('e', 80, IOCTL_PORTAL_TYPE) -#define IOC_PORTAL_GET_GMID _IOWR('e', 81, IOCTL_PORTAL_TYPE) - -#define IOC_PORTAL_MAX_NR 81 +#define IOC_LIBCFS_REGISTER_MYNID _IOWR('e', 70, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_CLOSE_CONNECTION _IOWR('e', 71, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_PUSH_CONNECTION _IOWR('e', 72, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_CONN _IOWR('e', 73, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_DEL_PEER _IOWR('e', 74, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_ADD_PEER _IOWR('e', 75, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_PEER _IOWR('e', 76, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_TXDESC _IOWR('e', 77, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_ADD_INTERFACE _IOWR('e', 78, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_DEL_INTERFACE _IOWR('e', 79, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_INTERFACE _IOWR('e', 80, IOCTL_PORTAL_TYPE) +#define IOC_LIBCFS_GET_GMID _IOWR('e', 81, IOCTL_PORTAL_TYPE) + +#define IOC_LIBCFS_MAX_NR 81 enum { diff --git a/lnet/include/libcfs/libcfs.h b/lnet/include/libcfs/libcfs.h index d70cf4b..6e49ca2 100644 --- a/lnet/include/libcfs/libcfs.h +++ b/lnet/include/libcfs/libcfs.h @@ -22,7 +22,7 @@ #include #endif -#define PORTAL_DEBUG +#define LIBCFS_DEBUG #ifndef offsetof # define offsetof(typ,memb) ((unsigned long)((char *)&(((typ *)0)->memb))) @@ -58,15 +58,15 @@ extern unsigned int libcfs_catastrophe; #define S_LLITE 0x00000080 #define S_RPC 0x00000100 #define S_MGMT 0x00000200 -#define S_PORTALS 0x00000400 -#define S_NAL 0x00000800 /* ALL NALs */ +#define S_LNET 0x00000400 +#define S_LND 0x00000800 /* ALL LNDs */ #define S_PINGER 0x00001000 #define S_FILTER 0x00002000 #define S_PTLBD 0x00004000 #define S_ECHO 0x00008000 #define S_LDLM 0x00010000 #define S_LOV 0x00020000 -#define S_PTLROUTER 0x00040000 +/* unused */ #define S_COBD 0x00080000 #define S_SM 0x00100000 #define S_ASOBD 0x00200000 @@ -258,22 +258,22 @@ do { \ #define EXIT do { } while (0) #endif /* !__KERNEL__ */ -#define LUSTRE_SRV_PTL_PID LUSTRE_PTL_PID +#define LUSTRE_SRV_LNET_PID LUSTRE_LNET_PID #ifdef __KERNEL__ #include -struct portal_ioctl_data; /* forward ref */ +struct libcfs_ioctl_data; /* forward ref */ struct libcfs_ioctl_handler { struct list_head item; - int (*handle_ioctl)(unsigned int cmd, struct portal_ioctl_data *data); + int (*handle_ioctl)(unsigned int cmd, struct libcfs_ioctl_data *data); }; #define DECLARE_IOCTL_HANDLER(ident, func) \ struct libcfs_ioctl_handler ident = { \ - .item = CFS_LIST_HEAD_INIT(ident.item), \ + .item = CFS_LIST_HEAD_INIT(ident.item), \ .handle_ioctl = func \ } diff --git a/lnet/include/libcfs/linux/libcfs.h b/lnet/include/libcfs/linux/libcfs.h index 1351add..fc86b61 100644 --- a/lnet/include/libcfs/linux/libcfs.h +++ b/lnet/include/libcfs/linux/libcfs.h @@ -115,7 +115,7 @@ struct ptldebug_header { #endif /* __KERNEL__ */ /* initial pid */ -#define LUSTRE_PTL_PID 12345 +#define LUSTRE_LNET_PID 12345 #define ENTRY_NESTING_SUPPORT (0) #define ENTRY_NESTING do {;} while (0) diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index ae8eb3b..167b25c 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -194,7 +194,7 @@ lnet_eq_alloc (void) /* NEVER called with liblock held */ lnet_eq_t *eq; - PORTAL_ALLOC(eq, sizeof(*eq)); + LIBCFS_ALLOC(eq, sizeof(*eq)); return (eq); } @@ -202,7 +202,7 @@ static inline void lnet_eq_free (lnet_eq_t *eq) { /* ALWAYS called with liblock held */ - PORTAL_FREE(eq, sizeof(*eq)); + LIBCFS_FREE(eq, sizeof(*eq)); } static inline lnet_libmd_t * @@ -222,7 +222,7 @@ lnet_md_alloc (lnet_md_t *umd) size = offsetof(lnet_libmd_t, md_iov.iov[niov]); } - PORTAL_ALLOC(md, size); + LIBCFS_ALLOC(md, size); if (md != NULL) { /* Set here in case of early free */ @@ -244,7 +244,7 @@ lnet_md_free (lnet_libmd_t *md) else size = offsetof(lnet_libmd_t, md_iov.iov[md->md_niov]); - PORTAL_FREE(md, size); + LIBCFS_FREE(md, size); } static inline lnet_me_t * @@ -253,7 +253,7 @@ lnet_me_alloc (void) /* NEVER called with liblock held */ lnet_me_t *me; - PORTAL_ALLOC(me, sizeof(*me)); + LIBCFS_ALLOC(me, sizeof(*me)); return (me); } @@ -261,7 +261,7 @@ static inline void lnet_me_free(lnet_me_t *me) { /* ALWAYS called with liblock held */ - PORTAL_FREE(me, sizeof(*me)); + LIBCFS_FREE(me, sizeof(*me)); } static inline lnet_msg_t * @@ -270,7 +270,7 @@ lnet_msg_alloc(void) /* NEVER called with liblock held; may be in interrupt... */ lnet_msg_t *msg; - PORTAL_ALLOC(msg, sizeof(*msg)); + LIBCFS_ALLOC(msg, sizeof(*msg)); if (msg != NULL) { /* NULL pointers, clear flags etc */ @@ -284,7 +284,7 @@ lnet_msg_free(lnet_msg_t *msg) { /* ALWAYS called with liblock held */ LASSERT (!msg->msg_onactivelist); - PORTAL_FREE(msg, sizeof(*msg)); + LIBCFS_FREE(msg, sizeof(*msg)); } #endif @@ -423,8 +423,8 @@ lnet_ptlcompat_srcnid(lnet_nid_t src, lnet_nid_t dst) { /* Give myself a portals srcnid if I'm sending to portals */ if (the_lnet.ln_ptlcompat > 0 && - PTL_NIDNET(dst) == 0) - return PTL_MKNID(0, PTL_NIDADDR(src)); + LNET_NIDNET(dst) == 0) + return LNET_MKNID(0, LNET_NIDADDR(src)); return src; } @@ -434,9 +434,9 @@ lnet_ptlcompat_matchnid(lnet_nid_t lnet_nid, lnet_nid_t ptl_nid) { return ((ptl_nid == lnet_nid) || (the_lnet.ln_ptlcompat > 0 && - PTL_NIDNET(ptl_nid) == 0 && - PTL_NETTYP(PTL_NIDNET(lnet_nid)) != LOLND && - PTL_NIDADDR(ptl_nid) == PTL_NIDADDR(lnet_nid))); + LNET_NIDNET(ptl_nid) == 0 && + LNET_NETTYP(LNET_NIDNET(lnet_nid)) != LOLND && + LNET_NIDADDR(ptl_nid) == LNET_NIDADDR(lnet_nid))); } static inline int @@ -445,13 +445,13 @@ lnet_ptlcompat_matchnet(__u32 lnet_net, __u32 ptl_net) return ((ptl_net == lnet_net) || (the_lnet.ln_ptlcompat > 0 && ptl_net == 0 && - PTL_NETTYP(lnet_net) != LOLND)); + LNET_NETTYP(lnet_net) != LOLND)); } static inline struct list_head * lnet_nid2peerhash (lnet_nid_t nid) { - unsigned int idx = PTL_NIDADDR(nid) % LNET_PEER_HASHSIZE; + unsigned int idx = LNET_NIDADDR(nid) % LNET_PEER_HASHSIZE; return &the_lnet.ln_peer_hash[idx]; } diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h index 54f5b22..189c87a 100644 --- a/lnet/klnds/gmlnd/gmlnd.h +++ b/lnet/klnds/gmlnd/gmlnd.h @@ -60,7 +60,7 @@ #include "linux/vmalloc.h" #include "linux/sysctl.h" -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include "libcfs/kp30.h" #include "lnet/lnet.h" diff --git a/lnet/klnds/gmlnd/gmlnd_api.c b/lnet/klnds/gmlnd/gmlnd_api.c index 936c0c1..201ea1d 100644 --- a/lnet/klnds/gmlnd/gmlnd_api.c +++ b/lnet/klnds/gmlnd/gmlnd_api.c @@ -40,16 +40,16 @@ gmnal_ni_t *the_gmni = NULL; int gmnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; switch (cmd) { - case IOC_PORTAL_REGISTER_MYNID: + case IOC_LIBCFS_REGISTER_MYNID: if (data->ioc_nid == ni->ni_nid) return 0; - LASSERT (PTL_NIDNET(data->ioc_nid) == PTL_NIDNET(ni->ni_nid)); + LASSERT (LNET_NIDNET(data->ioc_nid) == LNET_NIDNET(ni->ni_nid)); - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID for %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID for %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); return 0; @@ -82,7 +82,7 @@ gmnal_set_local_nid (gmnal_ni_t *gmni) CDEBUG(D_NET, "Global node id is [%u]\n", global_gmid); - ni->ni_nid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), global_gmid); + ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), global_gmid); return 1; } @@ -108,7 +108,7 @@ gmnal_shutdown(lnet_ni_t *ni) gmnal_free_txs(gmni); gmnal_free_rxs(gmni); - PORTAL_FREE(gmni, sizeof(*gmni)); + LIBCFS_FREE(gmni, sizeof(*gmni)); the_gmni = NULL; } @@ -131,7 +131,7 @@ gmnal_startup(lnet_ni_t *ni) return -EINVAL; } - PORTAL_ALLOC(gmni, sizeof(*gmni)); + LIBCFS_ALLOC(gmni, sizeof(*gmni)); if (gmni == NULL) { CERROR("can't allocate gmni\n"); return -ENOMEM; @@ -240,7 +240,7 @@ gmnal_startup(lnet_ni_t *ni) gmnal_free_txs(gmni); gmnal_free_rxs(gmni); - PORTAL_FREE(gmni, sizeof(*gmni)); + LIBCFS_FREE(gmni, sizeof(*gmni)); return -EIO; } diff --git a/lnet/klnds/gmlnd/gmlnd_cb.c b/lnet/klnds/gmlnd/gmlnd_cb.c index b364a61..209ae4a 100644 --- a/lnet/klnds/gmlnd/gmlnd_cb.c +++ b/lnet/klnds/gmlnd/gmlnd_cb.c @@ -95,7 +95,7 @@ gmnal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) tx->tx_nid = target.nid; - gmrc = gm_global_id_to_node_id(gmni->gmni_port, PTL_NIDADDR(target.nid), + gmrc = gm_global_id_to_node_id(gmni->gmni_port, LNET_NIDADDR(target.nid), &tx->tx_gmlid); if (gmrc != GM_SUCCESS) { CERROR("Can't map Nid %s to a GM local ID: %d\n", diff --git a/lnet/klnds/gmlnd/gmlnd_utils.c b/lnet/klnds/gmlnd/gmlnd_utils.c index 3e7bd32..3bf4493 100644 --- a/lnet/klnds/gmlnd/gmlnd_utils.c +++ b/lnet/klnds/gmlnd/gmlnd_utils.c @@ -86,7 +86,7 @@ gmnal_free_ltxbuf (gmnal_ni_t *gmni, gmnal_txbuf_t *txb) /* No unmapping; the port has been closed */ gmnal_free_netbuf_pages(&txb->txb_buf, gmni->gmni_large_pages); - PORTAL_FREE(txb, offsetof(gmnal_txbuf_t, txb_buf.nb_kiov[npages])); + LIBCFS_FREE(txb, offsetof(gmnal_txbuf_t, txb_buf.nb_kiov[npages])); } int @@ -97,7 +97,7 @@ gmnal_alloc_ltxbuf (gmnal_ni_t *gmni) gmnal_txbuf_t *txb; int rc; - PORTAL_ALLOC(txb, sz); + LIBCFS_ALLOC(txb, sz); if (txb == NULL) { CERROR("Can't allocate large txbuffer\n"); return -ENOMEM; @@ -105,7 +105,7 @@ gmnal_alloc_ltxbuf (gmnal_ni_t *gmni) rc = gmnal_alloc_netbuf_pages(gmni, &txb->txb_buf, npages); if (rc != 0) { - PORTAL_FREE(txb, sz); + LIBCFS_FREE(txb, sz); return rc; } @@ -123,7 +123,7 @@ gmnal_free_tx (gmnal_tx_t *tx) LASSERT (tx->tx_gmni->gmni_port == NULL); gmnal_free_netbuf_pages(&tx->tx_buf, 1); - PORTAL_FREE(tx, sizeof(*tx)); + LIBCFS_FREE(tx, sizeof(*tx)); } int @@ -132,7 +132,7 @@ gmnal_alloc_tx (gmnal_ni_t *gmni) gmnal_tx_t *tx; int rc; - PORTAL_ALLOC(tx, sizeof(*tx)); + LIBCFS_ALLOC(tx, sizeof(*tx)); if (tx == NULL) { CERROR("Failed to allocate tx\n"); return -ENOMEM; @@ -142,7 +142,7 @@ gmnal_alloc_tx (gmnal_ni_t *gmni) rc = gmnal_alloc_netbuf_pages(gmni, &tx->tx_buf, 1); if (rc != 0) { - PORTAL_FREE(tx, sizeof(*tx)); + LIBCFS_FREE(tx, sizeof(*tx)); return -ENOMEM; } @@ -164,7 +164,7 @@ gmnal_free_rx(gmnal_ni_t *gmni, gmnal_rx_t *rx) LASSERT (gmni->gmni_port == NULL); gmnal_free_netbuf_pages(&rx->rx_buf, npages); - PORTAL_FREE(rx, offsetof(gmnal_rx_t, rx_buf.nb_kiov[npages])); + LIBCFS_FREE(rx, offsetof(gmnal_rx_t, rx_buf.nb_kiov[npages])); } int @@ -176,7 +176,7 @@ gmnal_alloc_rx (gmnal_ni_t *gmni, int islarge) gmnal_rx_t *rx; gm_status_t gmrc; - PORTAL_ALLOC(rx, sz); + LIBCFS_ALLOC(rx, sz); if (rx == NULL) { CERROR("Failed to allocate rx\n"); return -ENOMEM; @@ -186,7 +186,7 @@ gmnal_alloc_rx (gmnal_ni_t *gmni, int islarge) rc = gmnal_alloc_netbuf_pages(gmni, &rx->rx_buf, npages); if (rc != 0) { - PORTAL_FREE(rx, sz); + LIBCFS_FREE(rx, sz); return rc; } diff --git a/lnet/klnds/iiblnd/iiblnd.c b/lnet/klnds/iiblnd/iiblnd.c index 3c040c1..7955e23 100644 --- a/lnet/klnds/iiblnd/iiblnd.c +++ b/lnet/klnds/iiblnd/iiblnd.c @@ -114,7 +114,7 @@ kibnal_check_advert (void) FSTATUS frc; FSTATUS frc2; - PORTAL_ALLOC(qry, sizeof(*qry)); + LIBCFS_ALLOC(qry, sizeof(*qry)); if (qry == NULL) return; @@ -171,7 +171,7 @@ kibnal_advertise (void) LASSERT (kibnal_data.kib_ni->ni_nid != LNET_NID_ANY); - PORTAL_ALLOC(fod, sizeof(*fod)); + LIBCFS_ALLOC(fod, sizeof(*fod)); if (fod == NULL) return (-ENOMEM); @@ -201,7 +201,7 @@ kibnal_advertise (void) CERROR ("Error %d advertising BUD %s\n", frc, libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); out: - PORTAL_FREE(fod, sizeof(*fod)); + LIBCFS_FREE(fod, sizeof(*fod)); return (frc == FSUCCESS) ? 0 : -EINVAL; } @@ -215,7 +215,7 @@ kibnal_unadvertise (int expect_success) LASSERT (kibnal_data.kib_ni->ni_nid != LNET_NID_ANY); - PORTAL_ALLOC(fod, sizeof(*fod)); + LIBCFS_ALLOC(fod, sizeof(*fod)); if (fod == NULL) return; @@ -249,7 +249,7 @@ kibnal_unadvertise (int expect_success) CWARN("Removed conflicting NID %s\n", libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); out: - PORTAL_FREE(fod, sizeof(*fod)); + LIBCFS_FREE(fod, sizeof(*fod)); } static int @@ -357,7 +357,7 @@ kibnal_create_peer (lnet_nid_t nid) LASSERT (nid != LNET_NID_ANY); - PORTAL_ALLOC (peer, sizeof (*peer)); + LIBCFS_ALLOC (peer, sizeof (*peer)); if (peer == NULL) return (NULL); @@ -387,7 +387,7 @@ kibnal_destroy_peer (kib_peer_t *peer) LASSERT (list_empty (&peer->ibp_conns)); LASSERT (list_empty (&peer->ibp_tx_queue)); - PORTAL_FREE (peer, sizeof (*peer)); + LIBCFS_FREE (peer, sizeof (*peer)); /* NB a peer's connections keep a reference on their peer until * they are destroyed, so we can be assured that _all_ state to do @@ -640,7 +640,7 @@ kibnal_create_conn (void) IB_QP_ATTRIBUTES_MODIFY qp_attr; } params; - PORTAL_ALLOC (conn, sizeof (*conn)); + LIBCFS_ALLOC (conn, sizeof (*conn)); if (conn == NULL) { CERROR ("Can't allocate connection\n"); return (NULL); @@ -656,7 +656,7 @@ kibnal_create_conn (void) atomic_inc (&kibnal_data.kib_nconns); /* well not really, but I call destroy() on failure, which decrements */ - PORTAL_ALLOC (conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); + LIBCFS_ALLOC (conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); if (conn->ibc_rxs == NULL) goto failed; memset (conn->ibc_rxs, 0, IBNAL_RX_MSGS * sizeof(kib_rx_t)); @@ -791,13 +791,13 @@ kibnal_destroy_conn (kib_conn_t *conn) kibnal_free_pages(conn->ibc_rx_pages); if (conn->ibc_rxs != NULL) - PORTAL_FREE(conn->ibc_rxs, + LIBCFS_FREE(conn->ibc_rxs, IBNAL_RX_MSGS * sizeof(kib_rx_t)); if (conn->ibc_peer != NULL) kib_peer_decref(conn->ibc_peer); - PORTAL_FREE(conn, sizeof (*conn)); + LIBCFS_FREE(conn, sizeof (*conn)); atomic_dec(&kibnal_data.kib_nconns); @@ -926,14 +926,14 @@ kibnal_close_matching_conns (lnet_nid_t nid) int kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; ENTRY; LASSERT (ni == kibnal_data.kib_ni); switch(cmd) { - case IOC_PORTAL_GET_PEER: { + case IOC_LIBCFS_GET_PEER: { lnet_nid_t nid = 0; int share_count = 0; @@ -943,15 +943,15 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) data->ioc_count = share_count; break; } - case IOC_PORTAL_ADD_PEER: { + case IOC_LIBCFS_ADD_PEER: { rc = kibnal_add_persistent_peer (data->ioc_nid); break; } - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { rc = kibnal_del_peer (data->ioc_nid); break; } - case IOC_PORTAL_GET_CONN: { + case IOC_LIBCFS_GET_CONN: { kib_conn_t *conn = kibnal_get_conn_by_idx (data->ioc_count); if (conn == NULL) @@ -963,11 +963,11 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) } break; } - case IOC_PORTAL_CLOSE_CONNECTION: { + case IOC_LIBCFS_CLOSE_CONNECTION: { rc = kibnal_close_matching_conns (data->ioc_nid); break; } - case IOC_PORTAL_REGISTER_MYNID: { + case IOC_LIBCFS_REGISTER_MYNID: { if (data->ioc_nid == LNET_NID_ANY) rc = -EINVAL; else @@ -996,7 +996,7 @@ kibnal_free_pages (kib_pages_t *p) if (p->ibp_pages[i] != NULL) __free_page(p->ibp_pages[i]); - PORTAL_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); } int @@ -1014,7 +1014,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write) access.s.RdmaRead = 1; access.s.RdmaWrite = 1; - PORTAL_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); if (p == NULL) { CERROR ("Can't allocate buffer %d\n", npages); return (-ENOMEM); @@ -1035,7 +1035,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write) if (kibnal_whole_mem()) goto out; - PORTAL_ALLOC(phys_pages, npages * sizeof(*phys_pages)); + LIBCFS_ALLOC(phys_pages, npages * sizeof(*phys_pages)); if (phys_pages == NULL) { CERROR ("Can't allocate physarray for %d pages\n", npages); /* XXX free ibp_pages? */ @@ -1058,7 +1058,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write) &p->ibp_handle, &p->ibp_vaddr, &p->ibp_lkey, &p->ibp_rkey); - PORTAL_FREE(phys_pages, npages * sizeof(*phys_pages)); + LIBCFS_FREE(phys_pages, npages * sizeof(*phys_pages)); if (frc != FSUCCESS) { CERROR ("Error %d mapping %d pages\n", frc, npages); @@ -1217,7 +1217,7 @@ kibnal_shutdown (lnet_ni_t *ni) /* fall through */ case IBNAL_INIT_PORTATTRS: - PORTAL_FREE(kibnal_data.kib_hca_attrs.PortAttributesList, + LIBCFS_FREE(kibnal_data.kib_hca_attrs.PortAttributesList, kibnal_data.kib_hca_attrs.PortAttributesListSize); /* fall through */ @@ -1262,11 +1262,11 @@ kibnal_shutdown (lnet_ni_t *ni) } if (kibnal_data.kib_tx_descs != NULL) - PORTAL_FREE (kibnal_data.kib_tx_descs, + LIBCFS_FREE (kibnal_data.kib_tx_descs, IBNAL_TX_MSGS * sizeof(kib_tx_t)); if (kibnal_data.kib_peers != NULL) - PORTAL_FREE (kibnal_data.kib_peers, + LIBCFS_FREE (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); @@ -1347,7 +1347,7 @@ kibnal_startup (lnet_ni_t *ni) rwlock_init(&kibnal_data.kib_global_lock); kibnal_data.kib_peer_hash_size = IBNAL_PEER_HASH_SIZE; - PORTAL_ALLOC (kibnal_data.kib_peers, + LIBCFS_ALLOC (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); if (kibnal_data.kib_peers == NULL) { goto failed; @@ -1368,7 +1368,7 @@ kibnal_startup (lnet_ni_t *ni) spin_lock_init (&kibnal_data.kib_tx_lock); INIT_LIST_HEAD (&kibnal_data.kib_idle_txs); - PORTAL_ALLOC (kibnal_data.kib_tx_descs, + LIBCFS_ALLOC (kibnal_data.kib_tx_descs, IBNAL_TX_MSGS * sizeof(kib_tx_t)); if (kibnal_data.kib_tx_descs == NULL) { CERROR ("Can't allocate tx descs\n"); @@ -1430,7 +1430,7 @@ kibnal_startup (lnet_ni_t *ni) goto failed; } - PORTAL_ALLOC(kibnal_data.kib_hca_attrs.PortAttributesList, + LIBCFS_ALLOC(kibnal_data.kib_hca_attrs.PortAttributesList, kibnal_data.kib_hca_attrs.PortAttributesListSize); if (kibnal_data.kib_hca_attrs.PortAttributesList == NULL) goto failed; diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 35a8f6f..9a84549 100644 --- a/lnet/klnds/iiblnd/iiblnd.h +++ b/lnet/klnds/iiblnd/iiblnd.h @@ -48,7 +48,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include diff --git a/lnet/klnds/iiblnd/iiblnd_cb.c b/lnet/klnds/iiblnd/iiblnd_cb.c index 3779c91..58461e3 100644 --- a/lnet/klnds/iiblnd/iiblnd_cb.c +++ b/lnet/klnds/iiblnd/iiblnd_cb.c @@ -696,7 +696,7 @@ kibnal_map_kiov (kib_tx_t *tx, IB_ACCESS_CONTROL access, if (!kibnal_whole_mem()) { phys_size = nkiov * sizeof (*phys); - PORTAL_ALLOC(phys, phys_size); + LIBCFS_ALLOC(phys, phys_size); if (phys == NULL) { CERROR ("Can't allocate tmp phys\n"); return (-ENOMEM); @@ -803,7 +803,7 @@ kibnal_map_kiov (kib_tx_t *tx, IB_ACCESS_CONTROL access, out: if (phys != NULL) - PORTAL_FREE(phys, phys_size); + LIBCFS_FREE(phys, phys_size); return (rc); } @@ -1815,7 +1815,7 @@ kibnal_connreq_done (kib_conn_t *conn, int active, int status) LASSERTF(!active == !(conn->ibc_connreq != NULL), "%d %p\n", active, conn->ibc_connreq); if (active) { - PORTAL_FREE (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); + LIBCFS_FREE (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); conn->ibc_connreq = NULL; } @@ -2057,13 +2057,13 @@ kibnal_reject (IB_HANDLE cep, uint16_t reason) { CM_REJECT_INFO *rej; - PORTAL_ALLOC(rej, sizeof(*rej)); - if (rej == NULL) /* PORTAL_ALLOC() will CERROR on failure */ + LIBCFS_ALLOC(rej, sizeof(*rej)); + if (rej == NULL) /* LIBCFS_ALLOC() will CERROR on failure */ return; rej->Reason = reason; iibt_cm_reject(cep, rej); - PORTAL_FREE(rej, sizeof(*rej)); + LIBCFS_FREE(rej, sizeof(*rej)); } static FSTATUS @@ -2339,11 +2339,11 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) } query = &conn->ibc_qp_attrs; - PORTAL_ALLOC(rep, sizeof(*rep)); - PORTAL_ALLOC(rcv, sizeof(*rcv)); + LIBCFS_ALLOC(rep, sizeof(*rep)); + LIBCFS_ALLOC(rcv, sizeof(*rcv)); if (rep == NULL || rcv == NULL) { - if (rep) PORTAL_FREE(rep, sizeof(*rep)); - if (rcv) PORTAL_FREE(rcv, sizeof(*rcv)); + if (rep) LIBCFS_FREE(rep, sizeof(*rep)); + if (rcv) LIBCFS_FREE(rcv, sizeof(*rcv)); CERROR ("can't allocate reply and receive buffers\n"); GOTO(out, reason = RC_INSUFFICIENT_RESP_RES); } @@ -2375,8 +2375,8 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) frc = iibt_cm_accept(cep, rep, rcv, kibnal_cm_callback, conn, &conn->ibc_cep); - PORTAL_FREE(rep, sizeof(*rep)); - PORTAL_FREE(rcv, sizeof(*rcv)); + LIBCFS_FREE(rep, sizeof(*rep)); + LIBCFS_FREE(rcv, sizeof(*rcv)); if (frc != FCM_CONNECT_ESTABLISHED) { /* XXX it seems we don't call reject after this point? */ @@ -2619,7 +2619,7 @@ kibnal_connect_peer (kib_peer_t *peer) conn->ibc_peer = peer; kib_peer_addref(peer); - PORTAL_ALLOC (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); + LIBCFS_ALLOC (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); if (conn->ibc_connreq == NULL) { CERROR ("Can't allocate connreq\n"); kibnal_connreq_done (conn, 1, -ENOMEM); diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c index 1fc30c5..91e67c8 100644 --- a/lnet/klnds/openiblnd/openiblnd.c +++ b/lnet/klnds/openiblnd/openiblnd.c @@ -311,7 +311,7 @@ kibnal_handle_svcqry (struct socket *sock) return; } - PORTAL_ALLOC(msg, sizeof(*msg)); + LIBCFS_ALLOC(msg, sizeof(*msg)); if (msg == NULL) { CERROR("Can't allocate msgs for %u.%u.%u.%u/%d\n", HIPQUAD(peer_ip), peer_port); @@ -392,14 +392,14 @@ kibnal_handle_svcqry (struct socket *sock) } out: - PORTAL_FREE(msg, sizeof(*msg)); + LIBCFS_FREE(msg, sizeof(*msg)); } void kibnal_free_acceptsock (kib_acceptsock_t *as) { libcfs_sock_release(as->ibas_sock); - PORTAL_FREE(as, sizeof(*as)); + LIBCFS_FREE(as, sizeof(*as)); } int @@ -409,7 +409,7 @@ kibnal_accept(lnet_ni_t *ni, struct socket *sock) int rc; unsigned long flags; - PORTAL_ALLOC(as, sizeof(*as)); + LIBCFS_ALLOC(as, sizeof(*as)); if (as == NULL) { CERROR("Out of Memory\n"); return -ENOMEM; @@ -491,7 +491,7 @@ kibnal_create_peer (kib_peer_t **peerp, lnet_nid_t nid) LASSERT (nid != LNET_NID_ANY); - PORTAL_ALLOC(peer, sizeof (*peer)); + LIBCFS_ALLOC(peer, sizeof (*peer)); if (peer == NULL) { CERROR("Cannot allocate peer\n"); return -ENOMEM; @@ -528,7 +528,7 @@ kibnal_create_peer (kib_peer_t **peerp, lnet_nid_t nid) CERROR("Can't create peer: %s\n", (rc == -ESHUTDOWN) ? "shutting down" : "too many peers"); - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); } else { *peerp = peer; } @@ -552,7 +552,7 @@ kibnal_destroy_peer (kib_peer_t *peer) LASSERT (list_empty (&peer->ibp_conns)); LASSERT (list_empty (&peer->ibp_tx_queue)); - PORTAL_FREE (peer, sizeof (*peer)); + LIBCFS_FREE (peer, sizeof (*peer)); /* NB a peer's connections keep a reference on their peer until * they are destroyed, so we can be assured that _all_ state to do @@ -822,7 +822,7 @@ kibnal_create_conn (void) struct ib_qp_attribute qp_attr; } params; - PORTAL_ALLOC (conn, sizeof (*conn)); + LIBCFS_ALLOC (conn, sizeof (*conn)); if (conn == NULL) { CERROR ("Can't allocate connection\n"); return (NULL); @@ -838,7 +838,7 @@ kibnal_create_conn (void) atomic_inc (&kibnal_data.kib_nconns); /* well not really, but I call destroy() on failure, which decrements */ - PORTAL_ALLOC (conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); + LIBCFS_ALLOC (conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); if (conn->ibc_rxs == NULL) goto failed; memset (conn->ibc_rxs, 0, IBNAL_RX_MSGS * sizeof(kib_rx_t)); @@ -958,13 +958,13 @@ kibnal_destroy_conn (kib_conn_t *conn) kibnal_free_pages(conn->ibc_rx_pages); if (conn->ibc_rxs != NULL) - PORTAL_FREE(conn->ibc_rxs, + LIBCFS_FREE(conn->ibc_rxs, IBNAL_RX_MSGS * sizeof(kib_rx_t)); if (conn->ibc_peer != NULL) kibnal_put_peer(conn->ibc_peer); - PORTAL_FREE(conn, sizeof (*conn)); + LIBCFS_FREE(conn, sizeof (*conn)); atomic_dec(&kibnal_data.kib_nconns); @@ -1094,13 +1094,13 @@ kibnal_close_matching_conns (lnet_nid_t nid) int kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; LASSERT (ni == kibnal_data.kib_ni); switch(cmd) { - case IOC_PORTAL_GET_PEER: { + case IOC_LIBCFS_GET_PEER: { lnet_nid_t nid = 0; __u32 ip = 0; int port = 0; @@ -1114,17 +1114,17 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) data->ioc_u32[1] = port; break; } - case IOC_PORTAL_ADD_PEER: { + case IOC_LIBCFS_ADD_PEER: { rc = kibnal_add_persistent_peer (data->ioc_nid, data->ioc_u32[0], /* IP */ data->ioc_u32[1]); /* port */ break; } - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { rc = kibnal_del_peer (data->ioc_nid); break; } - case IOC_PORTAL_GET_CONN: { + case IOC_LIBCFS_GET_CONN: { kib_conn_t *conn = kibnal_get_conn_by_idx (data->ioc_count); if (conn == NULL) @@ -1136,16 +1136,16 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) } break; } - case IOC_PORTAL_CLOSE_CONNECTION: { + case IOC_LIBCFS_CLOSE_CONNECTION: { rc = kibnal_close_matching_conns (data->ioc_nid); break; } - case IOC_PORTAL_REGISTER_MYNID: { + case IOC_LIBCFS_REGISTER_MYNID: { /* Ignore if this is a noop */ if (data->ioc_nid == ni->ni_nid) { rc = 0; } else { - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID: %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); rc = -EINVAL; @@ -1174,7 +1174,7 @@ kibnal_free_pages (kib_pages_t *p) if (p->ibp_pages[i] != NULL) __free_page(p->ibp_pages[i]); - PORTAL_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); } int @@ -1185,7 +1185,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int access) int i; int rc; - PORTAL_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); if (p == NULL) { CERROR ("Can't allocate buffer %d\n", npages); return (-ENOMEM); @@ -1203,7 +1203,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int access) } } - PORTAL_ALLOC(phys_pages, npages * sizeof(*phys_pages)); + LIBCFS_ALLOC(phys_pages, npages * sizeof(*phys_pages)); if (phys_pages == NULL) { CERROR ("Can't allocate physarray for %d pages\n", npages); kibnal_free_pages(p); @@ -1226,7 +1226,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int access) &p->ibp_lkey, &p->ibp_rkey); - PORTAL_FREE(phys_pages, npages * sizeof(*phys_pages)); + LIBCFS_FREE(phys_pages, npages * sizeof(*phys_pages)); if (rc != 0) { CERROR ("Error %d mapping %d pages\n", rc, npages); @@ -1409,11 +1409,11 @@ kibnal_shutdown (lnet_ni_t *ni) } if (kibnal_data.kib_tx_descs != NULL) - PORTAL_FREE (kibnal_data.kib_tx_descs, + LIBCFS_FREE (kibnal_data.kib_tx_descs, IBNAL_TX_MSGS() * sizeof(kib_tx_t)); if (kibnal_data.kib_peers != NULL) - PORTAL_FREE (kibnal_data.kib_peers, + LIBCFS_FREE (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); @@ -1466,7 +1466,7 @@ kibnal_startup (lnet_ni_t *ni) rwlock_init(&kibnal_data.kib_global_lock); kibnal_data.kib_peer_hash_size = IBNAL_PEER_HASH_SIZE; - PORTAL_ALLOC (kibnal_data.kib_peers, + LIBCFS_ALLOC (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); if (kibnal_data.kib_peers == NULL) { goto failed; @@ -1491,7 +1491,7 @@ kibnal_startup (lnet_ni_t *ni) spin_lock_init (&kibnal_data.kib_tx_lock); INIT_LIST_HEAD (&kibnal_data.kib_idle_txs); - PORTAL_ALLOC (kibnal_data.kib_tx_descs, + LIBCFS_ALLOC (kibnal_data.kib_tx_descs, IBNAL_TX_MSGS() * sizeof(kib_tx_t)); if (kibnal_data.kib_tx_descs == NULL) { CERROR ("Can't allocate tx descs\n"); diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h index c364d90..52a55f3 100644 --- a/lnet/klnds/openiblnd/openiblnd.h +++ b/lnet/klnds/openiblnd/openiblnd.h @@ -51,7 +51,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c index 1bd9d36..69af83b 100644 --- a/lnet/klnds/openiblnd/openiblnd_cb.c +++ b/lnet/klnds/openiblnd/openiblnd_cb.c @@ -502,7 +502,7 @@ kibnal_map_kiov (kib_tx_t *tx, enum ib_memory_access access, } phys_size = nkiov * sizeof (*phys); - PORTAL_ALLOC(phys, phys_size); + LIBCFS_ALLOC(phys, phys_size); if (phys == NULL) { CERROR ("Can't allocate tmp phys\n"); return (-ENOMEM); @@ -590,7 +590,7 @@ kibnal_map_kiov (kib_tx_t *tx, enum ib_memory_access access, } out: - PORTAL_FREE(phys, phys_size); + LIBCFS_FREE(phys, phys_size); return (rc); } @@ -934,7 +934,7 @@ kibnal_launch_tx (kib_tx_t *tx, lnet_nid_t nid) return; } - rc = kibnal_add_persistent_peer(nid, PTL_NIDADDR(nid), + rc = kibnal_add_persistent_peer(nid, LNET_NIDADDR(nid), lnet_acceptor_port()); if (rc != 0) { CERROR("Can't add peer %s: %d\n", @@ -1541,7 +1541,7 @@ kibnal_connreq_done (kib_conn_t *conn, int status) int i; if (conn->ibc_connreq != NULL) { - PORTAL_FREE (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); + LIBCFS_FREE (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); conn->ibc_connreq = NULL; } @@ -2099,7 +2099,7 @@ kibnal_connect_peer (kib_peer_t *peer) conn->ibc_peer = peer; atomic_inc (&peer->ibp_refcount); - PORTAL_ALLOC (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); + LIBCFS_ALLOC (conn->ibc_connreq, sizeof (*conn->ibc_connreq)); if (conn->ibc_connreq == NULL) { CERROR ("Can't allocate connreq\n"); kibnal_connreq_done(conn, -ENOMEM); diff --git a/lnet/klnds/ptllnd/ptllnd.c b/lnet/klnds/ptllnd/ptllnd.c index 4cb3908..9de60e3 100755 --- a/lnet/klnds/ptllnd/ptllnd.c +++ b/lnet/klnds/ptllnd/ptllnd.c @@ -198,7 +198,7 @@ kptllnd_msg_unpack(kptl_msg_t *msg, int nob,kptl_data_t *kptllnd_data) int kptllnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; kptl_data_t *kptllnd_data = ni->ni_data; @@ -211,17 +211,17 @@ kptllnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) LASSERT (ni == kptllnd_data->kptl_ni); switch(cmd) { - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { rc = kptllnd_peer_del (kptllnd_data,data->ioc_nid); break; } /* * Not Supported - This is Legacy stuff - case IOC_PORTAL_GET_PEER: - case IOC_PORTAL_ADD_PEER: - case IOC_PORTAL_GET_CONN: - case IOC_PORTAL_CLOSE_CONNECTION: - case IOC_PORTAL_REGISTER_MYNID: + case IOC_LIBCFS_GET_PEER: + case IOC_LIBCFS_ADD_PEER: + case IOC_LIBCFS_GET_CONN: + case IOC_LIBCFS_CLOSE_CONNECTION: + case IOC_LIBCFS_REGISTER_MYNID: */ default: CERROR("Unsupported IOCTL command %d\n",cmd); @@ -263,7 +263,7 @@ kptllnd_startup (lnet_ni_t *ni) LASSERT (ni->ni_lnd == &kptllnd_lnd); - PORTAL_ALLOC (kptllnd_data,sizeof(*kptllnd_data)); + LIBCFS_ALLOC (kptllnd_data,sizeof(*kptllnd_data)); if (kptllnd_data == NULL){ CERROR ("Failed to allocate memory for PTLLND context\n"); return -ENOMEM; @@ -385,7 +385,7 @@ kptllnd_startup (lnet_ni_t *ni) rwlock_init(&kptllnd_data->kptl_peer_rw_lock); kptllnd_data->kptl_peer_hash_size = *kptllnd_tunables.kptl_peer_hash_table_size; INIT_LIST_HEAD(&kptllnd_data->kptl_canceled_peers); - PORTAL_ALLOC (kptllnd_data->kptl_peers, + LIBCFS_ALLOC (kptllnd_data->kptl_peers, sizeof (struct list_head) * kptllnd_data->kptl_peer_hash_size); if (kptllnd_data->kptl_peers == NULL) { CERROR("Failed to allocate space for peer hash table size=%d\n", @@ -426,7 +426,7 @@ kptllnd_startup (lnet_ni_t *ni) * to know that we have to clean this up */ PJK_UT_MSG("Allocate TX Descriptor array\n"); - PORTAL_ALLOC (kptllnd_data->kptl_tx_descs, + LIBCFS_ALLOC (kptllnd_data->kptl_tx_descs, (*kptllnd_tunables.kptl_ntx) * sizeof(kptl_tx_t)); if (kptllnd_data->kptl_tx_descs == NULL){ CERROR ("Can't allocate space for TX Descriptor array count=%d\n", @@ -644,7 +644,7 @@ kptllnd_shutdown (lnet_ni_t *ni) * Free the tx descriptors */ if (kptllnd_data->kptl_tx_descs != NULL) - PORTAL_FREE(kptllnd_data->kptl_tx_descs, + LIBCFS_FREE(kptllnd_data->kptl_tx_descs, (*kptllnd_tunables.kptl_ntx) * sizeof(kptl_tx_t)); /* @@ -657,7 +657,7 @@ kptllnd_shutdown (lnet_ni_t *ni) * Cleanup the peer hash table */ if (kptllnd_data->kptl_peers != NULL){ - PORTAL_FREE (kptllnd_data->kptl_peers, + LIBCFS_FREE (kptllnd_data->kptl_peers, sizeof (struct list_head) * kptllnd_data->kptl_peer_hash_size); } @@ -665,7 +665,7 @@ kptllnd_shutdown (lnet_ni_t *ni) /* * And free the context block */ - PORTAL_FREE(kptllnd_data,sizeof(*kptllnd_data)); + LIBCFS_FREE(kptllnd_data,sizeof(*kptllnd_data)); CDEBUG(D_MALLOC, "after LND cleanup: kmem %d\n", atomic_read (&libcfs_kmemory)); diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h index 0819cf9..95f31c0 100755 --- a/lnet/klnds/ptllnd/ptllnd.h +++ b/lnet/klnds/ptllnd/ptllnd.h @@ -48,7 +48,7 @@ #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include @@ -665,18 +665,18 @@ int kptllnd_process_scheduled_rxb(kptl_data_t *kptllnd_data); static inline lnet_nid_t ptl2lnetnid(kptl_data_t *kptllnd_data,ptl_nid_t portals_nid) { #ifdef _USING_LUSTRE_PORTALS_ - return PTL_MKNID(PTL_NIDNET(kptllnd_data->kptl_ni->ni_nid), PTL_NIDADDR(portals_nid) ); + return LNET_MKNID(LNET_NIDNET(kptllnd_data->kptl_ni->ni_nid), LNET_NIDADDR(portals_nid)); #else /* _USING_CRAY_PORTALS_ */ - return PTL_MKNID(PTL_NIDNET(kptllnd_data->kptl_ni->ni_nid), portals_nid); + return LNET_MKNID(LNET_NIDNET(kptllnd_data->kptl_ni->ni_nid), portals_nid); #endif } static inline ptl_nid_t lnet2ptlnid(kptl_data_t *kptllnd_data,lnet_nid_t lnet_nid) { #ifdef _USING_LUSTRE_PORTALS_ - return PTL_MKNID(PTL_NIDNET(kptllnd_data->kptl_portals_id.nid), PTL_NIDADDR(lnet_nid) ); + return LNET_MKNID(LNET_NIDNET(kptllnd_data->kptl_portals_id.nid), LNET_NIDADDR(lnet_nid)); #else /* _USING_CRAY_PORTALS_ */ - return PTL_NIDADDR(lnet_nid); + return LNET_NIDADDR(lnet_nid); #endif } diff --git a/lnet/klnds/ptllnd/ptllnd_cb.c b/lnet/klnds/ptllnd/ptllnd_cb.c index 008a556..2c04334 100644 --- a/lnet/klnds/ptllnd/ptllnd_cb.c +++ b/lnet/klnds/ptllnd/ptllnd_cb.c @@ -828,7 +828,7 @@ void kptllnd_thread_fini (kptllnd_thread_data_t *thread_data) { atomic_dec (&thread_data->kptllnd_data->kptl_nthreads); - PORTAL_FREE(thread_data,sizeof(*thread_data)); + LIBCFS_FREE(thread_data,sizeof(*thread_data)); } int @@ -841,7 +841,7 @@ kptllnd_thread_start (int (*fn)(void *arg), int id,kptl_data_t *kptllnd_data) * Allocate the tread data so we can pass more that * one param to the thread function */ - PORTAL_ALLOC (thread_data,sizeof(*thread_data)); + LIBCFS_ALLOC (thread_data,sizeof(*thread_data)); if(thread_data == 0){ CERROR("No memory to allocated thread data structure\n"); return 0; diff --git a/lnet/klnds/ptllnd/ptllnd_peer.c b/lnet/klnds/ptllnd/ptllnd_peer.c index ad09daa..c5866e3 100644 --- a/lnet/klnds/ptllnd/ptllnd_peer.c +++ b/lnet/klnds/ptllnd/ptllnd_peer.c @@ -54,7 +54,7 @@ kptllnd_peer_create_locked ( rc = -EOVERFLOW; /* !! but at least it distinguishes */ } - PORTAL_ALLOC(peer, sizeof (*peer)); + LIBCFS_ALLOC(peer, sizeof (*peer)); if (peer == NULL) { CERROR("Cannot allocate memory for peer\n"); return -ENOMEM; @@ -99,7 +99,7 @@ kptllnd_peer_create_locked ( *kptllnd_tunables.kptl_peercredits); if(rc != 0){ CERROR("Cannot reserve rx buffer pool space\n"); - PORTAL_FREE(peer, sizeof (*peer)); + LIBCFS_FREE(peer, sizeof (*peer)); return rc; } @@ -140,7 +140,7 @@ kptllnd_peer_destroy ( /* No active tx descriptors */ LASSERT (list_empty (&peer->peer_active_txs)); - PORTAL_FREE (peer, sizeof (*peer)); + LIBCFS_FREE (peer, sizeof (*peer)); kptllnd_rx_buffer_pool_unreserve( &kptllnd_data->kptl_rx_buffer_pool, diff --git a/lnet/klnds/ptllnd/ptllnd_proc.c b/lnet/klnds/ptllnd/ptllnd_proc.c index 1795e41..0337bbf 100755 --- a/lnet/klnds/ptllnd/ptllnd_proc.c +++ b/lnet/klnds/ptllnd/ptllnd_proc.c @@ -68,7 +68,7 @@ ptllnd_stats_seq_start (struct seq_file *s, loff_t *pos) ptllnd_stats_seq_iterator_t *pssi; int rc; - PORTAL_ALLOC(pssi, sizeof(*pssi)); + LIBCFS_ALLOC(pssi, sizeof(*pssi)); if (pssi == NULL) return NULL; @@ -77,7 +77,7 @@ ptllnd_stats_seq_start (struct seq_file *s, loff_t *pos) if (rc == 0) return pssi; - PORTAL_FREE(pssi, sizeof(*pssi)); + LIBCFS_FREE(pssi, sizeof(*pssi)); return NULL; } @@ -87,7 +87,7 @@ ptllnd_stats_seq_stop (struct seq_file *s, void *iter) ptllnd_stats_seq_iterator_t *pssi = iter; if (pssi != NULL) - PORTAL_FREE(pssi, sizeof(*pssi)); + LIBCFS_FREE(pssi, sizeof(*pssi)); } static void * @@ -99,7 +99,7 @@ ptllnd_stats_seq_next (struct seq_file *s, void *iter, loff_t *pos) rc = ptllnd_stats_seq_seek(pssi, next); if (rc != 0) { - PORTAL_FREE(pssi, sizeof(*pssi)); + LIBCFS_FREE(pssi, sizeof(*pssi)); return NULL; } diff --git a/lnet/klnds/ptllnd/ptllnd_rx_buf.c b/lnet/klnds/ptllnd/ptllnd_rx_buf.c index 93f56d3..45f0c15 100644 --- a/lnet/klnds/ptllnd/ptllnd_rx_buf.c +++ b/lnet/klnds/ptllnd/ptllnd_rx_buf.c @@ -237,7 +237,7 @@ kptllnd_rx_buffer_pool_reserve( spin_unlock(&rxbp->rxbp_lock); for(i=0;irxb_list); INIT_LIST_HEAD (&rxb->rxb_repost_list); - PORTAL_ALLOC( rxb->rxb_buffer, + LIBCFS_ALLOC( rxb->rxb_buffer, PAGE_SIZE * *kptllnd_tunables.kptl_rxb_npages); if(rxb->rxb_buffer == NULL) { CERROR("Failed to allocate data buffer or size %d pages for rx%d\n", @@ -289,8 +289,8 @@ failed: if(rxb){ if(rxb->rxb_buffer) - PORTAL_FREE( rxb->rxb_buffer,PAGE_SIZE * *kptllnd_tunables.kptl_rxb_npages); - PORTAL_FREE( rxb,sizeof(*rxb)); + LIBCFS_FREE( rxb->rxb_buffer,PAGE_SIZE * *kptllnd_tunables.kptl_rxb_npages); + LIBCFS_FREE( rxb,sizeof(*rxb)); } return rc; @@ -482,8 +482,8 @@ kptllnd_rx_buffer_destroy( rxbp->rxbp_count--; spin_unlock(&rxbp->rxbp_lock); - PORTAL_FREE( rxb->rxb_buffer,PAGE_SIZE * *kptllnd_tunables.kptl_rxb_npages); - PORTAL_FREE(rxb,sizeof(*rxb)); + LIBCFS_FREE( rxb->rxb_buffer,PAGE_SIZE * *kptllnd_tunables.kptl_rxb_npages); + LIBCFS_FREE(rxb,sizeof(*rxb)); } diff --git a/lnet/klnds/ptllnd/ptllnd_tx.c b/lnet/klnds/ptllnd/ptllnd_tx.c index 300bd4d..10dfc96 100644 --- a/lnet/klnds/ptllnd/ptllnd_tx.c +++ b/lnet/klnds/ptllnd/ptllnd_tx.c @@ -54,7 +54,7 @@ kptllnd_setup_tx_descs (kptl_data_t *kptllnd_data) */ tx->tx_state = TX_STATE_ON_IDLE_QUEUE; - PORTAL_ALLOC( tx->tx_msg, *kptllnd_tunables.kptl_max_immd_size ); + LIBCFS_ALLOC( tx->tx_msg, *kptllnd_tunables.kptl_max_immd_size ); if(tx->tx_msg == NULL){ CERROR("Failed to allocate TX payload\n"); kptllnd_cleanup_tx_descs(kptllnd_data); @@ -91,7 +91,7 @@ kptllnd_cleanup_tx_descs(kptl_data_t *kptllnd_data) LASSERT( tx->tx_state == TX_STATE_ON_IDLE_QUEUE ); - PORTAL_FREE(tx->tx_msg,*kptllnd_tunables.kptl_max_immd_size); + LIBCFS_FREE(tx->tx_msg,*kptllnd_tunables.kptl_max_immd_size); } } diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c index 6ce966d..57400b3 100644 --- a/lnet/klnds/qswlnd/qswlnd.c +++ b/lnet/klnds/qswlnd/qswlnd.c @@ -35,7 +35,7 @@ lnd_t the_kqswlnd = kqswnal_data_t kqswnal_data; int -kqswnal_get_tx_desc (struct portal_ioctl_data *data) +kqswnal_get_tx_desc (struct libcfs_ioctl_data *data) { unsigned long flags; struct list_head *tmp; @@ -71,21 +71,21 @@ kqswnal_get_tx_desc (struct portal_ioctl_data *data) int kqswnal_ctl (lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; LASSERT (ni == kqswnal_data.kqn_ni); switch (cmd) { - case IOC_PORTAL_GET_TXDESC: + case IOC_LIBCFS_GET_TXDESC: return (kqswnal_get_tx_desc (data)); - case IOC_PORTAL_REGISTER_MYNID: + case IOC_LIBCFS_REGISTER_MYNID: if (data->ioc_nid == ni->ni_nid) return 0; - LASSERT (PTL_NIDNET(data->ioc_nid) == PTL_NIDNET(ni->ni_nid)); + LASSERT (LNET_NIDNET(data->ioc_nid) == LNET_NIDNET(ni->ni_nid)); - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID for %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID for %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); return 0; @@ -256,10 +256,10 @@ kqswnal_shutdown(lnet_ni_t *ni) ktx = kqswnal_data.kqn_txds; if (ktx->ktx_buffer != NULL) - PORTAL_FREE(ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE); + LIBCFS_FREE(ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE); kqswnal_data.kqn_txds = ktx->ktx_alloclist; - PORTAL_FREE(ktx, sizeof(*ktx)); + LIBCFS_FREE(ktx, sizeof(*ktx)); } while (kqswnal_data.kqn_rxds != NULL) { @@ -271,7 +271,7 @@ kqswnal_shutdown(lnet_ni_t *ni) __free_page (krx->krx_kiov[i].kiov_page); kqswnal_data.kqn_rxds = krx->krx_alloclist; - PORTAL_FREE(krx, sizeof (*krx)); + LIBCFS_FREE(krx, sizeof (*krx)); } /* resets flags, pointers to NULL etc */ @@ -378,7 +378,7 @@ kqswnal_startup (lnet_ni_t *ni) kqswnal_data.kqn_nnodes = ep_numnodes (kqswnal_data.kqn_ep); kqswnal_data.kqn_elanid = ep_nodeid (kqswnal_data.kqn_ep); - ni->ni_nid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), kqswnal_data.kqn_elanid); + ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), kqswnal_data.kqn_elanid); /**********************************************************************/ /* Get the transmitter */ @@ -489,7 +489,7 @@ kqswnal_startup (lnet_ni_t *ni) int premapped_pages; int basepage = i * KQSW_NTXMSGPAGES; - PORTAL_ALLOC (ktx, sizeof(*ktx)); + LIBCFS_ALLOC (ktx, sizeof(*ktx)); if (ktx == NULL) { kqswnal_shutdown (ni); return (-ENOMEM); @@ -499,7 +499,7 @@ kqswnal_startup (lnet_ni_t *ni) ktx->ktx_alloclist = kqswnal_data.kqn_txds; kqswnal_data.kqn_txds = ktx; - PORTAL_ALLOC (ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE); + LIBCFS_ALLOC (ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE); if (ktx->ktx_buffer == NULL) { kqswnal_shutdown (ni); @@ -545,7 +545,7 @@ kqswnal_startup (lnet_ni_t *ni) #endif int j; - PORTAL_ALLOC(krx, sizeof(*krx)); + LIBCFS_ALLOC(krx, sizeof(*krx)); if (krx == NULL) { kqswnal_shutdown(ni); return (-ENOMEM); diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index ded5812..985b279 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -72,7 +72,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include @@ -272,13 +272,13 @@ extern void kqswnal_rx_done (kqswnal_rx_t *krx); static inline lnet_nid_t kqswnal_elanid2nid (int elanid) { - return PTL_MKNID(PTL_NIDNET(kqswnal_data.kqn_ni->ni_nid), elanid); + return LNET_MKNID(LNET_NIDNET(kqswnal_data.kqn_ni->ni_nid), elanid); } static inline int kqswnal_nid2elanid (lnet_nid_t nid) { - __u32 elanid = PTL_NIDADDR(nid); + __u32 elanid = LNET_NIDADDR(nid); /* not in this cluster? */ return (elanid >= kqswnal_data.kqn_nnodes) ? -1 : elanid; diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c index 4b14815..c496e1b 100644 --- a/lnet/klnds/qswlnd/qswlnd_cb.c +++ b/lnet/klnds/qswlnd/qswlnd_cb.c @@ -1272,7 +1272,7 @@ kqswnal_parse (kqswnal_rx_t *krx) LASSERT (atomic_read(&krx->krx_refcount) == 1); - fromnid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), ep_rxd_node(krx->krx_rxd)); + fromnid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), ep_rxd_node(krx->krx_rxd)); rc = lnet_parse(ni, hdr, kqswnal_rx_nid(krx), krx); if (rc < 0) { diff --git a/lnet/klnds/ralnd/ralnd.c b/lnet/klnds/ralnd/ralnd.c index 393b7257..b289fcb 100644 --- a/lnet/klnds/ralnd/ralnd.c +++ b/lnet/klnds/ralnd/ralnd.c @@ -250,7 +250,7 @@ kranal_create_conn(kra_conn_t **connp, kra_device_t *dev) RAP_RETURN rrc; LASSERT (!in_interrupt()); - PORTAL_ALLOC(conn, sizeof(*conn)); + LIBCFS_ALLOC(conn, sizeof(*conn)); if (conn == NULL) return -ENOMEM; @@ -275,7 +275,7 @@ kranal_create_conn(kra_conn_t **connp, kra_device_t *dev) &conn->rac_rihandle); if (rrc != RAP_SUCCESS) { CERROR("RapkCreateRi failed: %d\n", rrc); - PORTAL_FREE(conn, sizeof(*conn)); + LIBCFS_FREE(conn, sizeof(*conn)); return -ENETDOWN; } @@ -306,7 +306,7 @@ kranal_destroy_conn(kra_conn_t *conn) if (conn->rac_peer != NULL) kranal_peer_decref(conn->rac_peer); - PORTAL_FREE(conn, sizeof(*conn)); + LIBCFS_FREE(conn, sizeof(*conn)); atomic_dec(&kranal_data.kra_nconns); } @@ -782,7 +782,7 @@ void kranal_free_acceptsock (kra_acceptsock_t *ras) { libcfs_sock_release(ras->ras_sock); - PORTAL_FREE(ras, sizeof(*ras)); + LIBCFS_FREE(ras, sizeof(*ras)); } int @@ -797,7 +797,7 @@ kranal_accept (lnet_ni_t *ni, struct socket *sock) rc = libcfs_sock_getaddr(sock, 1, &peer_ip, &peer_port); LASSERT (rc == 0); /* we succeeded before */ - PORTAL_ALLOC(ras, sizeof(*ras)); + LIBCFS_ALLOC(ras, sizeof(*ras)); if (ras == NULL) { CERROR("ENOMEM allocating connection request from " "%u.%u.%u.%u\n", HIPQUAD(peer_ip)); @@ -823,7 +823,7 @@ kranal_create_peer (kra_peer_t **peerp, lnet_nid_t nid) LASSERT (nid != LNET_NID_ANY); - PORTAL_ALLOC(peer, sizeof(*peer)); + LIBCFS_ALLOC(peer, sizeof(*peer)); if (peer == NULL) return -ENOMEM; @@ -845,7 +845,7 @@ kranal_create_peer (kra_peer_t **peerp, lnet_nid_t nid) /* shutdown has started already */ write_unlock_irqrestore(&kranal_data.kra_global_lock, flags); - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); CERROR("Can't create peer: network shutdown\n"); return -ESHUTDOWN; } @@ -874,7 +874,7 @@ kranal_destroy_peer (kra_peer_t *peer) LASSERT (list_empty(&peer->rap_tx_queue)); LASSERT (list_empty(&peer->rap_connd_list)); - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); /* NB a peer's connections keep a reference on their peer until * they are destroyed, so we can be assured that _all_ state to do @@ -1168,13 +1168,13 @@ kranal_close_matching_conns (lnet_nid_t nid) int kranal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; LASSERT (ni == kranal_data.kra_ni); switch(cmd) { - case IOC_PORTAL_GET_PEER: { + case IOC_LIBCFS_GET_PEER: { lnet_nid_t nid = 0; __u32 ip = 0; int port = 0; @@ -1188,17 +1188,17 @@ kranal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) data->ioc_u32[1] = port; break; } - case IOC_PORTAL_ADD_PEER: { + case IOC_LIBCFS_ADD_PEER: { rc = kranal_add_persistent_peer(data->ioc_nid, data->ioc_u32[0], /* IP */ data->ioc_u32[1]); /* port */ break; } - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { rc = kranal_del_peer(data->ioc_nid); break; } - case IOC_PORTAL_GET_CONN: { + case IOC_LIBCFS_GET_CONN: { kra_conn_t *conn = kranal_get_conn_by_idx(data->ioc_count); if (conn == NULL) @@ -1211,16 +1211,16 @@ kranal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) } break; } - case IOC_PORTAL_CLOSE_CONNECTION: { + case IOC_LIBCFS_CLOSE_CONNECTION: { rc = kranal_close_matching_conns(data->ioc_nid); break; } - case IOC_PORTAL_REGISTER_MYNID: { + case IOC_LIBCFS_REGISTER_MYNID: { /* Ignore if this is a noop */ if (data->ioc_nid == ni->ni_nid) { rc = 0; } else { - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID: %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); rc = -EINVAL; @@ -1241,8 +1241,8 @@ kranal_free_txdescs(struct list_head *freelist) tx = list_entry(freelist->next, kra_tx_t, tx_list); list_del(&tx->tx_list); - PORTAL_FREE(tx->tx_phys, PTL_MD_MAX_IOV * sizeof(*tx->tx_phys)); - PORTAL_FREE(tx, sizeof(*tx)); + LIBCFS_FREE(tx->tx_phys, PTL_MD_MAX_IOV * sizeof(*tx->tx_phys)); + LIBCFS_FREE(tx, sizeof(*tx)); } } @@ -1257,19 +1257,19 @@ kranal_alloc_txdescs(struct list_head *freelist, int n) for (i = 0; i < n; i++) { - PORTAL_ALLOC(tx, sizeof(*tx)); + LIBCFS_ALLOC(tx, sizeof(*tx)); if (tx == NULL) { CERROR("Can't allocate tx[%d]\n", i); kranal_free_txdescs(freelist); return -ENOMEM; } - PORTAL_ALLOC(tx->tx_phys, + LIBCFS_ALLOC(tx->tx_phys, PTL_MD_MAX_IOV * sizeof(*tx->tx_phys)); if (tx->tx_phys == NULL) { CERROR("Can't allocate tx[%d]->tx_phys\n", i); - PORTAL_FREE(tx, sizeof(*tx)); + LIBCFS_FREE(tx, sizeof(*tx)); kranal_free_txdescs(freelist); return -ENOMEM; } @@ -1445,7 +1445,7 @@ kranal_shutdown (lnet_ni_t *ni) for (i = 0; i < kranal_data.kra_peer_hash_size; i++) LASSERT (list_empty(&kranal_data.kra_peers[i])); - PORTAL_FREE(kranal_data.kra_peers, + LIBCFS_FREE(kranal_data.kra_peers, sizeof (struct list_head) * kranal_data.kra_peer_hash_size); } @@ -1455,7 +1455,7 @@ kranal_shutdown (lnet_ni_t *ni) for (i = 0; i < kranal_data.kra_conn_hash_size; i++) LASSERT (list_empty(&kranal_data.kra_conns[i])); - PORTAL_FREE(kranal_data.kra_conns, + LIBCFS_FREE(kranal_data.kra_conns, sizeof (struct list_head) * kranal_data.kra_conn_hash_size); } @@ -1548,7 +1548,7 @@ kranal_startup (lnet_ni_t *ni) PORTAL_MODULE_USE; kranal_data.kra_peer_hash_size = RANAL_PEER_HASH_SIZE; - PORTAL_ALLOC(kranal_data.kra_peers, + LIBCFS_ALLOC(kranal_data.kra_peers, sizeof(struct list_head) * kranal_data.kra_peer_hash_size); if (kranal_data.kra_peers == NULL) goto failed; @@ -1557,7 +1557,7 @@ kranal_startup (lnet_ni_t *ni) INIT_LIST_HEAD(&kranal_data.kra_peers[i]); kranal_data.kra_conn_hash_size = RANAL_PEER_HASH_SIZE; - PORTAL_ALLOC(kranal_data.kra_conns, + LIBCFS_ALLOC(kranal_data.kra_conns, sizeof(struct list_head) * kranal_data.kra_conn_hash_size); if (kranal_data.kra_conns == NULL) goto failed; diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index 4e6ccbb..fecb6de 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -51,7 +51,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include diff --git a/lnet/klnds/ralnd/ralnd_cb.c b/lnet/klnds/ralnd/ralnd_cb.c index 7be86cc..7ead02c 100644 --- a/lnet/klnds/ralnd/ralnd_cb.c +++ b/lnet/klnds/ralnd/ralnd_cb.c @@ -470,7 +470,7 @@ kranal_launch_tx (kra_tx_t *tx, lnet_nid_t nid) return; } - rc = kranal_add_persistent_peer(nid, PTL_NIDADDR(nid), + rc = kranal_add_persistent_peer(nid, LNET_NIDADDR(nid), lnet_acceptor_port()); if (rc != 0) { CERROR("Can't add peer %s: %d\n", diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 1c31f8d..7ed4b68 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -61,7 +61,7 @@ ksocknal_create_route (__u32 ipaddr, int port) { ksock_route_t *route; - PORTAL_ALLOC (route, sizeof (*route)); + LIBCFS_ALLOC (route, sizeof (*route)); if (route == NULL) return (NULL); @@ -87,7 +87,7 @@ ksocknal_destroy_route (ksock_route_t *route) if (route->ksnr_peer != NULL) ksocknal_peer_decref(route->ksnr_peer); - PORTAL_FREE (route, sizeof (*route)); + LIBCFS_FREE (route, sizeof (*route)); } int @@ -101,7 +101,7 @@ ksocknal_create_peer (ksock_peer_t **peerp, lnet_ni_t *ni, lnet_process_id_t id) LASSERT (id.pid != LNET_PID_ANY); LASSERT (!in_interrupt()); - PORTAL_ALLOC (peer, sizeof (*peer)); + LIBCFS_ALLOC (peer, sizeof (*peer)); if (peer == NULL) return -ENOMEM; @@ -120,7 +120,7 @@ ksocknal_create_peer (ksock_peer_t **peerp, lnet_ni_t *ni, lnet_process_id_t id) if (net->ksnn_shutdown) { spin_unlock_irqrestore(&net->ksnn_lock, flags); - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); CERROR("Can't create peer: network shutdown\n"); return -ESHUTDOWN; } @@ -147,7 +147,7 @@ ksocknal_destroy_peer (ksock_peer_t *peer) LASSERT (list_empty (&peer->ksnp_routes)); LASSERT (list_empty (&peer->ksnp_tx_queue)); - PORTAL_FREE (peer, sizeof (*peer)); + LIBCFS_FREE (peer, sizeof (*peer)); /* NB a peer's connections and routes keep a reference on their peer * until they are destroyed, so we can be assured that _all_ state to @@ -925,7 +925,7 @@ ksocknal_accept (lnet_ni_t *ni, struct socket *sock) rc = libcfs_sock_getaddr(sock, 1, &peer_ip, &peer_port); LASSERT (rc == 0); /* we succeeded before */ - PORTAL_ALLOC(cr, sizeof(*cr)); + LIBCFS_ALLOC(cr, sizeof(*cr)); if (cr == NULL) { LCONSOLE_ERROR("Dropping connection request from " "%u.%u.%u.%u: memory exhausted\n", @@ -975,7 +975,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route, irq = ksocknal_lib_sock_irq (sock); rc = -ENOMEM; - PORTAL_ALLOC(conn, sizeof(*conn)); + LIBCFS_ALLOC(conn, sizeof(*conn)); if (conn == NULL) goto failed_0; @@ -1187,7 +1187,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route, ksocknal_peer_decref(peer); failed_1: - PORTAL_FREE (conn, sizeof(*conn)); + LIBCFS_FREE (conn, sizeof(*conn)); failed_0: libcfs_sock_release(sock); @@ -1379,7 +1379,7 @@ ksocknal_destroy_conn (ksock_conn_t *conn) ksocknal_peer_decref(conn->ksnc_peer); - PORTAL_FREE (conn, sizeof (*conn)); + LIBCFS_FREE (conn, sizeof (*conn)); } int @@ -1742,11 +1742,11 @@ ksocknal_del_interface(lnet_ni_t *ni, __u32 ipaddress) int ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc; switch(cmd) { - case IOC_PORTAL_GET_INTERFACE: { + case IOC_LIBCFS_GET_INTERFACE: { ksock_net_t *net = ni->ni_data; ksock_interface_t *iface; @@ -1769,16 +1769,16 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) return rc; } - case IOC_PORTAL_ADD_INTERFACE: + case IOC_LIBCFS_ADD_INTERFACE: return ksocknal_add_interface(ni, data->ioc_u32[0], /* IP address */ data->ioc_u32[1]); /* net mask */ - case IOC_PORTAL_DEL_INTERFACE: + case IOC_LIBCFS_DEL_INTERFACE: return ksocknal_del_interface(ni, data->ioc_u32[0]); /* IP address */ - case IOC_PORTAL_GET_PEER: { + case IOC_LIBCFS_GET_PEER: { lnet_process_id_t id = {0,}; __u32 myip = 0; __u32 ip = 0; @@ -1802,20 +1802,20 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) return 0; } - case IOC_PORTAL_ADD_PEER: { + case IOC_LIBCFS_ADD_PEER: { lnet_process_id_t id = {.nid = data->ioc_nid, - .pid = LUSTRE_SRV_PTL_PID}; + .pid = LUSTRE_SRV_LNET_PID}; return ksocknal_add_peer (ni, id, data->ioc_u32[0], /* IP */ data->ioc_u32[1]); /* port */ } - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { lnet_process_id_t id = {.nid = data->ioc_nid, .pid = LNET_PID_ANY}; return ksocknal_del_peer (ni, id, data->ioc_u32[0]); /* IP */ } - case IOC_PORTAL_GET_CONN: { + case IOC_LIBCFS_GET_CONN: { int txmem; int rxmem; int nagle; @@ -1841,24 +1841,24 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) return 0; } - case IOC_PORTAL_CLOSE_CONNECTION: { + case IOC_LIBCFS_CLOSE_CONNECTION: { lnet_process_id_t id = {.nid = data->ioc_nid, .pid = LNET_PID_ANY}; return ksocknal_close_matching_conns (id, data->ioc_u32[0]); } - case IOC_PORTAL_REGISTER_MYNID: + case IOC_LIBCFS_REGISTER_MYNID: /* Ignore if this is a noop */ if (data->ioc_nid == ni->ni_nid) return 0; - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID: %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); return -EINVAL; - case IOC_PORTAL_PUSH_CONNECTION: { + case IOC_LIBCFS_PUSH_CONNECTION: { lnet_process_id_t id = {.nid = data->ioc_nid, .pid = LNET_PID_ANY}; @@ -1876,10 +1876,10 @@ ksocknal_free_buffers (void) LASSERT (atomic_read(&ksocknal_data.ksnd_nactive_ltxs) == 0); if (ksocknal_data.ksnd_schedulers != NULL) - PORTAL_FREE (ksocknal_data.ksnd_schedulers, + LIBCFS_FREE (ksocknal_data.ksnd_schedulers, sizeof (ksock_sched_t) * ksocknal_data.ksnd_nschedulers); - PORTAL_FREE (ksocknal_data.ksnd_peers, + LIBCFS_FREE (ksocknal_data.ksnd_peers, sizeof (struct list_head) * ksocknal_data.ksnd_peer_hash_size); } @@ -2002,7 +2002,7 @@ ksocknal_base_startup (void) memset (&ksocknal_data, 0, sizeof (ksocknal_data)); /* zero pointers */ ksocknal_data.ksnd_peer_hash_size = SOCKNAL_PEER_HASH_SIZE; - PORTAL_ALLOC (ksocknal_data.ksnd_peers, + LIBCFS_ALLOC (ksocknal_data.ksnd_peers, sizeof (struct list_head) * ksocknal_data.ksnd_peer_hash_size); if (ksocknal_data.ksnd_peers == NULL) return -ENOMEM; @@ -2031,7 +2031,7 @@ ksocknal_base_startup (void) PORTAL_MODULE_USE; ksocknal_data.ksnd_nschedulers = ksocknal_nsched(); - PORTAL_ALLOC(ksocknal_data.ksnd_schedulers, + LIBCFS_ALLOC(ksocknal_data.ksnd_schedulers, sizeof(ksock_sched_t) * ksocknal_data.ksnd_nschedulers); if (ksocknal_data.ksnd_schedulers == NULL) goto failed; @@ -2122,7 +2122,7 @@ ksocknal_shutdown (lnet_ni_t *ni) LASSERT (net->ksnn_interfaces[i].ksni_nroutes == 0); } - PORTAL_FREE(net, sizeof(*net)); + LIBCFS_FREE(net, sizeof(*net)); ksocknal_data.ksnd_nnets--; if (ksocknal_data.ksnd_nnets == 0) @@ -2199,7 +2199,7 @@ ksocknal_startup (lnet_ni_t *ni) return rc; } - PORTAL_ALLOC(net, sizeof(*net)); + LIBCFS_ALLOC(net, sizeof(*net)); if (net == NULL) goto fail_0; @@ -2243,15 +2243,15 @@ ksocknal_startup (lnet_ni_t *ni) net->ksnn_ninterfaces = i; } - ni->ni_nid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), - net->ksnn_interfaces[0].ksni_ipaddr); + ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), + net->ksnn_interfaces[0].ksni_ipaddr); ksocknal_data.ksnd_nnets++; return 0; fail_1: - PORTAL_FREE(net, sizeof(*net)); + LIBCFS_FREE(net, sizeof(*net)); fail_0: if (ksocknal_data.ksnd_nnets == 0) ksocknal_base_shutdown(); diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 99c0926..ca46245 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -28,7 +28,7 @@ # define EXPORT_SYMTAB #endif -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #if defined(__linux__) #include "socklnd_lib-linux.h" @@ -214,7 +214,7 @@ typedef struct /* transmit packet */ int tx_nkiov; /* # packet page frags */ lnet_kiov_t *tx_kiov; /* packet page frags */ struct ksock_conn *tx_conn; /* owning conn */ - lnet_hdr_t *tx_hdr; /* packet header (for debug only) */ + lnet_hdr_t *tx_hdr; /* packet header (for debug only) */ #if SOCKNAL_ZC zccd_t tx_zccd; /* zero copy callback descriptor */ #endif @@ -228,7 +228,7 @@ typedef struct /* locally transmitted packet */ ksock_tx_t ltx_tx; /* send info */ void *ltx_private; /* lnet_finalize() callback arg */ void *ltx_cookie; /* lnet_finalize() callback arg */ - lnet_hdr_t ltx_hdr; /* buffer for packet header */ + lnet_hdr_t ltx_hdr; /* buffer for packet header */ int ltx_desc_size; /* bytes allocated for this desc */ struct iovec ltx_iov[1]; /* iov for hdr + payload */ lnet_kiov_t ltx_kiov[0]; /* kiov for payload */ diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 0266b68..d5bd2cc 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -29,7 +29,7 @@ void ksocknal_free_ltx (ksock_ltx_t *ltx) { atomic_dec(&ksocknal_data.ksnd_nactive_ltxs); - PORTAL_FREE(ltx, ltx->ltx_desc_size); + LIBCFS_FREE(ltx, ltx->ltx_desc_size); } int @@ -743,7 +743,7 @@ ksocknal_launch_packet (lnet_ni_t *ni, ksock_tx_t *tx, lnet_process_id_t id) } rc = ksocknal_add_peer(ni, id, - PTL_NIDADDR(id.nid), + LNET_NIDADDR(id.nid), lnet_acceptor_port()); if (rc != 0) { CERROR("Can't add peer %s: %d\n", @@ -823,9 +823,9 @@ ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) type == LNET_MSG_REPLY) { /* Can't block if in interrupt or responding to an incoming * message */ - PORTAL_ALLOC_ATOMIC(ltx, desc_size); + LIBCFS_ALLOC_ATOMIC(ltx, desc_size); } else { - PORTAL_ALLOC(ltx, desc_size); + LIBCFS_ALLOC(ltx, desc_size); } if (ltx == NULL) { @@ -1539,12 +1539,12 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn, if (conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) { /* Userspace NAL assigns peer process ID from socket */ recv_id.pid = conn->ksnc_port | LNET_PID_USERFLAG; - recv_id.nid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), conn->ksnc_ipaddr); + recv_id.nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), conn->ksnc_ipaddr); } else { recv_id.nid = le64_to_cpu(hdr.src_nid); if (the_lnet.ln_ptlcompat > 1 && /* portals peers may exist */ - PTL_NIDNET(recv_id.nid) == 0) /* this is one */ + LNET_NIDNET(recv_id.nid) == 0) /* this is one */ recv_id.pid = the_lnet.ln_pid; /* give it a sensible pid */ else recv_id.pid = le32_to_cpu(hdr.src_pid); @@ -1769,7 +1769,7 @@ ksocknal_connd (void *arg) ksocknal_create_conn(cr->ksncr_ni, NULL, cr->ksncr_sock, SOCKLND_CONN_NONE); lnet_ni_decref(cr->ksncr_ni); - PORTAL_FREE(cr, sizeof(*cr)); + LIBCFS_FREE(cr, sizeof(*cr)); spin_lock_irqsave(&ksocknal_data.ksnd_connd_lock, flags); diff --git a/lnet/klnds/viblnd/viblnd.c b/lnet/klnds/viblnd/viblnd.c index d1cd5b3..f6cfa0e 100644 --- a/lnet/klnds/viblnd/viblnd.c +++ b/lnet/klnds/viblnd/viblnd.c @@ -470,7 +470,7 @@ kibnal_create_peer (kib_peer_t **peerp, lnet_nid_t nid) LASSERT (nid != LNET_NID_ANY); - PORTAL_ALLOC(peer, sizeof (*peer)); + LIBCFS_ALLOC(peer, sizeof (*peer)); if (peer == NULL) { CERROR("Cannot allocate peer\n"); return -ENOMEM; @@ -506,7 +506,7 @@ kibnal_create_peer (kib_peer_t **peerp, lnet_nid_t nid) CERROR("Can't create peer: %s\n", (rc == -ESHUTDOWN) ? "shutting down" : "too many peers"); - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); } else { *peerp = peer; } @@ -524,7 +524,7 @@ kibnal_destroy_peer (kib_peer_t *peer) LASSERT (list_empty (&peer->ibp_conns)); LASSERT (list_empty (&peer->ibp_tx_queue)); - PORTAL_FREE (peer, sizeof (*peer)); + LIBCFS_FREE (peer, sizeof (*peer)); /* NB a peer's connections keep a reference on their peer until * they are destroyed, so we can be assured that _all_ state to do @@ -865,7 +865,7 @@ kibnal_create_conn (cm_cep_handle_t cep) LASSERT(!in_interrupt()); LASSERT(current == kibnal_data.kib_connd); - PORTAL_ALLOC(conn, sizeof (*conn)); + LIBCFS_ALLOC(conn, sizeof (*conn)); if (conn == NULL) { CERROR ("Can't allocate connection\n"); return (NULL); @@ -884,7 +884,7 @@ kibnal_create_conn (cm_cep_handle_t cep) conn->ibc_cep = cep; - PORTAL_ALLOC(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); + LIBCFS_ALLOC(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); if (conn->ibc_connvars == NULL) { CERROR("Can't allocate in-progress connection state\n"); goto failed; @@ -894,7 +894,7 @@ kibnal_create_conn (cm_cep_handle_t cep) get_random_bytes(&conn->ibc_connvars->cv_rxpsn, sizeof(conn->ibc_connvars->cv_rxpsn)); - PORTAL_ALLOC(conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); + LIBCFS_ALLOC(conn->ibc_rxs, IBNAL_RX_MSGS * sizeof (kib_rx_t)); if (conn->ibc_rxs == NULL) { CERROR("Cannot allocate RX buffers\n"); goto failed; @@ -1032,16 +1032,16 @@ kibnal_destroy_conn (kib_conn_t *conn) kibnal_free_pages(conn->ibc_rx_pages); if (conn->ibc_rxs != NULL) - PORTAL_FREE(conn->ibc_rxs, + LIBCFS_FREE(conn->ibc_rxs, IBNAL_RX_MSGS * sizeof(kib_rx_t)); if (conn->ibc_connvars != NULL) - PORTAL_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); + LIBCFS_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); if (conn->ibc_peer != NULL) kibnal_peer_decref(conn->ibc_peer); - PORTAL_FREE(conn, sizeof (*conn)); + LIBCFS_FREE(conn, sizeof (*conn)); atomic_dec(&kibnal_data.kib_nconns); } @@ -1137,13 +1137,13 @@ kibnal_close_matching_conns (lnet_nid_t nid) int kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; LASSERT (ni == kibnal_data.kib_ni); switch(cmd) { - case IOC_PORTAL_GET_PEER: { + case IOC_LIBCFS_GET_PEER: { lnet_nid_t nid = 0; __u32 ip = 0; int share_count = 0; @@ -1156,16 +1156,16 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) data->ioc_u32[1] = *kibnal_tunables.kib_service_number; /* port */ break; } - case IOC_PORTAL_ADD_PEER: { + case IOC_LIBCFS_ADD_PEER: { rc = kibnal_add_persistent_peer (data->ioc_nid, data->ioc_u32[0]); /* IP */ break; } - case IOC_PORTAL_DEL_PEER: { + case IOC_LIBCFS_DEL_PEER: { rc = kibnal_del_peer (data->ioc_nid); break; } - case IOC_PORTAL_GET_CONN: { + case IOC_LIBCFS_GET_CONN: { kib_conn_t *conn = kibnal_get_conn_by_idx (data->ioc_count); if (conn == NULL) @@ -1177,15 +1177,15 @@ kibnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) } break; } - case IOC_PORTAL_CLOSE_CONNECTION: { + case IOC_LIBCFS_CLOSE_CONNECTION: { rc = kibnal_close_matching_conns (data->ioc_nid); break; } - case IOC_PORTAL_REGISTER_MYNID: { + case IOC_LIBCFS_REGISTER_MYNID: { if (ni->ni_nid == data->ioc_nid) { rc = 0; } else { - CERROR("obsolete IOC_PORTAL_REGISTER_MYNID: %s(%s)\n", + CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n", libcfs_nid2str(data->ioc_nid), libcfs_nid2str(ni->ni_nid)); rc = -EINVAL; @@ -1207,7 +1207,7 @@ kibnal_free_pages (kib_pages_t *p) if (p->ibp_pages[i] != NULL) __free_page(p->ibp_pages[i]); - PORTAL_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_FREE (p, offsetof(kib_pages_t, ibp_pages[npages])); } int @@ -1216,7 +1216,7 @@ kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write) kib_pages_t *p; int i; - PORTAL_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); + LIBCFS_ALLOC(p, offsetof(kib_pages_t, ibp_pages[npages])); if (p == NULL) { CERROR ("Can't allocate buffer %d\n", npages); return (-ENOMEM); @@ -1243,7 +1243,7 @@ kibnal_alloc_tx_descs (void) { int i; - PORTAL_ALLOC (kibnal_data.kib_tx_descs, + LIBCFS_ALLOC (kibnal_data.kib_tx_descs, IBNAL_TX_MSGS() * sizeof(kib_tx_t)); if (kibnal_data.kib_tx_descs == NULL) return -ENOMEM; @@ -1255,24 +1255,24 @@ kibnal_alloc_tx_descs (void) kib_tx_t *tx = &kibnal_data.kib_tx_descs[i]; #if IBNAL_USE_FMR - PORTAL_ALLOC(tx->tx_pages, PTL_MD_MAX_IOV * + LIBCFS_ALLOC(tx->tx_pages, PTL_MD_MAX_IOV * sizeof(*tx->tx_pages)); if (tx->tx_pages == NULL) return -ENOMEM; #else - PORTAL_ALLOC(tx->tx_wrq, + LIBCFS_ALLOC(tx->tx_wrq, (1 + IBNAL_MAX_RDMA_FRAGS) * sizeof(*tx->tx_wrq)); if (tx->tx_wrq == NULL) return -ENOMEM; - PORTAL_ALLOC(tx->tx_gl, + LIBCFS_ALLOC(tx->tx_gl, (1 + IBNAL_MAX_RDMA_FRAGS) * sizeof(*tx->tx_gl)); if (tx->tx_gl == NULL) return -ENOMEM; - PORTAL_ALLOC(tx->tx_rd, + LIBCFS_ALLOC(tx->tx_rd, offsetof(kib_rdma_desc_t, rd_frags[IBNAL_MAX_RDMA_FRAGS])); if (tx->tx_rd == NULL) @@ -1296,27 +1296,27 @@ kibnal_free_tx_descs (void) #if IBNAL_USE_FMR if (tx->tx_pages != NULL) - PORTAL_FREE(tx->tx_pages, PTL_MD_MAX_IOV * + LIBCFS_FREE(tx->tx_pages, PTL_MD_MAX_IOV * sizeof(*tx->tx_pages)); #else if (tx->tx_wrq != NULL) - PORTAL_FREE(tx->tx_wrq, + LIBCFS_FREE(tx->tx_wrq, (1 + IBNAL_MAX_RDMA_FRAGS) * sizeof(*tx->tx_wrq)); if (tx->tx_gl != NULL) - PORTAL_FREE(tx->tx_gl, + LIBCFS_FREE(tx->tx_gl, (1 + IBNAL_MAX_RDMA_FRAGS) * sizeof(*tx->tx_gl)); if (tx->tx_rd != NULL) - PORTAL_FREE(tx->tx_rd, + LIBCFS_FREE(tx->tx_rd, offsetof(kib_rdma_desc_t, rd_frags[IBNAL_MAX_RDMA_FRAGS])); #endif } - PORTAL_FREE(kibnal_data.kib_tx_descs, + LIBCFS_FREE(kibnal_data.kib_tx_descs, IBNAL_TX_MSGS() * sizeof(kib_tx_t)); } @@ -1527,7 +1527,7 @@ kibnal_shutdown (lnet_ni_t *ni) kibnal_free_tx_descs(); if (kibnal_data.kib_peers != NULL) - PORTAL_FREE (kibnal_data.kib_peers, + LIBCFS_FREE (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); @@ -1625,7 +1625,7 @@ kibnal_startup (lnet_ni_t *ni) return -ENETDOWN; } - ni->ni_nid = PTL_MKNID(PTL_NIDNET(ni->ni_nid), ip); + ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), ip); PORTAL_MODULE_USE; memset (&kibnal_data, 0, sizeof (kibnal_data)); /* zero pointers, flags etc */ @@ -1639,7 +1639,7 @@ kibnal_startup (lnet_ni_t *ni) rwlock_init(&kibnal_data.kib_global_lock); kibnal_data.kib_peer_hash_size = IBNAL_PEER_HASH_SIZE; - PORTAL_ALLOC (kibnal_data.kib_peers, + LIBCFS_ALLOC (kibnal_data.kib_peers, sizeof (struct list_head) * kibnal_data.kib_peer_hash_size); if (kibnal_data.kib_peers == NULL) { goto failed; diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index 7d0e5c53..050233b 100644 --- a/lnet/klnds/viblnd/viblnd.h +++ b/lnet/klnds/viblnd/viblnd.h @@ -53,7 +53,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include diff --git a/lnet/klnds/viblnd/viblnd_cb.c b/lnet/klnds/viblnd/viblnd_cb.c index 310f047..fd56975 100644 --- a/lnet/klnds/viblnd/viblnd_cb.c +++ b/lnet/klnds/viblnd/viblnd_cb.c @@ -1306,7 +1306,7 @@ kibnal_launch_tx (kib_tx_t *tx, lnet_nid_t nid) return; } - rc = kibnal_add_persistent_peer(nid, PTL_NIDADDR(nid)); + rc = kibnal_add_persistent_peer(nid, LNET_NIDADDR(nid)); if (rc != 0) { CERROR("Can't add peer %s: %d\n", libcfs_nid2str(nid), rc); @@ -2018,7 +2018,7 @@ kibnal_connreq_done(kib_conn_t *conn, int active, int status) LASSERT (!kibnal_peer_active(peer)); } - PORTAL_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); + LIBCFS_FREE(conn->ibc_connvars, sizeof(*conn->ibc_connvars)); conn->ibc_connvars = NULL; if (status != 0) { @@ -2445,7 +2445,7 @@ kibnal_listen_callback(cm_cep_handle_t cep, cm_conn_data_t *data, void *arg) return; } - PORTAL_ALLOC_ATOMIC(pcr, sizeof(*pcr)); + LIBCFS_ALLOC_ATOMIC(pcr, sizeof(*pcr)); if (pcr == NULL) { CERROR("Can't allocate passive connreq\n"); @@ -3121,7 +3121,7 @@ kibnal_connd (void *arg) dropped_lock = 1; kibnal_recv_connreq(pcr->pcr_cep, &pcr->pcr_cmreq); - PORTAL_FREE(pcr, sizeof(*pcr)); + LIBCFS_FREE(pcr, sizeof(*pcr)); spin_lock_irqsave(&kibnal_data.kib_connd_lock, flags); } diff --git a/lnet/libcfs/darwin/darwin-curproc.c b/lnet/libcfs/darwin/darwin-curproc.c index d930051..4832669 100644 --- a/lnet/libcfs/darwin/darwin-curproc.c +++ b/lnet/libcfs/darwin/darwin-curproc.c @@ -18,7 +18,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-debug.c b/lnet/libcfs/darwin/darwin-debug.c index 165ade0..6fdaa94 100644 --- a/lnet/libcfs/darwin/darwin-debug.c +++ b/lnet/libcfs/darwin/darwin-debug.c @@ -1,4 +1,4 @@ -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-fs.c b/lnet/libcfs/darwin/darwin-fs.c index 5b0f44c..0e2d5bf 100644 --- a/lnet/libcfs/darwin/darwin-fs.c +++ b/lnet/libcfs/darwin/darwin-fs.c @@ -33,7 +33,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-mem.c b/lnet/libcfs/darwin/darwin-mem.c index 4cf16d7..8f7654f 100644 --- a/lnet/libcfs/darwin/darwin-mem.c +++ b/lnet/libcfs/darwin/darwin-mem.c @@ -22,7 +22,7 @@ * Darwin porting library * Make things easy to port */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-module.c b/lnet/libcfs/darwin/darwin-module.c index 9f6cdd7..7405c06 100644 --- a/lnet/libcfs/darwin/darwin-module.c +++ b/lnet/libcfs/darwin/darwin-module.c @@ -4,23 +4,23 @@ #include #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include -int portal_ioctl_getdata(char *buf, char *end, void *arg) +int libcfs_ioctl_getdata(char *buf, char *end, void *arg) { - struct portal_ioctl_hdr *hdr; - struct portal_ioctl_data *data; + struct libcfs_ioctl_hdr *hdr; + struct libcfs_ioctl_data *data; int err = 0; ENTRY; - hdr = (struct portal_ioctl_hdr *)buf; - data = (struct portal_ioctl_data *)buf; + hdr = (struct libcfs_ioctl_hdr *)buf; + data = (struct libcfs_ioctl_data *)buf; /* portals_ioctl_data has been copied in by ioctl of osx */ - memcpy(buf, arg, sizeof(struct portal_ioctl_data)); + memcpy(buf, arg, sizeof(struct libcfs_ioctl_data)); - if (hdr->ioc_version != PORTAL_IOCTL_VERSION) { + if (hdr->ioc_version != LIBCFS_IOCTL_VERSION) { CERROR("PORTALS: version mismatch kernel vs application\n"); RETURN(-EINVAL); } @@ -30,7 +30,7 @@ int portal_ioctl_getdata(char *buf, char *end, void *arg) RETURN(-EINVAL); } - if (hdr->ioc_len < sizeof(struct portal_ioctl_data)) { + if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) { CERROR("PORTALS: user buffer too small for ioctl\n"); RETURN(-EINVAL); } @@ -55,12 +55,12 @@ int portal_ioctl_getdata(char *buf, char *end, void *arg) } extern struct cfs_psdev_ops libcfs_psdev_ops; -struct portals_device_userstate *mdev_state[16]; +struct libcfs_device_userstate *mdev_state[16]; static int libcfs_psdev_open(dev_t dev, int flags, int devtype, struct proc *p) { - struct portals_device_userstate *mstat = NULL; + struct libcfs_device_userstate *mstat = NULL; int rc = 0; int devid; devid = minor(dev); diff --git a/lnet/libcfs/darwin/darwin-prim.c b/lnet/libcfs/darwin/darwin-prim.c index fd2d120..ba5b06f 100644 --- a/lnet/libcfs/darwin/darwin-prim.c +++ b/lnet/libcfs/darwin/darwin-prim.c @@ -22,7 +22,7 @@ * Darwin porting library * Make things easy to port */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-proc.c b/lnet/libcfs/darwin/darwin-proc.c index 25faec8..f88b825 100644 --- a/lnet/libcfs/darwin/darwin-proc.c +++ b/lnet/libcfs/darwin/darwin-proc.c @@ -28,7 +28,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include static cfs_sysctl_table_header_t *portals_table_header = NULL; diff --git a/lnet/libcfs/darwin/darwin-sync.c b/lnet/libcfs/darwin/darwin-sync.c index 7ac24f6..ddb17d3 100644 --- a/lnet/libcfs/darwin/darwin-sync.c +++ b/lnet/libcfs/darwin/darwin-sync.c @@ -49,7 +49,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/darwin/darwin-tracefile.c b/lnet/libcfs/darwin/darwin-tracefile.c index 9da6b64..0c6253e 100644 --- a/lnet/libcfs/darwin/darwin-tracefile.c +++ b/lnet/libcfs/darwin/darwin-tracefile.c @@ -1,5 +1,5 @@ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #define LUSTRE_TRACEFILE_PRIVATE #include #include diff --git a/lnet/libcfs/darwin/darwin-utils.c b/lnet/libcfs/darwin/darwin-utils.c index d0241b4..7d75f50 100644 --- a/lnet/libcfs/darwin/darwin-utils.c +++ b/lnet/libcfs/darwin/darwin-utils.c @@ -22,7 +22,7 @@ * Darwin porting library * Make things easy to port */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c index eb22691..e54cd51 100644 --- a/lnet/libcfs/debug.c +++ b/lnet/libcfs/debug.c @@ -24,7 +24,7 @@ # define EXPORT_SYMTAB #endif -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #ifdef __KERNEL__ #include @@ -41,7 +41,7 @@ #endif #ifdef __KERNEL__ -unsigned int libcfs_subsystem_debug = ~0 - (S_PORTALS | S_NAL); +unsigned int libcfs_subsystem_debug = ~0 - (S_LNET | S_LND); EXPORT_SYMBOL(libcfs_subsystem_debug); unsigned int libcfs_debug = (D_WARNING | D_DLMTRACE | D_ERROR | D_EMERG | D_HA | @@ -145,7 +145,7 @@ static struct notifier_block lustre_panic_notifier = { #endif -int portals_debug_init(unsigned long bufsize) +int libcfs_debug_init(unsigned long bufsize) { cfs_waitq_init(&debug_ctlwq); #ifdef PORTALS_DUMP_ON_PANIC @@ -156,7 +156,7 @@ int portals_debug_init(unsigned long bufsize) return tracefile_init(); } -int portals_debug_cleanup(void) +int libcfs_debug_cleanup(void) { tracefile_exit(); #ifdef PORTALS_DUMP_ON_PANIC @@ -165,17 +165,17 @@ int portals_debug_cleanup(void) return 0; } -int portals_debug_clear_buffer(void) +int libcfs_debug_clear_buffer(void) { trace_flush_pages(); return 0; } -/* Debug markers, although printed by S_PORTALS +/* Debug markers, although printed by S_LNET * should not be be marked as such. */ #undef DEBUG_SUBSYSTEM #define DEBUG_SUBSYSTEM S_UNDEFINED -int portals_debug_mark_buffer(char *text) +int libcfs_debug_mark_buffer(char *text) { CDEBUG(D_TRACE,"***************************************************\n"); CDEBUG(D_WARNING, "DEBUG MARKER: %s\n", text); @@ -184,9 +184,9 @@ int portals_debug_mark_buffer(char *text) return 0; } #undef DEBUG_SUBSYSTEM -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET -void portals_debug_set_level(unsigned int debug_level) +void libcfs_debug_set_level(unsigned int debug_level) { printk(KERN_WARNING "Lustre: Setting portals debug level to %08x\n", debug_level); @@ -194,7 +194,7 @@ void portals_debug_set_level(unsigned int debug_level) } EXPORT_SYMBOL(libcfs_debug_dumplog); -EXPORT_SYMBOL(portals_debug_set_level); +EXPORT_SYMBOL(libcfs_debug_set_level); #else /* !__KERNEL__ */ @@ -226,23 +226,23 @@ void libcfs_debug_dumplog(void) } -int portals_debug_init(unsigned long bufsize) +int libcfs_debug_init(unsigned long bufsize) { debug_file_fd = stdout; return 0; } -int portals_debug_cleanup(void) +int libcfs_debug_cleanup(void) { return 0; //close(portals_debug_fd); } -int portals_debug_clear_buffer(void) +int libcfs_debug_clear_buffer(void) { return 0; } -int portals_debug_mark_buffer(char *text) +int libcfs_debug_mark_buffer(char *text) { fprintf(debug_file_fd, "*******************************************************************************\n"); @@ -252,11 +252,6 @@ int portals_debug_mark_buffer(char *text) return 0; } -int portals_debug_copy_to_user(char *buf, unsigned long len) -{ - return 0; -} - /* FIXME: I'm not very smart; someone smarter should make this better. */ void libcfs_debug_msg (int subsys, int mask, char *file, const char *fn, diff --git a/lnet/libcfs/linux/linux-curproc.c b/lnet/libcfs/linux/linux-curproc.c index 719e48b..e446169 100644 --- a/lnet/libcfs/linux/linux-curproc.c +++ b/lnet/libcfs/linux/linux-curproc.c @@ -20,7 +20,7 @@ #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c index 495bae0..0c9856a 100644 --- a/lnet/libcfs/linux/linux-debug.c +++ b/lnet/libcfs/linux/linux-debug.c @@ -47,7 +47,7 @@ #include #include -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/linux/linux-fs.c b/lnet/libcfs/linux/linux-fs.c index 61b7166..6657103 100644 --- a/lnet/libcfs/linux/linux-fs.c +++ b/lnet/libcfs/linux/linux-fs.c @@ -1,4 +1,4 @@ -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/linux/linux-lock.c b/lnet/libcfs/linux/linux-lock.c index a1d713e..01511d6 100644 --- a/lnet/libcfs/linux/linux-lock.c +++ b/lnet/libcfs/linux/linux-lock.c @@ -1,4 +1,4 @@ -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/linux/linux-lwt.c b/lnet/libcfs/linux/linux-lwt.c index 32adc80..520c54c 100644 --- a/lnet/libcfs/linux/linux-lwt.c +++ b/lnet/libcfs/linux/linux-lwt.c @@ -1,2 +1,2 @@ -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET diff --git a/lnet/libcfs/linux/linux-mem.c b/lnet/libcfs/linux/linux-mem.c index fb2c6a0..0662f49 100644 --- a/lnet/libcfs/linux/linux-mem.c +++ b/lnet/libcfs/linux/linux-mem.c @@ -18,7 +18,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include diff --git a/lnet/libcfs/linux/linux-module.c b/lnet/libcfs/linux/linux-module.c index c3c77ac..0150296 100644 --- a/lnet/libcfs/linux/linux-module.c +++ b/lnet/libcfs/linux/linux-module.c @@ -1,4 +1,4 @@ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include @@ -28,21 +28,21 @@ libcfs_blockallsigs () SIGNAL_MASK_UNLOCK(current, flags); } -int portal_ioctl_getdata(char *buf, char *end, void *arg) +int libcfs_ioctl_getdata(char *buf, char *end, void *arg) { - struct portal_ioctl_hdr *hdr; - struct portal_ioctl_data *data; + struct libcfs_ioctl_hdr *hdr; + struct libcfs_ioctl_data *data; int err; ENTRY; - hdr = (struct portal_ioctl_hdr *)buf; - data = (struct portal_ioctl_data *)buf; + hdr = (struct libcfs_ioctl_hdr *)buf; + data = (struct libcfs_ioctl_data *)buf; err = copy_from_user(buf, (void *)arg, sizeof(*hdr)); if (err) RETURN(err); - if (hdr->ioc_version != PORTAL_IOCTL_VERSION) { + if (hdr->ioc_version != LIBCFS_IOCTL_VERSION) { CERROR("PORTALS: version mismatch kernel vs application\n"); RETURN(-EINVAL); } @@ -53,7 +53,7 @@ int portal_ioctl_getdata(char *buf, char *end, void *arg) } - if (hdr->ioc_len < sizeof(struct portal_ioctl_data)) { + if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) { CERROR("PORTALS: user buffer too small for ioctl\n"); RETURN(-EINVAL); } @@ -62,7 +62,7 @@ int portal_ioctl_getdata(char *buf, char *end, void *arg) if (err) RETURN(err); - if (portal_ioctl_is_invalid(data)) { + if (libcfs_ioctl_is_invalid(data)) { CERROR("PORTALS: ioctl not correctly formatted\n"); RETURN(-EINVAL); } @@ -82,12 +82,12 @@ extern struct cfs_psdev_ops libcfs_psdev_ops; static int libcfs_psdev_open(struct inode * inode, struct file * file) { - struct portals_device_userstate **pdu = NULL; + struct libcfs_device_userstate **pdu = NULL; int rc = 0; if (!inode) return (-EINVAL); - pdu = (struct portals_device_userstate **)&file->private_data; + pdu = (struct libcfs_device_userstate **)&file->private_data; if (libcfs_psdev_ops.p_open != NULL) rc = libcfs_psdev_ops.p_open(0, (void *)pdu); else @@ -99,7 +99,7 @@ libcfs_psdev_open(struct inode * inode, struct file * file) static int libcfs_psdev_release(struct inode * inode, struct file * file) { - struct portals_device_userstate *pdu; + struct libcfs_device_userstate *pdu; int rc = 0; if (!inode) @@ -122,9 +122,9 @@ libcfs_ioctl(struct inode *inode, struct file *file, if (current->fsuid != 0) return -EACCES; - if ( _IOC_TYPE(cmd) != IOC_PORTAL_TYPE || - _IOC_NR(cmd) < IOC_PORTAL_MIN_NR || - _IOC_NR(cmd) > IOC_PORTAL_MAX_NR ) { + if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE || + _IOC_NR(cmd) < IOC_LIBCFS_MIN_NR || + _IOC_NR(cmd) > IOC_LIBCFS_MAX_NR ) { CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n", _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd)); return (-EINVAL); @@ -132,12 +132,12 @@ libcfs_ioctl(struct inode *inode, struct file *file, /* Handle platform-dependent IOC requests */ switch (cmd) { - case IOC_PORTAL_PANIC: + case IOC_LIBCFS_PANIC: if (!capable (CAP_SYS_BOOT)) return (-EPERM); panic("debugctl-invoked panic"); return (0); - case IOC_PORTAL_MEMHOG: + case IOC_LIBCFS_MEMHOG: if (!capable (CAP_SYS_ADMIN)) return -EPERM; /* go thought */ diff --git a/lnet/libcfs/linux/linux-prim.c b/lnet/libcfs/linux/linux-prim.c index 95365ee..28a7a25 100644 --- a/lnet/libcfs/linux/linux-prim.c +++ b/lnet/libcfs/linux/linux-prim.c @@ -1,4 +1,4 @@ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include #include diff --git a/lnet/libcfs/linux/linux-proc.c b/lnet/libcfs/linux/linux-proc.c index 67a710d..ce755cc 100644 --- a/lnet/libcfs/linux/linux-proc.c +++ b/lnet/libcfs/linux/linux-proc.c @@ -51,7 +51,7 @@ #include #include -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET #include #include @@ -69,9 +69,9 @@ enum { PSDEV_CONSOLE, /* allow _any_ messages to console */ PSDEV_DEBUG_PATH, /* crashdump log location */ PSDEV_DEBUG_DUMP_PATH, /* crashdump tracelog location */ - PSDEV_PORTALS_UPCALL, /* User mode upcall script */ - PSDEV_PORTALS_MEMUSED, /* bytes currently PORTAL_ALLOCated */ - PSDEV_PORTALS_CATASTROPHE,/* if we have LBUGged or panic'd */ + PSDEV_LNET_UPCALL, /* User mode upcall script */ + PSDEV_LNET_MEMUSED, /* bytes currently PORTAL_ALLOCated */ + PSDEV_LNET_CATASTROPHE, /* if we have LBUGged or panic'd */ }; static struct ctl_table lnet_table[] = { @@ -83,12 +83,12 @@ static struct ctl_table lnet_table[] = { &proc_dointvec}, {PSDEV_DEBUG_PATH, "debug_path", debug_file_path, sizeof(debug_file_path), 0644, NULL, &proc_dostring, &sysctl_string}, - {PSDEV_PORTALS_UPCALL, "upcall", lnet_upcall, + {PSDEV_LNET_UPCALL, "upcall", lnet_upcall, sizeof(lnet_upcall), 0644, NULL, &proc_dostring, &sysctl_string}, - {PSDEV_PORTALS_MEMUSED, "memused", (int *)&libcfs_kmemory.counter, + {PSDEV_LNET_MEMUSED, "memused", (int *)&libcfs_kmemory.counter, sizeof(int), 0644, NULL, &proc_dointvec}, - {PSDEV_PORTALS_CATASTROPHE, "catastrophe", &libcfs_catastrophe, + {PSDEV_LNET_CATASTROPHE, "catastrophe", &libcfs_catastrophe, sizeof(int), 0444, NULL, &proc_dointvec}, {0} }; diff --git a/lnet/libcfs/linux/linux-sync.c b/lnet/libcfs/linux/linux-sync.c index 32adc80..520c54c 100644 --- a/lnet/libcfs/linux/linux-sync.c +++ b/lnet/libcfs/linux/linux-sync.c @@ -1,2 +1,2 @@ -# define DEBUG_SUBSYSTEM S_PORTALS +# define DEBUG_SUBSYSTEM S_LNET diff --git a/lnet/libcfs/linux/linux-tcpip.c b/lnet/libcfs/linux/linux-tcpip.c index bad8f5b..e6f07d7 100644 --- a/lnet/libcfs/linux/linux-tcpip.c +++ b/lnet/libcfs/linux/linux-tcpip.c @@ -18,7 +18,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include @@ -137,7 +137,7 @@ libcfs_ipif_enumerate (char ***namesp) nalloc); } - PORTAL_ALLOC(ifr, nalloc * sizeof(*ifr)); + LIBCFS_ALLOC(ifr, nalloc * sizeof(*ifr)); if (ifr == NULL) { CERROR ("ENOMEM enumerating up to %d interfaces\n", nalloc); rc = -ENOMEM; @@ -164,14 +164,14 @@ libcfs_ipif_enumerate (char ***namesp) if (nfound < nalloc || toobig) break; - PORTAL_FREE(ifr, nalloc * sizeof(*ifr)); + LIBCFS_FREE(ifr, nalloc * sizeof(*ifr)); nalloc *= 2; } if (nfound == 0) goto out1; - PORTAL_ALLOC(names, nfound * sizeof(*names)); + LIBCFS_ALLOC(names, nfound * sizeof(*names)); if (names == NULL) { rc = -ENOMEM; goto out1; @@ -190,7 +190,7 @@ libcfs_ipif_enumerate (char ***namesp) goto out2; } - PORTAL_ALLOC(names[i], IFNAMSIZ); + LIBCFS_ALLOC(names[i], IFNAMSIZ); if (names[i] == NULL) { rc = -ENOMEM; goto out2; @@ -207,7 +207,7 @@ libcfs_ipif_enumerate (char ***namesp) if (rc < 0) libcfs_ipif_free_enumeration(names, nfound); out1: - PORTAL_FREE(ifr, nalloc * sizeof(*ifr)); + LIBCFS_FREE(ifr, nalloc * sizeof(*ifr)); out0: sock_release(sock); return rc; @@ -223,9 +223,9 @@ libcfs_ipif_free_enumeration (char **names, int n) LASSERT (n > 0); for (i = 0; i < n && names[i] != NULL; i++) - PORTAL_FREE(names[i], IFNAMSIZ); + LIBCFS_FREE(names[i], IFNAMSIZ); - PORTAL_FREE(names, n * sizeof(*names)); + LIBCFS_FREE(names, n * sizeof(*names)); } EXPORT_SYMBOL(libcfs_ipif_free_enumeration); diff --git a/lnet/libcfs/linux/linux-tracefile.c b/lnet/libcfs/linux/linux-tracefile.c index 8a983a8..a23c247 100644 --- a/lnet/libcfs/linux/linux-tracefile.c +++ b/lnet/libcfs/linux/linux-tracefile.c @@ -1,4 +1,4 @@ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #define LUSTRE_TRACEFILE_PRIVATE #include diff --git a/lnet/libcfs/linux/linux-utils.c b/lnet/libcfs/linux/linux-utils.c index c3163a7..6220541 100644 --- a/lnet/libcfs/linux/linux-utils.c +++ b/lnet/libcfs/linux/linux-utils.c @@ -24,7 +24,7 @@ /* * miscellaneous libcfs stuff */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include /* diff --git a/lnet/libcfs/lwt.c b/lnet/libcfs/lwt.c index b4ae10f5..73be85b 100644 --- a/lnet/libcfs/lwt.c +++ b/lnet/libcfs/lwt.c @@ -39,7 +39,7 @@ #include #include -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include @@ -202,7 +202,7 @@ lwt_init () return (-ENOMEM); } - PORTAL_ALLOC(lwtp, sizeof (*lwtp)); + LIBCFS_ALLOC(lwtp, sizeof (*lwtp)); if (lwtp == NULL) { CERROR ("Can't allocate lwtp\n"); __free_page(page); @@ -253,7 +253,7 @@ lwt_fini () } __free_page (lwtp->lwtp_page); - PORTAL_FREE (lwtp, sizeof (*lwtp)); + LIBCFS_FREE (lwtp, sizeof (*lwtp)); } } diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index 02d90b9..ef40672 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -22,16 +22,16 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include #include void -kportal_memhog_free (struct portals_device_userstate *pdu) +kportal_memhog_free (struct libcfs_device_userstate *ldu) { - cfs_page_t **level0p = &pdu->pdu_memhog_root_page; + cfs_page_t **level0p = &ldu->ldu_memhog_root_page; cfs_page_t **level1p; cfs_page_t **level2p; int count1; @@ -52,28 +52,28 @@ kportal_memhog_free (struct portals_device_userstate *pdu) *level2p != NULL) { cfs_free_page(*level2p); - pdu->pdu_memhog_pages--; + ldu->ldu_memhog_pages--; level2p++; count2++; } cfs_free_page(*level1p); - pdu->pdu_memhog_pages--; + ldu->ldu_memhog_pages--; level1p++; count1++; } cfs_free_page(*level0p); - pdu->pdu_memhog_pages--; + ldu->ldu_memhog_pages--; *level0p = NULL; } - LASSERT (pdu->pdu_memhog_pages == 0); + LASSERT (ldu->ldu_memhog_pages == 0); } int -kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flags) +kportal_memhog_alloc (struct libcfs_device_userstate *ldu, int npages, int flags) { cfs_page_t **level0p; cfs_page_t **level1p; @@ -81,8 +81,8 @@ kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flag int count1; int count2; - LASSERT (pdu->pdu_memhog_pages == 0); - LASSERT (pdu->pdu_memhog_root_page == NULL); + LASSERT (ldu->ldu_memhog_pages == 0); + LASSERT (ldu->ldu_memhog_root_page == NULL); if (npages < 0) return -EINVAL; @@ -90,17 +90,17 @@ kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flag if (npages == 0) return 0; - level0p = &pdu->pdu_memhog_root_page; + level0p = &ldu->ldu_memhog_root_page; *level0p = cfs_alloc_page(flags); if (*level0p == NULL) return -ENOMEM; - pdu->pdu_memhog_pages++; + ldu->ldu_memhog_pages++; level1p = (cfs_page_t **)cfs_page_address(*level0p); count1 = 0; memset(level1p, 0, CFS_PAGE_SIZE); - while (pdu->pdu_memhog_pages < npages && + while (ldu->ldu_memhog_pages < npages && count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) { if (cfs_signal_pending(cfs_current())) @@ -109,13 +109,13 @@ kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flag *level1p = cfs_alloc_page(flags); if (*level1p == NULL) return -ENOMEM; - pdu->pdu_memhog_pages++; + ldu->ldu_memhog_pages++; level2p = (cfs_page_t **)cfs_page_address(*level1p); count2 = 0; memset(level2p, 0, CFS_PAGE_SIZE); - while (pdu->pdu_memhog_pages < npages && + while (ldu->ldu_memhog_pages < npages && count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) { if (cfs_signal_pending(cfs_current())) @@ -124,7 +124,7 @@ kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flag *level2p = cfs_alloc_page(flags); if (*level2p == NULL) return (-ENOMEM); - pdu->pdu_memhog_pages++; + ldu->ldu_memhog_pages++; level2p++; count2++; @@ -140,17 +140,17 @@ kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flag /* called when opening /dev/device */ static int libcfs_psdev_open(unsigned long flags, void *args) { - struct portals_device_userstate *pdu; + struct libcfs_device_userstate *ldu; ENTRY; PORTAL_MODULE_USE; - PORTAL_ALLOC(pdu, sizeof(*pdu)); - if (pdu != NULL) { - pdu->pdu_memhog_pages = 0; - pdu->pdu_memhog_root_page = NULL; + LIBCFS_ALLOC(ldu, sizeof(*ldu)); + if (ldu != NULL) { + ldu->ldu_memhog_pages = 0; + ldu->ldu_memhog_root_page = NULL; } - *(struct portals_device_userstate **)args = pdu; + *(struct libcfs_device_userstate **)args = ldu; RETURN(0); } @@ -158,13 +158,13 @@ static int libcfs_psdev_open(unsigned long flags, void *args) /* called when closing /dev/device */ static int libcfs_psdev_release(unsigned long flags, void *args) { - struct portals_device_userstate *pdu; + struct libcfs_device_userstate *ldu; ENTRY; - pdu = (struct portals_device_userstate *)args; - if (pdu != NULL) { - kportal_memhog_free(pdu); - PORTAL_FREE(pdu, sizeof(*pdu)); + ldu = (struct libcfs_device_userstate *)args; + if (ldu != NULL) { + kportal_memhog_free(ldu); + LIBCFS_FREE(ldu, sizeof(*ldu)); } PORTAL_MODULE_UNUSE; @@ -208,38 +208,38 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a { char buf[1024]; int err = -EINVAL; - struct portal_ioctl_data *data; + struct libcfs_ioctl_data *data; ENTRY; /* 'cmd' and permissions get checked in our arch-specific caller */ - if (portal_ioctl_getdata(buf, buf + 800, (void *)arg)) { + if (libcfs_ioctl_getdata(buf, buf + 800, (void *)arg)) { CERROR("PORTALS ioctl: data error\n"); return (-EINVAL); } - data = (struct portal_ioctl_data *)buf; + data = (struct libcfs_ioctl_data *)buf; switch (cmd) { - case IOC_PORTAL_CLEAR_DEBUG: - portals_debug_clear_buffer(); + case IOC_LIBCFS_CLEAR_DEBUG: + libcfs_debug_clear_buffer(); RETURN(0); /* - * case IOC_PORTAL_PANIC: + * case IOC_LIBCFS_PANIC: * Handled in arch/cfs_module.c */ - case IOC_PORTAL_MARK_DEBUG: + case IOC_LIBCFS_MARK_DEBUG: if (data->ioc_inlbuf1 == NULL || data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0') RETURN(-EINVAL); - portals_debug_mark_buffer(data->ioc_inlbuf1); + libcfs_debug_mark_buffer(data->ioc_inlbuf1); RETURN(0); #if LWT_SUPPORT - case IOC_PORTAL_LWT_CONTROL: + case IOC_LIBCFS_LWT_CONTROL: err = lwt_control ((data->ioc_flags & 1) != 0, (data->ioc_flags & 2) != 0); break; - case IOC_PORTAL_LWT_SNAPSHOT: { + case IOC_LIBCFS_LWT_SNAPSHOT: { cycles_t now; int ncpu; int total_size; @@ -260,7 +260,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a break; } - case IOC_PORTAL_LWT_LOOKUP_STRING: + case IOC_LIBCFS_LWT_LOOKUP_STRING: err = lwt_lookup_string (&data->ioc_count, data->ioc_pbuf1, data->ioc_pbuf2, data->ioc_plen2); if (err == 0 && @@ -268,7 +268,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a err = -EFAULT; break; #endif - case IOC_PORTAL_MEMHOG: + case IOC_LIBCFS_MEMHOG: if (pfile->private_data == NULL) { err = -EINVAL; } else { @@ -282,9 +282,9 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a } break; - case IOC_PORTAL_PING: { - extern void (kping_client)(struct portal_ioctl_data *); - void (*ping)(struct portal_ioctl_data *); + case IOC_LIBCFS_PING: { + extern void (kping_client)(struct libcfs_ioctl_data *); + void (*ping)(struct libcfs_ioctl_data *); CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n", data->ioc_count, libcfs_nid2str(data->ioc_nid), @@ -353,9 +353,9 @@ static int init_libcfs_module(void) init_rwsem(&ioctl_list_sem); CFS_INIT_LIST_HEAD(&ioctl_list); - rc = portals_debug_init(5 * 1024 * 1024); + rc = libcfs_debug_init(5 * 1024 * 1024); if (rc < 0) { - printk(KERN_ERR "LustreError: portals_debug_init: %d\n", rc); + printk(KERN_ERR "LustreError: libcfs_debug_init: %d\n", rc); return (rc); } @@ -388,7 +388,7 @@ static int init_libcfs_module(void) lwt_fini(); cleanup_debug: #endif - portals_debug_cleanup(); + libcfs_debug_cleanup(); return rc; } @@ -413,9 +413,9 @@ static void exit_libcfs_module(void) CERROR("Portals memory leaked: %d bytes\n", atomic_read(&libcfs_kmemory)); - rc = portals_debug_cleanup(); + rc = libcfs_debug_cleanup(); if (rc) - printk(KERN_ERR "LustreError: portals_debug_cleanup: %d\n", rc); + printk(KERN_ERR "LustreError: libcfs_debug_cleanup: %d\n", rc); libcfs_arch_cleanup(); } diff --git a/lnet/libcfs/nidstrings.c b/lnet/libcfs/nidstrings.c index e12f75c..323ddb3 100644 --- a/lnet/libcfs/nidstrings.c +++ b/lnet/libcfs/nidstrings.c @@ -24,7 +24,7 @@ # define EXPORT_SYMTAB #endif -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include @@ -203,7 +203,7 @@ libcfs_ip_str2addr(char *str, int nob, __u32 *addr) ('A' <= str[0] && str[0] <= 'Z')) { char *tmp; - PORTAL_ALLOC(tmp, nob + 1); + LIBCFS_ALLOC(tmp, nob + 1); if (tmp != NULL) { struct hostent *he; @@ -212,7 +212,7 @@ libcfs_ip_str2addr(char *str, int nob, __u32 *addr) he = gethostbyname(tmp); - PORTAL_FREE(tmp, nob); + LIBCFS_FREE(tmp, nob); if (he != NULL) { __u32 ip = *(__u32 *)he->h_addr; @@ -314,8 +314,8 @@ libcfs_str2lnd(char *str) char * libcfs_net2str(__u32 net) { - int lnd = PTL_NETTYP(net); - int num = PTL_NETNUM(net); + int lnd = LNET_NETTYP(net); + int num = LNET_NETNUM(net); struct netstrfns *nf = libcfs_lnd2netstrfns(lnd); char *str = libcfs_next_nidstring(); @@ -332,10 +332,10 @@ libcfs_net2str(__u32 net) char * libcfs_nid2str(lnet_nid_t nid) { - __u32 addr = PTL_NIDADDR(nid); - __u32 net = PTL_NIDNET(nid); - int lnd = PTL_NETTYP(net); - int nnum = PTL_NETNUM(net); + __u32 addr = LNET_NIDADDR(nid); + __u32 net = LNET_NIDNET(nid); + int lnd = LNET_NETTYP(net); + int nnum = LNET_NETNUM(net); struct netstrfns *nf; char *str; int nob; @@ -343,7 +343,7 @@ libcfs_nid2str(lnet_nid_t nid) if (nid == LNET_NID_ANY) return "LNET_NID_ANY"; - nf = libcfs_lnd2netstrfns(PTL_NETTYP(net)); + nf = libcfs_lnd2netstrfns(LNET_NETTYP(net)); str = libcfs_next_nidstring(); if (nf == NULL) @@ -395,7 +395,7 @@ libcfs_str2net_internal(char *str, __u32 *net) return NULL; } - *net = PTL_MKNET(nf->nf_type, netnum); + *net = LNET_MKNET(nf->nf_type, netnum); return nf; } @@ -407,7 +407,7 @@ libcfs_str2net(char *str) if (libcfs_str2net_internal(str, &net) != NULL) return net; - return PTL_NIDNET(LNET_NID_ANY); + return LNET_NIDNET(LNET_NID_ANY); } lnet_nid_t @@ -424,7 +424,7 @@ libcfs_str2nid(char *str) return LNET_NID_ANY; } else { sep = str + strlen(str); - net = PTL_MKNET(SOCKLND, 0); + net = LNET_MKNET(SOCKLND, 0); nf = libcfs_lnd2netstrfns(SOCKLND); LASSERT (nf != NULL); } @@ -432,7 +432,7 @@ libcfs_str2nid(char *str) if (!nf->nf_str2addr(str, sep - str, &addr)) return LNET_NID_ANY; - return PTL_MKNID(net, addr); + return LNET_MKNID(net, addr); } char * diff --git a/lnet/libcfs/tracefile.c b/lnet/libcfs/tracefile.c index ff3bf22..1aaab9e 100644 --- a/lnet/libcfs/tracefile.c +++ b/lnet/libcfs/tracefile.c @@ -22,7 +22,7 @@ */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #define LUSTRE_TRACEFILE_PRIVATE #include "tracefile.h" diff --git a/lnet/libcfs/watchdog.c b/lnet/libcfs/watchdog.c index 6aa7986..143ce43 100644 --- a/lnet/libcfs/watchdog.c +++ b/lnet/libcfs/watchdog.c @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #include @@ -263,7 +263,7 @@ struct lc_watchdog *lc_watchdog_add(int timeout_ms, struct lc_watchdog *lcw = NULL; ENTRY; - PORTAL_ALLOC(lcw, sizeof(*lcw)); + LIBCFS_ALLOC(lcw, sizeof(*lcw)); if (!lcw) { CDEBUG(D_INFO, "Could not allocate new lc_watchdog\n"); RETURN(ERR_PTR(-ENOMEM)); @@ -380,7 +380,7 @@ void lc_watchdog_delete(struct lc_watchdog *lcw) lcw_dispatch_stop(); up(&lcw_refcount_sem); - PORTAL_FREE(lcw, sizeof(*lcw)); + LIBCFS_FREE(lcw, sizeof(*lcw)); EXIT; } diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 8c167b4..56d8308 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -20,7 +20,7 @@ * */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include #ifdef __KERNEL__ @@ -258,7 +258,7 @@ lnet_accept(lnet_ni_t *blind_ni, struct socket *sock, __u32 magic) return -EPROTO; } - ni = lnet_net2ni(PTL_NIDNET(cr.acr_nid)); + ni = lnet_net2ni(LNET_NIDNET(cr.acr_nid)); if (ni == NULL || /* no matching net */ ni->ni_nid != cr.acr_nid) /* right NET, but wrong NID! */ { if (ni != NULL) diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index a346953..c8b20d6 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include lnet_t the_lnet; /* THE state of the network */ @@ -350,7 +350,7 @@ lnet_freelist_init (lnet_freelist_t *fl, int n, int size) size += offsetof (lnet_freeobj_t, fo_contents); - PORTAL_ALLOC(space, n * size); + LIBCFS_ALLOC(space, n * size); if (space == NULL) return (-ENOMEM); @@ -384,7 +384,7 @@ lnet_freelist_fini (lnet_freelist_t *fl) LASSERT (count == fl->fl_nobjs); - PORTAL_FREE(fl->fl_objs, fl->fl_nobjs * fl->fl_objsize); + LIBCFS_FREE(fl->fl_objs, fl->fl_nobjs * fl->fl_objsize); memset (fl, 0, sizeof (fl)); } @@ -463,7 +463,7 @@ lnet_setup_handle_hash (void) #else the_lnet.ln_lh_hash_size = (MAX_MES + MAX_MDS + MAX_EQS)/4; #endif - PORTAL_ALLOC(the_lnet.ln_lh_hash_table, + LIBCFS_ALLOC(the_lnet.ln_lh_hash_table, the_lnet.ln_lh_hash_size * sizeof (struct list_head)); if (the_lnet.ln_lh_hash_table == NULL) return (-ENOMEM); @@ -482,7 +482,7 @@ lnet_cleanup_handle_hash (void) if (the_lnet.ln_lh_hash_table == NULL) return; - PORTAL_FREE(the_lnet.ln_lh_hash_table, + LIBCFS_FREE(the_lnet.ln_lh_hash_table, the_lnet.ln_lh_hash_size * sizeof (struct list_head)); } @@ -577,7 +577,7 @@ lnet_prepare(lnet_pid_t requested_pid) goto failed1; the_lnet.ln_nportals = MAX_PORTALS; - PORTAL_ALLOC(the_lnet.ln_portals, + LIBCFS_ALLOC(the_lnet.ln_portals, the_lnet.ln_nportals * sizeof(*the_lnet.ln_portals)); if (the_lnet.ln_portals == NULL) { @@ -655,7 +655,7 @@ lnet_unprepare (void) lnet_msg_free (msg); } - PORTAL_FREE(the_lnet.ln_portals, + LIBCFS_FREE(the_lnet.ln_portals, the_lnet.ln_nportals * sizeof(*the_lnet.ln_portals)); lnet_free_rtrpools(); @@ -675,7 +675,7 @@ lnet_net2ni_locked (__u32 net) list_for_each (tmp, &the_lnet.ln_nis) { ni = list_entry(tmp, lnet_ni_t, ni_list); - if (lnet_ptlcompat_matchnet(PTL_NIDNET(ni->ni_nid), net)) { + if (lnet_ptlcompat_matchnet(LNET_NIDNET(ni->ni_nid), net)) { lnet_ni_addref_locked(ni); return ni; } @@ -842,7 +842,7 @@ lnet_shutdown_lndnis (void) LCONSOLE(0, "Removed NI %s\n", libcfs_nid2str(ni->ni_nid)); - PORTAL_FREE(ni, sizeof(*ni)); + LIBCFS_FREE(ni, sizeof(*ni)); LNET_LOCK(); the_lnet.ln_nzombie_nis--; @@ -852,7 +852,7 @@ lnet_shutdown_lndnis (void) LNET_UNLOCK(); if (the_lnet.ln_network_tokens != NULL) { - PORTAL_FREE(the_lnet.ln_network_tokens, + LIBCFS_FREE(the_lnet.ln_network_tokens, the_lnet.ln_network_tokens_nob); the_lnet.ln_network_tokens = NULL; } @@ -875,7 +875,7 @@ lnet_startup_lndnis (void) while (!list_empty(&nilist)) { ni = list_entry(nilist.next, lnet_ni_t, ni_list); - lnd_type = PTL_NETTYP(PTL_NIDNET(ni->ni_nid)); + lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid)); LASSERT (libcfs_isknown_lnd(lnd_type)); @@ -992,7 +992,7 @@ lnet_startup_lndnis (void) while (!list_empty(&nilist)) { ni = list_entry(nilist.next, lnet_ni_t, ni_list); list_del(&ni->ni_list); - PORTAL_FREE(ni, sizeof(*ni)); + LIBCFS_FREE(ni, sizeof(*ni)); } return -ENETDOWN; @@ -1128,7 +1128,7 @@ LNetNIFini() int LNetCtl(unsigned int cmd, void *arg) { - struct portal_ioctl_data *data = arg; + struct libcfs_ioctl_data *data = arg; lnet_process_id_t id; lnet_ni_t *ni; int rc; @@ -1137,31 +1137,31 @@ LNetCtl(unsigned int cmd, void *arg) LASSERT (the_lnet.ln_refcount > 0); switch (cmd) { - case IOC_PORTAL_GET_NI: + case IOC_LIBCFS_GET_NI: rc = LNetGetId(data->ioc_count, &id); data->ioc_nid = id.nid; return rc; - case IOC_PORTAL_FAIL_NID: + case IOC_LIBCFS_FAIL_NID: return lnet_fail_nid(data->ioc_nid, data->ioc_count); - case IOC_PORTAL_ADD_ROUTE: + case IOC_LIBCFS_ADD_ROUTE: rc = lnet_add_route(data->ioc_net, data->ioc_count, data->ioc_nid); return (rc != 0) ? rc : lnet_check_routes(); - case IOC_PORTAL_DEL_ROUTE: + case IOC_LIBCFS_DEL_ROUTE: return lnet_del_route(data->ioc_net, data->ioc_nid); - case IOC_PORTAL_GET_ROUTE: + case IOC_LIBCFS_GET_ROUTE: return lnet_get_route(data->ioc_count, &data->ioc_net, &data->ioc_count, &data->ioc_nid, &data->ioc_flags); - case IOC_PORTAL_NOTIFY_ROUTER: + case IOC_LIBCFS_NOTIFY_ROUTER: return lnet_notify(NULL, data->ioc_nid, data->ioc_flags, (time_t)data->ioc_u64[0]); - case IOC_PORTAL_PORTALS_COMPATIBILITY: + case IOC_LIBCFS_PORTALS_COMPATIBILITY: return the_lnet.ln_ptlcompat; default: diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index b1863f2..4d66206 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include typedef struct { /* tmp struct for parsing routes */ @@ -113,7 +113,7 @@ lnet_net_unique(__u32 net, struct list_head *nilist) list_for_each (tmp, nilist) { ni = list_entry(tmp, lnet_ni_t, ni_list); - if (PTL_NIDNET(ni->ni_nid) == net) + if (LNET_NIDNET(ni->ni_nid) == net) return 0; } @@ -131,7 +131,7 @@ lnet_new_ni(__u32 net, struct list_head *nilist) return NULL; } - PORTAL_ALLOC(ni, sizeof(*ni)); + LIBCFS_ALLOC(ni, sizeof(*ni)); if (ni == NULL) { CERROR("Out of memory creating network %s\n", libcfs_net2str(net)); @@ -142,7 +142,7 @@ lnet_new_ni(__u32 net, struct list_head *nilist) memset(ni, 0, sizeof(*ni)); /* LND will fill in the address part of the NID */ - ni->ni_nid = PTL_MKNID(net, 0); + ni->ni_nid = LNET_MKNID(net, 0); CFS_INIT_LIST_HEAD(&ni->ni_txq); list_add_tail(&ni->ni_list, nilist); @@ -165,7 +165,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks) return -EINVAL; } - PORTAL_ALLOC(tokens, tokensize); + LIBCFS_ALLOC(tokens, tokensize); if (tokens == NULL) { CERROR("Can't allocate net tokens\n"); return -ENOMEM; @@ -177,7 +177,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks) str = tokens; /* Add in the loopback network */ - ni = lnet_new_ni(PTL_MKNET(LOLND, 0), nilist); + ni = lnet_new_ni(LNET_MKNET(LOLND, 0), nilist); if (ni == NULL) goto failed; @@ -199,14 +199,14 @@ lnet_parse_networks(struct list_head *nilist, char *networks) *comma++ = 0; net = libcfs_str2net(lnet_trimwhite(str)); - if (net == PTL_NIDNET(LNET_NID_ANY)) { + if (net == LNET_NIDNET(LNET_NID_ANY)) { lnet_syntax("networks", networks, str - tokens, strlen(str)); LCONSOLE_ERROR("Unrecognised network type\n"); goto failed; } - if (PTL_NETTYP(net) != LOLND && /* loopback is implicit */ + if (LNET_NETTYP(net) != LOLND && /* loopback is implicit */ lnet_new_ni(net, nilist) == NULL) goto failed; @@ -216,7 +216,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks) *bracket = 0; net = libcfs_str2net(lnet_trimwhite(str)); - if (net == PTL_NIDNET(LNET_NID_ANY)) { + if (net == LNET_NIDNET(LNET_NID_ANY)) { lnet_syntax("networks", networks, str - tokens, strlen(str)); goto failed; @@ -295,9 +295,9 @@ lnet_parse_networks(struct list_head *nilist, char *networks) ni = list_entry(nilist->next, lnet_ni_t, ni_list); list_del(&ni->ni_list); - PORTAL_FREE(ni, sizeof(*ni)); + LIBCFS_FREE(ni, sizeof(*ni)); } - PORTAL_FREE(tokens, tokensize); + LIBCFS_FREE(tokens, tokensize); the_lnet.ln_network_tokens = NULL; return -EINVAL; @@ -321,7 +321,7 @@ lnet_new_text_buf (int str_len) return NULL; } - PORTAL_ALLOC(ptb, nob); + LIBCFS_ALLOC(ptb, nob); if (ptb == NULL) return NULL; @@ -333,7 +333,7 @@ lnet_new_text_buf (int str_len) void lnet_free_text_buf (lnet_text_buf_t *ptb) { - PORTAL_FREE(ptb, ptb->ptb_size); + LIBCFS_FREE(ptb, ptb->ptb_size); lnet_tbnob -= ptb->ptb_size; } @@ -623,13 +623,13 @@ lnet_parse_route (char *str, int *im_a_router) if (ntokens == 1) { net = libcfs_str2net(ptb->ptb_text); - if (net == PTL_NIDNET(LNET_NID_ANY) || - PTL_NETTYP(net) == LOLND) + if (net == LNET_NIDNET(LNET_NID_ANY) || + LNET_NETTYP(net) == LOLND) goto token_error; } else { nid = libcfs_str2nid(ptb->ptb_text); if (nid == LNET_NID_ANY || - PTL_NETTYP(PTL_NIDNET(nid)) == LOLND) + LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) goto token_error; } } @@ -644,7 +644,7 @@ lnet_parse_route (char *str, int *im_a_router) list_for_each (tmp1, &nets) { ptb = list_entry(tmp1, lnet_text_buf_t, ptb_list); net = libcfs_str2net(ptb->ptb_text); - LASSERT (net != PTL_NIDNET(LNET_NID_ANY)); + LASSERT (net != LNET_NIDNET(LNET_NID_ANY)); list_for_each (tmp2, &gateways) { ptb = list_entry(tmp2, lnet_text_buf_t, ptb_list); @@ -731,7 +731,7 @@ lnet_parse_routes (char *routes, int *im_a_router) int lnet_set_ip_niaddr (lnet_ni_t *ni) { - __u32 net = PTL_NIDNET(ni->ni_nid); + __u32 net = LNET_NIDNET(ni->ni_nid); char **names; int n; __u32 ip; @@ -767,7 +767,7 @@ lnet_set_ip_niaddr (lnet_ni_t *ni) return -ENETDOWN; } - ni->ni_nid = PTL_MKNID(net, ip); + ni->ni_nid = LNET_MKNID(net, ip); return 0; } @@ -797,7 +797,7 @@ lnet_set_ip_niaddr (lnet_ni_t *ni) } libcfs_ipif_free_enumeration(names, n); - ni->ni_nid = PTL_MKNID(net, ip); + ni->ni_nid = LNET_MKNID(net, ip); return 0; } diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 5347b0d..2c5390a 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include int @@ -53,7 +53,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, if (eq == NULL) return (-ENOMEM); - PORTAL_ALLOC(eq->eq_events, count * sizeof(lnet_event_t)); + LIBCFS_ALLOC(eq->eq_events, count * sizeof(lnet_event_t)); if (eq->eq_events == NULL) { LNET_LOCK(); lnet_eq_free (eq); @@ -114,7 +114,7 @@ LNetEQFree(lnet_handle_eq_t eqh) LNET_UNLOCK(); - PORTAL_FREE(events, size * sizeof (lnet_event_t)); + LIBCFS_FREE(events, size * sizeof (lnet_event_t)); return 0; } diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index 45bb122..5ddd84f 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index f39b31a..ab873db 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 1ce53e6..99e6b24 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include @@ -161,7 +161,7 @@ lnet_fail_nid (lnet_nid_t nid, unsigned int threshold) if (threshold != 0) { /* Adding a new entry */ - PORTAL_ALLOC(tp, sizeof(*tp)); + LIBCFS_ALLOC(tp, sizeof(*tp)); if (tp == NULL) return -ENOMEM; @@ -197,7 +197,7 @@ lnet_fail_nid (lnet_nid_t nid, unsigned int threshold) tp = list_entry (cull.next, lnet_test_peer_t, tp_list); list_del (&tp->tp_list); - PORTAL_FREE(tp, sizeof (*tp)); + LIBCFS_FREE(tp, sizeof (*tp)); } return 0; } @@ -253,7 +253,7 @@ fail_peer (lnet_nid_t nid, int outgoing) tp = list_entry (cull.next, lnet_test_peer_t, tp_list); list_del (&tp->tp_list); - PORTAL_FREE(tp, sizeof (*tp)); + LIBCFS_FREE(tp, sizeof (*tp)); } return (fail); @@ -811,7 +811,7 @@ lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg) msg->msg_recvaftersend = 0; msg->msg_receiving = 0; - LASSERT (PTL_NETTYP(PTL_NIDNET(ni->ni_nid)) == LOLND || + LASSERT (LNET_NETTYP(LNET_NIDNET(ni->ni_nid)) == LOLND || (msg->msg_txcredit && msg->msg_peertxcredit)); rc = (ni->ni_lnd->lnd_send)(ni, priv, msg); @@ -1182,7 +1182,7 @@ lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg) } /* Is this for someone on a local network? */ - local_ni = lnet_net2ni_locked(PTL_NIDNET(dst_nid)); + local_ni = lnet_net2ni_locked(LNET_NIDNET(dst_nid)); if (local_ni != NULL) { if (src_ni == NULL) { @@ -1226,7 +1226,7 @@ lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg) LASSERT (lp->lp_ni == src_ni); } else { /* sending to a remote network */ - rnet = lnet_find_net_locked(PTL_NIDNET(dst_nid)); + rnet = lnet_find_net_locked(LNET_NIDNET(dst_nid)); if (rnet == NULL) { if (src_ni != NULL) lnet_ni_decref_locked(src_ni); @@ -1277,7 +1277,7 @@ lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg) msg->msg_target_is_router = 1; msg->msg_target.nid = lp->lp_nid; - msg->msg_target.pid = LUSTRE_SRV_PTL_PID; + msg->msg_target.pid = LUSTRE_SRV_LNET_PID; } /* 'lp' is our best choice of peer */ @@ -1736,7 +1736,7 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid, void *private) } if (the_lnet.ln_ptlcompat == 0 && - PTL_NIDNET(dest_nid) == PTL_NIDNET(ni->ni_nid)) { + LNET_NIDNET(dest_nid) == LNET_NIDNET(ni->ni_nid)) { /* should have gone direct */ CERROR ("%s, %s: Bad dest nid %s " "(should have been sent direct)\n", @@ -2128,7 +2128,7 @@ LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, int *orderp) lnet_ni_t *ni; lnet_route_t *route; lnet_remotenet_t *rnet; - __u32 dstnet = PTL_NIDNET(dstnid); + __u32 dstnet = LNET_NIDNET(dstnid); int hops; int order = 0; @@ -2142,9 +2142,9 @@ LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, int *orderp) if (ni->ni_nid == dstnid || (the_lnet.ln_ptlcompat > 0 && - PTL_NIDNET(dstnid) == 0 && - PTL_NIDADDR(dstnid) == PTL_NIDADDR(ni->ni_nid) && - PTL_NETTYP(PTL_NIDNET(ni->ni_nid)) != LOLND)) { + LNET_NIDNET(dstnid) == 0 && + LNET_NIDADDR(dstnid) == LNET_NIDADDR(ni->ni_nid) && + LNET_NETTYP(LNET_NIDNET(ni->ni_nid)) != LOLND)) { if (srcnidp != NULL) *srcnidp = dstnid; if (orderp != NULL) @@ -2153,10 +2153,10 @@ LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, int *orderp) return 0; } - if (PTL_NIDNET(ni->ni_nid) == dstnet || + if (LNET_NIDNET(ni->ni_nid) == dstnet || (the_lnet.ln_ptlcompat > 0 && dstnet == 0 && - PTL_NETTYP(PTL_NIDNET(ni->ni_nid)) != LOLND)) { + LNET_NETTYP(LNET_NIDNET(ni->ni_nid)) != LOLND)) { if (srcnidp != NULL) *srcnidp = ni->ni_nid; if (orderp != NULL) diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index c7ac4e2..a8a2a25 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index cf48eec..4851822 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -22,19 +22,19 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include static int config_on_load = 0; CFS_MODULE_PARM(config_on_load, "i", int, 0444, "configure network at module load"); -static int lnet_ioctl(unsigned int cmd, struct portal_ioctl_data *data) +static int lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data) { int initrc; int rc; - if (cmd == IOC_PORTAL_UNCONFIGURE) { + if (cmd == IOC_LIBCFS_UNCONFIGURE) { /* ghastly hack to prevent repeated net config */ LNET_MUTEX_DOWN(&the_lnet.ln_api_mutex); initrc = the_lnet.ln_niinit_self; @@ -50,7 +50,7 @@ static int lnet_ioctl(unsigned int cmd, struct portal_ioctl_data *data) return rc == 0 ? 0 : -EBUSY; } - initrc = LNetNIInit(LUSTRE_SRV_PTL_PID); + initrc = LNetNIInit(LUSTRE_SRV_LNET_PID); if (initrc < 0) RETURN (-ENETDOWN); @@ -86,7 +86,7 @@ static int init_lnet(void) the_lnet.ln_niinit_self = 1; LNET_MUTEX_UP(&the_lnet.ln_api_mutex); - rc = LNetNIInit(LUSTRE_SRV_PTL_PID); + rc = LNetNIInit(LUSTRE_SRV_LNET_PID); if (rc != 0) { /* Can't LNetFini or fail now if I loaded NALs */ LNET_MUTEX_DOWN(&the_lnet.ln_api_mutex); diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c index 2319131..a48df00 100644 --- a/lnet/lnet/peer.c +++ b/lnet/lnet/peer.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define DEBUG_SUBSYSTEM S_PORTALS +#define DEBUG_SUBSYSTEM S_LNET #include @@ -33,7 +33,7 @@ lnet_create_peer_table(void) int i; LASSERT (the_lnet.ln_peer_hash == NULL); - PORTAL_ALLOC(hash, LNET_PEER_HASHSIZE * sizeof(struct list_head)); + LIBCFS_ALLOC(hash, LNET_PEER_HASHSIZE * sizeof(struct list_head)); if (hash == NULL) { CERROR("Can't allocate peer hash table\n"); @@ -58,7 +58,7 @@ lnet_destroy_peer_table(void) for (i = 0; i < LNET_PEER_HASHSIZE; i++) LASSERT (list_empty(&the_lnet.ln_peer_hash[i])); - PORTAL_FREE(the_lnet.ln_peer_hash, + LIBCFS_FREE(the_lnet.ln_peer_hash, LNET_PEER_HASHSIZE * sizeof (struct list_head)); the_lnet.ln_peer_hash = NULL; } @@ -108,7 +108,7 @@ lnet_destroy_peer_locked (lnet_peer_t *lp) LASSERT (list_empty(&lp->lp_txq)); LASSERT (lp->lp_txqnob == 0); - PORTAL_FREE(lp, sizeof(*lp)); + LIBCFS_FREE(lp, sizeof(*lp)); LNET_LOCK(); @@ -119,7 +119,7 @@ lnet_destroy_peer_locked (lnet_peer_t *lp) lnet_peer_t * lnet_find_peer_locked (lnet_nid_t nid) { - unsigned int idx = PTL_NIDADDR(nid) % LNET_PEER_HASHSIZE; + unsigned int idx = LNET_NIDADDR(nid) % LNET_PEER_HASHSIZE; struct list_head *peers = &the_lnet.ln_peer_hash[idx]; struct list_head *tmp; lnet_peer_t *lp; @@ -154,7 +154,7 @@ lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid) LNET_UNLOCK(); - PORTAL_ALLOC(lp, sizeof(*lp)); + LIBCFS_ALLOC(lp, sizeof(*lp)); if (lp == NULL) { *lpp = NULL; return -ENOMEM; @@ -175,17 +175,17 @@ lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid) lp2 = lnet_find_peer_locked(nid); if (lp2 != NULL) { LNET_UNLOCK(); - PORTAL_FREE(lp, sizeof(*lp)); + LIBCFS_FREE(lp, sizeof(*lp)); LNET_LOCK(); *lpp = lp2; return 0; } - lp->lp_ni = lnet_net2ni_locked(PTL_NIDNET(nid)); + lp->lp_ni = lnet_net2ni_locked(LNET_NIDNET(nid)); if (lp->lp_ni == NULL) { LNET_UNLOCK(); - PORTAL_FREE(lp, sizeof(*lp)); + LIBCFS_FREE(lp, sizeof(*lp)); LNET_LOCK(); *lpp = NULL; diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 85b88a7..41eed78 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -66,7 +66,7 @@ kpr_do_upcall (void *arg) libcfs_run_upcall (argv); - PORTAL_FREE(u, sizeof(*u)); + LIBCFS_FREE(u, sizeof(*u)); } void @@ -75,7 +75,7 @@ kpr_upcall (lnet_nid_t gw_nid, int alive, time_t when) /* May be in arbitrary context */ kpr_upcall_t *u; - PORTAL_ALLOC_ATOMIC(u, sizeof(*u)); + LIBCFS_ALLOC_ATOMIC(u, sizeof(*u)); if (u == NULL) { CERROR ("Upcall out of memory: nid %s %s\n", libcfs_nid2str(gw_nid), alive ? "up" : "down"); @@ -102,7 +102,7 @@ lnet_notify (lnet_ni_t *ni, lnet_nid_t gateway_nid, int alive, time_t when) alive ? "up" : "down"); if (ni != NULL && - PTL_NIDNET(ni->ni_nid) != PTL_NIDNET(gateway_nid)) { + LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(gateway_nid)) { CWARN ("Ignoring notification of %s %s by %s (different net)\n", libcfs_nid2str(gateway_nid), alive ? "birth" : "death", libcfs_nid2str(ni->ni_nid)); @@ -221,10 +221,10 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) libcfs_net2str(net), hops, libcfs_nid2str(gateway)); if (gateway == LNET_NID_ANY || - PTL_NETTYP(PTL_NIDNET(gateway)) == LOLND || - net == PTL_NIDNET(LNET_NID_ANY) || - PTL_NETTYP(net) == LOLND || - PTL_NIDNET(gateway) == net || + LNET_NETTYP(LNET_NIDNET(gateway)) == LOLND || + net == LNET_NIDNET(LNET_NID_ANY) || + LNET_NETTYP(net) == LOLND || + LNET_NIDNET(gateway) == net || hops < 1 || hops > 255) return (-EINVAL); @@ -232,15 +232,15 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) return 0; /* ignore the route entry */ /* Assume net, route, all new */ - PORTAL_ALLOC(route, sizeof(*route)); - PORTAL_ALLOC(rnet, sizeof(*rnet)); + LIBCFS_ALLOC(route, sizeof(*route)); + LIBCFS_ALLOC(rnet, sizeof(*rnet)); if (route == NULL || rnet == NULL) { CERROR("Out of memory creating route %s %d %s\n", libcfs_net2str(net), hops, libcfs_nid2str(gateway)); if (route != NULL) - PORTAL_FREE(route, sizeof(*route)); + LIBCFS_FREE(route, sizeof(*route)); if (rnet != NULL) - PORTAL_FREE(rnet, sizeof(*rnet)); + LIBCFS_FREE(rnet, sizeof(*rnet)); return -ENOMEM; } @@ -254,8 +254,8 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) if (rc != 0) { LNET_UNLOCK(); - PORTAL_FREE(route, sizeof(*route)); - PORTAL_FREE(rnet, sizeof(*rnet)); + LIBCFS_FREE(route, sizeof(*route)); + LIBCFS_FREE(rnet, sizeof(*rnet)); if (rc == -EHOSTUNREACH) /* gateway is not on a local net */ return 0; /* ignore the route entry */ @@ -309,11 +309,11 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) } else { lnet_peer_decref_locked(route->lr_gateway); LNET_UNLOCK(); - PORTAL_FREE(route, sizeof(*route)); + LIBCFS_FREE(route, sizeof(*route)); } if (rnet != rnet2) - PORTAL_FREE(rnet, sizeof(*rnet)); + LIBCFS_FREE(rnet, sizeof(*rnet)); while (!list_empty(&zombies)) { route = list_entry(zombies.next, lnet_route_t, lr_list); @@ -322,7 +322,7 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) LNET_LOCK(); lnet_peer_decref_locked(route->lr_gateway); LNET_UNLOCK(); - PORTAL_FREE(route, sizeof(*route)); + LIBCFS_FREE(route, sizeof(*route)); } return rc; @@ -386,7 +386,7 @@ lnet_del_route (__u32 net, lnet_nid_t gw_nid) list_for_each (e1, &the_lnet.ln_remote_nets) { rnet = list_entry(e1, lnet_remotenet_t, lrn_list); - if (!(net == PTL_NIDNET(LNET_NID_ANY) || + if (!(net == LNET_NIDNET(LNET_NID_ANY) || net == rnet->lrn_net)) continue; @@ -408,10 +408,10 @@ lnet_del_route (__u32 net, lnet_nid_t gw_nid) lnet_peer_decref_locked(route->lr_gateway); LNET_UNLOCK(); - PORTAL_FREE(route, sizeof (*route)); + LIBCFS_FREE(route, sizeof (*route)); if (rnet != NULL) - PORTAL_FREE(rnet, sizeof(*rnet)); + LIBCFS_FREE(rnet, sizeof(*rnet)); rc = 0; goto again; @@ -425,7 +425,7 @@ lnet_del_route (__u32 net, lnet_nid_t gw_nid) void lnet_destroy_routes (void) { - lnet_del_route(PTL_NIDNET(LNET_NID_ANY), LNET_NID_ANY); + lnet_del_route(LNET_NIDNET(LNET_NID_ANY), LNET_NID_ANY); } int @@ -470,7 +470,7 @@ lnet_destory_rtrbuf(lnet_rtrbuf_t *rb, int npages) while (--npages >= 0) __free_page(rb->rb_kiov[npages].kiov_page); - PORTAL_FREE(rb, sz); + LIBCFS_FREE(rb, sz); } lnet_rtrbuf_t * @@ -482,7 +482,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp) lnet_rtrbuf_t *rb; int i; - PORTAL_ALLOC(rb, sz); + LIBCFS_ALLOC(rb, sz); rb->rb_pool = rbp; @@ -492,7 +492,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp) while (--i >= 0) __free_page(rb->rb_kiov[i].kiov_page); - PORTAL_FREE(rb, sz); + LIBCFS_FREE(rb, sz); return NULL; } diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index e1cbcdc..b51f5f2 100644 --- a/lnet/lnet/router_proc.c +++ b/lnet/lnet/router_proc.c @@ -43,7 +43,7 @@ lnet_router_proc_stats_read (char *page, char **start, off_t off, lnet_counters_t *ctrs; int rc; - PORTAL_ALLOC(ctrs, sizeof(*ctrs)); + LIBCFS_ALLOC(ctrs, sizeof(*ctrs)); if (ctrs == NULL) return -ENOMEM; @@ -65,7 +65,7 @@ lnet_router_proc_stats_read (char *page, char **start, off_t off, ctrs->send_length, ctrs->recv_length, ctrs->route_length, ctrs->drop_length); - PORTAL_FREE(ctrs, sizeof(*ctrs)); + LIBCFS_FREE(ctrs, sizeof(*ctrs)); return rc; } @@ -160,7 +160,7 @@ lnet_router_seq_start (struct seq_file *s, loff_t *pos) lnet_route_seq_iterator_t *lrsi; int rc; - PORTAL_ALLOC(lrsi, sizeof(*lrsi)); + LIBCFS_ALLOC(lrsi, sizeof(*lrsi)); if (lrsi == NULL) return NULL; @@ -169,7 +169,7 @@ lnet_router_seq_start (struct seq_file *s, loff_t *pos) if (rc == 0) return lrsi; - PORTAL_FREE(lrsi, sizeof(*lrsi)); + LIBCFS_FREE(lrsi, sizeof(*lrsi)); return NULL; } @@ -179,7 +179,7 @@ lnet_router_seq_stop (struct seq_file *s, void *iter) lnet_route_seq_iterator_t *lrsi = iter; if (lrsi != NULL) - PORTAL_FREE(lrsi, sizeof(*lrsi)); + LIBCFS_FREE(lrsi, sizeof(*lrsi)); } static void * @@ -191,7 +191,7 @@ lnet_router_seq_next (struct seq_file *s, void *iter, loff_t *pos) rc = lnet_router_seq_seek(lrsi, next); if (rc != 0) { - PORTAL_FREE(lrsi, sizeof(*lrsi)); + LIBCFS_FREE(lrsi, sizeof(*lrsi)); return NULL; } @@ -338,7 +338,7 @@ lnet_peer_seq_start (struct seq_file *s, loff_t *pos) lnet_peer_seq_iterator_t *lpsi; int rc; - PORTAL_ALLOC(lpsi, sizeof(*lpsi)); + LIBCFS_ALLOC(lpsi, sizeof(*lpsi)); if (lpsi == NULL) return NULL; @@ -348,7 +348,7 @@ lnet_peer_seq_start (struct seq_file *s, loff_t *pos) if (rc == 0) return lpsi; - PORTAL_FREE(lpsi, sizeof(*lpsi)); + LIBCFS_FREE(lpsi, sizeof(*lpsi)); return NULL; } @@ -358,7 +358,7 @@ lnet_peer_seq_stop (struct seq_file *s, void *iter) lnet_peer_seq_iterator_t *lpsi = iter; if (lpsi != NULL) - PORTAL_FREE(lpsi, sizeof(*lpsi)); + LIBCFS_FREE(lpsi, sizeof(*lpsi)); } static void * @@ -370,7 +370,7 @@ lnet_peer_seq_next (struct seq_file *s, void *iter, loff_t *pos) rc = lnet_peer_seq_seek(lpsi, next); if (rc != 0) { - PORTAL_FREE(lpsi, sizeof(*lpsi)); + LIBCFS_FREE(lpsi, sizeof(*lpsi)); return NULL; } @@ -503,7 +503,7 @@ lnet_buffer_seq_start (struct seq_file *s, loff_t *pos) lnet_buffer_seq_iterator_t *lbsi; int rc; - PORTAL_ALLOC(lbsi, sizeof(*lbsi)); + LIBCFS_ALLOC(lbsi, sizeof(*lbsi)); if (lbsi == NULL) return NULL; @@ -512,7 +512,7 @@ lnet_buffer_seq_start (struct seq_file *s, loff_t *pos) if (rc == 0) return lbsi; - PORTAL_FREE(lbsi, sizeof(*lbsi)); + LIBCFS_FREE(lbsi, sizeof(*lbsi)); return NULL; } @@ -522,7 +522,7 @@ lnet_buffer_seq_stop (struct seq_file *s, void *iter) lnet_buffer_seq_iterator_t *lbsi = iter; if (lbsi != NULL) - PORTAL_FREE(lbsi, sizeof(*lbsi)); + LIBCFS_FREE(lbsi, sizeof(*lbsi)); } static void * @@ -534,7 +534,7 @@ lnet_buffer_seq_next (struct seq_file *s, void *iter, loff_t *pos) rc = lnet_buffer_seq_seek(lbsi, next); if (rc != 0) { - PORTAL_FREE(lbsi, sizeof(*lbsi)); + LIBCFS_FREE(lbsi, sizeof(*lbsi)); return NULL; } @@ -653,7 +653,7 @@ lnet_ni_seq_start (struct seq_file *s, loff_t *pos) lnet_ni_seq_iterator_t *lnsi; int rc; - PORTAL_ALLOC(lnsi, sizeof(*lnsi)); + LIBCFS_ALLOC(lnsi, sizeof(*lnsi)); if (lnsi == NULL) return NULL; @@ -662,7 +662,7 @@ lnet_ni_seq_start (struct seq_file *s, loff_t *pos) if (rc == 0) return lnsi; - PORTAL_FREE(lnsi, sizeof(*lnsi)); + LIBCFS_FREE(lnsi, sizeof(*lnsi)); return NULL; } @@ -672,7 +672,7 @@ lnet_ni_seq_stop (struct seq_file *s, void *iter) lnet_ni_seq_iterator_t *lnsi = iter; if (lnsi != NULL) - PORTAL_FREE(lnsi, sizeof(*lnsi)); + LIBCFS_FREE(lnsi, sizeof(*lnsi)); } static void * @@ -684,7 +684,7 @@ lnet_ni_seq_next (struct seq_file *s, void *iter, loff_t *pos) rc = lnet_ni_seq_seek(lnsi, next); if (rc != 0) { - PORTAL_FREE(lnsi, sizeof(*lnsi)); + LIBCFS_FREE(lnsi, sizeof(*lnsi)); return NULL; } diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c index c9ed801..28ec36e 100644 --- a/lnet/tests/ping_cli.c +++ b/lnet/tests/ping_cli.c @@ -71,14 +71,14 @@ pingcli_shutdown(int err) case 4: /* Free our buffers */ if (client->outbuf != NULL) - PORTAL_FREE (client->outbuf, STDSIZE + client->size); + LIBCFS_FREE (client->outbuf, STDSIZE + client->size); if (client->inbuf != NULL) - PORTAL_FREE (client->inbuf, + LIBCFS_FREE (client->inbuf, (client->size + STDSIZE) * client->count); if (client != NULL) - PORTAL_FREE (client, + LIBCFS_FREE (client, sizeof(struct pingcli_data)); } @@ -105,7 +105,7 @@ static void pingcli_callback(lnet_event_t *ev) static void -pingcli_start(struct portal_ioctl_data *args) +pingcli_start(struct libcfs_ioctl_data *args) { unsigned ping_head_magic = __cpu_to_le32(PING_HEADER_MAGIC); int rc; @@ -124,7 +124,7 @@ pingcli_start(struct portal_ioctl_data *args) client->size, client->count, client->timeout); - PORTAL_ALLOC (client->outbuf, STDSIZE + client->size) ; + LIBCFS_ALLOC (client->outbuf, STDSIZE + client->size) ; if (client->outbuf == NULL) { CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE); @@ -132,7 +132,7 @@ pingcli_start(struct portal_ioctl_data *args) return; } - PORTAL_ALLOC (client->inbuf, + LIBCFS_ALLOC (client->inbuf, (client->size + STDSIZE) * client->count); if (client->inbuf == NULL) { @@ -260,9 +260,9 @@ pingcli_start(struct portal_ioctl_data *args) /* called by the portals_ioctl for ping requests */ -int kping_client(struct portal_ioctl_data *args) +int kping_client(struct libcfs_ioctl_data *args) { - PORTAL_ALLOC (client, sizeof(struct pingcli_data)); + LIBCFS_ALLOC (client, sizeof(struct pingcli_data)); if (client == NULL) { CERROR ("Unable to allocate client structure\n"); diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c index 0646d9f..c50a749 100644 --- a/lnet/tests/ping_srv.c +++ b/lnet/tests/ping_srv.c @@ -69,10 +69,10 @@ static void *pingsrv_shutdown(int err) case 5: if (server->in_buf != NULL) - PORTAL_FREE (server->in_buf, MAXSIZE); + LIBCFS_FREE (server->in_buf, MAXSIZE); if (server != NULL) - PORTAL_FREE (server, + LIBCFS_FREE (server, sizeof (struct pingsrv_data)); } @@ -217,7 +217,7 @@ static struct pingsrv_data *pingsrv_setup(void) return pingsrv_shutdown (2); } - PORTAL_ALLOC (server->in_buf, MAXSIZE); + LIBCFS_ALLOC (server->in_buf, MAXSIZE); if(!server->in_buf){ CDEBUG (D_OTHER,"Allocation error\n"); return pingsrv_shutdown(2); @@ -257,7 +257,7 @@ static int __init pingsrv_init(void) { ping_head_magic = __cpu_to_le32(PING_HEADER_MAGIC); ping_bulk_magic = __cpu_to_le32(PING_BULK_MAGIC); - PORTAL_ALLOC (server, sizeof(struct pingsrv_data)); + LIBCFS_ALLOC (server, sizeof(struct pingsrv_data)); atomic_set(&pkt, 0); return pingsrv_start (); } /* pingsrv_init() */ diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c index a4923d7..0895506 100644 --- a/lnet/tests/sping_cli.c +++ b/lnet/tests/sping_cli.c @@ -77,14 +77,14 @@ pingcli_shutdown(int err) case 4: /* Free our buffers */ if (client->outbuf != NULL) - PORTAL_FREE (client->outbuf, STDSIZE); + LIBCFS_FREE (client->outbuf, STDSIZE); if (client->inbuf != NULL) - PORTAL_FREE (client->inbuf, STDSIZE); + LIBCFS_FREE (client->inbuf, STDSIZE); if (client != NULL) - PORTAL_FREE (client, + LIBCFS_FREE (client, sizeof(struct pingcli_data)); } @@ -99,7 +99,7 @@ static void pingcli_callback(lnet_event_t *ev) static void -pingcli_start(struct portal_ioctl_data *args) +pingcli_start(struct libcfs_ioctl_data *args) { unsigned ping_head_magic = PING_HEADER_MAGIC; int rc; @@ -117,7 +117,7 @@ pingcli_start(struct portal_ioctl_data *args) client->size, client->count, client->timeout); - PORTAL_ALLOC (client->outbuf, STDSIZE) ; + LIBCFS_ALLOC (client->outbuf, STDSIZE) ; if (client->outbuf == NULL) { CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE); @@ -125,7 +125,7 @@ pingcli_start(struct portal_ioctl_data *args) return; } - PORTAL_ALLOC (client->inbuf, STDSIZE); + LIBCFS_ALLOC (client->inbuf, STDSIZE); if (client->inbuf == NULL) { @@ -237,10 +237,10 @@ pingcli_start(struct portal_ioctl_data *args) /* called by the portals_ioctl for ping requests */ -int kping_client(struct portal_ioctl_data *args) +int kping_client(struct libcfs_ioctl_data *args) { - PORTAL_ALLOC (client, sizeof(struct pingcli_data)); + LIBCFS_ALLOC (client, sizeof(struct pingcli_data)); memset (client, 0, sizeof(struct pingcli_data)); if (client == NULL) { diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c index d9d8321..a576987 100644 --- a/lnet/tests/sping_srv.c +++ b/lnet/tests/sping_srv.c @@ -90,10 +90,10 @@ static void *pingsrv_shutdown(int err) case 4: if (server->in_buf != NULL) - PORTAL_FREE (server->in_buf, STDSIZE); + LIBCFS_FREE (server->in_buf, STDSIZE); if (server != NULL) - PORTAL_FREE (server, + LIBCFS_FREE (server, sizeof (struct pingsrv_data)); } @@ -221,7 +221,7 @@ static struct pingsrv_data *pingsrv_setup(void) return pingsrv_shutdown (2); } - PORTAL_ALLOC (server->in_buf, STDSIZE); + LIBCFS_ALLOC (server->in_buf, STDSIZE); if(!server->in_buf){ CDEBUG (D_OTHER,"Allocation error\n"); return pingsrv_shutdown(2); @@ -261,7 +261,7 @@ static int pingsrv_start(void) static int __init pingsrv_init(void) { - PORTAL_ALLOC (server, sizeof(struct pingsrv_data)); + LIBCFS_ALLOC (server, sizeof(struct pingsrv_data)); return pingsrv_start (); } /* pingsrv_init() */ diff --git a/lnet/tests/ut_cli.c b/lnet/tests/ut_cli.c index a6e2650..3a6e255 100644 --- a/lnet/tests/ut_cli.c +++ b/lnet/tests/ut_cli.c @@ -42,8 +42,8 @@ static int __init utcli_init(void) return -EINVAL; } - PJK_UT_MSG("PORTAL_ALLOC\n"); - PORTAL_ALLOC (buffer, pkt_size); + PJK_UT_MSG("LIBCFS_ALLOC\n"); + LIBCFS_ALLOC (buffer, pkt_size); if (buffer == NULL) { CERROR ("Unable to allocate out_buf (%d bytes)\n", pkt_size); @@ -191,7 +191,7 @@ exit1: LNetNIFini(); exit0: if(buffer) - PORTAL_FREE(buffer,pkt_size); + LIBCFS_FREE(buffer,pkt_size); return -1; } /* utcli_init() */ diff --git a/lnet/tests/ut_srv.c b/lnet/tests/ut_srv.c index 73a3c7b..3ffbac6 100644 --- a/lnet/tests/ut_srv.c +++ b/lnet/tests/ut_srv.c @@ -28,8 +28,8 @@ static int __init utsrv_init(void) PJK_UT_MSG("pkt_size=%d\n",pkt_size); PJK_UT_MSG("auto_unlink=%d\n",auto_unlink); - PJK_UT_MSG("PORTAL_ALLOC\n"); - PORTAL_ALLOC (buffer, pkt_size); + PJK_UT_MSG("LIBCFS_ALLOC\n"); + LIBCFS_ALLOC (buffer, pkt_size); if (buffer == NULL) { CERROR ("Unable to allocate out_buf (%d bytes)\n", pkt_size); @@ -112,7 +112,7 @@ exit2: PJK_UT_MSG("LNetNiFini()\n"); LNetNIFini(); exit1: - PORTAL_FREE(buffer,pkt_size); + LIBCFS_FREE(buffer,pkt_size); exit0: PJK_UT_MSG("<<< rc=%d\n",rc); return rc; @@ -131,7 +131,7 @@ static void /*__exit*/ utsrv_cleanup(void) LNetEQFree(eqh); PJK_UT_MSG("LNetNiFini()\n"); LNetNIFini(); - PORTAL_FREE(buffer,pkt_size); + LIBCFS_FREE(buffer,pkt_size); PJK_UT_MSG("<<<\n"); } /* utsrv_cleanup() */ diff --git a/lnet/ulnds/ptllnd/ptllnd.c b/lnet/ulnds/ptllnd/ptllnd.c index b947ff6..76de220 100644 --- a/lnet/ulnds/ptllnd/ptllnd.c +++ b/lnet/ulnds/ptllnd/ptllnd.c @@ -115,7 +115,7 @@ ptllnd_create_buffer (lnet_ni_t *ni) ptllnd_ni_t *plni = ni->ni_data; ptllnd_buffer_t *buf; - PORTAL_ALLOC(buf, sizeof(*buf)); + LIBCFS_ALLOC(buf, sizeof(*buf)); if (buf == NULL) { CERROR("Can't allocate buffer descriptor\n"); return NULL; @@ -124,11 +124,11 @@ ptllnd_create_buffer (lnet_ni_t *ni) buf->plb_ni = ni; buf->plb_posted = 0; - PORTAL_ALLOC(buf->plb_buffer, plni->plni_buffer_size); + LIBCFS_ALLOC(buf->plb_buffer, plni->plni_buffer_size); if (buf->plb_buffer == NULL) { CERROR("Can't allocate buffer size %d\n", plni->plni_buffer_size); - PORTAL_FREE(buf, sizeof(*buf)); + LIBCFS_FREE(buf, sizeof(*buf)); return NULL; } @@ -147,8 +147,8 @@ ptllnd_destroy_buffer (ptllnd_buffer_t *buf) plni->plni_nbuffers--; list_del(&buf->plb_list); - PORTAL_FREE(buf->plb_buffer, plni->plni_buffer_size); - PORTAL_FREE(buf, sizeof(*buf)); + LIBCFS_FREE(buf->plb_buffer, plni->plni_buffer_size); + LIBCFS_FREE(buf, sizeof(*buf)); } int @@ -225,7 +225,7 @@ ptllnd_create_peer_hash (lnet_ni_t *ni) ptllnd_ni_t *plni = ni->ni_data; int i; - PORTAL_ALLOC(plni->plni_peer_hash, + LIBCFS_ALLOC(plni->plni_peer_hash, plni->plni_peer_hash_size * sizeof(*plni->plni_peer_hash)); if (plni->plni_peer_hash == NULL) { CERROR("Can't allocate ptllnd peer hash (size %d)\n", @@ -248,7 +248,7 @@ ptllnd_destroy_peer_hash (lnet_ni_t *ni) for (i = 0; i < plni->plni_peer_hash_size; i++) LASSERT (list_empty(&plni->plni_peer_hash[i])); - PORTAL_FREE(plni->plni_peer_hash, + LIBCFS_FREE(plni->plni_peer_hash, plni->plni_peer_hash_size * sizeof(*plni->plni_peer_hash)); } @@ -303,7 +303,7 @@ ptllnd_shutdown (lnet_ni_t *ni) LASSERT (rc == PTL_OK); ptllnd_destroy_peer_hash(ni); - PORTAL_FREE(plni, sizeof(*plni)); + LIBCFS_FREE(plni, sizeof(*plni)); ptllnd_ni_count--; } @@ -324,7 +324,7 @@ ptllnd_startup (lnet_ni_t *ni) ptllnd_ni_count++; - PORTAL_ALLOC(plni, sizeof(*plni)); + LIBCFS_ALLOC(plni, sizeof(*plni)); if (plni == NULL) { CERROR("Can't allocate ptllnd state\n"); rc = -ENOMEM; @@ -377,7 +377,7 @@ ptllnd_startup (lnet_ni_t *ni) failed2: ptllnd_destroy_peer_hash(ni); failed1: - PORTAL_FREE(plni, sizeof(*plni)); + LIBCFS_FREE(plni, sizeof(*plni)); failed0: ptllnd_ni_count--; return rc; diff --git a/lnet/ulnds/ptllnd/ptllnd.h b/lnet/ulnds/ptllnd/ptllnd.h index 61f7dcc..715804c 100644 --- a/lnet/ulnds/ptllnd/ptllnd.h +++ b/lnet/ulnds/ptllnd/ptllnd.h @@ -17,7 +17,7 @@ */ -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #include #include diff --git a/lnet/ulnds/ptllnd/ptllnd_cb.c b/lnet/ulnds/ptllnd/ptllnd_cb.c index d516dce..d8de788 100644 --- a/lnet/ulnds/ptllnd/ptllnd_cb.c +++ b/lnet/ulnds/ptllnd/ptllnd_cb.c @@ -39,7 +39,7 @@ ptllnd_destroy_peer(ptllnd_peer_t *peer) LASSERT (peer->plp_closing); LASSERT (plni->plni_npeers > 0); plni->plni_npeers--; - PORTAL_FREE(peer, sizeof(*peer)); + LIBCFS_FREE(peer, sizeof(*peer)); } void @@ -69,13 +69,13 @@ ptllnd_peer_t * ptllnd_find_peer(lnet_ni_t *ni, lnet_nid_t nid, int create) { ptllnd_ni_t *plni = ni->ni_data; - unsigned int hash = PTL_NIDADDR(nid) % plni->plni_peer_hash_size; + unsigned int hash = LNET_NIDADDR(nid) % plni->plni_peer_hash_size; struct list_head *tmp; ptllnd_peer_t *plp; ptllnd_tx_t *tx; int rc; - LASSERT (PTL_NIDNET(nid) == PTL_NIDNET(ni->ni_nid)); + LASSERT (LNET_NIDNET(nid) == LNET_NIDNET(ni->ni_nid)); list_for_each(tmp, &plni->plni_peer_hash[hash]) { plp = list_entry(tmp, ptllnd_peer_t, plp_list); @@ -97,7 +97,7 @@ ptllnd_find_peer(lnet_ni_t *ni, lnet_nid_t nid, int create) return NULL; } - PORTAL_ALLOC(plp, sizeof(*plp)); + LIBCFS_ALLOC(plp, sizeof(*plp)); if (plp == NULL) { CERROR("Can't allocate new peer %s\n", libcfs_nid2str(nid)); @@ -107,7 +107,7 @@ ptllnd_find_peer(lnet_ni_t *ni, lnet_nid_t nid, int create) plp->plp_ni = ni; plp->plp_nid = nid; - plp->plp_ptlid.nid = PTL_NIDADDR(nid); + plp->plp_ptlid.nid = LNET_NIDADDR(nid); plp->plp_ptlid.pid = plni->plni_pid; plp->plp_max_credits = plp->plp_credits = 1; /* add more later when she gives me credits */ @@ -182,7 +182,7 @@ ptllnd_new_tx(ptllnd_peer_t *peer, int type, int payload_nob) LASSERT (msgsize <= peer->plp_max_msg_size); - PORTAL_ALLOC(tx, offsetof(ptllnd_tx_t, tx_msg) + msgsize); + LIBCFS_ALLOC(tx, offsetof(ptllnd_tx_t, tx_msg) + msgsize); if (tx == NULL) { CERROR("Can't allocate msg type %d for %s\n", @@ -266,7 +266,7 @@ ptllnd_tx_done(ptllnd_tx_t *tx) ptllnd_abort_tx(tx, &tx->tx_bulkmdh); if (tx->tx_niov > 0) { - PORTAL_FREE(tx->tx_iov, tx->tx_niov * sizeof(*tx->tx_iov)); + LIBCFS_FREE(tx->tx_iov, tx->tx_niov * sizeof(*tx->tx_iov)); tx->tx_niov = 0; } @@ -284,7 +284,7 @@ ptllnd_tx_done(ptllnd_tx_t *tx) LASSERT (plni->plni_ntxs > 0); plni->plni_ntxs--; - PORTAL_FREE(tx, offsetof(ptllnd_tx_t, tx_msg) + tx->tx_msgsize); + LIBCFS_FREE(tx, offsetof(ptllnd_tx_t, tx_msg) + tx->tx_msgsize); } void @@ -323,7 +323,7 @@ ptllnd_set_txiov(ptllnd_tx_t *tx, } for (;;) { - PORTAL_ALLOC(piov, niov * sizeof(*piov)); + LIBCFS_ALLOC(piov, niov * sizeof(*piov)); if (piov == NULL) return -ENOMEM; @@ -352,7 +352,7 @@ ptllnd_set_txiov(ptllnd_tx_t *tx, /* Dang! The piov I allocated was too big and it's a drag to * have to maintain separate 'allocated' and 'used' sizes, so * I'll just do it again; NB this doesn't happen normally... */ - PORTAL_FREE(piov, niov * sizeof(*piov)); + LIBCFS_FREE(piov, niov * sizeof(*piov)); niov = npiov; } } @@ -785,7 +785,7 @@ ptllnd_rx_done(ptllnd_rx_t *rx) ptllnd_check_sends(rx->rx_peer); if (rx->rx_msg != (kptl_msg_t *)rx->rx_space) - PORTAL_FREE(rx, offsetof(ptllnd_rx_t, rx_space[rx->rx_nob])); + LIBCFS_FREE(rx, offsetof(ptllnd_rx_t, rx_space[rx->rx_nob])); LASSERT (plni->plni_nrxs > 0); plni->plni_nrxs--; @@ -802,7 +802,7 @@ ptllnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, LASSERT (stackrx->rx_msg != (kptl_msg_t *)stackrx->rx_space); - PORTAL_ALLOC(heaprx, offsetof(ptllnd_rx_t, rx_space[stackrx->rx_nob])); + LIBCFS_ALLOC(heaprx, offsetof(ptllnd_rx_t, rx_space[stackrx->rx_nob])); if (heaprx == NULL) return -ENOMEM; diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c index 6b54c1b..326779a 100644 --- a/lnet/ulnds/socklnd/connection.c +++ b/lnet/ulnds/socklnd/connection.c @@ -360,7 +360,7 @@ connection force_tcp_connection(manager m, lnet_nid_t nid, procbridge pb) { - unsigned int ip = PTL_NIDADDR(nid); + unsigned int ip = LNET_NIDADDR(nid); connection conn; struct sockaddr_in addr; struct sockaddr_in locaddr; diff --git a/lnet/ulnds/socklnd/debug.c b/lnet/ulnds/socklnd/debug.c deleted file mode 100644 index f661d12..0000000 --- a/lnet/ulnds/socklnd/debug.c +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * Copyright (C) 2002 Cluster File Systems, Inc. - * Author: Phil Schwan - * - * This file is part of Lustre, http://www.lustre.org. - * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include -#include -#include -#include -#include - -int smp_processor_id = 1; -char debug_file_path[1024] = "/tmp/lustre-log"; -char debug_file_name[1024]; -FILE *debug_file_fd; - -int portals_do_debug_dumplog(void *arg) -{ - printf("Look in %s\n", debug_file_name); - return 0; -} - - -void portals_debug_print(void) -{ - return; -} - - -void libcfs_debug_dumplog(void) -{ - printf("Look in %s\n", debug_file_name); - return; -} - - -int portals_debug_init(unsigned long bufsize) -{ - debug_file_fd = stdout; - return 0; -} - -int portals_debug_cleanup(void) -{ - return 0; //close(portals_debug_fd); -} - -int portals_debug_clear_buffer(void) -{ - return 0; -} - -int portals_debug_mark_buffer(char *text) -{ - - fprintf(debug_file_fd, "*******************************************************************************\n"); - fprintf(debug_file_fd, "DEBUG MARKER: %s\n", text); - fprintf(debug_file_fd, "*******************************************************************************\n"); - - return 0; -} - -int portals_debug_copy_to_user(char *buf, unsigned long len) -{ - return 0; -} - -/* FIXME: I'm not very smart; someone smarter should make this better. */ -void -libcfs_debug_msg (int subsys, int mask, char *file, const char *fn, - const int line, unsigned long stack, char *format, ...) -{ - va_list ap; - unsigned long flags; - struct timeval tv; - int nob; - - - /* NB since we pass a non-zero sized buffer (at least) on the first - * print, we can be assured that by the end of all the snprinting, - * we _do_ have a terminated buffer, even if our message got truncated. - */ - - gettimeofday(&tv, NULL); - - nob += fprintf(debug_file_fd, - "%02x:%06x:%d:%lu.%06lu ", - subsys >> 24, mask, smp_processor_id, - tv.tv_sec, tv.tv_usec); - - nob += fprintf(debug_file_fd, - "(%s:%d:%s() %d+%ld): ", - file, line, fn, 0, - 8192 - ((unsigned long)&flags & 8191UL)); - - va_start (ap, format); - nob += fprintf(debug_file_fd, format, ap); - va_end (ap); - - -} - -void -libcfs_assertion_failed(char *expr, char *file, const char *func, - const int line) -{ - libcfs_debug_msg(0, D_EMERG, file, func, line, 0, - "ASSERTION(%s) failed\n", expr); - abort(); -} diff --git a/lnet/ulnds/socklnd/select.c b/lnet/ulnds/socklnd/select.c index 49c770f..f843556 100644 --- a/lnet/ulnds/socklnd/select.c +++ b/lnet/ulnds/socklnd/select.c @@ -25,7 +25,7 @@ * io events through the select system call. */ -#define DEBUG_SUBSYSTEM S_NAL +#define DEBUG_SUBSYSTEM S_LND #ifdef sun #include diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index a833953..238e26e 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -195,14 +195,14 @@ static void applymask_all(unsigned int subs_mask, unsigned int debug_mask) applymask("/proc/sys/lnet/subsystem_debug", subs_mask); applymask("/proc/sys/lnet/debug", debug_mask); } else { - struct portals_debug_ioctl_data data; + struct libcfs_debug_ioctl_data data; data.hdr.ioc_len = sizeof(data); data.hdr.ioc_version = 0; data.subs = subs_mask; data.debug = debug_mask; - dump(OBD_DEV_ID, PTL_IOC_DEBUG_MASK, &data); + dump(OBD_DEV_ID, LIBCFS_IOC_DEBUG_MASK, &data); } printf("Applied subsystem_debug=%d, debug=%d to /proc/sys/lnet\n", subs_mask, debug_mask); @@ -596,7 +596,7 @@ out: int jt_dbg_clear_debug_buf(int argc, char **argv) { int rc; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; if (argc != 1) { fprintf(stderr, "usage: %s\n", argv[0]); @@ -604,14 +604,14 @@ int jt_dbg_clear_debug_buf(int argc, char **argv) } memset(&data, 0, sizeof(data)); - if (portal_ioctl_pack(&data, &buf, max) != 0) { - fprintf(stderr, "portal_ioctl_pack failed.\n"); + if (libcfs_ioctl_pack(&data, &buf, max) != 0) { + fprintf(stderr, "libcfs_ioctl_pack failed.\n"); return -1; } - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_CLEAR_DEBUG, buf); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_CLEAR_DEBUG, buf); if (rc) { - fprintf(stderr, "IOC_PORTAL_CLEAR_DEBUG failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_CLEAR_DEBUG failed: %s\n", strerror(errno)); return -1; } @@ -621,7 +621,7 @@ int jt_dbg_clear_debug_buf(int argc, char **argv) int jt_dbg_mark_debug_buf(int argc, char **argv) { int rc, max_size = MAX_MARK_SIZE-1; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; char *text; time_t now = time(NULL); @@ -647,14 +647,14 @@ int jt_dbg_mark_debug_buf(int argc, char **argv) memset(&data, 0, sizeof(data)); data.ioc_inllen1 = strlen(text) + 1; data.ioc_inlbuf1 = text; - if (portal_ioctl_pack(&data, &buf, max) != 0) { - fprintf(stderr, "portal_ioctl_pack failed.\n"); + if (libcfs_ioctl_pack(&data, &buf, max) != 0) { + fprintf(stderr, "libcfs_ioctl_pack failed.\n"); return -1; } - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_MARK_DEBUG, buf); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_MARK_DEBUG, buf); if (rc) { - fprintf(stderr, "IOC_PORTAL_MARK_DEBUG failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_MARK_DEBUG failed: %s\n", strerror(errno)); return -1; } @@ -822,7 +822,7 @@ int jt_dbg_modules(int argc, char **argv) int jt_dbg_panic(int argc, char **argv) { int rc; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; if (argc != 1) { fprintf(stderr, "usage: %s\n", argv[0]); @@ -830,14 +830,14 @@ int jt_dbg_panic(int argc, char **argv) } memset(&data, 0, sizeof(data)); - if (portal_ioctl_pack(&data, &buf, max) != 0) { - fprintf(stderr, "portal_ioctl_pack failed.\n"); + if (libcfs_ioctl_pack(&data, &buf, max) != 0) { + fprintf(stderr, "libcfs_ioctl_pack failed.\n"); return -1; } - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_PANIC, buf); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_PANIC, buf); if (rc) { - fprintf(stderr, "IOC_PORTAL_PANIC failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_PANIC failed: %s\n", strerror(errno)); return -1; } diff --git a/lnet/utils/l_ioctl.c b/lnet/utils/l_ioctl.c index 27305b0..c913b75 100644 --- a/lnet/utils/l_ioctl.c +++ b/lnet/utils/l_ioctl.c @@ -129,7 +129,7 @@ dump(int dev_id, unsigned int opc, void *buf) { FILE *fp; struct dump_hdr dump_hdr; - struct portal_ioctl_hdr * ioc_hdr = (struct portal_ioctl_hdr *) buf; + struct libcfs_ioctl_hdr * ioc_hdr = (struct libcfs_ioctl_hdr *) buf; int rc; printf("dumping opc %x to %s\n", opc, dump_filename); @@ -278,13 +278,13 @@ parse_dump(char * dump_file, ioc_handler_t ioc_func) while (buf < end) { struct dump_hdr *dump_hdr = (struct dump_hdr *) buf; - struct portal_ioctl_hdr * data; + struct libcfs_ioctl_hdr * data; char tmp[8096]; int rc; line++; - data = (struct portal_ioctl_hdr *) (buf + sizeof(*dump_hdr)); + data = (struct libcfs_ioctl_hdr *) (buf + sizeof(*dump_hdr)); if (buf + data->ioc_len > end ) { fprintf(stderr, "dump file overflow, %p + %d > %p\n", buf, data->ioc_len, end); diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index 4617621..c1ecb3d 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -246,7 +246,7 @@ int g_net_is_compatible (char *cmd, ...) do { nal = va_arg (ap, int); - if (nal == PTL_NETTYP(g_net)) { + if (nal == LNET_NETTYP(g_net)) { va_end (ap); return 1; } @@ -258,7 +258,7 @@ int g_net_is_compatible (char *cmd, ...) fprintf (stderr, "Command %s not compatible with %s NAL\n", cmd, - libcfs_lnd2str(PTL_NETTYP(g_net))); + libcfs_lnd2str(LNET_NETTYP(g_net))); return 0; } @@ -271,8 +271,8 @@ int ptl_initialize(int argc, char **argv) int jt_ptl_network(int argc, char **argv) { - struct portal_ioctl_data data; - __u32 net = PTL_NIDNET(LNET_NID_ANY); + struct libcfs_ioctl_data data; + __u32 net = LNET_NIDNET(LNET_NID_ANY); int set = argc >= 2; int count; int rc; @@ -280,8 +280,8 @@ int jt_ptl_network(int argc, char **argv) if (set && (!strcmp(argv[1], "unconfigure") || !strcmp(argv[1], "down"))) { - PORTAL_IOC_INIT(data); - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_UNCONFIGURE, &data); + LIBCFS_IOC_INIT(data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_UNCONFIGURE, &data); if (rc == 0) { printf ("lnet ready to unload\n"); @@ -298,16 +298,16 @@ int jt_ptl_network(int argc, char **argv) if (set) { net = libcfs_str2net(argv[1]); - if (net == PTL_NIDNET(LNET_NID_ANY)) { + if (net == LNET_NIDNET(LNET_NID_ANY)) { fprintf(stderr, "Can't parse net %s\n", argv[1]); return -1; } } for (count = 0;; count++) { - PORTAL_IOC_INIT (data); + LIBCFS_IOC_INIT (data); data.ioc_count = count; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_NI, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_NI, &data); if (rc >= 0) { if (!set) { @@ -315,7 +315,7 @@ int jt_ptl_network(int argc, char **argv) continue; } - if (net == PTL_NIDNET(data.ioc_nid)) { + if (net == LNET_NIDNET(data.ioc_nid)) { g_net_set = 1; g_net = net; return 0; @@ -326,7 +326,7 @@ int jt_ptl_network(int argc, char **argv) if (errno == ENOENT) break; - fprintf(stderr,"IOC_PORTAL_GET_NI error %d: %s\n", + fprintf(stderr,"IOC_LIBCFS_GET_NI error %d: %s\n", errno, strerror(errno)); return -1; } @@ -350,7 +350,7 @@ int jt_ptl_network(int argc, char **argv) int jt_ptl_print_interfaces (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; char buffer[3][64]; int index; int rc; @@ -359,11 +359,11 @@ jt_ptl_print_interfaces (int argc, char **argv) return -1; for (index = 0;;index++) { - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_count = index; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_INTERFACE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_INTERFACE, &data); if (rc != 0) break; @@ -390,7 +390,7 @@ jt_ptl_print_interfaces (int argc, char **argv) int jt_ptl_add_interface (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; __u32 ipaddr; int rc; __u32 netmask = 0xffffff00; @@ -423,12 +423,12 @@ jt_ptl_add_interface (int argc, char **argv) } } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_u32[0] = ipaddr; data.ioc_u32[1] = netmask; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_ADD_INTERFACE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_INTERFACE, &data); if (rc != 0) { fprintf (stderr, "failed to add interface: %s\n", strerror (errno)); @@ -441,7 +441,7 @@ jt_ptl_add_interface (int argc, char **argv) int jt_ptl_del_interface (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; __u32 ipaddr = 0; @@ -459,11 +459,11 @@ jt_ptl_del_interface (int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_u32[0] = ipaddr; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_DEL_INTERFACE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_INTERFACE, &data); if (rc != 0) { fprintf (stderr, "failed to delete interface: %s\n", strerror (errno)); @@ -476,8 +476,8 @@ jt_ptl_del_interface (int argc, char **argv) int jt_ptl_print_peers (int argc, char **argv) { - struct portal_ioctl_data data; - lnet_process_id_t id; + struct libcfs_ioctl_data data; + lnet_process_id_t id; char buffer[2][64]; int index; int rc; @@ -487,11 +487,11 @@ jt_ptl_print_peers (int argc, char **argv) return -1; for (index = 0;;index++) { - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_count = index; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_PEER, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER, &data); if (rc != 0) break; @@ -532,8 +532,8 @@ jt_ptl_print_peers (int argc, char **argv) int jt_ptl_add_peer (int argc, char **argv) { - struct portal_ioctl_data data; - lnet_nid_t nid; + struct libcfs_ioctl_data data; + lnet_nid_t nid; __u32 ip = 0; int port = 0; int rc; @@ -577,13 +577,13 @@ jt_ptl_add_peer (int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_nid = nid; data.ioc_u32[0] = ip; data.ioc_u32[1] = port; - rc = l_ioctl (LNET_DEV_ID, IOC_PORTAL_ADD_PEER, &data); + rc = l_ioctl (LNET_DEV_ID, IOC_LIBCFS_ADD_PEER, &data); if (rc != 0) { fprintf (stderr, "failed to add peer: %s\n", strerror (errno)); @@ -596,8 +596,8 @@ jt_ptl_add_peer (int argc, char **argv) int jt_ptl_del_peer (int argc, char **argv) { - struct portal_ioctl_data data; - lnet_nid_t nid = LNET_NID_ANY; + struct libcfs_ioctl_data data; + lnet_nid_t nid = LNET_NID_ANY; __u32 ip = 0; int rc; @@ -631,12 +631,12 @@ jt_ptl_del_peer (int argc, char **argv) } } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_nid = nid; data.ioc_u32[0] = ip; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_DEL_PEER, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_PEER, &data); if (rc != 0) { fprintf (stderr, "failed to remove peer: %s\n", strerror (errno)); @@ -649,8 +649,8 @@ jt_ptl_del_peer (int argc, char **argv) int jt_ptl_print_connections (int argc, char **argv) { - struct portal_ioctl_data data; - lnet_process_id_t id; + struct libcfs_ioctl_data data; + lnet_process_id_t id; char buffer[2][64]; int index; int rc; @@ -660,11 +660,11 @@ jt_ptl_print_connections (int argc, char **argv) return -1; for (index = 0; ; index++) { - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_count = index; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_CONN, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_CONN, &data); if (rc != 0) break; @@ -707,8 +707,8 @@ jt_ptl_print_connections (int argc, char **argv) int jt_ptl_disconnect(int argc, char **argv) { - struct portal_ioctl_data data; - lnet_nid_t nid = LNET_NID_ANY; + struct libcfs_ioctl_data data; + lnet_nid_t nid = LNET_NID_ANY; __u32 ipaddr = 0; int rc; @@ -734,12 +734,12 @@ int jt_ptl_disconnect(int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_nid = nid; data.ioc_u32[0] = ipaddr; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_CLOSE_CONNECTION, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_CLOSE_CONNECTION, &data); if (rc != 0) { fprintf(stderr, "failed to remove connection: %s\n", strerror(errno)); @@ -751,9 +751,9 @@ int jt_ptl_disconnect(int argc, char **argv) int jt_ptl_push_connection (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; - lnet_nid_t nid = LNET_NID_ANY; + lnet_nid_t nid = LNET_NID_ANY; if (argc > 2) { fprintf(stderr, "usage: %s [nid]\n", argv[0]); @@ -769,11 +769,11 @@ int jt_ptl_push_connection (int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_nid = nid; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_PUSH_CONNECTION, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_PUSH_CONNECTION, &data); if (rc != 0) { fprintf(stderr, "failed to push connection: %s\n", strerror(errno)); @@ -786,7 +786,7 @@ int jt_ptl_push_connection (int argc, char **argv) int jt_ptl_print_active_txs (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int index; int rc; @@ -794,11 +794,11 @@ jt_ptl_print_active_txs (int argc, char **argv) return -1; for (index = 0;;index++) { - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_count = index; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_TXDESC, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_TXDESC, &data); if (rc != 0) break; @@ -833,7 +833,7 @@ int jt_ptl_ping(int argc, char **argv) long count = 1; long size = 4; long timeout = 1; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; if (argc < 2) { fprintf(stderr, "usage: %s nid [count] [size] [timeout (secs)]\n", argv[0]); @@ -863,13 +863,13 @@ int jt_ptl_ping(int argc, char **argv) if (argc > 4) timeout = atol (argv[4]); - PORTAL_IOC_INIT (data); + LIBCFS_IOC_INIT (data); data.ioc_count = count; data.ioc_nid = nid; data.ioc_u32[0] = size; data.ioc_u32[1] = timeout; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_PING, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_PING, &data); if (rc) { fprintf(stderr, "failed to start pinger: %s\n", strerror(errno)); @@ -880,8 +880,8 @@ int jt_ptl_ping(int argc, char **argv) int jt_ptl_mynid(int argc, char **argv) { - struct portal_ioctl_data data; - lnet_nid_t nid; + struct libcfs_ioctl_data data; + lnet_nid_t nid; int rc; if (argc != 2) { @@ -895,11 +895,11 @@ int jt_ptl_mynid(int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); - data.ioc_net = PTL_NIDNET(nid); + LIBCFS_IOC_INIT(data); + data.ioc_net = LNET_NIDNET(nid); data.ioc_nid = nid; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_REGISTER_MYNID, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_REGISTER_MYNID, &data); if (rc < 0) fprintf(stderr, "setting my NID failed: %s\n", strerror(errno)); @@ -913,9 +913,9 @@ int jt_ptl_fail_nid (int argc, char **argv) { int rc; - lnet_nid_t nid; + lnet_nid_t nid; unsigned int threshold; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; if (argc < 2 || argc > 3) { @@ -936,13 +936,13 @@ jt_ptl_fail_nid (int argc, char **argv) return (-1); } - PORTAL_IOC_INIT (data); + LIBCFS_IOC_INIT (data); data.ioc_nid = nid; data.ioc_count = threshold; - rc = l_ioctl (LNET_DEV_ID, IOC_PORTAL_FAIL_NID, &data); + rc = l_ioctl (LNET_DEV_ID, IOC_LIBCFS_FAIL_NID, &data); if (rc < 0) - fprintf (stderr, "IOC_PORTAL_FAIL_NID failed: %s\n", + fprintf (stderr, "IOC_LIBCFS_FAIL_NID failed: %s\n", strerror (errno)); else printf ("%s %s\n", threshold == 0 ? "Unfailing" : "Failing", argv[1]); @@ -953,7 +953,7 @@ jt_ptl_fail_nid (int argc, char **argv) int jt_ptl_add_route (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; lnet_nid_t gateway_nid; unsigned int hops = 1; char *end; @@ -982,14 +982,14 @@ jt_ptl_add_route (int argc, char **argv) } } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_count = hops; data.ioc_nid = gateway_nid; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_ADD_ROUTE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data); if (rc != 0) { - fprintf (stderr, "IOC_PORTAL_ADD_ROUTE failed: %s\n", strerror (errno)); + fprintf (stderr, "IOC_LIBCFS_ADD_ROUTE failed: %s\n", strerror (errno)); return (-1); } @@ -999,8 +999,8 @@ jt_ptl_add_route (int argc, char **argv) int jt_ptl_del_route (int argc, char **argv) { - struct portal_ioctl_data data; - lnet_nid_t nid; + struct libcfs_ioctl_data data; + lnet_nid_t nid; int rc; if (argc != 2) { @@ -1014,13 +1014,13 @@ jt_ptl_del_route (int argc, char **argv) return -1; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_net = g_net; data.ioc_nid = nid; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_DEL_ROUTE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data); if (rc != 0) { - fprintf (stderr, "IOC_PORTAL_DEL_ROUTE (%s) failed: %s\n", + fprintf (stderr, "IOC_LIBCFS_DEL_ROUTE (%s) failed: %s\n", libcfs_nid2str(nid), strerror (errno)); return (-1); } @@ -1031,9 +1031,9 @@ jt_ptl_del_route (int argc, char **argv) int jt_ptl_notify_router (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int enable; - lnet_nid_t nid; + lnet_nid_t nid; int rc; struct timeval now; time_t when; @@ -1071,15 +1071,15 @@ jt_ptl_notify_router (int argc, char **argv) return (-1); } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_nid = nid; data.ioc_flags = enable; /* Yeuch; 'cept I need a __u64 on 64 bit machines... */ data.ioc_u64[0] = (__u64)when; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_NOTIFY_ROUTER, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_NOTIFY_ROUTER, &data); if (rc != 0) { - fprintf (stderr, "IOC_PORTAL_NOTIFY_ROUTER (%s) failed: %s\n", + fprintf (stderr, "IOC_LIBCFS_NOTIFY_ROUTER (%s) failed: %s\n", libcfs_nid2str(nid), strerror (errno)); return (-1); } @@ -1090,7 +1090,7 @@ jt_ptl_notify_router (int argc, char **argv) int jt_ptl_print_routes (int argc, char **argv) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; int index; __u32 net; @@ -1100,10 +1100,10 @@ jt_ptl_print_routes (int argc, char **argv) for (index = 0;;index++) { - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_count = index; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_GET_ROUTE, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_ROUTE, &data); if (rc != 0) break; @@ -1127,17 +1127,17 @@ jt_ptl_print_routes (int argc, char **argv) static int lwt_control(int enable, int clear) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_flags = (enable ? 1 : 0) | (clear ? 2 : 0); - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_LWT_CONTROL, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_LWT_CONTROL, &data); if (rc == 0) return (0); - fprintf(stderr, "IOC_PORTAL_LWT_CONTROL failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_LWT_CONTROL failed: %s\n", strerror(errno)); return (-1); } @@ -1146,16 +1146,16 @@ static int lwt_snapshot(cycles_t *now, int *ncpu, int *totalsize, lwt_event_t *events, int size) { - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_pbuf1 = (char *)events; data.ioc_plen1 = size; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_LWT_SNAPSHOT, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_LWT_SNAPSHOT, &data); if (rc != 0) { - fprintf(stderr, "IOC_PORTAL_LWT_SNAPSHOT failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_LWT_SNAPSHOT failed: %s\n", strerror(errno)); return (-1); } @@ -1188,22 +1188,22 @@ static char * lwt_get_string(char *kstr) { char *ustr; - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int size; int rc; /* FIXME: this could maintain a symbol table since we expect to be * looking up the same strings all the time... */ - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_pbuf1 = kstr; data.ioc_plen1 = 1; /* non-zero just to fool portal_ioctl_is_invalid() */ data.ioc_pbuf2 = NULL; data.ioc_plen2 = 0; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_LWT_LOOKUP_STRING, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_LWT_LOOKUP_STRING, &data); if (rc != 0) { - fprintf(stderr, "IOC_PORTAL_LWT_LOOKUP_STRING failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_LWT_LOOKUP_STRING failed: %s\n", strerror(errno)); return (NULL); } @@ -1216,15 +1216,15 @@ lwt_get_string(char *kstr) return (NULL); } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_pbuf1 = kstr; data.ioc_plen1 = 1; /* non-zero just to fool portal_ioctl_is_invalid() */ data.ioc_pbuf2 = ustr; data.ioc_plen2 = size; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_LWT_LOOKUP_STRING, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_LWT_LOOKUP_STRING, &data); if (rc != 0) { - fprintf(stderr, "IOC_PORTAL_LWT_LOOKUP_STRING failed: %s\n", + fprintf(stderr, "IOC_LIBCFS_LWT_LOOKUP_STRING failed: %s\n", strerror(errno)); return (NULL); } @@ -1491,7 +1491,7 @@ int jt_ptl_memhog(int argc, char **argv) { static int gfp = 0; /* sticky! */ - struct portal_ioctl_data data; + struct libcfs_ioctl_data data; int rc; int count; char *end; @@ -1516,10 +1516,10 @@ int jt_ptl_memhog(int argc, char **argv) gfp = rc; } - PORTAL_IOC_INIT(data); + LIBCFS_IOC_INIT(data); data.ioc_count = count; data.ioc_flags = gfp; - rc = l_ioctl(LNET_DEV_ID, IOC_PORTAL_MEMHOG, &data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_MEMHOG, &data); if (rc != 0) { fprintf(stderr, "memhog %d failed: %s\n", count, strerror(errno)); -- 1.8.3.1