Commit 8cb7c15b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://github.com/dledford/linux 

Pull infiniband updates from Doug Ledford:
 "Minor updates for 4.1-rc

  Most of the changes are fairly small and well confined.  The iWARP
  address reporting changes are the only ones that are a medium size.  I
  had these queued up prior to rc1, but due to the shuffle in
  maintainers, they did not get submitted when I expected.  My apologies
  for that.  I feel comfortable with them however due to the testing
  they've received, so I left them in this submission"

* tag 'for-linus' of git://github.com/dledford/linux:
  MAINTAINERS: Update InfiniBand subsystem maintainer
  MAINTAINERS: add include/rdma/ to InfiniBand subsystem
  IPoIB/CM: Fix indentation level
  iw_cxgb4: Remove negative advice dmesg warnings
  IB/core: Fix unaligned accesses
  IB/core: change rdma_gid2ip into void function as it always return zero
  IB/qib: use arch_phys_wc_add()
  IB/qib: add acounting for MTRR
  IB/core: dma unmap optimizations
  IB/core: dma map/unmap locking optimizations
  RDMA/cxgb4: Report the actual address of the remote connecting peer
  RDMA/nes: Report the actual address of the remote connecting peer
  RDMA/core: Enable the iWarp Port Mapper to provide the actual address of the connecting peer to its clients
  iw_cxgb4: enforce qp/cq id requirements
  iw_cxgb4: use BAR2 GTS register for T5 kernel mode CQs
  iw_cxgb4: 32b platform fixes
  iw_cxgb4: Cleanup register defines/MACROS
  RDMA/CMA: Canonize IPv4 on IPV6 sockets properly
parents 0e1dc427 b6b2bbe6

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -5042,17 +5042,19 @@ S: Orphan 
F:	drivers/video/fbdev/imsttfb.c



INFINIBAND SUBSYSTEM

M:	Roland Dreier <roland@kernel.org>

M:	Doug Ledford <dledford@redhat.com>

M:	Sean Hefty <sean.hefty@intel.com>

M:	Hal Rosenstock <hal.rosenstock@gmail.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git

T:	git git://github.com/dledford/linux.git

S:	Supported

F:	Documentation/infiniband/

F:	drivers/infiniband/

F:	include/uapi/linux/if_infiniband.h

F:	include/uapi/rdma/

F:	include/rdma/



INOTIFY

M:	John McCutchan <john@johnmccutchan.com>

drivers/infiniband/core/addr.c

+3 −10
Original line number Diff line number Diff line
@@ -472,13 +472,8 @@ int rdma_addr_find_dmac_by_grh(union ib_gid *sgid, union ib_gid *dgid, u8 *dmac, 
	} sgid_addr, dgid_addr;





	ret = rdma_gid2ip(&sgid_addr._sockaddr, sgid);

	if (ret)

		return ret;



	ret = rdma_gid2ip(&dgid_addr._sockaddr, dgid);

	if (ret)

		return ret;

	rdma_gid2ip(&sgid_addr._sockaddr, sgid);

	rdma_gid2ip(&dgid_addr._sockaddr, dgid);



	memset(&dev_addr, 0, sizeof(dev_addr));
@@ -512,10 +507,8 @@ int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id) 
		struct sockaddr_in6 _sockaddr_in6;

	} gid_addr;



	ret = rdma_gid2ip(&gid_addr._sockaddr, sgid);

	rdma_gid2ip(&gid_addr._sockaddr, sgid);



	if (ret)

		return ret;

	memset(&dev_addr, 0, sizeof(dev_addr));

	ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);

	if (ret)

drivers/infiniband/core/cm.c

+11 −12
Original line number Diff line number Diff line
@@ -437,39 +437,38 @@ static struct cm_id_private * cm_acquire_id(__be32 local_id, __be32 remote_id) 
	return cm_id_priv;

}



static void cm_mask_copy(u8 *dst, u8 *src, u8 *mask)

static void cm_mask_copy(u32 *dst, const u32 *src, const u32 *mask)

{

	int i;



	for (i = 0; i < IB_CM_COMPARE_SIZE / sizeof(unsigned long); i++)

		((unsigned long *) dst)[i] = ((unsigned long *) src)[i] &

					     ((unsigned long *) mask)[i];

	for (i = 0; i < IB_CM_COMPARE_SIZE; i++)

		dst[i] = src[i] & mask[i];

}



static int cm_compare_data(struct ib_cm_compare_data *src_data,

			   struct ib_cm_compare_data *dst_data)

{

	u8 src[IB_CM_COMPARE_SIZE];

	u8 dst[IB_CM_COMPARE_SIZE];

