upstream/oracle/userland-gate: comparison components/open-fabrics/libibverbs/patches/base.patch

equal deleted inserted replaced

-:0521ea8ab0da
+:d1c87d1ecd13
 /*
 diff -r -u /tmp/846623/libibverbs-1.1.4/src/verbs.c libibverbs-1.1.4/src/verbs.c
 --- /tmp/846623/libibverbs-1.1.4/src/verbs.c	Thu Feb  3 01:53:17 2011
 +++ libibverbs-1.1.4/src/verbs.c	Fri Feb 11 04:02:33 2011
-@@ -41,6 +41,11 @@
+@@ -41,9 +41,24 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 +#if defined(__SVR4) && defined(__sun)
 +#include <fcntl.h>
 +#include <sys/mkdev.h>
 +#endif
 #include "ibverbs.h"
-@@ -93,6 +98,12 @@
++#define	IBV_IS_VALID_UGID(gid)	\
++	(gid->raw[0] != 0xff)
++
++#define	IBV_IS_VALID_MGID(gid)					\
++	((gids->raw[0] == 0xff) &&				\
++	((gids->raw[1] == 0x0e) || (gids->raw[1] == 0x02) ||	\
++	(gids->raw[1] == 0x05)  || (gids->raw[1] == 0x08) ||	\
++	(gids->raw[1] == 0x1e)  || (gids->raw[1] == 0x12) ||	\
++	(gids->raw[1] == 0x15)  || (gids->raw[1] == 0x18)))
++
+int ibv_rate_to_mult(enum ibv_rate rate)
+{
+	switch (rate) {
+@@ -93,6 +108,12 @@
 int __ibv_query_gid(struct ibv_context *context, uint8_t port_num,
 		    int index, union ibv_gid *gid)
 {
 +#if defined(__SVR4) && defined(__sun)
 +	extern int sol_ibv_query_gid();
 +
 +#else
 	char name[24];
 	char attr[41];
 	uint16_t val;
-@@ -112,6 +123,7 @@
+@@ -112,6 +133,7 @@
 	}
 	return 0;
 +#endif
 }
 default_symver(__ibv_query_gid, ibv_query_gid);
-@@ -118,6 +130,12 @@
+@@ -118,6 +140,12 @@
 int __ibv_query_pkey(struct ibv_context *context, uint8_t port_num,
 		     int index, uint16_t *pkey)
 {
 +#if defined(__SVR4) && defined(__sun)
 +	extern int sol_ibv_query_pkey();
 +
 +#else
 	char name[24];
 	char attr[8];
 	uint16_t val;
-@@ -133,9 +151,142 @@
+@@ -133,9 +161,159 @@
 	*pkey = htons(val);
 	return 0;
 +#endif
 }
 +int ibv_register_sm_events(struct ibv_context *context,
 +    ibv_sm_event_type_t event, uint_t gid_num, union ibv_gid *gids)
 +{
 +	struct ibv_reg_sm_event		*cmd;
-+	int				rc, cmd_size, data_size;
++	int				cmd_size, data_size;
 +	void				*data_p;
 +
 +	if (((gid_num > 0) && (gids == NULL)) ||
 +	   ((gid_num == 0) && (gids != NULL))) {
 +		errno = EINVAL;
 +	cmd_size = (sizeof (struct ibv_reg_sm_event)) + data_size;
 +	data_p = (void *)gids;
 +	cmd  = alloca(cmd_size);
 +	cmd->data_num = gid_num;
 +
++	if ((event == IBV_SM_EVENT_UGID) && (!IBV_IS_VALID_UGID(gids))) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	if ((event == IBV_SM_EVENT_MGID) && (!IBV_IS_VALID_MGID(gids))) {
++		errno = EINVAL;
++		return (-1);
++	}
++
 +	IBV_INIT_CMD(cmd, cmd_size, REG_SM_EVENT);
 +
 +	cmd->events = event;
 +	if (gid_num > 0)
 +		memcpy(cmd->driver_data, data_p, data_size);
 +
-+	rc = write(context->cmd_fd, cmd, cmd_size);
++	if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) {
-+	if (rc < 0) {
++		errno = EINVAL;
-+		errno = -rc;
++		return (-1);
-+		rc = -1;
++	}
-+	}
++
-+
++	return (0);
-+	return (rc);
 +}
 +
 +int ibv_unregister_sm_events(struct ibv_context *context,
 +    ibv_sm_event_type_t event, uint_t gid_num, union ibv_gid *gids)
 +{
 +	struct ibv_unreg_sm_event	*cmd;
-+	int				rc, cmd_size, data_size;
++	int				cmd_size, data_size;
 +	void				*data_p;
 +
 +	if (((gid_num > 0) && (gids == NULL)) ||
 +	   ((gid_num == 0) && (gids != NULL))) {
 +		errno = EINVAL;
 +	cmd_size = (sizeof (struct ibv_unreg_sm_event)) + data_size;
 +	data_p = (void *)gids;
 +	cmd  = alloca(cmd_size);
 +	cmd->data_num = gid_num;
 +
++	if ((event == IBV_SM_EVENT_UGID) && (!IBV_IS_VALID_UGID(gids))) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	if ((event == IBV_SM_EVENT_MGID) && (!IBV_IS_VALID_MGID(gids))) {
++		errno = EINVAL;
++		return (-1);
++	}
++
 +	IBV_INIT_CMD(cmd, cmd_size, UNREG_SM_EVENT);
 +
 +	cmd->events = event;
 +	if (gid_num > 0)
 +		memcpy(cmd->driver_data, data_p, data_size);
 +
-+	rc = write(context->cmd_fd, cmd, cmd_size);
++	if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) {
-+	if (rc < 0) {
++		errno = EINVAL;
-+		errno = -rc;
++		return (-1);
-+		rc = -1;
++	}
-+	}
++
-+
++	return (0);
-+	return (rc);
 +}
 +
 +int ibv_gid_reachable(struct ibv_context *context,
 +    uint_t port, union ibv_gid *gid_p, int timeout)
 +{
 +
 +	memcpy(cmd->gid, gid_p, sizeof (*gid_p));
 +
 +	rc = write(context->cmd_fd, cmd, sizeof(struct ibv_gid_reachable));
 +	if (rc < 0) {
-+		errno = -rc;
++		return (-1);
-+		rc = -1;
++	}
-+	}
++
-+
++	return (0);
-+	return (rc);
 +}
 +
 struct ibv_pd *__ibv_alloc_pd(struct ibv_context *context)
 {
 	struct ibv_pd *pd;
-@@ -148,6 +299,27 @@
+@@ -148,6 +326,27 @@
 }
 default_symver(__ibv_alloc_pd, ibv_alloc_pd);
 +struct ibv_shpd *__ibv_alloc_shpd(struct ibv_pd *pd, uint64_t share_key, struct ibv_shpd *shpd)
 +{
 +default_symver(__ibv_share_pd, ibv_share_pd);
 +
 int __ibv_dealloc_pd(struct ibv_pd *pd)
 {
 	return pd->context->ops.dealloc_pd(pd);
-@@ -175,6 +347,27 @@
+@@ -175,6 +374,27 @@
 }
 default_symver(__ibv_reg_mr, ibv_reg_mr);
 +struct ibv_mr *__ibv_reg_mr_relaxed(struct ibv_pd *pd, void *addr,
 +			    size_t length, int access)
 +default_symver(__ibv_reg_mr_relaxed, ibv_reg_mr_relaxed);
 +
 int __ibv_dereg_mr(struct ibv_mr *mr)
 {
 	int ret;
-@@ -189,6 +382,26 @@
+@@ -189,6 +409,26 @@
 }
 default_symver(__ibv_dereg_mr, ibv_dereg_mr);
 +int __ibv_dereg_mr_relaxed(struct ibv_mr *mr)
 +{
 +default_symver(__ibv_flush_relaxed_mr, ibv_flush_relaxed_mr);
 +
 static struct ibv_comp_channel *ibv_create_comp_channel_v2(struct ibv_context *context)
 {
 	struct ibv_abi_compat_v2 *t = context->abi_compat;
-@@ -212,6 +425,10 @@
+@@ -212,6 +452,10 @@
 	struct ibv_comp_channel            *channel;
 	struct ibv_create_comp_channel      cmd;
 	struct ibv_create_comp_channel_resp resp;
 +#if defined(__SVR4) && defined(__sun)
 +	int		event_fd;
 +	struct stat	fstat_buf;
 +#endif
 	if (abi_ver <= 2)
 		return ibv_create_comp_channel_v2(context);
-@@ -221,7 +438,23 @@
+@@ -221,7 +465,23 @@
 		return NULL;
 	IBV_INIT_CMD_RESP(&cmd, sizeof cmd, CREATE_COMP_CHANNEL, &resp, sizeof resp);
 +#if defined(__SVR4) && defined(__sun)
 +	event_fd = open("/dev/infiniband/ofs/uverbs:event", O_RDWR);
 +		close(event_fd);
 +#endif
 		free(channel);
 		return NULL;
 	}
-@@ -228,6 +461,9 @@
+@@ -228,6 +488,9 @@
 	VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);
 +#if defined(__SVR4) && defined(__sun)
 +	resp.fd = event_fd;

changeset 1566	d1c87d1ecd13
parent 1399	8f4b38fe52ad
child 2187	391c8a50fa82