Revert "RDMA/cma: Simplify rdma_resolve_addr() error flow" (e4103312) · Commits · 戴 / test

This reverts commit . The call chain below requires the cm_id_priv's destination address to be setup before performing rdma_bind_addr(). Otherwise source port allocation fails as cma_port_is_unique() no longer sees the correct tuple to allow duplicate users of the source port. rdma_resolve_addr() cma_bind_addr() rdma_bind_addr() cma_get_port() cma_alloc_any_port() cma_port_is_unique() <- compared with zero daddr This can result in false failures to connect, particularly if the source port range is restricted. Fixes: ("RDMA/cma: Simplify rdma_resolve_addr() error flow") Link: https://lore.kernel.org/r/20200212072635.682689-4-leon@kernel.org Signed-off-by:

Parav Pandit <parav@mellanox.com> Signed-off-by:

Leon Romanovsky <leonro@mellanox.com> Signed-off-by:

Jason Gunthorpe <jgg@mellanox.com>

drivers/infiniband/core/cma.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -3212,19 +3212,26 @@ int rdma_resolve_addr(struct rdma_cm_id id, struct sockaddr src_addr,
		int ret;

		id_priv = container_of(id, struct rdma_id_private, id);
		memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr));
		if (id_priv->state == RDMA_CM_IDLE) {
		ret = cma_bind_addr(id, src_addr, dst_addr);
		if (ret)
		if (ret) {
		memset(cma_dst_addr(id_priv), 0,
		rdma_addr_size(dst_addr));
		return ret;
		}
		}

		if (cma_family(id_priv) != dst_addr->sa_family)
		if (cma_family(id_priv) != dst_addr->sa_family) {
		memset(cma_dst_addr(id_priv), 0, rdma_addr_size(dst_addr));
		return -EINVAL;
		}

		if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_ADDR_QUERY))
		if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_ADDR_QUERY)) {
		memset(cma_dst_addr(id_priv), 0, rdma_addr_size(dst_addr));
		return -EINVAL;
		}

		memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr));
		if (cma_any_addr(dst_addr)) {
		ret = cma_resolve_loopback(id_priv);
		} else {

Admin message