RDMA/srpt: Join split strings (75d79b80) · Commits · 戴 / test

drivers/infiniband/ulp/srpt/ib_srpt.c

+12 −17

Original line number	Diff line number	Diff line
		@@ -89,8 +89,7 @@ static int srpt_get_u64_x(char buffer, const struct kernel_param kp)
		module_param_call(srpt_service_guid, NULL, srpt_get_u64_x, &srpt_service_guid,
		0444);
		MODULE_PARM_DESC(srpt_service_guid,
		"Using this value for ioc_guid, id_ext, and cm_listen_id"
		" instead of using the node_guid of the first HCA.");
		"Using this value for ioc_guid, id_ext, and cm_listen_id instead of using the node_guid of the first HCA.");

		static struct ib_client srpt_client;
		/* Protects both rdma_cm_port and rdma_cm_id. */
		@@ -1037,8 +1036,7 @@ static int srpt_get_desc_tbl(struct srpt_send_ioctx *ioctx,

		if (nbufs >
		(srp_cmd->data_out_desc_cnt + srp_cmd->data_in_desc_cnt)) {
		pr_err("received unsupported SRP_CMD request"
		" type (%u out + %u in != %u / %zu)\n",
		pr_err("received unsupported SRP_CMD request type (%u out + %u in != %u / %zu)\n",
		srp_cmd->data_out_desc_cnt,
		srp_cmd->data_in_desc_cnt,
		be32_to_cpu(idb->table_desc.len),
		@@ -1352,8 +1350,8 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
		BUILD_BUG_ON(MIN_MAX_RSP_SIZE <= sizeof(*srp_rsp));
		max_sense_len = ch->max_ti_iu_len - sizeof(*srp_rsp);
		if (sense_data_len > max_sense_len) {
		pr_warn("truncated sense data from %d to %d"
		" bytes\n", sense_data_len, max_sense_len);
		pr_warn("truncated sense data from %d to %d bytes\n",
		sense_data_len, max_sense_len);
		sense_data_len = max_sense_len;
		}

		@@ -1693,14 +1691,14 @@ static void srpt_send_done(struct ib_cq cq, struct ib_wc wc)
		atomic_add(1 + ioctx->n_rdma, &ch->sq_wr_avail);

		if (wc->status != IB_WC_SUCCESS)
		pr_info("sending response for ioctx 0x%p failed"
		" with status %d\n", ioctx, wc->status);
		pr_info("sending response for ioctx 0x%p failed with status %d\n",
		ioctx, wc->status);

		if (state != SRPT_STATE_DONE) {
		transport_generic_free_cmd(&ioctx->cmd, 0);
		} else {
		pr_err("IB completion has been received too late for"
		" wr_id = %u.\n", ioctx->ioctx.index);
		pr_err("IB completion has been received too late for wr_id = %u.\n",
		ioctx->ioctx.index);
		}

		srpt_process_wait_list(ch);
		@@ -3023,9 +3021,8 @@ static void srpt_add_one(struct ib_device *device)
		}

		/* print out target login information */
		pr_debug("Target login info: id_ext=%016llx,ioc_guid=%016llx,"
		"pkey=ffff,service_id=%016llx\n", srpt_service_guid,
		srpt_service_guid, srpt_service_guid);
		pr_debug("Target login info: id_ext=%016llx,ioc_guid=%016llx,pkey=ffff,service_id=%016llx\n",
		srpt_service_guid, srpt_service_guid, srpt_service_guid);

		/*
		* We do not have a consistent service_id (ie. also id_ext of target_id)
		@@ -3738,16 +3735,14 @@ static int __init srpt_init_module(void)

		ret = -EINVAL;
		if (srp_max_req_size < MIN_MAX_REQ_SIZE) {
		pr_err("invalid value %d for kernel module parameter"
		" srp_max_req_size -- must be at least %d.\n",
		pr_err("invalid value %d for kernel module parameter srp_max_req_size -- must be at least %d.\n",
		srp_max_req_size, MIN_MAX_REQ_SIZE);
		goto out;
		}

		if (srpt_srq_size < MIN_SRPT_SRQ_SIZE
		\|\| srpt_srq_size > MAX_SRPT_SRQ_SIZE) {
		pr_err("invalid value %d for kernel module parameter"
		" srpt_srq_size -- must be in the range [%d..%d].\n",
		pr_err("invalid value %d for kernel module parameter srpt_srq_size -- must be in the range [%d..%d].\n",
		srpt_srq_size, MIN_SRPT_SRQ_SIZE, MAX_SRPT_SRQ_SIZE);
		goto out;
		}

Admin message