X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Fsocklnd.h;h=ff1fe2381768d56c38912123eb7bc8ad4840c652;hb=db0fb8f2b649c0c389a6915f1bbd49b36bfec4b9;hp=120feddb29350c6d763a4354cde57e059bc365f9;hpb=8d38912a8445060ccb5ca64f956ed8c4d584a904;p=fs%2Flustre-release.git

diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h
index 120fedd..ff1fe23 100644
--- a/lnet/include/lnet/socklnd.h
+++ b/lnet/include/lnet/socklnd.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -29,79 +25,75 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lnet/include/lnet/socklnd.h
- *
- * #defines shared between socknal implementation and utilities
  */
 #ifndef __LNET_LNET_SOCKLND_H__
 #define __LNET_LNET_SOCKLND_H__
 
-#include <lnet/types.h>
-#include <lnet/lib-types.h>
-
-#define SOCKLND_CONN_NONE     (-1)
-#define SOCKLND_CONN_ANY        0
-#define SOCKLND_CONN_CONTROL    1
-#define SOCKLND_CONN_BULK_IN    2
-#define SOCKLND_CONN_BULK_OUT   3
-#define SOCKLND_CONN_NTYPES     4
-
-#define SOCKLND_CONN_ACK        SOCKLND_CONN_BULK_IN
-
-#ifdef __WINNT__
-#include <libcfs/libcfs_pack.h>
-#include <libcfs/libcfs_unpack.h>
-#endif
-typedef struct {
-        __u32                   kshm_magic;     /* magic number of socklnd message */
-        __u32                   kshm_version;   /* version of socklnd message */
-        lnet_nid_t              kshm_src_nid;   /* sender's nid */
-        lnet_nid_t              kshm_dst_nid;   /* destination nid */
-        lnet_pid_t              kshm_src_pid;   /* sender's pid */
-        lnet_pid_t              kshm_dst_pid;   /* destination pid */
-        __u64                   kshm_src_incarnation; /* sender's incarnation */
-        __u64                   kshm_dst_incarnation; /* destination's incarnation */
-        __u32                   kshm_ctype;     /* connection type */
-        __u32                   kshm_nips;      /* # IP addrs */
-        __u32                   kshm_ips[0];    /* IP addrs */
-} WIRE_ATTR ksock_hello_msg_t;
+#include <uapi/linux/lnet/lnet-types.h>
+#include <uapi/linux/lnet/socklnd.h>
 
-typedef struct {
-        lnet_hdr_t              ksnm_hdr;       /* lnet hdr */
+struct ksock_hello_msg {
+	__u32			kshm_magic;	/* LNET_PROTO_MAGIC */
+	__u32			kshm_version;	/* KSOCK_PROTO_V* */
+	struct lnet_nid		kshm_src_nid;	/* sender's nid */
+	struct lnet_nid		kshm_dst_nid;	/* destination nid */
+	lnet_pid_t		kshm_src_pid;	/* sender's pid */
+	lnet_pid_t		kshm_dst_pid;	/* destination pid */
+	__u64			kshm_src_incarnation; /* sender's incarnation */
+	__u64			kshm_dst_incarnation; /* destination's incarnation */
+	__u32			kshm_ctype;	/* SOCKLND_CONN_* */
+	__u32			kshm_nips;	/* always sent as zero */
+	__u32			kshm_ips[0];	/* deprecated */
+} __packed;
 
-        /*
-         * ksnm_payload is removed because of winnt compiler's limitation:
-         * zero-sized array can only be placed at the tail of [nested]
-         * structure definitions. lnet payload will be stored just after
-         * the body of structure ksock_lnet_msg_t 
-         */
-} WIRE_ATTR ksock_lnet_msg_t;
+struct ksock_hello_msg_nid4 {
+	__u32			kshm_magic;	/* LNET_PROTO_MAGIC */
+	__u32			kshm_version;	/* KSOCK_PROTO_V* */
+	lnet_nid_t		kshm_src_nid;	/* sender's nid */
+	lnet_nid_t		kshm_dst_nid;	/* destination nid */
+	lnet_pid_t		kshm_src_pid;	/* sender's pid */
+	lnet_pid_t		kshm_dst_pid;	/* destination pid */
+	__u64			kshm_src_incarnation; /* sender's incarnation */
+	__u64			kshm_dst_incarnation; /* destination's incarnation */
+	__u32			kshm_ctype;	/* SOCKLND_CONN_* */
+	__u32			kshm_nips;	/* sent as zero */
+	__u32			kshm_ips[0];	/* deprecated */
+} __packed;
 
-typedef struct {
-        __u32                   ksm_type;       /* type of socklnd message */
-        __u32                   ksm_csum;       /* checksum if != 0 */
-        __u64                   ksm_zc_cookies[2]; /* Zero-Copy request/ACK cookie */
-        union {
-                ksock_lnet_msg_t lnetmsg;       /* lnet message, it's empty if it's NOOP */
-        } WIRE_ATTR ksm_u;
-} WIRE_ATTR ksock_msg_t;
+struct ksock_msg_hdr {
+	__u32			ksh_type;	/* type of socklnd message */
+	__u32			ksh_csum;	/* checksum if != 0 */
+	__u64			ksh_zc_cookies[2]; /* Zero-Copy request/ACK
+						    * cookie
+						    */
+} __packed;
 
-static inline void
-socklnd_init_msg(ksock_msg_t *msg, int type)
-{
-        msg->ksm_csum           = 0;
-        msg->ksm_type           = type;
-        msg->ksm_zc_cookies[0]  = msg->ksm_zc_cookies[1]  = 0;
-}
+#define KSOCK_MSG_NOOP		0xc0		/* empty */
+#define KSOCK_MSG_LNET		0xc1		/* lnet msg */
 
-#define KSOCK_MSG_NOOP          0xc0            /* ksm_u empty */
-#define KSOCK_MSG_LNET          0xc1            /* lnet msg */
+struct ksock_msg {
+	struct ksock_msg_hdr	ksm_kh;
+	union {
+		/* case ksm_kh.ksh_type == KSOCK_MSG_NOOP */
+		/* - nothing */
+		/* case ksm_kh.ksh_type == KSOCK_MSG_LNET */
+		struct lnet_hdr_nid4 lnetmsg_nid4;
+		/* case ksm_kh.ksh_type == KSOCK_MSG_LNET &&
+		 *      kshm_version >= KSOCK_PROTO_V4
+		 */
+		struct lnet_hdr_nid16 lnetmsg_nid16;
+	} __packed ksm_u;
+} __packed;
+#define ksm_type ksm_kh.ksh_type
+#define ksm_csum ksm_kh.ksh_csum
+#define ksm_zc_cookies ksm_kh.ksh_zc_cookies
 
 /* We need to know this number to parse hello msg from ksocklnd in
  * other LND (usocklnd, for example) */
-#define KSOCK_PROTO_V2          2
-#define KSOCK_PROTO_V3          3
+#define KSOCK_PROTO_V2		2
+#define KSOCK_PROTO_V3		3
+#define KSOCK_PROTO_V4		4
 
 #endif