Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3a2c3ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state
  IB/ehca: Use proper GFP_ flags for get_zeroed_page()
  IB/mthca: Fix PRM compliance problem in atomic-send completions
  RDMA/ucma: Don't report events with invalid user context
  RDMA/ucma: Fix struct ucma_event leak when backlog is full
  RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects
  IB/iser: Return error code when PDUs may not be sent
  IB/mthca: Fix off-by-one in FMR handling on memfree
parents 656829e2 f5e10529

drivers/infiniband/core/cma.c

+14 −3
Original line number Diff line number Diff line
@@ -1088,11 +1088,22 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event) 
		*sin = iw_event->local_addr;

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

		*sin = iw_event->remote_addr;

		if (iw_event->status)

			event.event = RDMA_CM_EVENT_REJECTED;

		else

		switch (iw_event->status) {

		case 0:

			event.event = RDMA_CM_EVENT_ESTABLISHED;

			break;

		case -ECONNRESET:

		case -ECONNREFUSED:

			event.event = RDMA_CM_EVENT_REJECTED;

			break;

		case -ETIMEDOUT:

			event.event = RDMA_CM_EVENT_UNREACHABLE;

			break;

		default:

			event.event = RDMA_CM_EVENT_CONNECT_ERROR;

			break;

		}

		break;

	case IW_CM_EVENT_ESTABLISHED:

		event.event = RDMA_CM_EVENT_ESTABLISHED;

		break;

drivers/infiniband/core/ucma.c

+11 −0
Original line number Diff line number Diff line
@@ -209,10 +209,21 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id, 
	if (event->event == RDMA_CM_EVENT_CONNECT_REQUEST) {

		if (!ctx->backlog) {

			ret = -EDQUOT;

			kfree(uevent);

			goto out;

		}

		ctx->backlog--;

	} else if (!ctx->uid) {

		/*

		 * We ignore events for new connections until userspace has set

		 * their context.  This can only happen if an error occurs on a

		 * new connection before the user accepts it.  This is okay,

		 * since the accept will just fail later.

		 */

		kfree(uevent);

		goto out;

	}



	list_add_tail(&uevent->list, &ctx->file->event_list);

	wake_up_interruptible(&ctx->file->poll_wait);

out:

drivers/infiniband/hw/ehca/ehca_hca.c

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props) 
					      ib_device);

	struct hipz_query_hca *rblock;



	rblock = ehca_alloc_fw_ctrlblock();

	rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);

	if (!rblock) {

		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");

		return -ENOMEM;
@@ -110,7 +110,7 @@ int ehca_query_port(struct ib_device *ibdev, 
					      ib_device);

	struct hipz_query_port *rblock;



	rblock = ehca_alloc_fw_ctrlblock();

	rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);

	if (!rblock) {

		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");

		return -ENOMEM;
@@ -179,7 +179,7 @@ int ehca_query_pkey(struct ib_device *ibdev, u8 port, u16 index, u16 *pkey) 
		return -EINVAL;

	}



	rblock = ehca_alloc_fw_ctrlblock();

	rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);

	if (!rblock) {

		ehca_err(&shca->ib_device,  "Can't allocate rblock memory.");

		return -ENOMEM;
@@ -212,7 +212,7 @@ int ehca_query_gid(struct ib_device *ibdev, u8 port, 
		return -EINVAL;

	}



	rblock = ehca_alloc_fw_ctrlblock();

	rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);

	if (!rblock) {

		ehca_err(&shca->ib_device, "Can't allocate rblock memory.");

		return -ENOMEM;

drivers/infiniband/hw/ehca/ehca_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data, 
	u64 *rblock;

	unsigned long block_count;



	rblock = ehca_alloc_fw_ctrlblock();

	rblock = ehca_alloc_fw_ctrlblock(GFP_ATOMIC);

	if (!rblock) {

		ehca_err(&shca->ib_device, "Cannot allocate rblock memory.");

		ret = -ENOMEM;

drivers/infiniband/hw/ehca/ehca_iverbs.h

+2 −2
Original line number Diff line number Diff line
@@ -180,10 +180,10 @@ int ehca_mmap_register(u64 physical,void **mapped, 
int ehca_munmap(unsigned long addr, size_t len);



#ifdef CONFIG_PPC_64K_PAGES

void *ehca_alloc_fw_ctrlblock(void);

void *ehca_alloc_fw_ctrlblock(gfp_t flags);

void ehca_free_fw_ctrlblock(void *ptr);

#else

#define ehca_alloc_fw_ctrlblock() ((void *) get_zeroed_page(GFP_KERNEL))

#define ehca_alloc_fw_ctrlblock(flags) ((void *) get_zeroed_page(flags))

#define ehca_free_fw_ctrlblock(ptr) free_page((unsigned long)(ptr))

#endif