	u32 src[IB_CM_COMPARE_SIZE];

	u32 dst[IB_CM_COMPARE_SIZE];



	if (!src_data || !dst_data)

		return 0;



	cm_mask_copy(src, src_data->data, dst_data->mask);

	cm_mask_copy(dst, dst_data->data, src_data->mask);

	return memcmp(src, dst, IB_CM_COMPARE_SIZE);

	return memcmp(src, dst, sizeof(src));

}



static int cm_compare_private_data(u8 *private_data,

static int cm_compare_private_data(u32 *private_data,

				   struct ib_cm_compare_data *dst_data)

{

	u8 src[IB_CM_COMPARE_SIZE];

	u32 src[IB_CM_COMPARE_SIZE];



	if (!dst_data)

		return 0;



	cm_mask_copy(src, private_data, dst_data->mask);

	return memcmp(src, dst_data->data, IB_CM_COMPARE_SIZE);

	return memcmp(src, dst_data->data, sizeof(src));

}



/*
@@ -538,7 +537,7 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv) 


static struct cm_id_private * cm_find_listen(struct ib_device *device,

					     __be64 service_id,

					     u8 *private_data)

					     u32 *private_data)

{

	struct rb_node *node = cm.listen_service_table.rb_node;

	struct cm_id_private *cm_id_priv;
@@ -953,7 +952,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask, 
		cm_mask_copy(cm_id_priv->compare_data->data,

			     compare_data->data, compare_data->mask);

		memcpy(cm_id_priv->compare_data->mask, compare_data->mask,

		       IB_CM_COMPARE_SIZE);

		       sizeof(compare_data->mask));

	}



	cm_id->state = IB_CM_LISTEN;

drivers/infiniband/core/cm_msgs.h

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ struct cm_req_msg { 
	/* local ACK timeout:5, rsvd:3 */

	u8 alt_offset139;



	u8 private_data[IB_CM_REQ_PRIVATE_DATA_SIZE];

	u32 private_data[IB_CM_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];



} __attribute__ ((packed));
@@ -801,7 +801,7 @@ struct cm_sidr_req_msg { 
	__be16 rsvd;

	__be64 service_id;



	u8 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE];

	u32 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];

} __attribute__ ((packed));



struct cm_sidr_rep_msg {

drivers/infiniband/core/cma.c

+17 −10
Original line number Diff line number Diff line
@@ -859,19 +859,27 @@ static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id 
	memcpy(&ib->sib_addr, &path->dgid, 16);

}



static __be16 ss_get_port(const struct sockaddr_storage *ss)

{

	if (ss->ss_family == AF_INET)

		return ((struct sockaddr_in *)ss)->sin_port;

	else if (ss->ss_family == AF_INET6)

		return ((struct sockaddr_in6 *)ss)->sin6_port;

	BUG();

}



static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,

			      struct cma_hdr *hdr)

{

	struct sockaddr_in *listen4, *ip4;

	struct sockaddr_in *ip4;



	listen4 = (struct sockaddr_in *) &listen_id->route.addr.src_addr;

	ip4 = (struct sockaddr_in *) &id->route.addr.src_addr;

	ip4->sin_family = listen4->sin_family;

	ip4->sin_family = AF_INET;

	ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr;

	ip4->sin_port = listen4->sin_port;

	ip4->sin_port = ss_get_port(&listen_id->route.addr.src_addr);



	ip4 = (struct sockaddr_in *) &id->route.addr.dst_addr;

	ip4->sin_family = listen4->sin_family;

	ip4->sin_family = AF_INET;

	ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr;

	ip4->sin_port = hdr->port;

}
@@ -879,16 +887,15 @@ static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_i 
static void cma_save_ip6_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,

			      struct cma_hdr *hdr)

{

	struct sockaddr_in6 *listen6, *ip6;

	struct sockaddr_in6 *ip6;



	listen6 = (struct sockaddr_in6 *) &listen_id->route.addr.src_addr;

	ip6 = (struct sockaddr_in6 *) &id->route.addr.src_addr;

	ip6->sin6_family = listen6->sin6_family;

	ip6->sin6_family = AF_INET6;

	ip6->sin6_addr = hdr->dst_addr.ip6;

	ip6->sin6_port = listen6->sin6_port;

	ip6->sin6_port = ss_get_port(&listen_id->route.addr.src_addr);



	ip6 = (struct sockaddr_in6 *) &id->route.addr.dst_addr;

	ip6->sin6_family = listen6->sin6_family;

	ip6->sin6_family = AF_INET6;

	ip6->sin6_addr = hdr->src_addr.ip6;

	ip6->sin6_port = hdr->port;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE